Fingertips-internetkassa 0.9.3 → 0.9.4

data/lib/abn-amro/internetkassa.rb

@@ -1,5 +1,6 @@
 require 'abn-amro/internetkassa/response'
 require "digest/sha1"
+require "cgi"
 
 module AbnAmro
   class Internetkassa
@@ -26,17 +27,20 @@ module AbnAmro
     PRODUCTION_URL   = "https://internetkassa.abnamro.nl/ncol/prod/orderstandard.asp"
     TEST_URL         = "https://internetkassa.abnamro.nl/ncol/test/orderstandard.asp"
     
+    attr_reader :params
+    
     attr_accessor :order_id, :amount, :description, :currency, :language
     attr_accessor :accept_url, :decline_url, :exception_url, :cancel_url
+    attr_accessor :url_variable, :endpoint_params
     
-    def initialize(options = {})
-      @options = {}
+    def initialize(params = {})
+      @params = {}
       
-      DEFAULT_VALUES.merge(options).each do |k,v|
+      DEFAULT_VALUES.merge(params).each do |k,v|
         if respond_to?("#{k}=")
           send("#{k}=", v)
         else
-          @options[k] = v
+          @params[k] = v
         end
       end
     end
@@ -49,7 +53,7 @@ module AbnAmro
     
     def data
       verify_values!
-      @options.merge(
+      @params.merge(
         :PSPID        => merchant_id,
         :orderID      => @order_id,
         :amount       => @amount,
@@ -57,11 +61,13 @@ module AbnAmro
         :language     => @language,
         :COM          => @description,
         :SHASign      => signature,
+        :PARAMVAR     => @url_variable,
+        :PARAMPLUS    => url_encoded_endpoint_params,
         :accepturl    => @accept_url,
         :declineurl   => @decline_url,
         :exceptionurl => @exception_url,
         :cancelurl    => @cancel_url
-      )
+      ).delete_if { |key, value| value.nil? || value.to_s.empty? }
     end
     
     private
@@ -83,5 +89,10 @@ module AbnAmro
     def signature
       Digest::SHA1.hexdigest("#{@order_id}#{@amount}#{@currency}#{merchant_id}#{passphrase}").upcase
     end
+    
+    def url_encoded_endpoint_params
+      return unless @endpoint_params
+      @endpoint_params.map { |k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&')
+    end
   end
 end

data/test/internetkassa_test.rb

@@ -44,7 +44,9 @@ describe "AbnAmro::Internetkassa, an instance" do
       :order_id => 123,
       :amount => 1000,
       :description => "HappyHardcore vol. 123 - the ballads",
-      :endpoint_url => "http://example.com/payments"
+      :endpoint_url => "http://example.com/payments",
+      :url_variable => ":id",
+      :endpoint_params => [[:session_id, 'abcde12345'], [:message, '“Thanks for your purchase”']]
     }
     @instance = AbnAmro::Internetkassa.new(@valid_attributes)
   end
@@ -67,6 +69,14 @@ describe "AbnAmro::Internetkassa, an instance" do
     @instance.language.should == 'nl_NL'
   end
   
+  it "should return the url_variable" do
+    @instance.url_variable.should == ":id"
+  end
+  
+  it "should return the extra params" do
+    @instance.endpoint_params.should == [[:session_id, 'abcde12345'], [:message, '“Thanks for your purchase”']]
+  end
+  
   it "should have access to the pspid/merchant_id" do
     @instance.send(:merchant_id).should == AbnAmro::Internetkassa.merchant_id
   end
@@ -97,6 +107,8 @@ describe "AbnAmro::Internetkassa, an instance" do
       :language     => @instance.language,
       :COM          => @instance.description,
       :SHASign      => @instance.send(:signature),
+      :PARAMVAR     => @instance.url_variable,
+      :PARAMPLUS    => "session_id=abcde12345&message=%E2%80%9CThanks+for+your+purchase%E2%80%9D",
       :accepturl    => @valid_attributes[:endpoint_url],
       :declineurl   => @valid_attributes[:endpoint_url],
       :exceptionurl => @valid_attributes[:endpoint_url],
@@ -119,6 +131,8 @@ describe "AbnAmro::Internetkassa, an instance" do
       :language     => @instance.language,
       :COM          => @instance.description,
       :SHASign      => @instance.send(:signature),
+      :PARAMVAR     => @instance.url_variable,
+      :PARAMPLUS    => "session_id=abcde12345&message=%E2%80%9CThanks+for+your+purchase%E2%80%9D",
       :accepturl    => @valid_attributes[:endpoint_url],
       :declineurl   => @valid_attributes[:endpoint_url],
       :exceptionurl => @valid_attributes[:endpoint_url],
@@ -126,4 +140,12 @@ describe "AbnAmro::Internetkassa, an instance" do
       :TITLE        => 'My Transaction'
     }
   end
+  
+  it "should not return blank values in the `data'" do
+    @instance.url_variable = nil
+    @instance.data.should.not.has_key :PARAMVAR
+    
+    @instance.url_variable = ''
+    @instance.data.should.not.has_key :PARAMVAR
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Fingertips-internetkassa
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Eloy Duran