adyen 1.3.2 → 1.4.0

data/lib/adyen/api/payment_service.rb

@@ -108,6 +108,7 @@ module Adyen
         validate_parameters!(:merchant_account, :reference, :amount => [:currency, :value])
         content << amount_partial
         content << shopper_partial if @params[:shopper]
+        content << fraud_offset_partial if @params[:fraud_offset]
         LAYOUT % [@params[:merchant_account], @params[:reference], content]
       end
 
@@ -139,16 +140,25 @@ module Adyen
       end
 
       def card_partial
-        validate_parameters!(:card => [:holder_name, :number, :cvc, :expiry_year, :expiry_month])
-        card  = @params[:card].values_at(:holder_name, :number, :cvc, :expiry_year)
-        card << @params[:card][:expiry_month].to_i
-        CARD_PARTIAL % card
+        if @params[:card] and @params[:card][:encrypted] and @params[:card][:encrypted][:json]
+          ENCRYPTED_CARD_PARTIAL % [@params[:card][:encrypted][:json]]
+        else
+          validate_parameters!(:card => [:holder_name, :number, :cvc, :expiry_year, :expiry_month])
+          card  = @params[:card].values_at(:holder_name, :number, :cvc, :expiry_year)
+          card << @params[:card][:expiry_month].to_i
+          CARD_PARTIAL % card
+        end
       end
 
       def shopper_partial
         @params[:shopper].map { |k, v| SHOPPER_PARTIALS[k] % v }.join("\n")
       end
-
+      
+      def fraud_offset_partial
+        validate_parameters!(:fraud_offset)
+        FRAUD_OFFSET_PARTIAL % @params[:fraud_offset]
+      end
+        
       class AuthorisationResponse < Response
         ERRORS = {
           "validation 101 Invalid card number"                           => [:number,       'is not a valid creditcard number'],

data/lib/adyen/api/templates/payment_service.rb

@@ -65,6 +65,17 @@ EOS
         </payment:card>
 EOS
 
+      # @private
+      ENCRYPTED_CARD_PARTIAL = <<EOS
+        <additionalAmount xmlns="http://payment.services.adyen.com" xsi:nil="true" />
+        <additionalData xmlns="http://payment.services.adyen.com">
+          <entry>
+            <key xsi:type="xsd:string">card.encrypted.json</key>
+            <value xsi:type="xsd:string">%s</value>
+          </entry>
+        </additionalData>
+EOS
+
       # @private
       ENABLE_RECURRING_CONTRACTS_PARTIAL = <<EOS
         <payment:recurring>
@@ -99,6 +110,9 @@ EOS
         :ip        => '        <payment:shopperIP>%s</payment:shopperIP>',
         :statement => '        <payment:shopperStatement>%s</payment:shopperStatement>',
       }
+                              
+      # @private
+      FRAUD_OFFSET_PARTIAL = '<payment:fraudOffset>%s</payment:fraudOffset>'
     end
   end
 end

data/lib/adyen/templates/notification_migration.rb

@@ -4,7 +4,7 @@ class CreateAdyenNotifications < ActiveRecord::Migration
   def self.up
     create_table :adyen_notifications do |t|
       t.boolean  :live,                  :null => false, :default => false
-      t.string   :event_code,            :null => false, :limit => 20
+      t.string   :event_code,            :null => false, :limit => 40
       t.string   :psp_reference,         :null => false, :limit => 50
       t.string   :original_reference,    :null => true
       t.string   :merchant_reference,    :null => false

data/spec/api/api_spec.rb

@@ -7,7 +7,7 @@ describe Adyen::API do
   describe "shortcut methods" do
     describe "for the PaymentService" do
       before do
-        @payment = mock('PaymentService')
+        @payment = double('PaymentService')
       end
 
       def should_map_shortcut_to(method, params)
@@ -21,7 +21,8 @@ describe Adyen::API do
           :amount => { :currency => 'EUR', :value => 1234 },
           :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
           :card => { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737' },
-          :recurring => false
+          :recurring => false,
+          :fraud_offset => nil
         )
         Adyen::API.authorise_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
@@ -29,6 +30,24 @@ 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',
+          :amount => { :currency => 'EUR', :value => 1234 },
+          :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
+          :card => { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737' },
+          :recurring => false,
+          :fraud_offset => -100
+        )
+        Adyen::API.authorise_payment('order-id',
+          { :currency => 'EUR', :value => 1234 },
+          { :reference => 'user-id', :email => 's.hopper@example.com' },
+          { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737' },
+          false,
+          -100
+        )
+      end
 
       it "performs a `authorise payment' request with enabling :recurring" do
         should_map_shortcut_to(:authorise_payment,
@@ -36,7 +55,8 @@ describe Adyen::API do
           :amount => { :currency => 'EUR', :value => 1234 },
           :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
           :card => { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737' },
-          :recurring => true
+          :recurring => true,
+          :fraud_offset => nil
         )
         Adyen::API.authorise_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
@@ -51,20 +71,22 @@ describe Adyen::API do
           :reference => 'order-id',
           :amount => { :currency => 'EUR', :value => 1234 },
           :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
-          :recurring_detail_reference => 'LATEST'
+          :recurring_detail_reference => 'LATEST',
+          :fraud_offset => nil
         )
         Adyen::API.authorise_recurring_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
           { :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',
           :amount => { :currency => 'EUR', :value => 1234 },
           :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
-          :recurring_detail_reference => 'recurring-detail-reference'
+          :recurring_detail_reference => 'recurring-detail-reference',
+          :fraud_offset => nil
         )
         Adyen::API.authorise_recurring_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
@@ -72,6 +94,22 @@ 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',
+          :amount => { :currency => 'EUR', :value => 1234 },
+          :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
+          :recurring_detail_reference => 'recurring-detail-reference',
+          :fraud_offset => 50
+        )
+        Adyen::API.authorise_recurring_payment('order-id',
+          { :currency => 'EUR', :value => 1234 },
+          { :reference => 'user-id', :email => 's.hopper@example.com' },
+          'recurring-detail-reference',
+          50
+        )
+      end
 
       it "performs a `authorise one-click payment' request with specific detail" do
         should_map_shortcut_to(:authorise_one_click_payment,
@@ -79,7 +117,8 @@ describe Adyen::API do
           :amount => { :currency => 'EUR', :value => 1234 },
           :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
           :card => { :cvc => '737' },
-          :recurring_detail_reference => 'recurring-detail-reference'
+          :recurring_detail_reference => 'recurring-detail-reference',
+          :fraud_offset => nil
         )
         Adyen::API.authorise_one_click_payment('order-id',
           { :currency => 'EUR', :value => 1234 },
@@ -88,6 +127,24 @@ describe Adyen::API do
           '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',
+          :amount => { :currency => 'EUR', :value => 1234 },
+          :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
+          :card => { :cvc => '737' },
+          :recurring_detail_reference => 'recurring-detail-reference',
+          :fraud_offset => -10
+        )
+        Adyen::API.authorise_one_click_payment('order-id',
+          { :currency => 'EUR', :value => 1234 },
+          { :reference => 'user-id', :email => 's.hopper@example.com' },
+          '737',
+          'recurring-detail-reference',
+          -10
+        )
+      end
 
       it "performs a `capture' request" do
         should_map_shortcut_to(:capture, :psp_reference => 'original-psp-reference', :amount => { :currency => 'EUR', :value => '1234' })
@@ -112,7 +169,7 @@ describe Adyen::API do
 
     describe "for the RecurringService" do
       before do
-        @recurring = mock('RecurringService')
+        @recurring = double('RecurringService')
       end
 
       def should_map_shortcut_to(method, params)

data/spec/api/payment_service_spec.rb

@@ -23,6 +23,15 @@ 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 "only includes shopper details for given parameters" do
     # TODO pretty lame, but for now it will do
@@ -86,7 +95,8 @@ describe Adyen::API::PaymentService do
         #:start_month => ,
         #:start_year => ,
       },
-      :recurring_detail_reference => 'RecurringDetailReference1'
+      :recurring_detail_reference => 'RecurringDetailReference1',
+      :fraud_offset => 30
     }
     @payment = @object = Adyen::API::PaymentService.new(@params)
   end
@@ -103,6 +113,10 @@ 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
 
     [:reference, :email].each do |attr|
       it_should_validate_request_param(:shopper) do
@@ -233,6 +247,7 @@ describe Adyen::API::PaymentService do
 
     it_should_validate_request_parameters :merchant_account,
                                           :reference,
+                                          :fraud_offset,
                                           :amount  => [:currency, :value],
                                           :shopper => [:reference, :email]
 
@@ -269,6 +284,7 @@ describe Adyen::API::PaymentService do
     it_should_validate_request_parameters :merchant_account,
                                           :reference,
                                           :recurring_detail_reference,
+                                          :fraud_offset,
                                           :amount  => [:currency, :value],
                                           :shopper => [:reference, :email],
                                           :card    => [:cvc]

data/spec/api/response_spec.rb

@@ -5,7 +5,7 @@ describe Adyen::API::Response do
   before do
     http_response = Net::HTTPOK.new('1.1', '200', 'OK')
     http_response.add_field('Content-type', 'text/xml')
-    http_response.stub!(:body).and_return(AUTHORISE_RESPONSE)
+    http_response.stub(:body).and_return(AUTHORISE_RESPONSE)
     @response = Adyen::API::Response.new(http_response)
   end
 
@@ -36,7 +36,7 @@ describe Adyen::API::Response do
   describe "with a server error HTTP response and _no_ SOAP fault message" do
     before do
       http_response = Net::HTTPServerError.new('1.1', '500', 'Internal Server Error')
-      http_response.stub!(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body></soap:Body></soap:Envelope>})
+      http_response.stub(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body></soap:Body></soap:Envelope>})
       @response = Adyen::API::Response.new(http_response)
     end
 
@@ -48,7 +48,7 @@ describe Adyen::API::Response do
   describe "with a server error HTTP response _and_ SOAP fault message" do
     before do
       http_response = Net::HTTPServerError.new('1.1', '500', 'Internal Server Error')
-      http_response.stub!(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><soap:Fault><faultcode>soap:Server</faultcode><faultstring>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
+      http_response.stub(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><soap:Fault><faultcode>soap:Server</faultcode><faultstring>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
       @response = Adyen::API::Response.new(http_response)
     end
 

data/spec/api/simple_soap_client_spec.rb

@@ -84,7 +84,7 @@ describe Adyen::API::SimpleSOAPClient do
       ]
     ].each do |label, response, expected_exception|
       it "raises when the HTTP response is a subclass of #{response.class.name}" do
-        response.stub!(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><soap:Fault><faultcode>soap:Server</faultcode><faultstring>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
+        response.stub(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><soap:Fault><faultcode>soap:Server</faultcode><faultstring>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
         Net::HTTP.stubbed_response = response
 
         exception = nil
@@ -107,7 +107,7 @@ describe Adyen::API::SimpleSOAPClient do
         ["[505 HTTP Version Not Supported] A server", Net::HTTPBadGateway.new('1.1', '505', 'HTTP Version Not Supported')],
       ].each do |label, response|
         it "is raised when the HTTP response is a `real` server error by status code" do
-          response.stub!(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body></soap:Body></soap:Envelope>})
+          response.stub(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body></soap:Body></soap:Envelope>})
           Net::HTTP.stubbed_response = response
 
           exception = nil
@@ -122,11 +122,11 @@ describe Adyen::API::SimpleSOAPClient do
 
       it "is not raised when the HTTP response has a 500 status code with a fault message" do
         response = Net::HTTPServerError.new('1.1', '500', 'Internal Server Error')
-        response.stub!(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><soap:Fault><faultcode>soap:Server</faultcode><faultstring>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
+        response.stub(:body).and_return(%{<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><soap:Fault><faultcode>soap:Server</faultcode><faultstring>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
 
-         lambda do
-            @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
-          end.should_not raise_error Adyen::API::SimpleSOAPClient::ServerError
+        lambda do
+          @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
+        end.should_not raise_error
       end
     end
   end

data/spec/api/spec_helper.rb

@@ -98,7 +98,7 @@ module APISpecHelper
   def stub_net_http(response_body)
     Net::HTTP.stubbing_enabled = true
     response = Net::HTTPOK.new('1.1', '200', 'OK')
-    response.stub!(:body).and_return(response_body)
+    response.stub(:body).and_return(response_body)
     Net::HTTP.stubbed_response = response
   end
 

data/spec/form_spec.rb

@@ -28,7 +28,7 @@ describe Adyen::Form do
     end
 
     it "should generate correct live url in a production environment" do
-      Adyen.configuration.stub!(:autodetect_environment).and_return('live')
+      Adyen.configuration.stub(:autodetect_environment).and_return('live')
       Adyen::Form.url.should. == 'https://live.adyen.com/hpp/select.shtml'
     end
 

metadata

@@ -1,65 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: adyen
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Willem van Bergen
 - Michel Barbosa
 - Stefan Borsje
-- Eloy Duran
+- Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70260598824500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260598824500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70260598798280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.14'
   type: :development
   prerelease: false
-  version_requirements: *70260598798280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70260598790820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70260598790820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70260598661900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70260598661900
-description: ! "    Package to simplify including the Adyen payments services into
-  a Ruby on Rails application.\n    The package provides functionality to create payment
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+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
   SOAP services provided by Adyen. Moreover, it contains helper\n    methods, mocks
   and matchers to simpify writing tests/specs for your code.\n"
@@ -117,7 +128,9 @@ files:
 - tasks/github-gem.rake
 - yard_extensions.rb
 homepage: http://github.com/wvanbergen/adyen/wiki
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -129,23 +142,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - Having Nokogiri installed will speed up XML handling when using the SOAP API.
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Integrate Adyen payment services in your Ruby on Rails application.
 test_files:
 - spec/adyen_spec.rb
@@ -157,3 +168,4 @@ test_files:
 - spec/api/test_helpers_spec.rb
 - spec/form_spec.rb
 - spec/functional/api_spec.rb
+has_rdoc: