activemerchant 1.83.0 → 1.84.0

data/lib/active_merchant/billing/gateways/banwire.rb

@@ -63,7 +63,7 @@ module ActiveMerchant #:nodoc:
         post[:card_num] = creditcard.number
         post[:card_name] = creditcard.name
         post[:card_type] = card_brand(creditcard)
-        post[:card_exp] = "#{sprintf("%02d", creditcard.month)}/#{"#{creditcard.year}"[-2, 2]}"
+        post[:card_exp] = "#{sprintf("%02d", creditcard.month)}/#{creditcard.year.to_s[-2, 2]}"
         post[:card_ccv2] = creditcard.verification_value
       end
 
@@ -90,10 +90,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(success?(response),
-                     response['message'],
-                     response,
-                     :test => test?,
-                     :authorization => response['code_auth'])
+          response['message'],
+          response,
+          :test => test?,
+          :authorization => response['code_auth'])
       end
 
       def success?(response)

data/lib/active_merchant/billing/gateways/barclaycard_smartpay.rb

@@ -141,7 +141,6 @@ module ActiveMerchant #:nodoc:
           avs_result: AVSResult.new(:code => parse_avs_code(response)),
           authorization: response['recurringDetailReference'] || authorization_from(post, response)
         )
-
       rescue ResponseError => e
         case e.response.code
         when '401'
@@ -308,6 +307,7 @@ module ActiveMerchant #:nodoc:
         hash[:shopperIP]        = options[:ip] if options[:ip]
         hash[:shopperReference] = options[:customer] if options[:customer]
         hash[:shopperInteraction] = options[:shopper_interaction] if options[:shopper_interaction]
+        hash[:deviceFingerprint]  = options[:device_fingerprint] if options[:device_fingerprint]
         hash.keep_if { |_, v| v }
       end
 

data/lib/active_merchant/billing/gateways/beanstream.rb

@@ -205,6 +205,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def build_response(*args)
         Response.new(*args)
       end

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -467,7 +467,6 @@ module ActiveMerchant #:nodoc:
 
         params.reject{|k, v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
-
     end
   end
 end

data/lib/active_merchant/billing/gateways/blue_snap.rb

@@ -215,7 +215,7 @@ module ActiveMerchant
         parsed = {}
         doc = Nokogiri::XML(response.body)
         doc.root.xpath('*').each do |node|
-          if (node.elements.empty?)
+          if node.elements.empty?
             parsed[node.name.downcase] = node.text
           else
             node.elements.each do |childnode|
@@ -237,11 +237,9 @@ module ActiveMerchant
       end
 
       def api_request(action, request, verb)
-        begin
-          ssl_request(verb, url(action), request, headers)
-        rescue ResponseError => e
-          e.response
-        end
+        ssl_request(verb, url(action), request, headers)
+      rescue ResponseError => e
+        e.response
       end
 
       def commit(action, verb = :post)
@@ -258,7 +256,7 @@ module ActiveMerchant
           avs_result: avs_result(parsed),
           cvv_result: cvv_result(parsed),
           error_code: error_code_from(parsed),
-          test: test?,
+          test: test?
         )
       end
 

data/lib/active_merchant/billing/gateways/braintree_blue.rb

@@ -66,7 +66,7 @@ module ActiveMerchant #:nodoc:
           :private_key       => options[:private_key],
           :environment       => (options[:environment] || (test? ? :sandbox : :production)).to_sym,
           :custom_user_agent => "ActiveMerchant #{ActiveMerchant::VERSION}",
-          :logger            => options[:logger] || logger,
+          :logger            => options[:logger] || logger
         )
 
         @braintree_gateway = Braintree::Gateway.new( @configuration )
@@ -140,7 +140,7 @@ module ActiveMerchant #:nodoc:
       def update(vault_id, creditcard, options = {})
         braintree_credit_card = nil
         commit do
-          braintree_credit_card = @braintree_gateway.customer.find(vault_id).credit_cards.detect { |cc| cc.default? }
+          braintree_credit_card = @braintree_gateway.customer.find(vault_id).credit_cards.detect(&:default?)
           return Response.new(false, 'Braintree::NotFoundError') if braintree_credit_card.nil?
 
           options.merge!(:update_existing_token => braintree_credit_card.token)
@@ -347,10 +347,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_from_result(result)
-        Response.new(result.success?, message_from_result(result),
-          { braintree_transaction: transaction_hash(result) },
-          { authorization: (result.transaction.id if result.transaction) }
-         )
+        response_hash = { braintree_transaction: transaction_hash(result) }
+
+        Response.new(
+          result.success?,
+          message_from_result(result),
+          response_hash,
+          authorization: (result.transaction.id if result.transaction),
+          test: test?
+        )
       end
 
       def response_params(result)
@@ -367,6 +372,7 @@ module ActiveMerchant #:nodoc:
           options[:avs_result] = { code: avs_code_from(result.transaction) }
           options[:cvv_result] = result.transaction.cvv_response_code
         end
+        options[:test] = test?
         options
       end
 

data/lib/active_merchant/billing/gateways/bridge_pay.rb

@@ -13,7 +13,6 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
 
-
       def initialize(options={})
         requires!(options, :user_name, :password)
         super

data/lib/active_merchant/billing/gateways/card_connect.rb

@@ -141,8 +141,8 @@ module ActiveMerchant #:nodoc:
       def unstore(authorization, options = {})
         account_id, profile_id = authorization.split('|')
         commit('profile', {},
-               verb: :delete,
-               path: "/#{profile_id}/#{account_id}/#{@options[:merchant_id]}")
+          verb: :delete,
+          path: "/#{profile_id}/#{account_id}/#{@options[:merchant_id]}")
       end
 
       def supports_scrubbing?

data/lib/active_merchant/billing/gateways/card_save.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       
       self.money_format = :cents
       self.default_currency = 'GBP'
-      self.supported_cardtypes = [ :visa, :switch, :maestro, :master, :solo, :american_express, :jcb ]
+      self.supported_cardtypes = [ :visa, :maestro, :master, :american_express, :jcb ]
       self.supported_countries = [ 'GB' ]
       self.homepage_url = 'http://www.cardsave.net/'
       self.display_name = 'CardSave'

data/lib/active_merchant/billing/gateways/card_stream.rb

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.default_currency = 'GBP'
       self.supported_countries = ['GB', 'US', 'CH', 'SE', 'SG', 'NO', 'JP', 'IS', 'HK', 'NL', 'CZ', 'CA', 'AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro, :solo, :switch]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro]
       self.homepage_url = 'http://www.cardstream.com/'
       self.display_name = 'CardStream'
 
@@ -272,17 +272,8 @@ module ActiveMerchant #:nodoc:
       def add_credit_card(post, credit_card)
         add_pair(post, :customerName, credit_card.name, :required => true)
         add_pair(post, :cardNumber, credit_card.number, :required => true)
-
         add_pair(post, :cardExpiryMonth, format(credit_card.month, :two_digits), :required => true)
         add_pair(post, :cardExpiryYear, format(credit_card.year, :two_digits), :required => true)
-
-        if requires_start_date_or_issue_number?(credit_card)
-          add_pair(post, :cardStartMonth, format(credit_card.start_month, :two_digits))
-          add_pair(post, :cardStartYear, format(credit_card.start_year, :two_digits))
-
-          add_pair(post, :cardIssueNumber, credit_card.issue_number)
-        end
-
         add_pair(post, :cardCVV, credit_card.verification_value)
       end
 
@@ -327,13 +318,14 @@ module ActiveMerchant #:nodoc:
 
         response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
-        Response.new(response[:responseCode] == '0',
-                     response[:responseCode] == '0' ? 'APPROVED' : response[:responseMessage],
-                     response,
-                     :test => test?,
-                     :authorization => response[:xref],
-                     :cvv_result => CVV_CODE[response[:avscv2ResponseCode].to_s[0, 1]],
-                     :avs_result => avs_from(response)
+        Response.new(
+          response[:responseCode] == '0',
+          response[:responseCode] == '0' ? 'APPROVED' : response[:responseMessage],
+          response,
+          :test => test?,
+          :authorization => response[:xref],
+          :cvv_result => CVV_CODE[response[:avscv2ResponseCode].to_s[0, 1]],
+          :avs_result => avs_from(response)
         )
       end
 
@@ -358,7 +350,6 @@ module ActiveMerchant #:nodoc:
         })
       end
 
-
       def currency_code(currency)
         CURRENCY_CODES[currency]
       end

data/lib/active_merchant/billing/gateways/cardknox.rb

@@ -279,18 +279,17 @@ module ActiveMerchant #:nodoc:
         }.delete_if{|k, v| v.nil?}
       end
 
-
       def commit(action, source_type, parameters)
         response = parse(ssl_post(live_url, post_data(COMMANDS[source_type][action], parameters)))
 
        Response.new(
-          (response[:status] == 'Approved'),
-          message_from(response),
-          response,
-          authorization: authorization_from(response, source_type),
-          avs_result: { code: response[:avs_result_code] },
-          cvv_result: response[:cvv_result_code]
-        )
+         (response[:status] == 'Approved'),
+         message_from(response),
+         response,
+         authorization: authorization_from(response, source_type),
+         avs_result: { code: response[:avs_result_code] },
+         cvv_result: response[:cvv_result_code]
+       )
       end
 
       def message_from(response)
@@ -312,7 +311,7 @@ module ActiveMerchant #:nodoc:
           Key: @options[:api_key],
           Version: '4.5.4',
           SoftwareName: 'Active Merchant',
-          SoftwareVersion: "#{ActiveMerchant::VERSION}",
+          SoftwareVersion: ActiveMerchant::VERSION.to_s,
           Command: command,
         }
 

data/lib/active_merchant/billing/gateways/cc5.rb

@@ -70,7 +70,6 @@ module ActiveMerchant #:nodoc:
               add_address(xml, address)
             end
           end
-
         end
 
         xml.target!

data/lib/active_merchant/billing/gateways/cecabank.rb

@@ -152,7 +152,6 @@ module ActiveMerchant #:nodoc:
         end
 
         return response
-
       rescue REXML::ParseException => e
         response[:success] = false
         response[:message] = 'Unable to parse the response.'

data/lib/active_merchant/billing/gateways/cenpos.rb

@@ -313,7 +313,7 @@ module ActiveMerchant #:nodoc:
       def validation_result_element_text(element)
         result_text = element.elements.detect { |elem|
           elem.name == 'Result'
-        }.children.detect { |elem| elem.text }.text
+        }.children.detect(&:text).text
 
         result_text.split(';').collect(&:strip)
       end

data/lib/active_merchant/billing/gateways/checkout_v2.rb

@@ -22,7 +22,7 @@ module ActiveMerchant #:nodoc:
           r.process { capture(amount, r.authorization, options) }
         end
 
-        merged_params = multi.responses.map { |r| r.params }.reduce({}, :merge)
+        merged_params = multi.responses.map(&:params).reduce({}, :merge)
         succeeded = success_from(merged_params)
 
         response(:purchase, succeeded, merged_params)
@@ -180,11 +180,11 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         JSON.parse(body)
-        rescue JSON::ParserError
-          {
-            'message' => 'Invalid JSON response received from CheckoutV2Gateway. Please contact CheckoutV2Gateway if you continue to receive this message.',
-            'raw_response' => scrub(body)
-          }
+      rescue JSON::ParserError
+        {
+          'message' => 'Invalid JSON response received from CheckoutV2Gateway. Please contact CheckoutV2Gateway if you continue to receive this message.',
+          'raw_response' => scrub(body)
+        }
       end
 
       def success_from(response)

data/lib/active_merchant/billing/gateways/citrus_pay.rb

@@ -15,7 +15,7 @@ module ActiveMerchant
       self.homepage_url = 'http://www.citruspay.com/'
       self.supported_countries = %w(AR AU BR FR DE HK MX NZ SG GB US)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro, :laser]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro]
 
     end
   end

data/lib/active_merchant/billing/gateways/commercegate.rb

@@ -76,7 +76,6 @@ module ActiveMerchant #:nodoc:
         post[:email]       = options[:email] || 'unknown@example.com'
         post[:currencyCode]= options[:currency] || currency(money)
         post[:merchAcct]   = options[:merchant]
-
       end
 
       def add_creditcard(params, creditcard)

data/lib/active_merchant/billing/gateways/conekta.rb

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://api.conekta.io/'
 
       self.supported_countries = ['MX']
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = [:visa, :master, :american_express, :carnet]
       self.homepage_url = 'https://conekta.io/'
       self.display_name = 'Conekta Gateway'
       self.money_format = :cents
@@ -162,8 +162,8 @@ module ActiveMerchant #:nodoc:
           post[:card][:name] = payment_source.name
           post[:card][:cvc] = payment_source.verification_value
           post[:card][:number] = payment_source.number
-          post[:card][:exp_month] = "#{sprintf("%02d", payment_source.month)}"
-          post[:card][:exp_year] = "#{"#{payment_source.year}"[-2, 2]}"
+          post[:card][:exp_month] = sprintf('%02d', payment_source.month)
+          post[:card][:exp_year] = payment_source.year.to_s[-2, 2]
           add_address(post[:card], options)
         end
       end
@@ -211,11 +211,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_error(raw_response)
-        begin
-          parse(raw_response)
-        rescue JSON::ParserError
-          json_error(raw_response)
-        end
+        parse(raw_response)
+      rescue JSON::ParserError
+        json_error(raw_response)
       end
 
       def json_error(raw_response)

data/lib/active_merchant/billing/gateways/creditcall.rb

@@ -52,7 +52,7 @@ module ActiveMerchant #:nodoc:
           r.process { capture(money, r.authorization, options) }
         end
 
-        merged_params = multi_response.responses.map { |r| r.params }.reduce({}, :merge)
+        merged_params = multi_response.responses.map(&:params).reduce({}, :merge)
         
         Response.new(
           multi_response.primary_response.success?,
@@ -214,7 +214,6 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-
         response
       end
 

data/lib/active_merchant/billing/gateways/ct_payment.rb

@@ -172,7 +172,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, creditcard, options)
         if address = options[:billing_address] || options[:address]
-          post[:CardHolderAddress] = ("#{address[:address1]} #{address[:address2]} #{address[:city]} #{address[:state]}").rjust(20, ' ')
+          post[:CardHolderAddress] = "#{address[:address1]} #{address[:address2]} #{address[:city]} #{address[:state]}".rjust(20, ' ')
           post[:CardHolderPostalCode] = address[:zip].gsub(/\s+/, '').rjust(9, ' ')
         end
       end

data/lib/active_merchant/billing/gateways/culqi.rb

@@ -243,16 +243,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        begin
-          JSON.parse(body)
-        rescue JSON::ParserError
-          message = 'Invalid JSON response received from CulqiGateway. Please contact CulqiGateway if you continue to receive this message.'
-          message += "(The raw response returned by the API was #{body.inspect})"
-          {
-            'status' => 'N',
-            'statusdescription' => message
-          }
-        end
+        JSON.parse(body)
+      rescue JSON::ParserError
+        message = 'Invalid JSON response received from CulqiGateway. Please contact CulqiGateway if you continue to receive this message.'
+        message += "(The raw response returned by the API was #{body.inspect})"
+        {
+          'status' => 'N',
+          'statusdescription' => message
+        }
       end
 
       def success_from(response)

data/lib/active_merchant/billing/gateways/cyber_source.rb

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
 
       XSD_VERSION = '1.121'
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :switch, :dankort, :maestro]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :dankort, :maestro]
       self.supported_countries = %w(US BR CA CN DK FI FR DE JP MX NO SE GB SG LB)
 
       self.default_currency = 'USD'
@@ -42,7 +42,6 @@ module ActiveMerchant #:nodoc:
         :discover => '004',
         :diners_club => '005',
         :jcb => '007',
-        :switch => '024',
         :dankort => '034',
         :maestro => '042'
       }

data/lib/active_merchant/billing/gateways/data_cash.rb

@@ -6,7 +6,7 @@ module ActiveMerchant
       self.default_currency = 'GBP'
       self.supported_countries = ['GB']
 
-      self.supported_cardtypes = [ :visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro, :switch, :solo, :laser ]
+      self.supported_cardtypes = [ :visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro ]
 
       self.homepage_url = 'http://www.datacash.com/'
       self.display_name = 'DataCash'
@@ -214,23 +214,11 @@ module ActiveMerchant
       end
 
       def add_credit_card(xml, credit_card, address)
-
         xml.tag! :Card do
-
           # DataCash calls the CC number 'pan'
           xml.tag! :pan, credit_card.number
           xml.tag! :expirydate, format_date(credit_card.month, credit_card.year)
 
-          # optional values - for Solo etc
-          if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
-
-            xml.tag! :issuenumber, credit_card.issue_number unless credit_card.issue_number.blank?
-
-            if !credit_card.start_month.blank? && !credit_card.start_year.blank?
-              xml.tag! :startdate, format_date(credit_card.start_month, credit_card.start_year)
-            end
-          end
-
           xml.tag! :Cv2Avs do
             xml.tag! :cv2, credit_card.verification_value if credit_card.verification_value?
             if address
@@ -249,23 +237,23 @@ module ActiveMerchant
             # a predefined one
             xml.tag! :ExtendedPolicy do
               xml.tag! :cv2_policy,
-              :notprovided =>   POLICY_REJECT,
-              :notchecked =>    POLICY_REJECT,
-              :matched =>       POLICY_ACCEPT,
-              :notmatched =>    POLICY_REJECT,
-              :partialmatch =>  POLICY_REJECT
+                :notprovided =>   POLICY_REJECT,
+                :notchecked =>    POLICY_REJECT,
+                :matched =>       POLICY_ACCEPT,
+                :notmatched =>    POLICY_REJECT,
+                :partialmatch =>  POLICY_REJECT
               xml.tag! :postcode_policy,
-              :notprovided =>   POLICY_ACCEPT,
-              :notchecked =>    POLICY_ACCEPT,
-              :matched =>       POLICY_ACCEPT,
-              :notmatched =>    POLICY_REJECT,
-              :partialmatch =>  POLICY_ACCEPT
+                :notprovided =>   POLICY_ACCEPT,
+                :notchecked =>    POLICY_ACCEPT,
+                :matched =>       POLICY_ACCEPT,
+                :notmatched =>    POLICY_REJECT,
+                :partialmatch =>  POLICY_ACCEPT
               xml.tag! :address_policy,
-              :notprovided =>   POLICY_ACCEPT,
-              :notchecked =>    POLICY_ACCEPT,
-              :matched =>       POLICY_ACCEPT,
-              :notmatched =>    POLICY_REJECT,
-              :partialmatch =>  POLICY_ACCEPT
+                :notprovided =>   POLICY_ACCEPT,
+                :notchecked =>    POLICY_ACCEPT,
+                :matched =>       POLICY_ACCEPT,
+                :notmatched =>    POLICY_REJECT,
+                :partialmatch =>  POLICY_ACCEPT
             end
           end
         end
@@ -285,7 +273,6 @@ module ActiveMerchant
       end
 
       def parse(body)
-
         response = {}
         xml = REXML::Document.new(body)
         root = REXML::XPath.first(xml, '//Response')