amazon_pay 2.3.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 608eb867ed536d6409ad4c5d454ad489d6c34168
-  data.tar.gz: ade1f627a5fc56580ddc5b7922a725914ae0df6a
+SHA256:
+  metadata.gz: fe42cd1c1161cf3ad88ccba66c243e7b816729672ab136c3a99e33ff1caceb53
+  data.tar.gz: 0e628bdcc508d9705e869cc30c4ed18fdd45cb32991459f181823cbb88dbf735
 SHA512:
-  metadata.gz: 49a3d78cc72650945c2d081417b81d99a970b06d99e09a8e938b9436ba941a3210ddc980c6e7dcbb7181366d04153e5cd9dd75a92b81367d506e251b48208706
-  data.tar.gz: bb0e83f78b3d340db12a3a86be126f9d13bc5beb2be74a1dbc20765f9b3fb68bd366a9eb11fa105355f07fb9584eb633d86a8214082ef19a8210206aa4403680
+  metadata.gz: fa3bebaa9bf5dcdceef3eebdf283ff48bbf335030e02db6d9f51241108a9f412eebadd18e07776cb7660f04ac31e13fd22fb14e17750cc7f2ddf4df81df133c7
+  data.tar.gz: 3adbe8158ad59d28a286c13e80900137ea8e86e10e9b94dd39967c156cc9db262f67f357e27e61c668419d0b2e89d7d568763c9a9cf140118c6e407142e91a03

data/lib/amazon_pay/client.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength, Metrics/LineLength, Metrics/AbcSize, Metrics/ClassLength, Metrics/ParameterLists, Style/AccessorMethodName
+
 require 'time'
 require 'logger'
 require 'stringio'
@@ -26,7 +28,6 @@ module AmazonPay
     )
 
     attr_accessor(
-      :sandbox,
       :proxy_addr,
       :proxy_port,
       :proxy_user,
@@ -126,6 +127,7 @@ module AmazonPay
     # @optional seller_order_id [String]
     # @optional store_name [String]
     # @optional custom_information [String]
+    # @optional supplementary_data [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
     def create_order_reference_for_id(
@@ -140,6 +142,7 @@ module AmazonPay
       seller_order_id: nil,
       store_name: nil,
       custom_information: nil,
+      supplementary_data: nil,
       merchant_id: @merchant_id,
       mws_auth_token: nil
     )
@@ -161,6 +164,7 @@ module AmazonPay
         'OrderReferenceAttributes.SellerOrderAttributes.SellerOrderId' => seller_order_id,
         'OrderReferenceAttributes.SellerOrderAttributes.StoreName' => store_name,
         'OrderReferenceAttributes.SellerOrderAttributes.CustomInformation' => custom_information,
+        'OrderReferenceAttributes.SellerOrderAttributes.SupplementaryData' => supplementary_data,
         'MWSAuthToken' => mws_auth_token
       }
 
@@ -174,6 +178,7 @@ module AmazonPay
     # @optional access_token [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
+
     def get_billing_agreement_details(
       amazon_billing_agreement_id,
       address_consent_token: nil,
@@ -191,7 +196,10 @@ module AmazonPay
       optional = {
         # Preseving address_consent_token for backwards compatibility
         # AccessToken returns all data in AddressConsentToken plus new data
-        'AccessToken' => access_token || address_consent_token,
+        # You cannot pass both address_consent_token and access_token in
+        # the same call or you will encounter a 400/"AmbiguousToken" error
+        'AccessToken' => access_token,
+        'AddressConsentToken' => address_consent_token,
         'MWSAuthToken' => mws_auth_token
       }
 
@@ -209,6 +217,10 @@ module AmazonPay
     # @optional store_name [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
+    # @optional billing_agreement_type [String] - one of CustomerInitiatedTransaction or MerchantInitiatedTransaction
+    # @optional subscription_amount [String]
+    # @optional subscription_currency_code [String]
+
     def set_billing_agreement_details(
       amazon_billing_agreement_id,
       platform_id: nil,
@@ -217,6 +229,9 @@ module AmazonPay
       custom_information: nil,
       store_name: nil,
       merchant_id: @merchant_id,
+      billing_agreement_type: nil,
+      subscription_amount: nil,
+      subscription_currency_code: @currency_code,
       mws_auth_token: nil
     )
 
@@ -232,9 +247,14 @@ module AmazonPay
         'BillingAgreementAttributes.SellerBillingAgreementAttributes.SellerBillingAgreementId' => seller_billing_agreement_id,
         'BillingAgreementAttributes.SellerBillingAgreementAttributes.CustomInformation' => custom_information,
         'BillingAgreementAttributes.SellerBillingAgreementAttributes.StoreName' => store_name,
+        'BillingAgreementAttributes.BillingAgreementType' => billing_agreement_type,
+        'BillingAgreementAttributes.SubscriptionAmount.Amount' => subscription_amount,
+        'BillingAgreementAttributes.SubscriptionAmount.CurrencyCode' => subscription_currency_code,
         'MWSAuthToken' => mws_auth_token
       }
 
+      optional['BillingAgreementAttributes.SubscriptionAmount.CurrencyCode'] = nil if subscription_amount.nil?
+
       operation(parameters, optional)
     end
 
@@ -244,9 +264,13 @@ module AmazonPay
     # @param amazon_billing_agreement_id [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
+    # @optional success_url [String]
+    # @optional failure_url [String]
     def confirm_billing_agreement(
       amazon_billing_agreement_id,
       merchant_id: @merchant_id,
+      success_url: nil,
+      failure_url: nil,
       mws_auth_token: nil
     )
 
@@ -257,6 +281,8 @@ module AmazonPay
       }
 
       optional = {
+        'SuccessUrl' => success_url,
+        'FailureUrl' => failure_url,
         'MWSAuthToken' => mws_auth_token
       }
 
@@ -305,6 +331,7 @@ module AmazonPay
     # @optional seller_order_id [String]
     # @optional store_name [String]
     # @optional inherit_shipping_address [Boolean]
+    # @optional supplementary_data [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
     def authorize_on_billing_agreement(
@@ -322,6 +349,7 @@ module AmazonPay
       seller_order_id: nil,
       store_name: nil,
       inherit_shipping_address: nil,
+      supplementary_data: nil,
       merchant_id: @merchant_id,
       mws_auth_token: nil
     )
@@ -345,6 +373,7 @@ module AmazonPay
         'SellerOrderAttributes.CustomInformation' => custom_information,
         'SellerOrderAttributes.SellerOrderId' => seller_order_id,
         'SellerOrderAttributes.StoreName' => store_name,
+        'SellerOrderAttributes.SupplementaryData' => supplementary_data,
         'InheritShippingAddress' => inherit_shipping_address,
         'MWSAuthToken' => mws_auth_token
       }
@@ -463,7 +492,7 @@ module AmazonPay
       optional = {
         'MWSAuthToken' => mws_auth_token
       }
-      
+
       operation(parameters, optional)
     end
 
@@ -511,6 +540,7 @@ module AmazonPay
     # @optional store_name [String]
     # @optional order_item_categories Array[String]
     # @optional custom_information [String]
+    # @optional supplementary_data [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
     def set_order_reference_details(
@@ -524,6 +554,7 @@ module AmazonPay
       store_name: nil,
       order_item_categories: nil,
       custom_information: nil,
+      supplementary_data: nil,
       merchant_id: @merchant_id,
       mws_auth_token: nil
     )
@@ -543,6 +574,7 @@ module AmazonPay
         'OrderReferenceAttributes.SellerOrderAttributes.SellerOrderId' => seller_order_id,
         'OrderReferenceAttributes.SellerOrderAttributes.StoreName' => store_name,
         'OrderReferenceAttributes.SellerOrderAttributes.CustomInformation' => custom_information,
+        'OrderReferenceAttributes.SellerOrderAttributes.SupplementaryData' => supplementary_data,
         'MWSAuthToken' => mws_auth_token
       }
 
@@ -571,12 +603,13 @@ module AmazonPay
     # @optional store_name [String]
     # @optional order_item_categories Array[String]
     # @optional custom_information [String]
+    # @optional supplementary_data [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
     def set_order_attributes(
       amazon_order_reference_id,
       amount: nil,
-      currency_code: nil,
+      currency_code: @currency_code,
       platform_id: nil,
       seller_note: nil,
       seller_order_id: nil,
@@ -586,6 +619,7 @@ module AmazonPay
       store_name: nil,
       order_item_categories: nil,
       custom_information: nil,
+      supplementary_data: nil,
       merchant_id: @merchant_id,
       mws_auth_token: nil
     )
@@ -607,9 +641,12 @@ module AmazonPay
         'OrderAttributes.RequestPaymentAuthorization' => request_payment_authorization,
         'OrderAttributes.SellerOrderAttributes.StoreName' => store_name,
         'OrderAttributes.SellerOrderAttributes.CustomInformation' => custom_information,
+        'OrderAttributes.SellerOrderAttributes.SupplementaryData' => supplementary_data,
         'MWSAuthToken' => mws_auth_token
       }
 
+      optional['OrderAttributes.OrderTotal.CurrencyCode'] = nil if amount.nil?
+
       if order_item_categories
         optional.merge!(
           get_categories_list(
@@ -626,12 +663,22 @@ module AmazonPay
     # information has been set on the order reference
     # @see https://pay.amazon.com/documentation/apireference/201751630#201751980
     # @param amazon_order_reference_id [String]
+    # @optional success_url [String]
+    # @optional failure_url [String]
+    # @optional authorization_amount [String]
+    # @optional currency_code [String]
     # @optional merchant_id [String]
     # @optional mws_auth_token [String]
+    # @optional expect_immediate_authorization [Boolean]
     def confirm_order_reference(
       amazon_order_reference_id,
+      success_url: nil,
+      failure_url: nil,
+      authorization_amount: nil,
+      currency_code: @currency_code,
       merchant_id: @merchant_id,
-      mws_auth_token: nil
+      mws_auth_token: nil,
+      expect_immediate_authorization: nil
     )
 
       parameters = {
@@ -641,9 +688,16 @@ module AmazonPay
       }
 
       optional = {
-        'MWSAuthToken' => mws_auth_token
+        'SuccessUrl' => success_url,
+        'FailureUrl' => failure_url,
+        'AuthorizationAmount.Amount' => authorization_amount,
+        'AuthorizationAmount.CurrencyCode' => currency_code,
+        'MWSAuthToken' => mws_auth_token,
+        'ExpectImmediateAuthorization' => expect_immediate_authorization
       }
 
+      optional['AuthorizationAmount.CurrencyCode'] = nil if authorization_amount.nil?
+
       operation(parameters, optional)
     end
 
@@ -1076,8 +1130,8 @@ module AmazonPay
       list = {}
 
       categories.each_with_index do |val, index|
-          list.merge!({"#{attribute_key}.SellerOrderAttributes.OrderItemCategories.OrderItemCategory.#{index + 1}" => val})
-      end   
+        list.merge!("#{attribute_key}.SellerOrderAttributes.OrderItemCategories.OrderItemCategory.#{index + 1}" => val)
+      end
 
       list
     end

data/lib/amazon_pay/client_helper.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength, Metrics/LineLength, Metrics/ClassLength, Metrics/ParameterLists
+
 module AmazonPay
   # This will extend the client class to add additional
   # helper methods that combine core API calls.
@@ -31,8 +33,8 @@ module AmazonPay
       mws_auth_token: nil
     )
 
-      if is_order_reference?(amazon_reference_id)
-        response = call_order_reference_api(
+      if order_reference?(amazon_reference_id)
+        call_order_reference_api(
           amazon_reference_id,
           authorization_reference_id,
           charge_amount,
@@ -46,11 +48,8 @@ module AmazonPay
           merchant_id,
           mws_auth_token
         )
-        return response
-      end
-
-      if is_billing_agreement?(amazon_reference_id)
-        response = call_billing_agreement_api(
+      elsif billing_agreement?(amazon_reference_id)
+        call_billing_agreement_api(
           amazon_reference_id,
           authorization_reference_id,
           charge_amount,
@@ -64,7 +63,6 @@ module AmazonPay
           merchant_id,
           mws_auth_token
         )
-        return response
       end
     end
 
@@ -94,10 +92,11 @@ module AmazonPay
       mws_auth_token: nil
     )
 
-      set_order_attributes(amazon_order_reference_id,
+      set_order_attributes(
         # amount:(This value can't be modified after order is confirmed so it isn't passed to set_order_attributes)
         # currency_code:(This value can't be modified after order is confirmed so it isn't passed to set_order_attributes)
         # platform_id:(This value can't be modified after order is confirmed so it isn't passed to set_order_attributes)
+        amazon_order_reference_id,
         seller_note: seller_note,
         seller_order_id: seller_order_id,
         payment_service_provider_id: payment_service_provider_id,
@@ -161,7 +160,7 @@ module AmazonPay
           )
         end
       end
-      return response
+      response
     end
 
     def call_billing_agreement_api(
@@ -223,14 +222,14 @@ module AmazonPay
         merchant_id: merchant_id,
         mws_auth_token: mws_auth_token
       )
-      return response
+      response
     end
 
-    def is_order_reference?(amazon_reference_id)
+    def order_reference?(amazon_reference_id)
       amazon_reference_id.start_with?('S', 'P')
     end
 
-    def is_billing_agreement?(amazon_reference_id)
+    def billing_agreement?(amazon_reference_id)
       amazon_reference_id.start_with?('C', 'B')
     end
   end

data/lib/amazon_pay/ipn_handler.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength, Metrics/ClassLength, Metrics/LineLength, Metrics/ParameterLists, Metrics/AbcSize, Metrics/CyclomaticComplexity, Rails/Blank
+
 require 'base64'
 require 'json'
 require 'net/http'
@@ -18,6 +20,10 @@ module AmazonPay
   # there are many helper methods in place to extract information received
   # from the ipn notification.
   class IpnHandler
+    MSG_HEADER = 'Error - Header does not contain x-amz-sns-message-type header'.freeze
+    MSG_CERTIFICATE = 'Error - Unable to verify certificate subject issued by Amazon'.freeze
+    MSG_KEY = 'Error - Unable to verify public key with signature and signed string'.freeze
+
     SIGNABLE_KEYS = %w[
       Message
       MessageId
@@ -66,13 +72,7 @@ module AmazonPay
       @proxy_pass = proxy_pass
 
       @log_enabled = log_enabled
-      if @log_enabled
-        log_set = AmazonPay::LogInitializer.new(
-          log_file_name,
-          log_level
-        )
-        @logger = log_set.create_logger
-      end
+      @logger = AmazonPay::LogInitializer.new(log_file_name, log_level).create_logger if @log_enabled
     end
 
     # This method will authenticate the ipn message sent from Amazon.
@@ -81,8 +81,8 @@ module AmazonPay
     def authentic?
       decoded_from_base64 = Base64.decode64(signature)
       validate_header
-      validate_subject(get_certificate.subject)
-      public_key = get_public_key_from(get_certificate)
+      validate_subject(certificate.subject)
+      public_key = public_key_from(certificate)
       verify_public_key(public_key, decoded_from_base64, canonical_string)
 
       return true
@@ -156,12 +156,12 @@ module AmazonPay
 
     protected
 
-    def get_certificate
+    def certificate
       cert_pem = download_cert(signing_cert_url)
       OpenSSL::X509::Certificate.new(cert_pem)
     end
 
-    def get_public_key_from(certificate)
+    def public_key_from(certificate)
       OpenSSL::PKey::RSA.new(certificate.public_key)
     end
 
@@ -178,11 +178,9 @@ module AmazonPay
 
     def download_cert(url)
       uri = URI.parse(url)
-      unless
-        uri.scheme == 'https' &&
-        uri.host.match(/^sns\.[a-zA-Z0-9\-]{3,}\.amazonaws\.com(\.cn)?$/) &&
-        File.extname(uri.path) == '.pem'
-      then
+      unless uri.scheme == 'https' &&
+             uri.host.match(/^sns\.[a-zA-Z0-9\-]{3,}\.amazonaws\.com(\.cn)?$/) &&
+             File.extname(uri.path) == '.pem'
         msg = "Error - certificate is not hosted at AWS URL (https): #{url}"
         raise IpnWasNotAuthenticError, msg
       end
@@ -191,7 +189,7 @@ module AmazonPay
         resp = https_get(url)
         if @log_enabled
           data = AmazonPay::Sanitize.new(resp.body)
-          @logger.debug(data.sanitize_response_data)          
+          @logger.debug(data.sanitize_response_data)
         end
         resp.body
       rescue StandardError => error
@@ -213,31 +211,16 @@ module AmazonPay
     end
 
     def validate_header
-      unless
-        @headers['x-amz-sns-message-type'] == 'Notification'
-      then
-        msg = 'Error - Header does not contain x-amz-sns-message-type header'
-        raise IpnWasNotAuthenticError, msg
-      end
+      raise IpnWasNotAuthenticError, MSG_HEADER unless @headers['x-amz-sns-message-type'] == 'Notification'
     end
 
     def validate_subject(certificate_subject)
       subject = certificate_subject.to_a
-      unless 
-        subject.rassoc(COMMON_NAME)
-      then
-        msg = 'Error - Unable to verify certificate subject issued by Amazon'
-        raise IpnWasNotAuthenticError, msg
-      end
+      raise IpnWasNotAuthenticError, MSG_CERTIFICATE unless subject.rassoc(COMMON_NAME)
     end
 
     def verify_public_key(public_key, decoded_signature, signed_string)
-      unless
-        public_key.verify(OpenSSL::Digest::SHA1.new, decoded_signature, signed_string)
-      then
-        msg = 'Error - Unable to verify public key with signature and signed string'
-        raise IpnWasNotAuthenticError, msg
-      end
+      raise IpnWasNotAuthenticError, MSG_KEY unless public_key.verify(OpenSSL::Digest::SHA1.new, decoded_signature, signed_string)
     end
   end
 end

data/lib/amazon_pay/log_initializer.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength
+
 require 'logger'
 require 'stringio'
 

data/lib/amazon_pay/login.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength, Metrics/LineLength, Metrics/AbcSize
+
 require 'uri'
 require 'net/http'
 require 'net/https'
@@ -5,14 +7,12 @@ require 'json'
 require 'openssl'
 
 module AmazonPay
-
   # AmazonPay API
   #
   # This class allows you to obtain user profile
   # information once a user has logged into your
   # application using their Amazon credentials.
   class Login
-
     attr_reader(:region)
 
     attr_accessor(:client_id, :sandbox)
@@ -25,7 +25,7 @@ module AmazonPay
       @region = region
       @endpoint = region_hash[@region]
       @sandbox = sandbox
-      @sandbox_str = @sandbox ? "api.sandbox" : "api"
+      @sandbox_str = @sandbox ? 'api.sandbox' : 'api'
     end
 
     # This method will validate the access token and
@@ -42,34 +42,30 @@ module AmazonPay
       response = http.request(req)
       decode = JSON.parse(response.body)
 
-      if decode['aud'] != @client_id
-        raise "Invalid Access Token"
-      end
+      raise 'Invalid Access Token' if decode['aud'] != @client_id
 
       uri = URI.parse("https://#{@sandbox_str}.#{@endpoint}/user/profile")
       req = Net::HTTP::Get.new(uri.request_uri)
-      req['Authorization'] = "bearer " + decoded_access_token
+      req['Authorization'] = 'bearer ' + decoded_access_token
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       response = http.request(req)
       decoded_login_profile = JSON.parse(response.body)
-      return decoded_login_profile
+      decoded_login_profile
     end
 
     private
 
     def region_hash
       {
-        :jp => 'amazon.co.jp',
-        :uk => 'amazon.co.uk',
-        :de => 'amazon.de',
-        :eu => 'amazon.co.uk',
-        :us => 'amazon.com',
-        :na => 'amazon.com'
+        jp: 'amazon.co.jp',
+        uk: 'amazon.co.uk',
+        de: 'amazon.de',
+        eu: 'amazon.co.uk',
+        us: 'amazon.com',
+        na: 'amazon.com'
       }
     end
-
   end
-
 end

data/lib/amazon_pay/request.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength, Metrics/LineLength, Metrics/ParameterLists, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
 require 'uri'
 require 'net/http'
 require 'net/https'
@@ -46,13 +48,7 @@ module AmazonPay
       @application_name = application_name
       @application_version = application_version
 
-      if @log_enabled
-        log_set = AmazonPay::LogInitializer.new(
-          log_file_name,
-          log_level
-        )
-        @logger = log_set.create_logger
-      end
+      @logger = AmazonPay::LogInitializer.new(log_file_name, log_level).create_logger if @log_enabled
     end
 
     # This method sends the post request.
@@ -68,7 +64,7 @@ module AmazonPay
     # the post url.
     def build_post_url
       @optional.map { |k, v| @parameters[k] = v unless v.nil? }
-      @parameters['Timestamp'] = Time.now.utc.iso8601 unless @parameters.has_key?('Timestamp')
+      @parameters['Timestamp'] = Time.now.utc.iso8601 unless @parameters.key?('Timestamp')
       @parameters = @default_hash.merge(@parameters)
       post_url = @parameters.sort.map { |k, v| "#{k}=#{custom_escape(v)}" }.join('&')
       post_body = ['POST', @mws_endpoint.to_s, "/#{@sandbox_str}/#{AmazonPay::API_VERSION}", post_url].join("\n")
@@ -106,11 +102,8 @@ module AmazonPay
           @logger.debug("response: #{data.sanitize_response_data}")
         end
         if @throttle.eql?(true)
-          if response.code.eql?('500')
-            raise 'InternalServerError'
-          elsif response.code.eql?('503')
-            raise 'ServiceUnavailable or RequestThrottled'
-          end
+          raise 'InternalServerError' if response.code.eql?('500')
+          raise 'ServiceUnavailable or RequestThrottled' if response.code.eql?('503')
         end
         AmazonPay::Response.new(response)
       rescue StandardError => error

data/lib/amazon_pay/response.rb

@@ -1,42 +1,35 @@
 require 'rexml/document'
 
 module AmazonPay
-
   # This class provides helpers to parse the response
   class Response
-
-     def initialize(response)
-       @response = response
-     end
-
-     def body
-       @response.body
-     end
-
-     def to_xml
-       REXML::Document.new(body)
-     end
-
-     def get_element(xpath, xml_element)
-       xml = self.to_xml
-       xml.elements.each(xpath) do |element|
-         @value = element.elements[xml_element].text
-       end
-       return @value
-     end
-
-     def code
-       @response.code
-     end
-
-     def success
-      if @response.code.eql? '200'
-         return true
-      else
-         return false
+    def initialize(response)
+      @response = response
+    end
+
+    def body
+      @response.body
+    end
+
+    def to_xml
+      REXML::Document.new(body)
+    end
+
+    def get_element(xpath, xml_element)
+      xml = to_xml
+      value = nil
+      xml.elements.each(xpath) do |element|
+        value = element.elements[xml_element].text
       end
-     end
+      value
+    end
 
-  end
+    def code
+      @response.code
+    end
 
+    def success
+      @response.code.eql? '200'
+    end
+  end
 end

data/lib/amazon_pay/sanitize.rb

@@ -1,4 +1,7 @@
+# rubocop:disable Metrics/MethodLength, Metrics/LineLength
+
 module AmazonPay
+  # Removes PII and other sensitive data for the logger
   class Sanitize
     def initialize(input_data)
       @copy = input_data ? input_data.dup : ''
@@ -29,14 +32,14 @@ module AmazonPay
       # Array of item to remove
 
       patterns = []
-      patterns.push(/(?<=<Buyer>).*(?=<\/Buyer>)/s)
-      patterns.push(/(?<=<PhysicalDestination>).*(?=<\/PhysicalDestination>)/ms)
-      patterns.push(/(?<=<BillingAddress>).*(?=<\/BillingAddress>)/s)
-      patterns.push(/(?<=<SellerNote>).*(?=<\/SellerNote>)/s)
-      patterns.push(/(?<=<AuthorizationBillingAddress>).*(?=<\/AuthorizationBillingAddress>)/s)
-      patterns.push(/(?<=<SellerAuthorizationNote>).*(?=<\/SellerAuthorizationNote>)/s)
-      patterns.push(/(?<=<SellerCaptureNote>).*(?=<\/SellerCaptureNote>)/s)
-      patterns.push(/(?<=<SellerRefundNote>).*(?=<\/SellerRefundNote>)/s)
+      patterns.push(%r{(?<=<Buyer>).*(?=<\/Buyer>)}s)
+      patterns.push(%r{(?<=<PhysicalDestination>).*(?=<\/PhysicalDestination>)}ms)
+      patterns.push(%r{(?<=<BillingAddress>).*(?=<\/BillingAddress>)}s)
+      patterns.push(%r{(?<=<SellerNote>).*(?=<\/SellerNote>)}s)
+      patterns.push(%r{(?<=<AuthorizationBillingAddress>).*(?=<\/AuthorizationBillingAddress>)}s)
+      patterns.push(%r{(?<=<SellerAuthorizationNote>).*(?=<\/SellerAuthorizationNote>)}s)
+      patterns.push(%r{(?<=<SellerCaptureNote>).*(?=<\/SellerCaptureNote>)}s)
+      patterns.push(%r{(?<=<SellerRefundNote>).*(?=<\/SellerRefundNote>)}s)
 
       patterns.each do |s|
         @copy.gsub!(s, '*REMOVED*')

data/lib/amazon_pay/version.rb

@@ -1,5 +1,5 @@
 module AmazonPay
-  VERSION = "2.3.2"
-  SDK_NAME = "amazon-pay-sdk-ruby"
-  API_VERSION = "2013-01-01"
+  VERSION = '2.6.0'.freeze
+  SDK_NAME = 'amazon-pay-sdk-ruby'.freeze
+  API_VERSION = '2013-01-01'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_pay
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.6.0
 platform: ruby
 authors:
 - AmazonPay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies: []
 description: AmazonPay Ruby SDK
 email: amazon-pay-sdk@amazon.com
@@ -19,7 +19,6 @@ files:
 - LICENSE
 - NOTICE
 - README.md
-- lib/CHANGES.txt
 - lib/amazon_pay.rb
 - lib/amazon_pay/client.rb
 - lib/amazon_pay/client_helper.rb
@@ -37,7 +36,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -50,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: AmazonPay Ruby SDK

data/lib/CHANGES.txt

@@ -1,35 +0,0 @@
-2.3.2 May 2018
-- Modify get_order_reference_details and get_billing_agreement_details
-    to take access_token parameter 
-
-2.3.1 May 2018
-- Modify ipn_handler to work with new Cert format
-- Add CHANGES file
-
-2.3.0 April 2018
-- Add GetMerchantAccountStatus 
-
-2.2.1 March 2018
-- Create new Timestamp parameter on every request
-
-2.2.0 Jan 2018
-- Add ListOrderReference 
-- Add ListOrderReferenceByNextToken
-
-2.1.0 Jan 2018
-- Add Logging
-- Add SetOrderAttribute
-
-2.0.0 Feb 2017
-- Pay with Amazon to Amazon Pay rebranding
-
-1.x - 2015
-- Update README
-- Update documentation links
-- Change Login with Amazon API class and method name
-- Add one time transaction and subscriptions api flow
-- Add marketplace api support
-- Add client helper method
-- Add get user info api
-- Separate post request from client
-- Initial release