adyen 1.4.1 → 1.5.0

data/lib/adyen/version.rb

@@ -1,5 +1,5 @@
 module Adyen
   # Version constant for the Adyen plugin.
   # Set it & commit the change before running rake release.
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/api/api_spec.rb

@@ -30,7 +30,7 @@ describe Adyen::API do
           { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737' }
         )
       end
-      
+
       it "performs a `authorise payment' request with additional :fraud_offset" do
         should_map_shortcut_to(:authorise_payment,
           :reference => 'order-id',
@@ -79,7 +79,7 @@ describe Adyen::API do
           { :reference => 'user-id', :email => 's.hopper@example.com' }
         )
       end
-      
+
       it "performs a `authorise recurring payment' request with specific detail" do
         should_map_shortcut_to(:authorise_recurring_payment,
           :reference => 'order-id',
@@ -94,7 +94,7 @@ describe Adyen::API do
           'recurring-detail-reference'
         )
       end
-      
+
       it "performs a `authorise recurring payment' request with specific detail and fraud offset" do
         should_map_shortcut_to(:authorise_recurring_payment,
           :reference => 'order-id',
@@ -123,11 +123,11 @@ describe Adyen::API do
         Adyen::API.authorise_one_click_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
           { :reference => 'user-id', :email => 's.hopper@example.com' },
-          '737',
+          { :cvc => '737' },
           'recurring-detail-reference'
         )
       end
-      
+
       it "performs a `authorise one-click payment' request with specific detail and fraud offset" do
         should_map_shortcut_to(:authorise_one_click_payment,
           :reference => 'order-id',
@@ -140,7 +140,7 @@ describe Adyen::API do
         Adyen::API.authorise_one_click_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
           { :reference => 'user-id', :email => 's.hopper@example.com' },
-          '737',
+          { :cvc => '737' },
           'recurring-detail-reference',
           -10
         )

data/spec/api/payment_service_spec.rb

@@ -23,16 +23,27 @@ shared_examples_for "payment requests" do
     text('./payment:shopperIP').should == '61.294.12.12'
     text('./payment:shopperStatement').should == 'invoice number 123456'
   end
-  
+
   it "includes the fraud offset" do
     text('./payment:fraudOffset').should == '30'
   end
-  
+
   it "does not include the fraud offset if none is given" do
     @payment.params.delete(:fraud_offset)
     xpath('./payment:fraudOffset').should be_empty
   end
 
+  it "includes the given amount of `installments'" do
+    xpath('./payment:installments') do |amount|
+      amount.text('./common:value').should == '6'
+    end
+  end
+
+  it "does not include the installments amount if none is given" do
+    @payment.params.delete(:installments)
+    xpath('./payment:installments').should be_empty
+  end
+
   it "only includes shopper details for given parameters" do
     # TODO pretty lame, but for now it will do
     unless @method == "authorise_one_click_payment_request_body" || @method == "authorise_recurring_payment_request_body"
@@ -95,6 +106,9 @@ describe Adyen::API::PaymentService do
         #:start_month => ,
         #:start_year => ,
       },
+      :installments => {
+        :value => 6
+      },
       :recurring_detail_reference => 'RecurringDetailReference1',
       :fraud_offset => 30
     }
@@ -113,7 +127,7 @@ describe Adyen::API::PaymentService do
       @payment.params[:recurring] = true
       @payment.params[:shopper] = nil
     end
-    
+
     it_should_validate_request_param(:fraud_offset) do
       @payment.params[:fraud_offset] = ''
     end
@@ -128,7 +142,7 @@ describe Adyen::API::PaymentService do
     it "includes the creditcard details" do
       xpath('./payment:card') do |card|
         # there's no reason why Nokogiri should escape these characters, but as long as they're correct
-        card.text('./payment:holderName').should == 'Simon わくわく Hopper'
+        card.text('./payment:holderName').should == 'Simon わくわく Hopper'
         card.text('./payment:number').should == '4444333322221111'
         card.text('./payment:cvc').should == '737'
         card.text('./payment:expiryMonth').should == '12'
@@ -153,6 +167,7 @@ describe Adyen::API::PaymentService do
       :psp_reference => '9876543210987654',
       :result_code => 'Authorised',
       :auth_code => '1234',
+      :additional_data => { "cardSummary" => "1111" },
       :refusal_reason => ''
     })
 
@@ -226,8 +241,9 @@ describe Adyen::API::PaymentService do
 
       it "prepends the error attribute with the given prefix, except for :base" do
         [
-          ["validation 101 Invalid card number", [:card_number, 'is not a valid creditcard number']],
-          ["validation 130 Reference Missing",   [:base,        "validation 130 Reference Missing"]],
+          ["validation 101 Invalid card number",            [:card_number, 'is not a valid creditcard number']],
+          ["validation 130 Reference Missing",              [:base,        "validation 130 Reference Missing"]],
+          ["validation 152 Invalid number of installments", [:base,        "validation 152 Invalid number of installments"]],
         ].each do |message, error|
           response_with_fault_message(message).error(:card).should == error
         end
@@ -274,6 +290,7 @@ describe Adyen::API::PaymentService do
       :psp_reference => '9876543210987654',
       :result_code => 'Authorised',
       :auth_code => '1234',
+      :additional_data => { "cardSummary" => "1111" },
       :refusal_reason => ''
     })
   end
@@ -314,6 +331,7 @@ describe Adyen::API::PaymentService do
       :psp_reference => '9876543210987654',
       :result_code => 'Authorised',
       :auth_code => '1234',
+      :additional_data => { "cardSummary" => "1111" },
       :refusal_reason => ''
     })
   end

data/spec/api/recurring_service_spec.rb

@@ -170,7 +170,7 @@ describe Adyen::API::RecurringService do
     it "includes the creditcard details" do
       xpath('./recurring:card') do |card|
         # there's no reason why Nokogiri should escape these characters, but as long as they're correct
-        card.text('./payment:holderName').should == 'Simon わくわく Hopper'
+        card.text('./payment:holderName').should == 'Simon わくわく Hopper'
         card.text('./payment:number').should == '4444333322221111'
         card.text('./payment:cvc').should == '737'
         card.text('./payment:expiryMonth').should == '12'
@@ -207,7 +207,7 @@ describe Adyen::API::RecurringService do
     it "includes the ELV details" do
       xpath('./recurring:elv') do |elv|
         # there's no reason why Nokogiri should escape these characters, but as long as they're correct        
-        elv.text('./payment:accountHolderName').should == 'Simon わくわく Hopper'
+        elv.text('./payment:accountHolderName').should == 'Simon わくわく Hopper'
         elv.text('./payment:bankAccountNumber').should == '1234567890'
         elv.text('./payment:bankLocation').should == 'Berlin'
         elv.text('./payment:bankLocationId').should == '12345678'

data/spec/api/response_spec.rb

@@ -11,7 +11,7 @@ describe Adyen::API::Response do
 
   it "returns a XMLQuerier instance with the response body" do
     @response.xml_querier.should be_instance_of(Adyen::API::XMLQuerier)
-    @response.xml_querier.to_s.should == AUTHORISE_RESPONSE
+    @response.xml_querier.to_s.rstrip.should == AUTHORISE_RESPONSE.rstrip
   end
 
   describe "with a successful HTTP response" do

data/spec/api/simple_soap_client_spec.rb

@@ -73,7 +73,7 @@ describe Adyen::API::SimpleSOAPClient do
 
     it "returns an Adyen::API::Response instance" do
       @response.should be_instance_of(Adyen::API::Response)
-      @response.xml_querier.to_s.should == AUTHORISE_RESPONSE
+      @response.xml_querier.to_s.rstrip.should == AUTHORISE_RESPONSE.rstrip
     end
 
     [

data/spec/api/spec_helper.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 
 require 'adyen/api'
 
-require 'rubygems'
 require 'nokogiri'
 require 'rexml/document'
 
@@ -223,7 +222,12 @@ AUTHORISE_RESPONSE = <<EOS
   <soap:Body>
     <ns1:authoriseResponse xmlns:ns1="http://payment.services.adyen.com">
       <ns1:paymentResult>
-        <additionalData xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <additionalData xmlns="http://payment.services.adyen.com">
+          <entry>
+            <key xsi:type="xsd:string">cardSummary</key>
+            <value xsi:type="xsd:string">1111</value>
+          </entry>
+        </additionalData>
         <authCode xmlns="http://payment.services.adyen.com">1234</authCode>
         <dccAmount xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
         <dccSignature xmlns="http://payment.services.adyen.com" xsi:nil="true"/>

data/spec/form_spec.rb

@@ -138,6 +138,30 @@ describe Adyen::Form do
     end
   end
 
+  describe 'payment methods available URL' do
+    let(:payment_methods_url) do
+      @attributes = { :currency_code => 'GBP', :payment_amount => 10000, :ship_before_date => Date.today,
+        :merchant_reference => 'Internet Order 12345', :skin => :testing,
+        :session_validity => Time.now + 3600 }
+
+      Adyen::Form.payment_methods_url(@attributes)
+    end
+
+    it "should return an directory URL" do
+      payment_methods_url.should =~ %r[^#{Adyen::Form.url(nil, :directory)}]
+    end
+
+    it "should include all provided attributes" do
+      params = payment_methods_url.split('?', 2).last.split('&').map { |param| param.split('=', 2).first }
+      params.should include(*(@attributes.keys.map { |k| Adyen::Form.camelize(k) }))
+    end
+
+    it "should include the merchant signature" do
+      params = payment_methods_url.split('?', 2).last.split('&').map { |param| param.split('=', 2).first }
+      params.should include('merchantSig')
+    end
+  end
+
   describe 'hidden fields generation' do
     include APISpecHelper
     subject { %Q'<form action="#{CGI.escapeHTML(Adyen::Form.url)}" method="post">#{Adyen::Form.hidden_fields(@attributes)}</form>' }
@@ -176,12 +200,18 @@ describe Adyen::Form do
         :ship_before_date => '2007-10-20', :merchant_reference => 'Internet Order 12345',
         :skin => :testing, :session_validity => '2007-10-11T11:00:00Z',
         :billing_address => {
-           :street               => 'Alexanderplatz',
-           :house_number_or_name => '0815',
-           :city                 => 'Berlin',
-           :postal_code          => '10119',
-           :state_or_province    => 'Berlin',
-           :country              => 'Germany',
+            :street               => 'Alexanderplatz',
+            :house_number_or_name => '0815',
+            :city                 => 'Berlin',
+            :postal_code          => '10119',
+            :state_or_province    => 'Berlin',
+            :country              => 'Germany',
+          },
+        :shopper => {
+            :telephone_number       => '1234512345',
+            :first_name             => 'John',
+            :last_name              => 'Doe',
+            :social_security_number => '123-45-1234'
           }
         }
 
@@ -194,7 +224,6 @@ describe Adyen::Form do
 
       signature_string = Adyen::Form.calculate_signature_string(@parameters.merge(:merchant_return_data => 'testing123'))
       signature_string.should == "10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Ztesting123"
-
     end
 
     it "should calculate the signature correctly" do
@@ -243,6 +272,28 @@ describe Adyen::Form do
           signature = Adyen::Form.calculate_billing_address_signature(@parameters)
         end.to raise_error ArgumentError
       end
+
+    end
+
+    context 'shopper' do
+
+      it "should construct the signature base string correctly" do
+        signature_string = Adyen::Form.calculate_shopper_signature_string(@parameters[:shopper])
+        signature_string.should == "JohnDoe1234512345"
+      end
+
+      it "should calculate the signature correctly" do
+        signature = Adyen::Form.calculate_shopper_signature(@parameters)
+        signature.should == 'rb2GEs1kGKuLh255a3QRPBYXmsQ='
+      end
+
+      it "should raise ArgumentError on empty shared_secret" do
+        expect do
+          @parameters.delete(:shared_secret)
+          signature = Adyen::Form.calculate_shopper_signature(@parameters)
+        end.to raise_error ArgumentError
+      end
+
     end
 
   end

data/spec/functional/api_spec.rb

@@ -12,7 +12,7 @@ if File.exist?(API_SPEC_INITIALIZER)
       require API_SPEC_INITIALIZER
       Net::HTTP.stubbing_enabled = false
       @order_id = @user_id = Time.now.to_i
-      perform_payment_request
+      @payment_response = perform_payment_request
     end
 
     after :all do
@@ -20,7 +20,7 @@ if File.exist?(API_SPEC_INITIALIZER)
     end
 
     def perform_payment_request
-      @payment_response = Adyen::API.authorise_payment(
+      Adyen::API.authorise_payment(
         @order_id,
         { :currency => 'EUR', :value => '1234' },
         { :email => "#{@user_id}@example.com", :reference => @user_id },
@@ -29,33 +29,36 @@ if File.exist?(API_SPEC_INITIALIZER)
       )
     end
 
-    it "performs a payment request" do
-      @payment_response.should be_authorized
-      @payment_response.psp_reference.should_not be_empty
-    end
+    # TODO disabled for now: https://github.com/wvanbergen/adyen/issues/29
+    # it "performs a payment request" do
+    #   @payment_response.should be_authorized
+    #   @payment_response.psp_reference.should_not be_empty
+    # end
 
-    it "performs a recurring payment request" do
-      response = Adyen::API.authorise_recurring_payment(
-        @order_id,
-        { :currency => 'EUR', :value => '1234' },
-        { :email => "#{@user_id}@example.com", :reference => @user_id }
-      )
-      response.should be_authorized
-      response.psp_reference.should_not be_empty
-    end
+    # TODO disabled for now: https://github.com/wvanbergen/adyen/issues/29
+    # it "performs a recurring payment request" do
+    #   response = Adyen::API.authorise_recurring_payment(
+    #     @order_id,
+    #     { :currency => 'EUR', :value => '1234' },
+    #     { :email => "#{@user_id}@example.com", :reference => @user_id }
+    #   )
+    #   response.should be_authorized
+    #   response.psp_reference.should_not be_empty
+    # end
 
-    it "performs a one-click payment request" do
-      detail   = Adyen::API.list_recurring_details(@user_id).references.last
-      response = Adyen::API.authorise_one_click_payment(
-        @order_id,
-        { :currency => 'EUR', :value => '1234' },
-        { :email => "#{@user_id}@example.com", :reference => @user_id },
-        '737',
-        detail
-      )
-      response.should be_authorized
-      response.psp_reference.should_not be_empty
-    end
+    # TODO disabled for now: https://github.com/wvanbergen/adyen/issues/29
+    # it "performs a one-click payment request" do
+    #   detail   = Adyen::API.list_recurring_details(@user_id).references.last
+    #   response = Adyen::API.authorise_one_click_payment(
+    #     @order_id,
+    #     { :currency => 'EUR', :value => '1234' },
+    #     { :email => "#{@user_id}@example.com", :reference => @user_id },
+    #     '737',
+    #     detail
+    #   )
+    #   response.should be_authorized
+    #   response.psp_reference.should_not be_empty
+    # end
 
     # TODO disabled for now: https://github.com/wvanbergen/adyen/issues/29
     #it "stores the provided ELV account details" do
@@ -95,11 +98,12 @@ if File.exist?(API_SPEC_INITIALIZER)
       response.should be_success
     end
 
-    it "disables a recurring contract" do
-      response = Adyen::API.disable_recurring_contract(@user_id)
-      response.should be_success
-      response.should be_disabled
-    end
+    # TODO disabled for now: https://github.com/wvanbergen/adyen/issues/29
+    # it "disables a recurring contract" do
+    #   response = Adyen::API.disable_recurring_contract(@user_id)
+    #   response.should be_success
+    #   response.should be_disabled
+    # end
   end
 
 else

data/spec/functional/initializer.rb.ci

@@ -0,0 +1,3 @@
+Adyen.configuration.default_api_params = { :merchant_account => ENV['ADYEN_MERCHANT_ACCOUNT'] }
+Adyen.configuration.api_username = ENV['ADYEN_API_USERNAME']
+Adyen.configuration.api_password = ENV['ADYEN_API_PASSWORD']

data/spec/functional/initializer.rb.sample

@@ -1,3 +1,3 @@
-Adyen.configuration.default_api_params = { :merchant_account => 'SuperShopper' }
-Adyen.configuration.api_username = 'SuperShopper'
-Adyen.configuration.api_password = 'secret'
+Adyen.configuration.default_api_params = { :merchant_account => 'SuperShopperCOM' }
+Adyen.configuration.api_username = 'ws@company.SuperShopper'
+Adyen.configuration.api_password = '$ecret'

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 # encoding: UTF-8
 
-require 'rubygems'
-
 require 'rspec'
 require 'adyen'
 require 'adyen/matchers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
 description: "    Package to simplify including the Adyen payments services into a
   Ruby on Rails application.\n    The package provides functionality to create payment
   forms, handling and storing notifications \n    sent by Adyen and consuming the
@@ -124,6 +124,7 @@ files:
 - spec/api/test_helpers_spec.rb
 - spec/form_spec.rb
 - spec/functional/api_spec.rb
+- spec/functional/initializer.rb.ci
 - spec/functional/initializer.rb.sample
 - spec/spec_helper.rb
 - yard_extensions.rb
@@ -145,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -169,5 +170,6 @@ test_files:
 - spec/api/test_helpers_spec.rb
 - spec/form_spec.rb
 - spec/functional/api_spec.rb
+- spec/functional/initializer.rb.ci
 - spec/functional/initializer.rb.sample
 - spec/spec_helper.rb