activemerchant 1.105.0 → 1.107.4

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://process.sandbox.safecharge.com/service.asmx/Process'
       self.live_url = 'https://process.safecharge.com/service.asmx/Process'
 
-      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'GR', 'ES', 'FI', 'FR', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'GB', 'US']
+      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'GR', 'ES', 'FI', 'FR', 'GI', 'HK', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SG', 'SI', 'SK', 'GB', 'US']
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master]
 

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

@@ -11,12 +11,12 @@ module ActiveMerchant #:nodoc:
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
 
       TRANSACTIONS = {
-        :purchase           => '01',
-        :authorization      => '02',
-        :capture            => '11',
-        :void               => '04',
-        :credit             => '06',
-        :refund             => '10'
+        purchase:       '01',
+        authorization:  '02',
+        capture:        '11',
+        void:           '04',
+        credit:         '06',
+        refund:         '10'
       }
 
       SOURCE_CARD   = 'bankcard'
@@ -261,10 +261,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url, post_data(action, params)), source)
 
         Response.new(success?(response), response[:message], response,
-          :test => test?,
-          :authorization => authorization_from(response, source),
-          :avs_result => { :code => response[:avs_result] },
-          :cvv_result => response[:cvv_result]
+          test: test?,
+          authorization: authorization_from(response, source),
+          avs_result: { code: response[:avs_result] },
+          cvv_result: response[:cvv_result]
         )
       end
 

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

@@ -13,26 +13,26 @@ module ActiveMerchant #:nodoc:
       APPROVED = 'OK'
 
       TRANSACTIONS = {
-        :purchase => 'PAYMENT',
-        :credit => 'REFUND',
-        :authorization => 'DEFERRED',
-        :capture => 'RELEASE',
-        :void => 'VOID',
-        :abort => 'ABORT',
-        :store => 'TOKEN',
-        :unstore => 'REMOVETOKEN',
-        :repeat => 'REPEAT'
+        purchase: 'PAYMENT',
+        credit: 'REFUND',
+        authorization: 'DEFERRED',
+        capture: 'RELEASE',
+        void: 'VOID',
+        abort: 'ABORT',
+        store: 'TOKEN',
+        unstore: 'REMOVETOKEN',
+        repeat: 'REPEAT'
       }
 
       CREDIT_CARDS = {
-        :visa => 'VISA',
-        :master => 'MC',
-        :delta => 'DELTA',
-        :maestro => 'MAESTRO',
-        :american_express => 'AMEX',
-        :electron => 'UKE',
-        :diners_club => 'DC',
-        :jcb => 'JCB'
+        visa: 'VISA',
+        master: 'MC',
+        delta: 'DELTA',
+        maestro: 'MAESTRO',
+        american_express: 'AMEX',
+        electron: 'UKE',
+        diners_club: 'DC',
+        jcb: 'JCB'
       }
 
       AVS_CODE = {
@@ -213,18 +213,18 @@ module ActiveMerchant #:nodoc:
 
       def add_amount(post, money, options)
         currency = options[:currency] || currency(money)
-        add_pair(post, :Amount, localized_amount(money, currency), :required => true)
-        add_pair(post, :Currency, currency, :required => true)
+        add_pair(post, :Amount, localized_amount(money, currency), required: true)
+        add_pair(post, :Currency, currency, required: true)
       end
 
       def add_currency(post, money, options)
         currency = options[:currency] || currency(money)
-        add_pair(post, :Currency, currency, :required => true)
+        add_pair(post, :Currency, currency, required: true)
       end
 
       # doesn't actually use the currency -- dodgy!
       def add_release_amount(post, money, options)
-        add_pair(post, :ReleaseAmount, amount(money), :required => true)
+        add_pair(post, :ReleaseAmount, amount(money), required: true)
       end
 
       def add_customer_data(post, options)
@@ -269,7 +269,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, options)
-        add_pair(post, :VendorTxCode, sanitize_order_id(options[:order_id]), :required => true)
+        add_pair(post, :VendorTxCode, sanitize_order_id(options[:order_id]), required: true)
         add_pair(post, :Description, truncate(options[:description] || options[:order_id], 100))
       end
 
@@ -286,10 +286,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_credit_card(post, credit_card)
-        add_pair(post, :CardHolder, truncate(credit_card.name, 50), :required => true)
-        add_pair(post, :CardNumber, credit_card.number, :required => true)
+        add_pair(post, :CardHolder, truncate(credit_card.name, 50), required: true)
+        add_pair(post, :CardNumber, credit_card.number, required: true)
 
-        add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), :required => true)
+        add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), required: true)
         add_pair(post, :CardType, map_card_type(credit_card))
 
         add_pair(post, :CV2, credit_card.verification_value)
@@ -347,13 +347,13 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url_for(action), post_data(action, parameters)))
 
         Response.new(response['Status'] == APPROVED, message_from(response), response,
-          :test => test?,
-          :authorization => authorization_from(response, parameters, action),
-          :avs_result => {
-            :street_match => AVS_CODE[response['AddressResult']],
-            :postal_match => AVS_CODE[response['PostCodeResult']],
+          test: test?,
+          authorization: authorization_from(response, parameters, action),
+          avs_result: {
+            street_match: AVS_CODE[response['AddressResult']],
+            postal_match: AVS_CODE[response['PostCodeResult']],
           },
-          :cvv_result => CVV_CODE[response['CV2Result']]
+          cvv_result: CVV_CODE[response['CV2Result']]
         )
       end
 
@@ -400,12 +400,12 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, parameters = {})
         parameters.update(
-          :Vendor => @options[:login],
-          :TxType => TRANSACTIONS[action],
-          :VPSProtocol => @options.fetch(:protocol_version, '3.00')
+          Vendor: @options[:login],
+          TxType: TRANSACTIONS[action],
+          VPSProtocol: @options.fetch(:protocol_version, '3.00')
         )
 
-        parameters.update(:ReferrerID => application_id) if application_id && (application_id != Gateway.application_id)
+        parameters.update(ReferrerID: application_id) if application_id && (application_id != Gateway.application_id)
 
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end

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

@@ -121,8 +121,8 @@ module ActiveMerchant #:nodoc:
 
         response = parse(ssl_post(self.live_url, parameters.to_post_data) || '')
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => response['refcode']
+          test: test?,
+          authorization: response['refcode']
         )
       end
 

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

@@ -4,11 +4,11 @@ module ActiveMerchant #:nodoc:
       API_VERSION = '4.0'
 
       TRANSACTIONS = {
-        :auth_only                      => '0000',
-        :auth_capture                   => '0100',
-        :prior_auth_capture             => '0200',
-        :void                           => '0400',
-        :credit                         => '0500'
+        auth_only:            '0000',
+        auth_capture:         '0100',
+        prior_auth_capture:   '0200',
+        void:                 '0400',
+        credit:               '0500'
       }
 
       XML_ATTRIBUTES = {
@@ -80,10 +80,10 @@ module ActiveMerchant #:nodoc:
         response = parse(data)
 
         Response.new(success?(response), message_from(response), response,
-          :test => test?,
-          :authorization => build_authorization(response),
-          :avs_result => { :code => response[:avs_result_code] },
-          :cvv_result => response[:card_code_response_code]
+          test: test?,
+          authorization: build_authorization(response),
+          avs_result: { code: response[:avs_result_code] },
+          cvv_result: response[:card_code_response_code]
         )
       end
 

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

@@ -57,11 +57,11 @@ module ActiveMerchant #:nodoc:
         message = message_from(response)
 
         Response.new(success?(response), message, response,
-          :test => test?,
-          :authorization => response[:transaction_id],
-          :fraud_review => fraud_review?(response),
-          :avs_result => { :code => response[:avs_result_code] },
-          :cvv_result => response[:card_code]
+          test: test?,
+          authorization: response[:transaction_id],
+          fraud_review: fraud_review?(response),
+          avs_result: { code: response[:avs_result_code] },
+          cvv_result: response[:card_code]
         )
       end
 
@@ -77,14 +77,14 @@ module ActiveMerchant #:nodoc:
         fields = split(body)
 
         results = {
-          :response_code => fields[RESPONSE_CODE].to_i,
-          :response_reason_code => fields[RESPONSE_REASON_CODE],
-          :response_reason_text => fields[RESPONSE_REASON_TEXT],
-          :avs_result_code => fields[AVS_RESULT_CODE],
-          :transaction_id => fields[TRANSACTION_ID],
-          :card_code => fields[CARD_CODE_RESPONSE_CODE],
-          :authorization_code => fields[AUTHORIZATION_CODE],
-          :cardholder_authentication_code => fields[CARDHOLDER_AUTH_CODE]
+          response_code: fields[RESPONSE_CODE].to_i,
+          response_reason_code: fields[RESPONSE_REASON_CODE],
+          response_reason_text: fields[RESPONSE_REASON_TEXT],
+          avs_result_code: fields[AVS_RESULT_CODE],
+          transaction_id: fields[TRANSACTION_ID],
+          card_code: fields[CARD_CODE_RESPONSE_CODE],
+          authorization_code: fields[AUTHORIZATION_CODE],
+          cardholder_authentication_code: fields[CARDHOLDER_AUTH_CODE]
         }
         results
       end

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :test_periodic_url, :live_periodic_url
 
-      self.test_url = 'https://api.securepay.com.au/test/payment'
+      self.test_url = 'https://test.api.securepay.com.au/xmlapi/payment'
       self.live_url = 'https://api.securepay.com.au/xmlapi/payment'
 
       self.test_periodic_url = 'https://test.securepay.com.au/xmlapi/periodic'
@@ -35,23 +35,23 @@ module ActiveMerchant #:nodoc:
       # 10 Preauthorise
       # 11 Preauth Complete (Advice)
       TRANSACTIONS = {
-        :purchase => 0,
-        :authorization => 10,
-        :capture => 11,
-        :void => 6,
-        :refund => 4
+        purchase:       0,
+        authorization:  10,
+        capture:        11,
+        void:           6,
+        refund:         4
       }
 
       PERIODIC_ACTIONS = {
-        :add_triggered    => 'add',
-        :remove_triggered => 'delete',
-        :trigger          => 'trigger'
+        add_triggered:      'add',
+        remove_triggered:   'delete',
+        trigger:            'trigger'
       }
 
       PERIODIC_TYPES = {
-        :add_triggered    => 4,
-        :remove_triggered => nil,
-        :trigger          => nil
+        add_triggered:    4,
+        remove_triggered: nil,
+        trigger:          nil
       }
 
       SUCCESS_CODES = ['00', '08', '11', '16', '77']
@@ -184,8 +184,8 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(action, request)))
 
         Response.new(success?(response), message_from(response), response,
-          :test => test?,
-          :authorization => authorization_from(response)
+          test: test?,
+          authorization: authorization_from(response)
         )
       end
 
@@ -241,8 +241,8 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, my_request))
 
         Response.new(success?(response), message_from(response), response,
-          :test => test?,
-          :authorization => authorization_from(response)
+          test: test?,
+          authorization: authorization_from(response)
         )
       end
 

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

@@ -85,8 +85,8 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(self.live_url, post_data(action, post)))
 
         Response.new(response[:result_code] == 1, message_from(response), response,
-          :test => test?,
-          :authorization => response[:merchant_transaction_reference]
+          test: test?,
+          authorization: response[:merchant_transaction_reference]
         )
       end
 

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

@@ -12,9 +12,9 @@ module ActiveMerchant #:nodoc:
       ADVANCED_PATH = '/evolvcc/evolvcc.aspx'
 
       ACTIONS = {
-        :authorization => 'AuthorizeAPI',
-        :change_status => 'SJAPI_TransactionChangeStatusRequest',
-        :get_status => 'SJAPI_TransactionStatusRequest'
+        authorization: 'AuthorizeAPI',
+        change_status: 'SJAPI_TransactionChangeStatusRequest',
+        get_status: 'SJAPI_TransactionStatusRequest'
       }
 
       SUCCESS_MESSAGE = 'The transaction was successful.'
@@ -242,7 +242,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def status(order_id)
-        commit(:get_status, nil, :szOrderNumber => order_id)
+        commit(:get_status, nil, szOrderNumber: order_id)
       end
 
       private
@@ -264,10 +264,10 @@ module ActiveMerchant #:nodoc:
 
         # Pass along the original transaction id in the case an update transaction
         Response.new(response[:success], message_from(response, action), response,
-          :test => test?,
-          :authorization => response[:szTransactionFileName] || parameters[:szTransactionId],
-          :avs_result => { :code => response[:szAVSResponseCode] },
-          :cvv_result => response[:szCVV2ResponseCode]
+          test: test?,
+          authorization: response[:szTransactionFileName] || parameters[:szTransactionId],
+          avs_result: { code: response[:szAVSResponseCode] },
+          cvv_result: response[:szCVV2ResponseCode]
         )
       end
 

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

@@ -47,13 +47,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        post ={}
+        post = {}
         post[:transactionid] = authorization
         commit('capture', money, post)
       end
 
       def void(authorization, options = {})
-        post ={}
+        post = {}
         post[:transactionid] = authorization
         commit('void', nil, post)
       end
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
       def store(payment_source, options = {})
         post = {}
         billing_id = options.delete(:billing_id).to_s || true
-        add_payment_source(post, payment_source, :store => billing_id)
+        add_payment_source(post, payment_source, store: billing_id)
         add_address(post, options[:billing_address] || options[:address])
         add_customer_data(post, options)
         commit(nil, nil, post)
@@ -134,16 +134,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, address, prefix='')
-        prefix +='_' unless prefix.blank?
+        prefix += '_' unless prefix.blank?
         unless address.blank? or address.values.blank?
-          post[prefix+'address1']    = address[:address1].to_s
-          post[prefix+'address2']    = address[:address2].to_s unless address[:address2].blank?
-          post[prefix+'company']    = address[:company].to_s
-          post[prefix+'phone']      = address[:phone].to_s
-          post[prefix+'zip']        = address[:zip].to_s
-          post[prefix+'city']       = address[:city].to_s
-          post[prefix+'country']    = address[:country].to_s
-          post[prefix+'state']      = address[:state].blank? ? 'n/a' : address[:state]
+          post[prefix + 'address1']    = address[:address1].to_s
+          post[prefix + 'address2']    = address[:address2].to_s unless address[:address2].blank?
+          post[prefix + 'company']    = address[:company].to_s
+          post[prefix + 'phone']      = address[:phone].to_s
+          post[prefix + 'zip']        = address[:zip].to_s
+          post[prefix + 'city']       = address[:city].to_s
+          post[prefix + 'country']    = address[:country].to_s
+          post[prefix + 'state']      = address[:state].blank? ? 'n/a' : address[:state]
         end
       end
 
@@ -227,10 +227,10 @@ module ActiveMerchant #:nodoc:
         parameters[:amount] = localized_amount(money, parameters[:currency] || default_currency) if money
         response = parse(ssl_post(self.live_url, post_data(action, parameters)))
         Response.new(response['response'] == '1', message_from(response), response,
-          :authorization => (response['transactionid'] || response['customer_vault_id']),
-          :test => test?,
-          :cvv_result => response['cvvresponse'],
-          :avs_result => { :code => response['avsresponse'] }
+          authorization: (response['transactionid'] || response['customer_vault_id']),
+          test: test?,
+          cvv_result: response['cvvresponse'],
+          avs_result: { code: response['avsresponse'] }
         )
       end
 

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

@@ -164,13 +164,13 @@ module ActiveMerchant #:nodoc:
         return Response.new(response['errorcode'] == '000',
           response['errormessage'],
           response,
-          :test => test?,
-          :authorization => response['transaction_id'])
+          test: test?,
+          authorization: response['transaction_id'])
       end
 
       def build_soap(request)
-        retval = Builder::XmlMarkup.new(:indent => 2)
-        retval.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
+        retval = Builder::XmlMarkup.new(indent: 2)
+        retval.instruct!(:xml, version: '1.0', encoding: 'utf-8')
         retval.tag!('soap:Envelope', {
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
           'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
@@ -179,9 +179,9 @@ module ActiveMerchant #:nodoc:
           'xmlns:types' => 'urn:Interface/encodedTypes',
           'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'
         }) do
-          retval.tag!('soap:Body', {'soap:encodingStyle'=>'http://schemas.xmlsoap.org/soap/encoding/'}) do
+          retval.tag!('soap:Body', {'soap:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'}) do
             retval.tag!("tns:#{request}") do
-              retval.tag!("#{request}Request", {'xsi:type'=>"tns:#{request}Request"}) do
+              retval.tag!("#{request}Request", {'xsi:type' => "tns:#{request}Request"}) do
                 yield retval
               end
             end