debitech 1.3.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80a1113ae193781f0000c1c5ce7d5dff6d4a8ef7
-  data.tar.gz: f129e8f59589dc5a53d1d16d51030599f3926e34
+SHA256:
+  metadata.gz: 448697aa6d7c6fec201cbca4371590832853ab761f32fde54fa510a85598611a
+  data.tar.gz: 475d18a41fbfbf71660dc6e897721fda5b83aea1127609be20954de89894330b
 SHA512:
-  metadata.gz: f747691d6e2a953583edc59bd4e1f6189ab5d93aa2c4772357687d94b83c7c552590fd959f12a54ed395644f67a4e962deddc75f63fd1149ed2068eaff54a477
-  data.tar.gz: 46d07f8d33c8ccd8ad81822074cc029886acbac904bcec55161d9b2e0580692c882fec6e21a986efcdc8045e846c07364122c1b94c5915de607dc257037d88f6
+  metadata.gz: '09ed9bdb56735924483932fa52135f19dc60235e9302814dfe2620509746cb6d008c64ea92d6aa19b298db53933ffdd2daf1a8deab97f453e057a0f57fa025a1'
+  data.tar.gz: '08b6a7ab5517031de70b1bf98e63c9a71b86baa570db26c948717552541039a9c856ce62053d997c70accea43a0a1a1b60a1051f75668957dd0bad3abd9a6ab1'

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ["3.0", "2.7", "2.6", "2.5", "jruby-head"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@ae9cb3b565e36682a2c6045e4f664388da4c73aa
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  Exclude:
+    - "tmp/**/*"
+inherit_gem:
+  barsoom_utils: shared_rubocop.yml

data/Gemfile

@@ -1,2 +1,10 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+gem "rexml" if RUBY_VERSION.start_with?("3")
+
 gemspec
+
+group :development do
+  gem "barsoom_utils", github: "barsoom/barsoom_utils"
+  gem "rubocop"
+end

data/README.md

@@ -1,12 +1,12 @@
 # Debitech
 
-[![Build Status](https://travis-ci.org/barsoom/debitech.png?branch=master)](https://travis-ci.org/barsoom/debitech)
+[![Ruby CI](https://github.com/barsoom/debitech/actions/workflows/ci.yml/badge.svg)](https://github.com/barsoom/debitech/actions/workflows/ci.yml)
 
 This is a DebiTech payment library extracted from production code.
 
 You can use this to do subscription payments without needing to handle any credit card information yourself.
 
-If you want something more low level, check the [debitech_soap](https://github.com/joakimk/debitech_soap) gem, which this library uses for API access.
+If you want something more low-level, check the [debitech_soap](https://github.com/joakimk/debitech_soap) gem, which this library uses for API access.
 
 Setting up payments using DebiTech (one of the two payment systems run by DIBS) is not trivial,
 but it seems there are not many good options in Sweden yet. Atleast using this you don't need to
@@ -22,7 +22,9 @@ Todo:
 
 Add this line to your application's Gemfile:
 
-    gem 'debitech'
+```ruby
+gem 'debitech'
+```
 
 And then execute:
 
@@ -41,68 +43,77 @@ Get the API docs in DIBS manager, setup the account.
 
 ## Usage: Adding a credit card
 
-    # MAC:    Secret key shared by your app and DIBS, get it from the DIBS manager
-    # METHOD: Something like cc.cekab, check the docs or ask support.
-    debitech_web_config = {
-      :merchant => "ACCOUNT_NAME",
-      :secret_key => "MAC",
-      :fields => { :method => "METHOD", pageSet: "my-default-pageset" }
-    }
-
-    # In the view: form to redirect the user to DIBS
-    <% api = Debitech::WebApi.new(debitech_web_config) %>
-    # You can optionally pass a hash of further custom fields.
-    # Note that if you override the "currency" here, you will also need to pass it explicitly into `valid_response?`.
-    <% custom_fields = { pageSet: "my-custom-pageset" } %>
-    <form accept-charset="iso-8859-1" action="<%= api.form_action %>" method="post">
-      <% api.form_fields(custom_fields).each do |name, value| %>
-        <input name="<%= name %>" type="hidden" value="<%= value %>">
-      <% end %>
-
-      <!-- send translation strings, redirect back urls, etc here -->
-      <input name="redirect_back_url" type="hidden" value="https://yourapp/credit_cards">
-    </form>
-
-    # When you get the response back (TODO: add example templates)
-    api.valid_response?(mac, sum, reply, verify_id) # is the response from DIBS?
-    api.approved_reply?(reply)                      # was the card added successfully?
-
-    # Store verify_id as your reference to the card.
+```erb
+# MAC:    Secret key shared by your app and DIBS, get it from the DIBS manager
+# METHOD: Something like cc.cekab, check the docs or ask support.
+debitech_web_config = {
+  :merchant => "ACCOUNT_NAME",
+  :secret_key => "MAC",
+  :fields => { :method => "METHOD", pageSet: "my-default-pageset" }
+}
+
+# In the view: form to redirect the user to DIBS
+<% api = Debitech::WebApi.new(debitech_web_config) %>
+# You can optionally pass a hash of further custom fields.
+# Note that if you override the "currency" here, you will also need to pass it explicitly into `valid_response?`.
+<% custom_fields = { pageSet: "my-custom-pageset" } %>
+<form accept-charset="iso-8859-1" action="<%= api.form_action %>" method="post">
+  <% api.form_fields(custom_fields).each do |name, value| %>
+    <input name="<%= name %>" type="hidden" value="<%= value %>">
+  <% end %>
+
+  <!-- send translation strings, redirect back urls, etc here -->
+  <input name="redirect_back_url" type="hidden" value="https://yourapp/credit_cards">
+</form>
+```
+
+```ruby
+# When you get the response back (TODO: add example templates)
+api.valid_response?(mac, sum, reply, verify_id) # is the response from DIBS?
+api.valid_response?(mac, sum, reply, verify_id, currency, reference_number) # if the request included "referenceNo", do this instead
+api.approved_reply?(reply)                      # was the card added successfully?
+
+# Store verify_id as your reference to the card.
+```
 
 ## Usage: Charging a credit card
 
 Configuration:
 
-    # METHOD, MAC, ACCOUNT_NAME: Just like with the Web Api.
-    # API_USER, API_PASSWORD:    A API user you can create in DIBS manager.
-    debitech_server_config = {
-      :method => "METHOD",
-      :secret_key => "MAC",
-      :soap_opts => {
-        :merchant => "ACCOUNT_NAME",
-        :username => "API_USER",
-        :password => "API_PASSWORD"
-      }
-    }
+```ruby
+# METHOD, MAC, ACCOUNT_NAME: Just like with the Web Api.
+# API_USER, API_PASSWORD:    A API user you can create in DIBS manager.
+debitech_server_config = {
+  :method => "METHOD",
+  :secret_key => "MAC",
+  :soap_opts => {
+    :merchant => "ACCOUNT_NAME",
+    :username => "API_USER",
+    :password => "API_PASSWORD"
+  }
+}
+```
 
 First try to get "valid_credentials?" to return true using [debitech_soap](https://github.com/joakimk/debitech_soap). If it does not work, try to regenerate the password for the API user. Some characters are not possible with the SOAP library.
 
 Charging a credit card:
 
-    debitech = Debitech::ServerApi.new(debitech_server_config)
-
-    # VERIFY_ID:        The id you get back when registering a card.
-    # AMOUNT:           The amount to charge, must be in cents (1 SEK = 100).
-    # IP:               The ip, can be "127.0.0.1", but the request ip is probably more useful.
-    # UNIQUE_REFERENCE: A unique reference, you want this to be something like invoice-NUM, so that you can search for it
-    #                   in DIBS manager with "invoice*". This is required so that you don't charge more than once for a
-    #                   single payment by accident. Must be atleast 5 characters long.
-
-    debitech.charge(:verify_id => verify_id,
-                    :amount => AMOUNT,
-                    :unique_reference => "UNIQUE_REFERENCE",
-                    :currency => "SEK",
-                    :ip => "IP")
+```ruby
+debitech = Debitech::ServerApi.new(debitech_server_config)
+
+# VERIFY_ID:        The id you get back when registering a card.
+# AMOUNT:           The amount to charge, must be in cents (1 SEK = 100).
+# IP:               The ip, can be "127.0.0.1", but the request ip is probably more useful.
+# UNIQUE_REFERENCE: A unique reference, you want this to be something like invoice-NUM, so that you can search for it
+#                   in DIBS manager with "invoice*". This is required so that you don't charge more than once for a
+#                   single payment by accident. Must be atleast 5 characters long.
+
+debitech.charge(:verify_id => verify_id,
+                :amount => AMOUNT,
+                :unique_reference => "UNIQUE_REFERENCE",
+                :currency => "SEK",
+                :ip => "IP")
+```
 
 This returns a Debitech::ServerApi::ChargeResult, check [server_api.rb](https://github.com/barsoom/debitech/blob/master/lib/debitech/server_api.rb).
 

data/Rakefile

@@ -1,11 +1,11 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 desc "Run all specs"
-RSpec::Core::RakeTask.new('spec') do |t|
-  t.pattern = 'spec/**/*.rb'
+RSpec::Core::RakeTask.new("spec") do |t|
+  t.pattern = "spec/**/*.rb"
 end
 
-task :default => :spec
+task default: :spec
 

data/debitech.gemspec

@@ -1,15 +1,16 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/debitech/version', __FILE__)
+require File.expand_path("../lib/debitech/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
-  s.authors       = ["Joakim Kolsjö"]
-  s.email         = ["joakim@barsoom.se"]
+  s.authors       = [ "Joakim Kolsjö" ]
+  s.email         = [ "joakim@barsoom.se" ]
   s.description   = %q{Library for doing payments using DebiTech (DIBS)}
   s.summary       = %q{Library for doing payments using DebiTech (DIBS)}
   s.homepage      = "https://github.com/barsoom/debitech"
   s.name          = "debitech"
   s.version       = Debitech::VERSION
+  s.metadata      = { "rubygems_mfa_required" => "true" }
 
   s.required_ruby_version = ">= 1.8.7"
 
@@ -20,5 +21,5 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  s.require_paths = ["lib"]
+  s.require_paths = [ "lib" ]
 end

data/lib/debitech/server_api.rb

@@ -13,7 +13,7 @@ module Debitech
       end
 
       def success?
-        @response.result_code.to_s[0,1] == "1"
+        @response.result_code.to_s[0, 1] == "1"
       end
 
       def pending?
@@ -44,7 +44,7 @@ module Debitech
       data = "001:payment:1:#{opts[:amount].to_i}:"
       mac = Mac.build [ data, opts[:currency], opts[:unique_reference], @config[:secret_key] ]
       extra = "&method=#{@config[:method]}&currency=#{opts[:currency]}&MAC=#{mac}&referenceNo=#{opts[:unique_reference]}"
-      response = @soap_api.subscribe_and_settle(:verifyID => opts[:verify_id], :ip => opts[:ip], :data => data, :extra => extra)
+      response = @soap_api.subscribe_and_settle(verifyID: opts[:verify_id], ip: opts[:ip], data: data, extra: extra)
       ChargeResult.new(response)
     end
   end

data/lib/debitech/version.rb

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

data/lib/debitech/web_api.rb

@@ -13,19 +13,21 @@ 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)
-      all_fields_except_mac.merge(:MAC => mac)
+      all_fields_except_mac.merge(MAC: mac)
     end
 
     def form_action
       "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)
@@ -40,30 +42,41 @@ module Debitech
 
     def base_fields
       {
-        :currency         => "SEK",
-        :method           => "cc.test",
-        :amount           => "100",
-        :authOnly         => "true",
-        :pageSet          => "creditcard",
-        :data             => "001:auth:1:100:",
-        :uses3dsecure     => "false",
-        :billingFirstName => "First name",
-        :billingLastName  => "Last name",
-        :billingAddress   => "Address",
-        :billingCity      => "City",
-        :billingCountry   => "Country",
-        :eMail            => "email@example.com",
+        currency: "SEK",
+        method: "cc.test",
+        amount: "100",
+        authOnly: "true",
+        pageSet: "creditcard",
+        data: "001:auth:1:100:",
+        billingFirstName: "First name",
+        billingLastName: "Last name",
+        billingAddress: "Address",
+        billingCity: "City",
+        billingCountry: "Country",
+        eMail: "email@example.com",
       }
     end
 
     private
 
     def request_mac(fields)
-      Mac.build [ fields[:data], fields[:currency], fields[:method], @secret_key ]
+      verify_id = fields[:verifyID]
+
+      if verify_id
+        Mac.build [ fields[:data], fields[:currency], fields[:method], @secret_key, verify_id ]
+      else
+        Mac.build [ fields[:data], fields[:currency], fields[:method], @secret_key ]
+      end
     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/lib/debitech.rb

@@ -1,3 +1,3 @@
-require 'debitech/version'
-require 'debitech/server_api'
-require 'debitech/web_api'
+require "debitech/version"
+require "debitech/server_api"
+require "debitech/web_api"

data/spec/debitech/server_api_spec.rb

@@ -2,51 +2,51 @@ require "debitech"
 
 describe Debitech::ServerApi, "charge" do
   let(:unique_reference) {
-    { :unique_reference => "some_unique_ref" }
+    { unique_reference: "some_unique_ref" }
   }
 
   let(:transaction) {
-    { :verify_id => 1234567, :amount => 2235, :currency => "SEK", :ip => "127.0.0.1" }.merge(unique_reference)
+    { verify_id: 1234567, amount: 2235, currency: "SEK", ip: "127.0.0.1" }.merge(unique_reference)
   }
 
   it "should perform a subscribe_and_settle call" do
     settings = {
-      :secret_key => "112756FC8C60C5603C58DA6E0A4844ACFDB60525",
-      :method => "cc.cekab",
-      :soap_opts => {
-        :merchant => "store",
-        :username => "api_user",
-        :password => "api_password",
-      }
+      secret_key: "112756FC8C60C5603C58DA6E0A4844ACFDB60525",
+      method: "cc.cekab",
+      soap_opts: {
+        merchant: "store",
+        username: "api_user",
+        password: "api_password",
+      },
     }
 
     soap_api = double
-    allow(DebitechSoap::API).to receive(:new).
-      with({ :merchant => "store", :username => "api_user", :password => "api_password" }).
-      and_return(soap_api)
+    allow(DebitechSoap::API).to receive(:new)
+      .with({ merchant: "store", username: "api_user", password: "api_password" })
+      .and_return(soap_api)
     expect(soap_api).to receive(:subscribe_and_settle).with(
-      :verifyID => 1234567,
-      :data => "001:payment:1:10000:",
-      :ip => "127.0.0.1",
-      :extra => "&method=cc.cekab&currency=SEK&MAC=1931EE498A77F6B12B2C2D2EC8599719EF9CE419&referenceNo=some_unique_ref",
+      verifyID: 1234567,
+      data: "001:payment:1:10000:",
+      ip: "127.0.0.1",
+      extra: "&method=cc.cekab&currency=SEK&MAC=1931EE498A77F6B12B2C2D2EC8599719EF9CE419&referenceNo=some_unique_ref",
     )
 
     server_api = Debitech::ServerApi.new(settings)
-    server_api.charge(transaction.merge(:amount => 10000))
+    server_api.charge(transaction.merge(amount: 10000))
   end
 
   it "should convert the amount to a integer to avoid 500 errors" do
     soap_api = double
     allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
     expect(soap_api).to receive(:subscribe_and_settle).with(
-      :verifyID => 1234567,
-      :data => "001:payment:1:2235:",
-      :ip => "127.0.0.1",
-      :extra => "&method=&currency=SEK&MAC=78B1144270B1A74A55539FAEB81BB49EC39B90DF&referenceNo=some_unique_ref",
+      verifyID: 1234567,
+      data: "001:payment:1:2235:",
+      ip: "127.0.0.1",
+      extra: "&method=&currency=SEK&MAC=78B1144270B1A74A55539FAEB81BB49EC39B90DF&referenceNo=some_unique_ref",
     )
 
     server_api = Debitech::ServerApi.new({})
-    server_api.charge(transaction.merge(:amount => 2235.0))
+    server_api.charge(transaction.merge(amount: 2235.0))
   end
 
   it "should raise an error if the amount has a fraction" do
@@ -54,7 +54,7 @@ describe Debitech::ServerApi, "charge" do
     allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
     server_api = Debitech::ServerApi.new({})
     expect {
-      server_api.charge(transaction.merge(:amount => 2235.55))
+      server_api.charge(transaction.merge(amount: 2235.55))
     }.to raise_error("The amount (2235.55) contains fractions (for example 10.44 instead of 10), amount should specified in cents.")
   end
 
@@ -63,7 +63,7 @@ describe Debitech::ServerApi, "charge" do
     allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
     server_api = Debitech::ServerApi.new({})
     expect {
-      server_api.charge(transaction.merge(:unique_reference => nil))
+      server_api.charge(transaction.merge(unique_reference: nil))
     }.to raise_error(Debitech::ServerApi::ValidUniqueReferenceRequired)
   end
 
@@ -72,7 +72,7 @@ describe Debitech::ServerApi, "charge" do
     allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
     server_api = Debitech::ServerApi.new({})
     expect {
-      server_api.charge(transaction.merge(:unique_reference => "1234"))
+      server_api.charge(transaction.merge(unique_reference: "1234"))
     }.to raise_error(Debitech::ServerApi::ValidUniqueReferenceRequired)
   end
 
@@ -81,14 +81,14 @@ describe Debitech::ServerApi, "charge" do
     allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
     allow(soap_api).to receive(:subscribe_and_settle)
     server_api = Debitech::ServerApi.new({})
-    server_api.charge(transaction.merge(:unique_reference => "12345"))
+    server_api.charge(transaction.merge(unique_reference: "12345"))
   end
 
   [ 100, 101, 150, 199 ].each do |result_code|
     it "should return success for result_code #{result_code}" do
       soap_api = double
       allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
-      response = double(:result_code => result_code)
+      response = double(result_code: result_code)
       allow(soap_api).to receive(:subscribe_and_settle).and_return(response)
 
       server_api = Debitech::ServerApi.new({})
@@ -104,7 +104,7 @@ describe Debitech::ServerApi, "charge" do
     it "should not be successful for result_code #{result_code}" do
       soap_api = double
       allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
-      response = double(:result_code => result_code)
+      response = double(result_code: result_code)
       allow(soap_api).to receive(:subscribe_and_settle).and_return(response)
 
       server_api = Debitech::ServerApi.new({})
@@ -119,7 +119,7 @@ describe Debitech::ServerApi, "charge" do
   it "should return pending and not be successful for 403" do
     soap_api = double
     allow(DebitechSoap::API).to receive(:new).and_return(soap_api)
-    response = double(:result_code => 403)
+    response = double(result_code: 403)
     allow(soap_api).to receive(:subscribe_and_settle).and_return(response)
     server_api = Debitech::ServerApi.new({})
     result = server_api.charge(unique_reference)

data/spec/debitech/web_api_spec.rb

@@ -3,7 +3,7 @@ require "debitech"
 
 describe Debitech::WebApi do
   let(:secret_key) {
-    { :secret_key => "secretkey" }
+    { secret_key: "secretkey" }
   }
 
   describe "form_fields" do
@@ -14,32 +14,38 @@ describe Debitech::WebApi do
     end
 
     it "is possible to override the values via the initializer" do
-      fields = Debitech::WebApi.new(secret_key.merge(:fields => { :method => "cc.cekab" })).form_fields
+      fields = Debitech::WebApi.new(secret_key.merge(fields: { method: "cc.cekab" })).form_fields
       expect(fields[:method]).to eq "cc.cekab"
     end
 
     it "is possible to override the values via method parameters" do
-      api = Debitech::WebApi.new(secret_key.merge(:fields => { :pageSet => "mydefault" }))
+      api = Debitech::WebApi.new(secret_key.merge(fields: { pageSet: "mydefault" }))
 
       expect(api.form_fields.fetch(:pageSet)).to eq "mydefault"
       expect(api.form_fields(pageSet: "override").fetch(:pageSet)).to eq "override"
     end
 
     it "calculates MAC" do
-      expect(Debitech::WebApi.new({ :secret_key => "secretkey1" }).form_fields[:MAC]).to match /DF253765337968C5ED7E6EA530CD692942416ABE/
-      expect(Debitech::WebApi.new({ :secret_key => "secretkey2" }).form_fields[:MAC]).to match /BEB3C370E37837734642111D44CA7E304A0F45F2/
+      expect(Debitech::WebApi.new({ secret_key: "secretkey1" }).form_fields[:MAC]).to match /DF253765337968C5ED7E6EA530CD692942416ABE/
+      expect(Debitech::WebApi.new({ secret_key: "secretkey2" }).form_fields[:MAC]).to match /BEB3C370E37837734642111D44CA7E304A0F45F2/
     end
 
     it "accounts for overrides in the MAC" do
-      mac_without_override = Debitech::WebApi.new({ :secret_key => "secretkey1" }).form_fields.fetch(:MAC)
-      mac_with_override = Debitech::WebApi.new({ :secret_key => "secretkey1" }).form_fields(method: "other-method").fetch(:MAC)
+      mac_without_override = Debitech::WebApi.new({ secret_key: "secretkey1" }).form_fields.fetch(:MAC)
+      mac_with_override = Debitech::WebApi.new({ secret_key: "secretkey1" }).form_fields(method: "other-method").fetch(:MAC)
       expect(mac_without_override).not_to eq(mac_with_override)
     end
+
+    it "includes verify_id in the MAC if provided" do
+      mac_without_verify_id = Debitech::WebApi.new({ secret_key: "secretkey1" }).form_fields.fetch(:MAC)
+      mac_with_verify_id = Debitech::WebApi.new({ secret_key: "secretkey1" }).form_fields(verifyID: "123456").fetch(:MAC)
+      expect(mac_without_verify_id).not_to eq(mac_with_verify_id)
+    end
   end
 
   describe "form_action" do
     it "return the url based on shop" do
-      api = Debitech::WebApi.new({ :merchant => "myshop" })
+      api = Debitech::WebApi.new({ merchant: "myshop" })
       expect(api.form_action).to include "https://securedt.dibspayment.com/verify/bin/myshop/index"
     end
   end
@@ -72,11 +78,11 @@ describe Debitech::WebApi do
     end
 
     it "is not true if the secretkey is different" do
-      api = Debitech::WebApi.new({ :secret_key => "secretkey2" })
+      api = Debitech::WebApi.new({ secret_key: "secretkey2" })
       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 integer" do
       api = Debitech::WebApi.new(secret_key)
       expect(api.valid_response?("MAC=667026AD7692F9AFDA362919EA72D8E6A250A849", "1,00", "A", 1234567)).to be true
     end
@@ -86,5 +92,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debitech
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Joakim Kolsjö
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debitech_soap
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".rvmrc"
-- ".travis.yml"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -75,7 +75,8 @@ files:
 - spec/debitech/web_api_spec.rb
 homepage: https://github.com/barsoom/debitech
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -91,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.2.28
 signing_key: 
 specification_version: 4
 summary: Library for doing payments using DebiTech (DIBS)

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create ruby-1.9.3@debitech

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.0
-  - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
-  - ruby-head
-  - jruby-head
-
-# Workaround for Travis + Bundler issues. If this ticket has been resolved, maybe we can remove the workaround.
-# https://github.com/travis-ci/travis-ci/issues/3531
-before_install:
-  - gem install bundler