adyen 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ef547799ff5fa479e0adb223c8e325b394e064
-  data.tar.gz: 964b4e93c00f7448a073aa9423497713ee480dfd
+  metadata.gz: 1b926d8669cb0ce4a11bb4b3d1cd04d64921da2d
+  data.tar.gz: f286044af288973fe8c392de39c5cfc633392df1
 SHA512:
-  metadata.gz: 6c0d7a296dd0697404034dbc655a7b53fb1e3cba9443fe6a821203db33fe307ec4b21b58b1196c853d486eec05b8bf6d15c5f9152078a939d5fca0779664b010
-  data.tar.gz: 62422891b4307c4b6e1a872cfe17223bb323c1163df1ce47920f77bd0990ce4432fd5189ad9e55463dcd10a99d769956c1f4a3f0114134b6c2b80d6322ff1210
+  metadata.gz: 11a035e5c3faaad7c8875d6f62370e5f5451c5e26ef604797c9b0a18188809de738657b61b7db603f715aa057e1c926c2a51ea57db8581fc7bb1ed0bbc597fc0
+  data.tar.gz: 0672a9e65e12f72a189f47fe7558aefd145225190c68b99b677fe511a7793a0e473012027cc9e14d3f4c3af5de4fa2feadbab191b82999be846925c0c60c1d60

data/.travis.yml

@@ -1,29 +1,26 @@
 sudo: false
-dist: trusty
 language: ruby
 cache: bundler
 rvm:
-- "2.0"
-- "2.1"
-- "2.2"
-- "2.3.1"
-- "2.4.1"
-- "jruby-9.0"
-- "jruby-9.1"
-- "ruby-head"
-- "rubinius-3"
-- "jruby-head"
+  - "2.2"
+  - "2.3"
+  - "2.4"
+  - "2.5"
+  - "jruby-9.1.15.0"
+  - "ruby-head"
+  - "rubinius-3"
+  - "jruby-head"
 matrix:
   allow_failures:
-  - rvm: jruby-head
-  - rvm: ruby-head
-  - rvm: rubinius-3
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: rubinius-3
 
 before_install:
   - bundle --version || gem install bundler
   - gem update bundler
 before_script:
-- cp test/functional/initializer.rb.ci test/functional/initializer.rb
+  - cp test/functional/initializer.rb.ci test/functional/initializer.rb
 script: bundle exec rake
 
 env:

data/CHANGELOG.md

@@ -2,12 +2,20 @@
 
 The following changes have been made to the library over the years. Pleae add an entry to this file as part of your pull requests.
 
+#### Unreleased changes
+
+#### Version 2.4.0
+
+- Add `additionalData` to response from `listRecurringDetails` recurring payment SOAP endpoint.
+- Updates to the development & test setup for this gem.
+
 #### Version 2.3.0
 
-- Add `shopper_statement` option to `Adyen::APP`, allowing to generate Billets with custom payment instructions.
+- Add support for merchant-specific endpoints.
+- Add `shopper_statement` option to `Adyen::HPP`, allowing to generate Billets with custom payment instructions.
 - Make sure the unique index created by the notification model generator includes `merchant_account_code`
-- Make refusal_reson availble as a response field for failed requests.
-- Updates to the testing in frastructure
+- Make `refusal_resaon` availble as a response field for failed requests.
+- Updates to the testing infrastructure
 
 #### Version 2.2.0
 

data/Gemfile

@@ -6,7 +6,6 @@ ruby RUBY_VERSION
 gem 'pry'
 
 platform :rbx do
-  gem 'rubysl'
   gem 'racc'
 end
 

data/README.md

@@ -16,7 +16,7 @@ This library aims to ease the implementation of all these modes into your Rack a
 - Check out [the example server](https://github.com/wvanbergen/adyen/blob/master/test/helpers/example_server.rb) for an example implementation of the HPP payment flow, and an implementation of self-hosted a payment flow that uses the REST webservice. To start the example server, run `bundle exec rackup` in the root of this project.
 - Complete RDoc documentation can be found on [rubydoc.info](http://www.rubydoc.info/gems/adyen).
 - For more information about Adyen, see http://www.adyen.com
-- For more information about integrating Adyen, see [their manuals](https://www.adyen.com/home/support/manuals.html). Of primary interest are the HPP integration manual for `Adyen::Form`, and the API integration manual for `Adyen::REST`.
+- For more information about integrating Adyen, see [their manuals](https://www.adyen.com/home/support/manuals.html). Of primary interest are the HPP integration manual for `Adyen::HPP`, and the API integration manual for `Adyen::REST`.
 
 The library doesn't have any dependencies, but making Nokogiri available in your environment will greatly improve the speed of any XML and HTML processing.
 

data/adyen.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('minitest', '~> 5.0')
   s.add_development_dependency('mocha')
   s.add_development_dependency('sinatra')
-  s.add_development_dependency('poltergeist')
+  s.add_development_dependency('capybara-webkit')
 
-  s.add_development_dependency('railties', '>= 3.2', '< 5.2')
+  s.add_development_dependency('railties', '>= 3.2', '< 6.0')
   s.add_development_dependency('nokogiri', '>= 1.6.8')
 
   s.requirements << 'Having Nokogiri installed will speed up XML handling when using the SOAP API.'

data/lib/adyen/api/recurring_service.rb

@@ -93,7 +93,7 @@ module Adyen
       end
 
       class ListResponse < Response
-        response_attrs :details, :last_known_shopper_email, :shopper_reference, :creation_date
+        response_attrs :details, :last_known_shopper_email, :shopper_reference, :creation_date, :additional_data
 
         def references
           details ? details.map { |d| d[:recurring_detail_reference] } : []
@@ -117,7 +117,8 @@ module Adyen
           result = {
             :recurring_detail_reference => node.text('./recurring:recurringDetailReference'),
             :variant                    => node.text('./recurring:variant'),
-            :creation_date              => DateTime.parse(node.text('./recurring:creationDate'))
+            :creation_date              => DateTime.parse(node.text('./recurring:creationDate')),
+            :additional_data            => parse_additional_data(node.xpath('./recurring:additionalData'))
           }
 
           card = node.xpath('./recurring:card')
@@ -164,6 +165,21 @@ module Adyen
             :holder_name      => bank.text('./payment:ownerName')
           }
         end
+
+        def parse_additional_data(xpath)
+          if xpath.empty?
+            {}
+          else
+            results = {}
+            xpath.map do |node|
+              key = node.text('./recurring:entry/recurring:key')
+              value = node.text('./recurring:entry/recurring:value')
+              results[key] = value unless key.empty?
+            end
+
+            results
+          end
+        end
       end
 
       class StoreTokenResponse < Response

data/lib/adyen/configuration.rb

@@ -41,6 +41,10 @@ class Adyen::Configuration
     LIVE_RAILS_ENVIRONMENTS.include?(rails_env) ? 'live' : 'test'
   end
 
+
+  # TODO
+  attr_accessor :merchant_specific_endpoint
+
   # The payment flow page type that’s used to choose the payment process
   #
   # @example

data/lib/adyen/rest.rb

@@ -45,7 +45,8 @@ module Adyen
       Adyen::REST::Client.new(
         Adyen.configuration.environment,
         Adyen.configuration.api_username,
-        Adyen.configuration.api_password
+        Adyen.configuration.api_password,
+        Adyen.configuration.merchant_specific_endpoint
       )
     end
 

data/lib/adyen/rest/client.rb

@@ -20,14 +20,15 @@ module Adyen
       include AuthorisePayment
       include ModifyPayment
 
-      attr_reader :environment
+      attr_reader :environment, :merchant
 
       # @param environment [String] The Adyen environment to interface with. Either
       #   <tt>'live'</tt> or <tt>'test'</tt>.
       # @param username [String] The webservice username, e.g. <tt>ws@Company.Account</tt>
       # @param password [String] The password associated with the username
-      def initialize(environment, username, password)
-        @environment, @username, @password = environment, username, password
+      # @param merchant [String]
+      def initialize(environment, username, password, merchant = nil)
+        @environment, @username, @password, @merchant = environment, username, password, merchant
       end
 
       # Closes the client.
@@ -113,12 +114,18 @@ module Adyen
       # The endpoint URI for this client.
       # @return [URI] The endpoint to use for the environment.
       def endpoint
-        @endpoint ||= URI(ENDPOINT % [environment])
+        @endpoint ||= if merchant && environment.to_sym == :live
+          URI(ENDPOINT_MERCHANT_SPECIFIC % [merchant])
+        else
+          URI(ENDPOINT % [environment])
+        end
       end
 
       # @see Adyen::REST::Client#endpoint
       ENDPOINT = 'https://pal-%s.adyen.com/pal/adapter/httppost'
-      private_constant :ENDPOINT
+      ENDPOINT_MERCHANT_SPECIFIC = 'https://%s.pal-live.adyenpayments.com/pal/adapter/httppost'
+
+      private_constant :ENDPOINT, :ENDPOINT_MERCHANT_SPECIFIC
     end
   end
 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.3.0"
+  VERSION = "2.4.0"
 end

data/test/helpers/capybara.rb

@@ -1,12 +1,7 @@
 require 'helpers/example_server'
 require 'capybara/dsl'
-require 'capybara/poltergeist'
+require 'capybara/webkit'
 
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, phantomjs_options: ['--ssl-protocol=any'])
-end
-
-Capybara.default_driver = :poltergeist
-Capybara.javascript_driver = :poltergeist
+Capybara.default_driver = :webkit
+Capybara.javascript_driver = :webkit
 Capybara.app = Adyen::ExampleServer
-

data/test/unit/api/recurring_service_test.rb

@@ -71,6 +71,7 @@ describe Adyen::API::RecurringService do
             :number => '1111'
           },
           :recurring_detail_reference => 'RecurringDetailReference1',
+          :additional_data => { "newAlias" => "123456" },
           :variant => 'mc',
           :creation_date => DateTime.parse('2009-10-27T11:50:12.178+01:00')
         },
@@ -85,6 +86,7 @@ describe Adyen::API::RecurringService do
             :holder_name => 'S. Hopper'
           },
           :recurring_detail_reference => 'RecurringDetailReference2',
+          :additional_data => { "newAlias" => "123456" },
           :variant => 'IDEAL',
           :creation_date => DateTime.parse('2009-10-27T11:26:22.216+01:00')
         },
@@ -97,6 +99,7 @@ describe Adyen::API::RecurringService do
             :bank_name        => 'TestBank',
           },
           :recurring_detail_reference => 'RecurringDetailReference3',
+          :additional_data => { "newAlias" => "123456" },
           :variant => 'elv',
           :creation_date => DateTime.parse('2009-10-27T11:26:22.216+01:00')
         }

data/test/unit/api/test_helper.rb

@@ -328,6 +328,12 @@ LIST_RESPONSE = <<EOS
             <elv xsi:nil="true"/>
             <name/>
             <recurringDetailReference>RecurringDetailReference1</recurringDetailReference>
+            <additionalData>
+              <entry>
+                <key xsi:type="xsd:string">newAlias</key>
+                <value xsi:type="xsd:string">123456</value>
+              </entry>
+            </additionalData>
             <variant>mc</variant>
           </RecurringDetail>
           <RecurringDetail>
@@ -345,6 +351,12 @@ LIST_RESPONSE = <<EOS
             <elv xsi:nil="true"/>
             <name/>
             <recurringDetailReference>RecurringDetailReference2</recurringDetailReference>
+            <additionalData>
+              <entry>
+                <key xsi:type="xsd:string">newAlias</key>
+                <value xsi:type="xsd:string">123456</value>
+              </entry>
+            </additionalData>
             <variant>IDEAL</variant>
           </RecurringDetail>
           <RecurringDetail>
@@ -360,6 +372,12 @@ LIST_RESPONSE = <<EOS
             <creationDate>2009-10-27T11:26:22.216+01:00</creationDate>
             <name/>
             <recurringDetailReference>RecurringDetailReference3</recurringDetailReference>
+            <additionalData>
+              <entry>
+                <key xsi:type="xsd:string">newAlias</key>
+                <value xsi:type="xsd:string">123456</value>
+              </entry>
+            </additionalData>
             <variant>elv</variant>
           </RecurringDetail>
         </details>

data/test/unit/form_test.rb

@@ -83,6 +83,8 @@ class FormTest < Minitest::Test
 
     Adyen.configuration.environment = :live
     assert_equal 'https://live.adyen.com/hpp/select.shtml', Adyen::Form.url
+  ensure
+    Adyen.configuration.environment = nil
   end
 
   def test_redirect_url_for_different_payment_flows

data/test/unit/rest/client_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+require 'adyen/rest/client'
+
+class RESTClientTest < Minitest::Test
+  def test_endpoint_dev
+    client =  Adyen::REST::Client.new(
+        :test,
+        'login',
+        'password'
+    )
+
+    assert_equal client.http.address, 'pal-test.adyen.com'
+  end
+
+  def test_endpoint_live
+    client =  Adyen::REST::Client.new(
+        :live,
+        'login',
+        'password'
+    )
+
+    assert_equal client.http.address, 'pal-live.adyen.com'
+  end
+
+  def test_endpoint_live_with_merchant
+    merchant = 'merchantEndpoint'
+
+    client =  Adyen::REST::Client.new(
+        :live,
+        'login',
+        'password',
+        merchant
+    )
+
+    assert_equal client.http.address, "#{merchant}.pal-live.adyenpayments.com"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -11,110 +11,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
 description: |2
@@ -134,8 +134,8 @@ extra_rdoc_files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -210,6 +210,7 @@ files:
 - test/unit/hpp/request_test.rb
 - test/unit/hpp/signature_test.rb
 - test/unit/hpp_test.rb
+- test/unit/rest/client_test.rb
 - test/unit/rest/signature_test.rb
 - test/unit/rest_list_recurring_details_response_test.rb
 - test/unit/rest_request_test.rb
@@ -223,28 +224,28 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - adyen
-- --main
+- "--main"
 - README.md
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   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: 2.0.14.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Integrate Adyen payment services in your Ruby on Rails application.
@@ -280,6 +281,7 @@ test_files:
 - test/unit/hpp/request_test.rb
 - test/unit/hpp/signature_test.rb
 - test/unit/hpp_test.rb
+- test/unit/rest/client_test.rb
 - test/unit/rest/signature_test.rb
 - test/unit/rest_list_recurring_details_response_test.rb
 - test/unit/rest_request_test.rb