Update pedicel to use ruby 2.7 (#36)

Co-authored-by: Bror Winther <[email protected]>

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.5]
+        ruby: [2.7]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Check out repository

lib/pedicel/ec.rb

@@ -3,6 +3,8 @@
 module Pedicel
   class EC < Base
     def ephemeral_public_key
+      @token[:header].transform_keys!(&:to_sym)
+
       Base64.decode64(@token[:header][:ephemeralPublicKey])
     end
 

lib/pedicel/version.rb

@@ -1,3 +1,3 @@
 module Pedicel
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

pedicel.gemspec

@@ -14,11 +14,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir.glob("lib/**/*.rb")
 
-  s.add_runtime_dependency 'dry-validation', '~> 0.11.1'
+  s.add_runtime_dependency 'dry-validation', '1.8'
+  s.add_runtime_dependency 'dry-schema', '~> 1.9'
+  s.add_runtime_dependency 'dry-logic', '~> 1.0'
 
-  s.required_ruby_version = '~> 2.5.5'
+  s.required_ruby_version = '~> 2.7.4'
 
   s.add_development_dependency 'rake', '~> 12.3'
   s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'pedicel-pay', '~> 0.0'
+  s.add_development_dependency 'pry', '~> 0.0'
 end

spec/expectations/schema.rb

@@ -8,8 +8,9 @@
 
   failure_message do |actual|
     <<~EOM
+      #{actual}
       expected that the given hash satisfy the schema, but:
-        #{@check.messages}
+        #{@check.errors.to_h}
     EOM
   end
 end
@@ -19,32 +20,21 @@
     check = expected.call(actual)
 
     @mismatches = mismatches
-    @errors = check.errors
+
+    @errors = check.errors.to_h
 
     return false if check.success?
 
     return true unless mismatches
 
-    return false unless check.errors.keys.sort == mismatches.keys.sort
-
-    check.errors.sort.zip(mismatches.sort).each do |error, mismatch|
-      # Check key
-      return false unless error.first == mismatch.first
-
-      # Check messages
-      next unless mismatch.last.is_a?(Array)
-      return false if error.last.length > mismatch.last.length
-
-      error.last.zip(mismatch.last).each do |error_message, mismatch_message|
-        case mismatch_message
-        when String
-          return false unless error_message == mismatch_message
-        when Regexp
-          return false unless error_message =~ mismatch_message
-        else
-          fail "unknown match type for '#{mismatch_message}'"
-        end
-      end
+    return false unless @errors.keys.include? mismatches.keys.first
+
+    @errors.values.each do |error|
+      return false unless mismatches.values.include? error
+    end
+
+    mismatches.values.each do |mismatch|
+      return false unless @errors.values.include? mismatch
     end
 
     true

spec/lib/pedicel/validator/errors_formatted_spec.rb

@@ -39,7 +39,7 @@ def validator(data)
 
     expect(validator(invalid_data).errors_formatted).to eq [
       'transactionAmount must be an integer',
-      'when paymentDataType is 3DSecure, onlinePaymentCryptogram must be filled'
-    ]
+      'paymentDataType when paymentDataType is 3DSecure, onlinePaymentCryptogram must be filled'
+    ].sort
   end
 end