debitech 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82279dd06b05d239c43e6ff2190190fa8ffd654b
-  data.tar.gz: 9dd2575228951cce994151aab74f883af3a64f62
+  metadata.gz: 24d3837cce2fed9f2d327af0a5e14a45956a7826
+  data.tar.gz: 9353b96c987b1314af7487cdd795ef54d9b4ebb5
 SHA512:
-  metadata.gz: e9343f83273a827349186aa6b63187eaf54674c5be823c19ad9968bc891979a1d50b0945a14de5fb1749962a71a4547bbf728696f64bb7efd93f5ccf3d6b9ccc
-  data.tar.gz: e2a9dd971b861a830d0322f88734e304b07e2a6ec2518b71c1280987ce400e02edd0651cb1e29dcaa417c9108f69e78f48ca8cc063df3f9295e6a41d684ff926
+  metadata.gz: 7c309871d7f6a87f2e3abb27fe4a50cbaf137a19f22b923e536dcdc7bbacfc9854a65c3cdde6d0d1600b66ff09d37e9c3464351ee07e5e32850260c37edb0f7d
+  data.tar.gz: 15e0e23ba1d96ab869b5ce09985cafb68000969ed781be8b32d229592f4e0491781bb30a0dcdd74fc999dec7cb537201051a4f17884967cd908d6266aa2c1dc6

data/.travis.yml

@@ -1,9 +1,13 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.3.0
   - 1.9.3
   - jruby-19mode
   - rbx-19mode
   - ruby-head
   - jruby-head
-  - ree
+
+# 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

data/README.md

@@ -46,13 +46,15 @@ Get the API docs in DIBS manager, setup the account.
     debitech_web_config = {
       :merchant => "ACCOUNT_NAME",
       :secret_key => "MAC",
-      :fields => { :method => "METHOD" }
+      :fields => { :method => "METHOD", pageSet: "my-default-pageset" }
     }
 
     # In the view: form to redirect the user to DIBS
+    # You can optionally pass a hash of further custom fields.
     <% api = Debitech::WebApi.new(debitech_web_config) %>
+    <% custom_fields = { pageSet: "my-custom-pageset" } %>
     <form accept-charset="iso-8859-1" action="<%= api.form_action %>" method="post">
-      <% api.form_fields.each do |name, value| %>
+      <% api.form_fields(custom_fields).each do |name, value| %>
         <input name="<%= name %>" type="hidden" value="<%= value %>">
       <% end %>
 

data/lib/debitech/version.rb

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

data/lib/debitech/web_api.rb

@@ -6,16 +6,23 @@ module Debitech
     APPROVED_REPLY = "A"
 
     def initialize(opts = {})
-      @opts = opts
+      @merchant = opts.fetch(:merchant, nil)
+      @secret_key = opts.fetch(:secret_key, nil)
+      @custom_fields = opts.fetch(:fields, {})
     end
 
     # you probably want to encode these when posting to dibs, for example HTMLEntities.new.encode(v, :named) (gem: htmlentities)
-    def form_fields
-      base_fields.merge(:MAC => request_mac)
+    def form_fields(more_custom_fields = {})
+      # 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.
+      base_fields.
+        merge(@custom_fields).
+        merge(more_custom_fields).
+        merge(:MAC => request_mac)
     end
 
     def form_action
-      "https://securedt.dibspayment.com/verify/bin/#{@opts[:merchant]}/index"
+      "https://securedt.dibspayment.com/verify/bin/#{@merchant}/index"
     end
 
     def valid_response?(mac, sum, reply, verify_id)
@@ -42,16 +49,16 @@ module Debitech
         :billingAddress   => "Address",
         :billingCity      => "City",
         :billingCountry   => "Country",
-        :eMail            => "email@example.com"
-      }.merge!(@opts[:fields] || {})
+        :eMail            => "email@example.com",
+      }
     end
 
     def request_mac
-      Mac.build [ base_fields[:data], base_fields[:currency], base_fields[:method], @opts[:secret_key] ]
+      Mac.build [ base_fields[:data], base_fields[:currency], base_fields[:method], @secret_key ]
     end
 
     def response_mac(sum, reply, verify_id)
-      Mac.build [ sum, base_fields[:currency], reply, verify_id, @opts[:secret_key] ]
+      Mac.build [ sum, base_fields[:currency], reply, verify_id, @secret_key ]
     end
   end
 end

data/spec/debitech/web_api_spec.rb

@@ -9,13 +9,20 @@ describe Debitech::WebApi do
   describe "form_fields" do
     it "include static values" do
       fields = Debitech::WebApi.new(secret_key).form_fields
-      expect(fields[:currency]).to match /SEK/
-      expect(fields[:method]).to match /cc.test/
+      expect(fields[:currency]).to eq "SEK"
+      expect(fields[:method]).to eq "cc.test"
     end
 
-    it "is possible to override the values" do
+    it "is possible to override the values via the initializer" do
       fields = Debitech::WebApi.new(secret_key.merge(:fields => { :method => "cc.cekab" })).form_fields
-      expect(fields[:method]).to match /cc.cekab/
+      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" }))
+
+      expect(api.form_fields.fetch(:pageSet)).to eq "mydefault"
+      expect(api.form_fields(pageSet: "override").fetch(:pageSet)).to eq "override"
     end
 
     it "calculate mac" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debitech
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Joakim Kolsjö