adyen 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd5a2022e170a6376459b9fa48062f85ac05ce97
-  data.tar.gz: dc37f35aa6a2265d467c5ae1dd3d6860cc959894
+  metadata.gz: 65289d682bc415347ec65ea427c0d6e7943cb3d3
+  data.tar.gz: e3a11edb4ac752b412721f3bdf61a0a04b4bf85e
 SHA512:
-  metadata.gz: 6928bc0115a69ed05d2be6cd1deccce983bb3bcb53ff34a8e068505bc8d09b82930df245fc96c6e5bd058830e4a92f2f12df352724285b4bab5f7a3684bf11f2
-  data.tar.gz: bcc9cd8995fd9c299a71dcc20ec2415b87038bdf1b8d6eb05177303d1470e38f08ee1e72d54fb1dbbaa3813aa8839b67c3bbabd4f16f3eeba6bc5b73358378d7
+  metadata.gz: fb6eb78b5a9748124fa432b7105f88d1b0d358ad7fe13817d36ae97036968ebb9514e7986aa8ee071a0210331d16782b67db5179ef90a04733c9d08835b07fcb
+  data.tar.gz: db40c3ff10543755bbe055f6f2ac677cbba179aea097ea175389d0c39b9958e6434118ff646deba9cb2ce2dd5096bca23ae869ae1ce45766a738e79f4c5ca4bb

data/.travis.yml

@@ -2,13 +2,13 @@ language: ruby
 cache: bundler
 script: bundle exec rake
 rvm:
-- 1.9.3
-- 2.0.0
-- 2.1.1
-- ruby-head
-- rbx-2
-- jruby-19mode
-- jruby-head
+- "2.0"
+- "2.1"
+- "2.2"
+- "ruby-head"
+- "rbx-2"
+- "jruby-19mode"
+- "jruby-head"
 matrix:
   allow_failures:
   - rvm: jruby-head

data/CONTRIBUTING.md

@@ -51,11 +51,11 @@ So follow good engineering practices:
 
 ### Contributors
 
-- Willem van Bergen
-- Michel Barbosa
-- Stefan Borsje
-- Eloy Durán
-- Tobias Bielohlawek
+- [Willem van Bergen](https://github.com/wvanbergen)
+- [Michel Barbosa](https://github.com/mbarb0sa)
+- [Stefan Borsje](https://github.com/sborsje)
+- [Eloy Durán](https://github.com/alloy)
+- [Tobias Bielohlawek](https://github.com/rngtng)
 - Dimitri Sinitsa
 - Rinaldi Fonseca
 - Joost Hietbrink
@@ -73,6 +73,7 @@ So follow good engineering practices:
 - Thibaut Assus
 - Vinicius Ferriani
 - Timo Rößner
+- [Enzo Finidori](https://github.com/tiredenzo)
 
 ## Release process
 

data/Rakefile

@@ -2,26 +2,35 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rake/testtask"
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
-end
+namespace(:test) do
+  Rake::TestTask.new(:all) do |t|
+    t.description = "Run all tests"
+    t.libs << "test"
+    t.test_files = FileList['test/**/*_test.rb']
+  end
 
-Rake::TestTask.new('test:unit') do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-end
+  Rake::TestTask.new(:unit) do |t|
+    t.description = "Run unit tests"
+    t.libs << "test"
+    t.test_files = FileList['test/*_test.rb']
+  end
 
-Rake::TestTask.new('test:functional') do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/functional/**/*_test.rb']
-end
+  Rake::TestTask.new(:functional) do |t|
+    t.description = "Run functional tests"
+    t.libs << "test"
+    t.test_files = FileList['test/functional/**/*_test.rb']
+  end
 
-Rake::TestTask.new('test:integration') do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/integration/**/*_test.rb']
+  Rake::TestTask.new(:integration) do |t|
+    t.description = "Run integration tests"
+    t.libs << "test"
+    t.test_files = FileList['test/integration/**/*_test.rb']
+  end
 end
 
+desc "Run unit and functional tests"
+task :test => %w{test:unit test:functional}
+
 RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = "./spec/**/*_spec.rb"
   task.rspec_opts = ['--color']
@@ -42,14 +51,4 @@ end
 #   sh "git diff-index --quiet HEAD #{CACERT_PATH} || (git add #{CACERT_PATH} && git commit -m '[API] Update CA root certificates file.')"
 # end
 
-begin
-  require 'rubygems'
-  require 'yard'
-  require File.expand_path('../yard_extensions', __FILE__)
-  YARD::Rake::YardocTask.new do |y|
-    y.options << '--no-private' << '--title' << "The 'Adyen payment service' library for Ruby"
-  end
-rescue LoadError
-end
-
-task :default => [:test, :spec]
+task :default => %w{test spec}

data/lib/adyen.rb

@@ -1,14 +1,18 @@
-# The Adyen module is the container module for all Adyen related functionality, 
-# which is implemented in submodules. This module only contains some global 
+# The Adyen module is the container module for all Adyen related functionality,
+# which is implemented in submodules. This module only contains some global
 # configuration methods.
 #
 # The most important submodules are:
-# * {Adyen::Form} for generating payment form fields, generating redirect URLs 
+# * {Adyen::Form} for generating payment form fields, generating redirect URLs
 #   to the Adyen payment system, and generating and checking of signatures.
 # * {Adyen::API} for communicating with the Adyen SOAP services for issuing
 #   (recurring) payments and recurring contract maintenance.
 module Adyen
 
+  # Basic exception class for Adyen
+  class Error < ::StandardError
+  end
+
   # @return [Configuration] The configuration singleton.
   def self.configuration
     @configuration ||= Adyen::Configuration.new

data/lib/adyen/rest/authorise_payment.rb

@@ -14,7 +14,7 @@ module Adyen
         def set_encrypted_card_data(source)
           encrypted_json = if source.respond_to?(:params)
             source.params['adyen-encrypted-data']
-          elsif source.respond_to?(:[]) && source.key?('adyen-encrypted-data')
+          elsif source.is_a?(Hash) && source.key?('adyen-encrypted-data')
             source['adyen-encrypted-data']
           else
             source
@@ -139,10 +139,106 @@ module Adyen
         execute_request(request)
       end
 
+      # Generates <tt>Payment.authorise</tt> request with recurring for Adyen's webservice.
+      # @param (see #authorise_recurring_payment)
+      # @return [Adyen::REST::Request] The request to send
+      # @see #authorise_recurring_payment
+      def authorise_recurring_payment_request(attributes={})
+        Adyen::REST::AuthoriseRecurringPayment::Request.new('Payment.authorise', attributes,
+            prefix: 'payment_request',
+            response_class: Adyen::REST::AuthorisePayment::Response,
+            response_options: { prefix: 'payment_result' })
+      end
+
+      # Sends an authorise recurring payment request to Adyen's webservice.
+      # @param attributes [Hash] The attributes to include in the request.
+      # @return [Adyen::REST::AuthorisePayment::Response] The response from Adyen.
+      #   The response responds to <tt>.authorised?</tt> to check whether the
+      #   authorization was successful.
+      # @see Adyen::REST::AuthorisePayment::Response#authorised?
+      def authorise_recurring_payment(attributes)
+        request = authorise_recurring_payment_request(attributes)
+        execute_request(request)
+      end
+
+      # Generates <tt>Payment.authorise</tt> request with recurring for Adyen's webservice.
+      # This method can be called if a previous contract was established with #authorise_recurring_payment
+      # @param (see #authorise_recurring_payment)
+      # @return [Adyen::REST::Request] The request to send
+      # @see #authorise_recurring_payment
+      def reauthorise_recurring_payment_request(attributes={})
+        Adyen::REST::ReauthoriseRecurringPayment::Request.new('Payment.authorise', attributes,
+            prefix: 'payment_request',
+            response_class: Adyen::REST::AuthorisePayment::Response,
+            response_options: { prefix: 'payment_result' })
+      end
+
+      # Sends an authorise recurring payment request to Adyen's webservice.
+      # This method can be called if a previous contract was established with #authorise_recurring_payment
+      # @param attributes [Hash] The attributes to include in the request.
+      # @return [Adyen::REST::AuthorisePayment::Response] The response from Adyen.
+      #   The response responds to <tt>.authorised?</tt> to check whether the
+      #   authorization was successful.
+      # @see Adyen::REST::AuthorisePayment::Response#authorised?
+      def reauthorise_recurring_payment(attributes)
+        request = reauthorise_recurring_payment_request(attributes)
+        execute_request(request)
+      end
+
+      # The Response class implements some extensions for the list recurring details call.
+      # @see Adyen::REST::Response
+      class ListRecurringDetailsResponse < Adyen::REST::Response
+        # Returns a list of recurring details
+        # @return [Array] A not empty array if there is at least a recurring detail
+        def details
+          mapped_attributes = {
+            :recurring_detail_reference => "recurringDetailReference",
+            :creation_date => "creationDate",
+            :variant => "variant",
+            :card_holder_name => "card.holderName",
+            :card_expiry_month => "card.expiryMonth",
+            :card_expiry_year => "card.expiryYear",
+            :card_number => "card.number"
+          }
+
+          map_response_list("recurringDetailsResult.details", mapped_attributes)
+        end
+
+        # Returns a list of recurring details references
+        # @return [Array] A not empty array if there is at least a recurring detail reference
+        def references
+          details.map { |detail| detail[:recurring_detail_reference] }
+        end
+      end
+
+      # Generates <tt>Recurring.listRecurringDetails</tt> request for Adyen's webservice.
+      # @param (see #list_recurring_details)
+      # @return [Adyen::REST::ListRecurringDetailsPayment::Request] The request to send
+      # @see #list_recurring_details
+      def list_recurring_details_request(attributes = {})
+        Adyen::REST::ListRecurringDetailsPayment::Request.new('Recurring.listRecurringDetails', attributes,
+            prefix: 'recurring_details_request',
+            response_class: Adyen::REST::AuthorisePayment::ListRecurringDetailsResponse,
+            response_options: { prefix: 'recurring_details_result' })
+      end
+
+      # Sends an list recurring details request to Adyen's webservice.
+      # @param attributes [Hash] The attributes to include in the request.
+      # @return [Adyen::REST::AuthorisePayment::ListRecurringDetailsResponse] The response from Adyen.
+      # The response responds to <tt>.details</tt> and <tt>.references</tt> with recurring data.
+      # @see Adyen::REST::AuthorisePayment::ListRecurringDetailsResponse#references
+      # @see Adyen::REST::AuthorisePayment::ListRecurringDetailsResponse#details
+      def list_recurring_details(attributes)
+        request = list_recurring_details_request(attributes)
+        execute_request(request)
+      end
+
       alias_method :authorize_payment_request, :authorise_payment_request
       alias_method :authorize_payment, :authorise_payment
       alias_method :authorize_payment_3dsecure_request, :authorise_payment_3dsecure_request
       alias_method :authorize_payment_3dsecure, :authorise_payment_3dsecure
+      alias_method :reauthorize_recurring_payment_request, :reauthorise_recurring_payment_request
+      alias_method :reauthorize_recurring_payment, :reauthorise_recurring_payment
     end
   end
 end

data/lib/adyen/rest/authorise_recurring_payment.rb

@@ -0,0 +1,47 @@
+module Adyen
+  module REST
+
+    # This modules implements the recurring requests using<b>Payment.authorise</b> by subclassing Adyen::REST::AuthorisePayment::Request it only adds mandatory fields to it
+    # Those requests can be called using #Adyen::Rest::AuthorisePayment.authorise_recurring_payment and #Adyen::Rest::AuthorisePayment.reauthorise_recurring_payment
+    module AuthoriseRecurringPayment
+      class Request < Adyen::REST::AuthorisePayment::Request
+        def initialize(action, attributes, options)
+          attributes[:recurring] ||= { contract: 'RECURRING' }
+          super(action, attributes, options)
+          @required_attributes += ['paymentRequest.shopperEmail',
+            'paymentRequest.recurring.contract',
+            'paymentRequest.shopperReference',
+          ]
+        end
+      end
+    end
+
+    module ReauthoriseRecurringPayment
+      class Request < Adyen::REST::AuthorisePayment::Request
+        def initialize(action, attributes, options)
+          attributes[:recurring] ||= { contract: 'RECURRING' }
+          attributes[:shopper_interaction] ||= 'ContAuth'
+          attributes[:selected_recurring_detail_reference] ||= 'LATEST'
+          super(action, attributes, options)
+          @required_attributes += ['paymentRequest.shopperEmail',
+            'paymentRequest.shopperReference',
+            'paymentRequest.recurring.contract',
+            'paymentRequest.shopperInteraction'
+          ]
+        end
+      end
+    end
+
+    module ListRecurringDetailsPayment
+      class Request < Adyen::REST::Request
+        def initialize(action, attributes, options)
+          attributes[:recurring] ||= { contract: 'RECURRING' }
+          super(action, attributes, options)
+          @required_attributes += ['recurringDetailsRequest.merchantAccount',
+            'recurringDetailsRequest.recurring.contract',
+            'recurringDetailsRequest.shopperReference']
+        end
+      end
+    end
+  end
+end

data/lib/adyen/rest/client.rb

@@ -5,6 +5,7 @@ require 'adyen/rest/errors'
 require 'adyen/rest/request'
 require 'adyen/rest/response'
 require 'adyen/rest/authorise_payment'
+require 'adyen/rest/authorise_recurring_payment'
 require 'adyen/rest/modify_payment'
 
 module Adyen

data/lib/adyen/rest/errors.rb

@@ -2,11 +2,11 @@ module Adyen
   module REST
 
     # The main exception class for error reporting when using the REST API Client.
-    class Error < ::StandardError
+    class Error < Adyen::Error
     end
 
     # Exception class for errors on requests
-    class RequestValidationFailed < Error
+    class RequestValidationFailed < Adyen::REST::Error
     end
 
     # Exception class for error responses from the Adyen API.
@@ -17,7 +17,7 @@ module Adyen
     #    @return [Integer, nil]
     # @!attribute description
     #    @return [String, nil]
-    class ResponseError < Error
+    class ResponseError < Adyen::REST::Error
       attr_accessor :category, :code, :description
 
       def initialize(response_body)

data/lib/adyen/rest/response.rb

@@ -41,6 +41,25 @@ module Adyen
 
       protected
 
+      def map_response_list(response_prefix, mapped_attributes)
+        list  = []
+        index = 0
+
+        loop do
+          response = {}
+          mapped_attributes.each do |key, value|
+            new_value = attributes["#{response_prefix}.#{index.to_s}.#{value}"]
+            response[key] = new_value unless new_value.empty?
+          end
+
+          index += 1
+          break unless response.any?
+          list << response
+        end
+
+        list
+      end
+
       def canonical_name(name)
         Adyen::Util.camelize(apply_prefix(name))
       end

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 = "2.0.0.pre1"
+  VERSION = "2.0.0.pre2"
 end

data/test/functional/payment_authorisation_api_test.rb

@@ -51,4 +51,56 @@ class PaymentAuthorisationAPITest < Minitest::Test
     assert response.has_attribute?(:md)
     assert_equal "https://test.adyen.com/hpp/3d/validate.shtml", response['issuer_url']
   end
+
+  def test_initial_recurring_payment_api_request
+    response = @client.authorise_recurring_payment(
+      merchant_account: 'VanBergenORG',
+      shopper_email: 'willem@van-bergen.org',
+      shopper_reference: 'willem42',
+      amount: { currency: 'EUR', value: 1234 },
+      reference: 'Test initial recurring payment order #1',
+      card: Adyen::TestCards::VISA
+    )
+
+    assert response.authorised?
+    assert response.psp_reference
+  end
+
+  def test_recurring_payment_api_request
+    response = @client.reauthorise_recurring_payment(
+      merchant_account: 'VanBergenORG',
+      shopper_email: 'willem@van-bergen.org',
+      shopper_reference: 'willem42',
+      amount: { currency: 'EUR', value: 1234 },
+      reference: 'Test recurring payment order #1'
+    )
+
+    assert response.authorised?
+    assert response.psp_reference
+  end
+
+  def test_list_recurring_details_api_request
+    response = @client.list_recurring_details(
+      recurring: { contract: "RECURRING" },
+      merchant_account: 'VanBergenORG',
+      shopper_reference: 'willem42',
+    )
+
+    assert !response.details.first[:recurring_detail_reference].empty?
+    assert_equal response.details.first[:card_holder_name], Adyen::TestCards::VISA[:holder_name]
+    assert_equal response.details.first[:card_expiry_month].to_i, Adyen::TestCards::VISA[:expiry_month].to_i
+    assert_equal response.details.first[:card_expiry_year], Adyen::TestCards::VISA[:expiry_year]
+    assert_equal response.details.first[:card_number], Adyen::TestCards::VISA[:number][-4..-1]
+  end
+
+
+  def test_list_recurring_references_api_request
+    response = @client.list_recurring_details(
+      recurring: { contract: "RECURRING" },
+      merchant_account: 'VanBergenORG',
+      shopper_reference: 'willem42',
+    )
+
+    assert_equal response.references.first, response.details.first[:recurring_detail_reference]
+  end
 end

data/test/helpers/example_server.rb

@@ -100,6 +100,12 @@ class Adyen::ExampleServer < Sinatra::Base
       auth_code: api_response[:auth_code],
     }
 
-    erb :authorized
+    if api_response.authorised?
+      erb :authorized
+
+    else
+      status 400
+      body api_response[:refusal_reason]
+    end
   end
 end

data/test/rest_list_recurring_details_response_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class ListRecurringDetailsResponse < Minitest::Test
+
+  def setup
+    @http_response = mock
+    @recurring_detail_reference = "8314231570619177" 
+    @body = "recurringDetailsResult.shopperReference=lup%40lup.com%23555&recurringDetailsResult.details.0.variant=mc&recurringDetailsResult.details.0.card.number=1111&recurringDetailsResult.details.0.recurringDetailReference=#{@recurring_detail_reference}&recurringDetailsResult.details.0.card.expiryMonth=6&recurringDetailsResult.creationDate=2015-02-05T18%3A24%3A21%2B01%3A00&recurringDetailsResult.lastKnownShopperEmail=lup%40lup.com&recurringDetailsResult.details.0.creationDate=2015-02-05T18%3A24%3A21%2B01%3A00&recurringDetailsResult.details.0.card.expiryYear=2016&recurringDetailsResult.details.0.card.holderName=jose"
+    @expected_details = [{ recurring_detail_reference: @recurring_detail_reference, creation_date: "2015-02-05T18:24:21+01:00", variant: "mc", card_holder_name: "jose", card_expiry_month: "6", card_expiry_year: "2016", card_number: "1111" }]
+    @http_response.stubs(body: @body)
+    @response = Adyen::REST::AuthorisePayment::ListRecurringDetailsResponse.new(@http_response, prefix: 'recurring_details_result')
+  end
+
+  def test_getting_details
+    assert_equal @response.details, @expected_details
+  end
+
+  def test_getting_references
+    assert_equal @response.references, [@recurring_detail_reference]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Willem van Bergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,6 +170,7 @@ files:
 - lib/adyen/railtie.rb
 - lib/adyen/rest.rb
 - lib/adyen/rest/authorise_payment.rb
+- lib/adyen/rest/authorise_recurring_payment.rb
 - lib/adyen/rest/client.rb
 - lib/adyen/rest/errors.rb
 - lib/adyen/rest/modify_payment.rb
@@ -206,6 +207,7 @@ files:
 - test/integration/hpp_integration_test.rb
 - test/integration/payment_using_3d_secure_integration_test.rb
 - test/integration/payment_with_client_side_encryption_integration_test.rb
+- test/rest_list_recurring_details_response_test.rb
 - test/rest_request_test.rb
 - test/rest_response_test.rb
 - test/test_helper.rb
@@ -270,6 +272,7 @@ test_files:
 - test/integration/hpp_integration_test.rb
 - test/integration/payment_using_3d_secure_integration_test.rb
 - test/integration/payment_with_client_side_encryption_integration_test.rb
+- test/rest_list_recurring_details_response_test.rb
 - test/rest_request_test.rb
 - test/rest_response_test.rb
 - test/test_helper.rb