activemerchant 1.100.0 → 1.101.0

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

@@ -175,9 +175,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_card_or_token(post, payment)
-        if payment.is_a?(String)
-          payment, brand = payment.split('|')
-        end
+        payment, brand = payment.split('|') if payment.is_a?(String)
         post[:payment][:payment_type_code] = payment.is_a?(String) ? brand : CARD_BRAND[payment.brand.to_sym]
         post[:payment][:creditcard] = payment_details(payment)
       end

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

@@ -98,9 +98,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, creditcard, options = {})
-        if creditcard.is_a?(String)
-          raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card or use the #refund method.'
-        end
+        raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card or use the #refund method.' if creditcard.is_a?(String)
 
         form = {}
         add_invoice(form, options)
@@ -174,9 +172,7 @@ module ActiveMerchant #:nodoc:
         form[:card_number] = creditcard.number
         form[:exp_date] = expdate(creditcard)
 
-        if creditcard.verification_value?
-          add_verification_value(form, creditcard)
-        end
+        add_verification_value(form, creditcard) if creditcard.verification_value?
 
         form[:first_name] = truncate(creditcard.first_name, 20)
         form[:last_name] = truncate(creditcard.last_name, 30)

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

@@ -246,9 +246,7 @@ module ActiveMerchant #:nodoc:
         doc.remove_namespaces!
         root = doc.root.xpath('//response/*')
 
-        if root.empty?
-          root = doc.root.xpath('//Response/*')
-        end
+        root = doc.root.xpath('//Response/*') if root.empty?
 
         root.each do |node|
           if node.elements.empty?

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

@@ -214,11 +214,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, post)
-        raw = begin
-          ssl_post(test? ? self.test_url : self.live_url, soap_request(post, action), 'Content-Type' => 'application/soap+xml; charset=utf-8')
-        rescue ResponseError => e
-          e.response.body
-        end
+        raw =
+          begin
+            ssl_post(test? ? self.test_url : self.live_url, soap_request(post, action), 'Content-Type' => 'application/soap+xml; charset=utf-8')
+          rescue ResponseError => e
+            e.response.body
+          end
         response = parse(raw)
 
         EwayResponse.new(response[:success], response[:message], response,

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

@@ -145,12 +145,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(method, uri, parameters=nil)
-        response = begin
-          parse(ssl_request(method, get_url(uri), parameters.to_json, headers))
-        rescue ResponseError => e
-          return Response.new(false, 'Invalid Login') if(e.response.code == '401')
-          parse(e.response.body)
-        end
+        response =
+          begin
+            parse(ssl_request(method, get_url(uri), parameters.to_json, headers))
+          rescue ResponseError => e
+            return Response.new(false, 'Invalid Login') if(e.response.code == '401')
+            parse(e.response.body)
+          end
 
         success = success_from(response)
         Response.new(

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

@@ -130,13 +130,9 @@ module ActiveMerchant #:nodoc:
           post[:billing_address][:physical_address][:locality] = address[:city] if address[:city]
         end
 
-        if empty?(post[:billing_address][:first_name]) && payment.first_name
-          post[:billing_address][:first_name] = payment.first_name
-        end
+        post[:billing_address][:first_name] = payment.first_name if empty?(post[:billing_address][:first_name]) && payment.first_name
 
-        if empty?(post[:billing_address][:last_name]) && payment.last_name
-          post[:billing_address][:last_name] = payment.last_name
-        end
+        post[:billing_address][:last_name] = payment.last_name if empty?(post[:billing_address][:last_name]) && payment.last_name
       end
 
       def add_shipping_address(post, options)

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

@@ -137,9 +137,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'OrderID', format_order_id(options[:order_id])
           xml.tag! 'GroupID'
 
-          if block_given?
-            yield xml
-          end
+          yield xml if block_given?
         end
       end
 

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

@@ -228,9 +228,7 @@ module ActiveMerchant #:nodoc:
           raw_response = ssl_post(url(action, authorization), post.to_json, headers(action, post, authorization))
           response = parse(raw_response)
         rescue ResponseError => e
-          if e.response.code.to_i >= 400
-            response = parse(e.response.body)
-          end
+          response = parse(e.response.body) if e.response.code.to_i >= 400
         rescue JSON::ParserError
           response = json_error(raw_response)
         end

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

@@ -196,9 +196,7 @@ EOA
 
       def escape(string, max_length=250)
         return '' unless string
-        if max_length
-          string = string[0...max_length]
-        end
+        string = string[0...max_length] if max_length
         string.gsub(/[^A-Za-z0-9 \-_@\.\n]/, '')
       end
     end

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

@@ -274,11 +274,12 @@ module ActiveMerchant #:nodoc:
       def commit(action, &request)
         data = build_request(action, &request)
 
-        response = begin
-          parse(ssl_post((test? ? test_url : live_url), data, 'Content-Type' => 'text/xml'))
-        rescue ResponseError => e
-          parse(e.response.body)
-        end
+        response =
+          begin
+            parse(ssl_post((test? ? test_url : live_url), data, 'Content-Type' => 'text/xml'))
+          rescue ResponseError => e
+            parse(e.response.body)
+          end
 
         ActiveMerchant::Billing::Response.new(
           successful?(response),

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

@@ -101,13 +101,9 @@ module ActiveMerchant #:nodoc:
       private
 
       def add_customer_data(post, options)
-        if options.has_key? :email
-          post[:email] = options[:email]
-        end
+        post[:email] = options[:email] if options.has_key? :email
 
-        if options.has_key? :ip
-          post[:ipaddress] = options[:ip]
-        end
+        post[:ipaddress] = options[:ip] if options.has_key? :ip
       end
 
       def add_address(post, creditcard, options)

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

@@ -150,9 +150,7 @@ module ActiveMerchant #:nodoc:
       def post_data(action, parameters = {})
         post = {}
         post[:acctid] = @options[:login]
-        if(@options[:password])
-          post[:merchantpin] = @options[:password]
-        end
+        post[:merchantpin] = @options[:password] if @options[:password]
         post[:action] = action
         request = post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
         request

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

@@ -342,9 +342,7 @@ module ActiveMerchant #:nodoc:
       def add_customerdetails(xml, creditcard, address, options, shipTo = false)
         xml.tag! 'CustomerDetails' do
           if address
-            unless address[:country].blank?
-              country_code = Country.find(address[:country]).code(:numeric)
-            end
+            country_code = Country.find(address[:country]).code(:numeric) unless address[:country].blank?
             xml.tag! 'BillingAddress' do
               xml.tag! 'Address1', address[:address1]
               xml.tag! 'Address2', address[:address2]

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

@@ -150,11 +150,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(post)
-        raw_response = begin
-          ssl_post(live_url, build_xml_envelope(post), headers(post))
-        rescue ActiveMerchant::ResponseError => e
-          e.response.body
-        end
+        raw_response =
+          begin
+            ssl_post(live_url, build_xml_envelope(post), headers(post))
+          rescue ActiveMerchant::ResponseError => e
+            e.response.body
+          end
 
         parsed = parse(raw_response)
         succeeded = success_from(parsed)
@@ -234,9 +235,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def error_code_from(response, succeeded)
-        unless succeeded
-          response['result_code']
-        end
+        response['result_code'] unless succeeded
       end
 
       def underscore(camel_cased_word)

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

@@ -213,9 +213,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'TerminalID', @options[:login]
           xml.tag! 'TransactionType', transaction_type
           xml.tag! 'TransactionID', transaction_id.nil? ? generate_unique_id.slice(0, 18) : transaction_id
-          if options && options[:origin]
-            xml.tag! 'Origin', options[:origin]
-          end
+          xml.tag! 'Origin', options[:origin] if options && options[:origin]
 
           if block_given?
             yield xml
@@ -343,13 +341,9 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'CardExpMonth', format_exp(credit_card.month)
         xml.tag! 'CardExpYear', format_exp(credit_card.year)
 
-        if credit_card.first_name || credit_card.last_name
-          xml.tag! 'CardName', [credit_card.first_name, credit_card.last_name].compact.join(' ')
-        end
+        xml.tag! 'CardName', [credit_card.first_name, credit_card.last_name].compact.join(' ') if credit_card.first_name || credit_card.last_name
 
-        unless credit_card.verification_value.nil? || (credit_card.verification_value.length == 0)
-          xml.tag! 'CVV2', credit_card.verification_value
-        end
+        xml.tag! 'CVV2', credit_card.verification_value unless credit_card.verification_value.nil? || (credit_card.verification_value.length == 0)
       end
 
       def add_addresses(xml, options)

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

@@ -368,13 +368,9 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'CardExpMonth', format_exp(credit_card.month)
         xml.tag! 'CardExpYear', format_exp(credit_card.year)
 
-        if credit_card.first_name || credit_card.last_name
-          xml.tag! 'CardName', [credit_card.first_name, credit_card.last_name].compact.join(' ')
-        end
+        xml.tag! 'CardName', [credit_card.first_name, credit_card.last_name].compact.join(' ') if credit_card.first_name || credit_card.last_name
 
-        unless credit_card.verification_value.nil? || (credit_card.verification_value.length == 0)
-          xml.tag! 'CVV2', credit_card.verification_value
-        end
+        xml.tag! 'CVV2', credit_card.verification_value unless credit_card.verification_value.nil? || (credit_card.verification_value.length == 0)
       end
 
       def add_addresses(xml, options)

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

@@ -94,9 +94,7 @@ module ActiveMerchant #:nodoc:
         sum[:iva] = 0
         sum[:subtotalIva0] = 0
 
-        if sum[:currency] != 'COP'
-          sum[:ice] = 0
-        end
+        sum[:ice] = 0 if sum[:currency] != 'COP'
       end
 
       def add_amount_by_country(sum, options)
@@ -137,11 +135,12 @@ module ActiveMerchant #:nodoc:
       }
 
       def commit(action, params)
-        response = begin
-          parse(ssl_invoke(action, params))
-        rescue ResponseError => e
-          parse(e.response.body)
-        end
+        response =
+          begin
+            parse(ssl_invoke(action, params))
+          rescue ResponseError => e
+            parse(e.response.body)
+          end
 
         success = success_from(response)
 

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

@@ -158,11 +158,12 @@ module ActiveMerchant #:nodoc:
         url = test? ? self.test_url : self.live_url
         parameters[:transaction_amount]  = amount(money) if money unless action == 'V'
 
-        response = begin
-          parse(ssl_post(url, post_data(action, parameters)))
-        rescue ActiveMerchant::ResponseError => e
-          { 'error_code' => '404',  'auth_response_text' => e.to_s }
-        end
+        response =
+          begin
+            parse(ssl_post(url, post_data(action, parameters)))
+          rescue ActiveMerchant::ResponseError => e
+            { 'error_code' => '404',  'auth_response_text' => e.to_s }
+          end
 
         Response.new(response['error_code'] == '000', message_from(response), response,
           :authorization => response['transaction_id'],

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

@@ -91,9 +91,7 @@ module ActiveMerchant #:nodoc:
         ret = ''
         for key in parameters.keys
           ret += "#{key}=#{CGI.escape(parameters[key].to_s)}"
-          if key != parameters.keys.last
-            ret += '&'
-          end
+          ret += '&' if key != parameters.keys.last
         end
         ret.to_s
       end

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

@@ -308,9 +308,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(response)
-        if response[:success]
-          [ response['ReferenceID'], response['OrderNumber'] ].join(';')
-        end
+        [ response['ReferenceID'], response['OrderNumber'] ].join(';') if response[:success]
       end
     end
   end

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

@@ -181,9 +181,7 @@ module ActiveMerchant #:nodoc:
       def add_auth(action, post)
         post['merchantUUID'] = @options[:merchant_uuid]
         post['apiKey'] = @options[:api_key]
-        unless token?(post)
-          post['method'] = action
-        end
+        post['method'] = action unless token?(post)
       end
 
       def url_for(action, post)

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

@@ -103,9 +103,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'Credit'
             xml.tag! 'TranCode', action
-            if options[:allow_partial_auth] && ['PreAuth', 'Sale'].include?(action)
-              xml.tag! 'PartialAuth', 'Allow'
-            end
+            xml.tag! 'PartialAuth', 'Allow' if options[:allow_partial_auth] && ['PreAuth', 'Sale'].include?(action)
             add_invoice(xml, options[:order_id], nil, options)
             add_reference(xml, 'RecordNumberRequested')
             add_customer_data(xml, options)
@@ -126,9 +124,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'TStream' do
           xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'Credit'
-            if options[:allow_partial_auth] && (action == 'PreAuthCapture')
-              xml.tag! 'PartialAuth', 'Allow'
-            end
+            xml.tag! 'PartialAuth', 'Allow' if options[:allow_partial_auth] && (action == 'PreAuthCapture')
             xml.tag! 'TranCode', (@use_tokenization ? (action + 'ByRecordNo') : action)
             add_invoice(xml, invoice_no, ref_no, options)
             add_reference(xml, record_no)

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

@@ -242,21 +242,15 @@ module ActiveMerchant #:nodoc:
           post[:email_customer] = false
         end
 
-        if options.has_key? :customer
-          post[:cust_id] = options[:customer]
-        end
+        post[:cust_id] = options[:customer] if options.has_key? :customer
 
-        if options.has_key? :ip
-          post[:customer_ip] = options[:ip]
-        end
+        post[:customer_ip] = options[:ip] if options.has_key? :ip
       end
 
       # x_duplicate_window won't be sent by default, because sending it changes the response.
       # "If this field is present in the request with or without a value, an enhanced duplicate transaction response will be sent."
       def add_duplicate_window(post)
-        unless duplicate_window.nil?
-          post[:duplicate_window] = duplicate_window
-        end
+        post[:duplicate_window] = duplicate_window unless duplicate_window.nil?
       end
 
       def add_address(post, options)
@@ -286,9 +280,7 @@ module ActiveMerchant #:nodoc:
       def message_from(results)
         if results[:response_code] == DECLINED
           return CVVResult.messages[results[:card_code]] if CARD_CODE_ERRORS.include?(results[:card_code])
-          if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
-            return AVSResult.messages[results[:avs_result_code]]
-          end
+          return AVSResult.messages[results[:avs_result_code]] if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
         end
 
         (results[:response_reason_text] ? results[:response_reason_text].chomp('.') : '')

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

@@ -195,9 +195,7 @@ module ActiveMerchant #:nodoc:
         response_hash = parse(data)
 
         expected_secure_hash = calculate_secure_hash(response_hash, @options[:secure_hash])
-        unless response_hash[:SecureHash] == expected_secure_hash
-          raise SecurityError, 'Secure Hash mismatch, response may be tampered with'
-        end
+        raise SecurityError, 'Secure Hash mismatch, response may be tampered with' unless response_hash[:SecureHash] == expected_secure_hash
 
         response_object(response_hash)
       end

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

@@ -287,9 +287,7 @@ module ActiveMerchant #:nodoc:
 
       # Generates a Moneris authorization string of the form 'trans_id;receipt_id'.
       def authorization_from(response = {})
-        if response[:trans_id] && response[:receipt_id]
-          "#{response[:trans_id]};#{response[:receipt_id]}"
-        end
+        "#{response[:trans_id]};#{response[:receipt_id]}" if response[:trans_id] && response[:receipt_id]
       end
 
       # Tests for a successful response from Moneris' servers

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

@@ -230,9 +230,7 @@ module ActiveMerchant #:nodoc:
 
       # Generates a Moneris authorization string of the form 'trans_id;receipt_id'.
       def authorization_from(response = {})
-        if response[:trans_id] && response[:receipt_id]
-          "#{response[:trans_id]};#{response[:receipt_id]}"
-        end
+        "#{response[:trans_id]};#{response[:receipt_id]}" if response[:trans_id] && response[:receipt_id]
       end
 
       # Tests for a successful response from Moneris' servers