debitech 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 80a1113ae193781f0000c1c5ce7d5dff6d4a8ef7
-  data.tar.gz: f129e8f59589dc5a53d1d16d51030599f3926e34
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjQ0NGNhYjM4MjljY2NlNTJjOWY5MGFkZDc1NmJhM2JlYzg3MjBiNA==
+  data.tar.gz: !binary |-
+    Y2Y5NDc3NmQyOTIwODI3YzgzOTYwNzk1OGNiMzVhZDc4NmY2MzdhMA==
 SHA512:
-  metadata.gz: f747691d6e2a953583edc59bd4e1f6189ab5d93aa2c4772357687d94b83c7c552590fd959f12a54ed395644f67a4e962deddc75f63fd1149ed2068eaff54a477
-  data.tar.gz: 46d07f8d33c8ccd8ad81822074cc029886acbac904bcec55161d9b2e0580692c882fec6e21a986efcdc8045e846c07364122c1b94c5915de607dc257037d88f6
+  metadata.gz: !binary |-
+    MWY1YmQ5MTlhODEwYmExMGEyOGE1MTBkZDJjMDU3MTJmNjdiOWY4ODQzMmI5
+    YWIwN2IwNTlmZjU3Y2VmNDU4MThhNTBiZGQzN2Q0ZWI5YjVkOTkxNzJhZDA1
+    YmJlNDUxNmY2YTg2MzIwOTBjNDE0ZjcwNmQxMzZhNWNjYjVjOGE=
+  data.tar.gz: !binary |-
+    MjM3YThkZTM0ZjY2NDQ4YTBhMWE5NzcyMjJkNGZmNjAyMmFlOGFiY2RkMzg4
+    YmEzN2FhYmUzYWYzZDI3ZjhmZTFkOThkODFlMGZiZGJlNWMxY2YxMzBiMjVk
+    MTk4OGJiZDY5ZTgyODg4ZTQxMzQ1OTE2MzE4YWQ2ZDFlNzVhZDk=

data/lib/debitech/version.rb

@@ -1,4 +1,4 @@
 module Debitech
   # try to follow http://semver.org/
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/debitech/web_api.rb

@@ -13,7 +13,7 @@ module Debitech
 
     # you probably want to encode these when posting to dibs, for example HTMLEntities.new.encode(v, :named) (gem: htmlentities)
     def form_fields(more_custom_fields = {})
-      # Overriding via the initializer may be more convenient for per-env stuff like "method"".
+      # Overriding via the initializer may be more convenient for per-env stuff like "method".
       # Overriding via the method argument may be more convenient for per-request stuff like multiple pageSets.
       all_fields_except_mac = custom_fields.merge(more_custom_fields)
       mac = request_mac(all_fields_except_mac)
@@ -24,8 +24,10 @@ module Debitech
       "https://securedt.dibspayment.com/verify/bin/#{@merchant}/index"
     end
 
-    def valid_response?(mac, sum, reply, verify_id, currency = custom_fields[:currency])
-      response_mac(sum, reply, verify_id, currency) == mac.upcase.split("=").last
+    # If the currency was passed into form_fields (and thus isn't known on an instance level),
+    # you will need to pass it in explicitly here.
+    def valid_response?(mac, sum, reply, verify_id, currency = custom_fields[:currency], reference_number = nil)
+      response_mac(sum, reply, verify_id, currency, reference_number) == mac.upcase.split("=").last
     end
 
     def approved_reply?(reply)
@@ -62,8 +64,14 @@ module Debitech
       Mac.build [ fields[:data], fields[:currency], fields[:method], @secret_key ]
     end
 
-    def response_mac(sum, reply, verify_id, currency)
-      Mac.build [ sum, currency, reply, verify_id, @secret_key ]
+    def response_mac(sum, reply, verify_id, currency, reference_number)
+      # Reference number is optional, but if it's passed in when making the payment it
+      # needs to be part of the response_mac calculation to verify the payment result.
+      if reference_number
+        Mac.build [ sum, currency, reply, verify_id, reference_number, @secret_key ]
+      else
+        Mac.build [ sum, currency, reply, verify_id, @secret_key ]
+      end
     end
   end
 end

data/spec/debitech/web_api_spec.rb

@@ -76,7 +76,7 @@ describe Debitech::WebApi do
       expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", "1234567")).to be false
     end
 
-    it "handle if verify_id is an int" do
+    it "handles if verify_id is an int" do
       api = Debitech::WebApi.new(secret_key)
       expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567)).to be true
     end
@@ -86,5 +86,10 @@ describe Debitech::WebApi do
       expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567, "SEK")).to be true
       expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567, "EUR")).to be false
     end
+
+    it "handles MAC based on reference_number" do
+      api = Debitech::WebApi.new(secret_key)
+      expect(api.valid_response?("MAC=AB4698D21798C6F3A1EA25CD67590A072211123D", "1,00", "A", "1234567", "SEK", "ref-123")).to be true
+    end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: debitech
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Joakim Kolsjö
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debitech_soap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Library for doing payments using DebiTech (DIBS)
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rvmrc"
-- ".travis.yml"
+- .gitignore
+- .rvmrc
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Library for doing payments using DebiTech (DIBS)