activemerchant 1.45.0 → 1.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705744a332bbe4db27dc6e0dbbefd63712e94c28
-  data.tar.gz: 452924bd903988716baa84b34969a9248abb6480
+  metadata.gz: fef1eb0d503d1d6aff1334d0a6715ac163f4f6fe
+  data.tar.gz: 4ae14dcf7fc8883c819ee1b2c36d00c95f63a7cc
 SHA512:
-  metadata.gz: bea4d6dd57b28e0e6b852e05630ace0b08d51e6d3403f5754ba060b8651842ab26871e601833e966b293d2d3d28cc49a52aa6b54352b7fd774c4cb324c84d1fa
-  data.tar.gz: 11dab3ab3cb2b85a54b31283f2127c6adfe0f1e2dbcdeb73a40e9d2096d45fa258474845f62ee73d6a6ecb6564bd04974941b85c2450cb403773bc739c41d3fa
+  metadata.gz: 337e1502bcf24ff67fc58da0128d2526bb449089df5908c38b02645c56024c760b8239eaaf675570aefcd99fcf654e1c87ad7daeeaf7c34511bcc1a089db1671
+  data.tar.gz: e0d8140445aa478bee95d90dd672df544aec404976b21b5f2583335713518281090509d92e0eeb240dcb618e8741de8d3f287290ea049c06fa61ca3a8bb42a84

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-��j#D>j(QV
r�B��<���N�ז���zV�&��ҴL�C�N��O�,��+�"G�&�j*��R�|���c�L�i�3�t��Is�K[���������sz>����Շ���Tk�w�%��/�J`ą���Ճ&<����.�)i�m�6�r�^5��~/��8q�D<If ���͈��

��p��iL�}Iٺ_x5e�*8��>>���w*�^h�G\A#���g����9�);T	Z+i
+f���g��b��eܸ���H7��%G\hPQ9��+֐��-�s�2�'d�C��<�d6�&��Ǽ�Ȧof�<.'�<���ݗy~e��D�
+D�b�+������I[�}���2G��v2µ�	(�~�O �׬{P^&B�[�E}'[r�<��"��`n�ת�����uG��[�d��O�AH&@V�P��B�D^�� ��
+oF\w^��I5

data/CHANGELOG

@@ -1,5 +1,30 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.46.0 (January 20, 2015)
+
+* CHANGE: drop `offsite_payments` and `active_utils` as dependencies. [wvanbergen]
+* CHANGE: remove `OffsitePaymentShim`. You will have to add offsite_payments as a dependency,
+  and update any mentions of `ActiveSupport::Billing::Integration` to
+  `OffsitePayments::Integrations`. [wvanbergen]
+* QuickBooks Payments: Add adapter [ivanfer, bizla]
+* Quickbooks: Remove requirement of oauth gem.
+* PayGate: Add support for refunds [StephanAtG2]
+* PayPal: Add #scrub for scrubbing PCI information out of HTTP transcripts [girasquid]
+* Stripe: Add #scrub for scrubbing PCI information out of HTTP transcripts [girasquid]
+* Cybersource: Add ability to verify a card [duff]
+* BraintreeBlue: Expose the error code in the response params [duff]
+* eWay Rapid: Update supported countries and card types [incarnate]
+* PayPal: Allow specifying ButtonSource at init [ntalbott]
+* Payflow: Add fraud_review support [ntalbott]
+* Add IPP gateway [InfraRuby]
+* Redsys: Fix order_id truncation [duff]
+* AuthorizeNet: Improve duplicate_window handling [duff]
+* PayPal: Fix ButtonSource bug [ntalbott]
+* Checkout: Prevent multiple trackids from being passed [markabe]
+* Pin: Handle JSON parsing exception in response [duff]
+* Improve test suite to test against multiple ActiveSupport versions [wvanbergen]
+* Misc. code cleanup [wvanbergen]
+
 == Version 1.45.0 (December 1, 2014)
 
 * HPS: Always pass CardHolderData element [SecureSubmit, ntalbott]

data/CONTRIBUTORS

@@ -509,3 +509,12 @@ Bank Frick (September 2014)
 Global Transport (September 2014)
 
 * Duff O'Melia (duff)
+
+IPP (December 2014)
+
+* (InfraRuby)
+
+QuickBooks Payments (January 2015)
+
+* Arbab Ahmed (bizla)
+* Ivan Sanchez (ivanfer)

data/README.md

@@ -41,7 +41,6 @@ This simple example demonstrates how a purchase can be made using a person's
 credit card details.
 
 ```ruby
-require 'rubygems'
 require 'active_merchant'
 
 # Use the TrustCommerce test servers
@@ -112,7 +111,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [ePay](http://epay.dk/) - DK, SE, NO
 * [EVO Canada](http://www.evocanada.com/) - CA
 * [eWAY](http://www.eway.com.au/) - AU, NZ, GB
-* [eWAY Rapid 3.0](http://www.eway.com.au/) - AU
+* [eWAY Rapid](http://www.eway.com.au/) - AU, NZ, GB, SG
 * [E-xact](http://www.e-xact.com) - CA, US
 * [Fat Zebra](https://www.fatzebra.com.au/) - AU
 * [Federated Canada](http://www.federatedcanada.com/) - CA
@@ -127,6 +126,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [iATS Payments](http://home.iatspayments.com/) - AU, BR, CA, CH, DE, DK, ES, FI, FR, GR, HK, IE, IT, NL, NO, PT, SE, SG, TR, UK, US
 * [Inspire Commerce](http://www.inspiregateway.com) - US
 * [InstaPay](http://www.instapayllc.com) - US
+* [IPP](http://www.ippayments.com.au/) - AU
 * [Iridium](http://www.iridiumcorp.co.uk/) - GB, ES
 * [iTransact](http://www.itransact.com/) - US
 * [JetPay](http://www.jetpay.com/) - US
@@ -137,7 +137,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Merchant One Gateway](http://merchantone.com/) - US
 * [MerchantWARE](http://merchantwarehouse.com/merchantware) - US
 * [MerchantWarrior](http://www.merchantwarrior.com/) - AU
-* [Mercury](http://www.mercurypay.com) - US
+* [Mercury](http://www.mercurypay.com) - US, CA
 * [Metrics Global](http://www.metricsglobal.com) - US
 * [MasterCard Internet Gateway Service (MiGS)](http://mastercard.com/mastercardsps) - AU, AE, BD, BN, EG, HK, ID, IN, JO, KW, LB, LK, MU, MV, MY, NZ, OM, PH, QA, SA, SG, TT, VN
 * [Modern Payments](http://www.modpay.com) - US
@@ -177,6 +177,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Psigate](http://www.psigate.com/) - CA
 * [PSL Payment Solutions](http://www.paymentsolutionsltd.com/) - GB
 * [QuickBooks Merchant Services](http://payments.intuit.com/) - US
+* [QuickBooks Payments](http://payments.intuit.com/) - US
 * [Quantum Gateway](http://www.quantumgateway.com) - US
 * [QuickPay](http://quickpay.net/) - DE, DK, ES, FI, FR, FO, GB, IS, NO, SE
 * [Raven PacNet](http://www.pacnetservices.com/) - US
@@ -208,21 +209,6 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Worldpay](http://www.worldpay.com/) - HK, US, GB, AU, AD, BE, CH, CY, CZ, DE, DK, ES, FI, FR, GI, GR, HU, IE, IL, IT, LI, LU, MC, MT, NL, NO, NZ, PL, PT, SE, SG, SI, SM, TR, UM, VA
 * [Worldpay US](http://www.worldpay.com/us) - US
 
-## Deprecation Policy
-
-Deprecated functionality is removed on major version changes - for example, deprecations from 2.x are removed in 3.x.
-
-## Contributing
-
-1. [Fork it](http://github.com/Shopify/active_merchant/fork) and clone your new repo
-2. Create a branch (`git checkout -b my_awesome_feature`)
-3. Commit your changes (`git add my/awesome/file.rb; git commit -m "Added my awesome feature"`)
-4. Push your changes to your fork (`git push origin my_awesome_feature`)
-5. Open a [Pull Request](https://github.com/shopify/active_merchant/pulls)
-
-Please see the [ActiveMerchant Guide to Contributing](http://github.com/Shopify/active_merchant/wikis/contributing) for
-information on adding a new gateway to ActiveMerchant.
-
-Please don't touch the CHANGELOG in your pull requests, we'll add the appropriate CHANGELOG entries
-at release time.
+## API stability policy
 
+Functionality or APIs that are deprecated will be marked as such. Deprecated functionality is removed on major version changes - for example, deprecations from 2.x are removed in 3.x.

data/lib/active_merchant.rb

@@ -27,7 +27,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/enumerable.rb'
+require 'active_support/core_ext/enumerable'
 
 if(!defined?(ActiveSupport::VERSION) || (ActiveSupport::VERSION::STRING < "4.1"))
   require 'active_support/core_ext/class/attribute_accessors'
@@ -36,22 +36,7 @@ end
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/module/attribute_accessors'
 
-begin
-  require 'active_support/base64'
-
-  unless defined?(Base64)
-    Base64 = ActiveSupport::Base64
-  end
-
-  unless Base64.respond_to?(:strict_encode64)
-    def Base64.strict_encode64(v)
-      ActiveSupport::Base64.encode64s(v)
-    end
-  end
-rescue LoadError
-  require 'base64'
-end
-
+require 'base64'
 require 'securerandom'
 require 'builder'
 require 'cgi'
@@ -59,44 +44,16 @@ require 'rexml/document'
 require 'timeout'
 require 'socket'
 
-require 'active_utils/common/network_connection_retries'
-silence_warnings{require 'active_utils/common/connection'}
-require 'active_utils/common/post_data'
-require 'active_utils/common/posts_data'
+require 'active_merchant/network_connection_retries'
+require 'active_merchant/connection'
+require 'active_merchant/post_data'
+require 'active_merchant/posts_data'
 
 require 'active_merchant/billing'
 require 'active_merchant/version'
 require 'active_merchant/country'
 
-I18n.enforce_available_locales = false
-
-module ActiveMerchant #:nodoc:
-  OFFSITE_PAYMENT_EXTRACTION_MESSAGE = "Integrations have been extracted into a separate gem (https://github.com/Shopify/offsite_payments) and will no longer be loaded by ActiveMerchant 2.x."
-
-  module Billing #:nodoc:
-    def self.const_missing(name)
-      if name.to_s == "Integrations"
-        ActiveMerchant.deprecated(OFFSITE_PAYMENT_EXTRACTION_MESSAGE)
-        require "active_merchant/offsite_payments_shim"
-        ActiveMerchant::OffsitePaymentsShim
-      else
-        super
-      end
-    end
-
-    def self.included(klass)
-      def klass.const_missing(name)
-        if name.to_s == "Integrations"
-          ActiveMerchant.deprecated(OFFSITE_PAYMENT_EXTRACTION_MESSAGE)
-          require "active_merchant/offsite_payments_shim"
-          ActiveMerchant::OffsitePaymentsShim
-        else
-          super
-        end
-      end
-    end
-  end
-
+module ActiveMerchant
   def self.deprecated(message, caller=Kernel.caller[1])
     warning = caller + ": " + message
     if(respond_to?(:logger) && logger.present?)
@@ -106,3 +63,5 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
+
+I18n.enforce_available_locales = false

data/lib/active_merchant/billing.rb

@@ -11,3 +11,4 @@ require 'active_merchant/billing/payment_token'
 require 'active_merchant/billing/apple_pay_payment_token'
 require 'active_merchant/billing/response'
 require 'active_merchant/billing/gateways'
+require 'active_merchant/billing/gateway'

data/lib/active_merchant/billing/gateway.rb

@@ -128,7 +128,7 @@ module ActiveMerchant #:nodoc:
 
       # The application making the calls to the gateway
       # Useful for things like the PayPal build notation (BN) id fields
-      superclass_delegating_accessor :application_id
+      class_attribute :application_id, instance_writer: false
       self.application_id = 'ActiveMerchant'
 
       attr_reader :options
@@ -181,6 +181,15 @@ module ActiveMerchant #:nodoc:
         (@options.has_key?(:test) ? @options[:test] : Base.test?)
       end
 
+      # Does this gateway know how to scrub sensitive information out of HTTP transcripts?
+      def supports_scrubbing?
+        false
+      end
+
+      def scrub(transcript)
+        raise RuntimeError.new("This gateway does not support scrubbing.")
+      end
+
       protected # :nodoc: all
 
       def normalize(field)

data/lib/active_merchant/billing/gateways.rb

@@ -1,17 +1,12 @@
 module ActiveMerchant
   module Billing
-    autoload :Gateway, 'active_merchant/billing/gateway'
+    load_path = Pathname.new(__FILE__ + '/../../..')
+    Dir[File.dirname(__FILE__) + '/gateways/**/*.rb'].each do |filename|
+      gateway_name      = File.basename(filename, '.rb')
+      gateway_classname = "#{gateway_name}_gateway".camelize
+      gateway_filename  = Pathname.new(filename).relative_path_from(load_path).sub_ext('')
 
-    Dir[File.dirname(__FILE__) + '/gateways/**/*.rb'].each do |f|
-      # Get camelized class name
-      filename = File.basename(f, '.rb')
-      # Add _gateway suffix
-      gateway_name = filename + '_gateway'
-      # Camelize the string to get the class name
-      gateway_class = gateway_name.camelize
-
-      # Register for autoloading
-      autoload gateway_class, f
+      autoload(gateway_classname, gateway_filename)
     end
   end
 end

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

@@ -41,8 +41,9 @@ module ActiveMerchant #:nodoc:
         commit("AUTH_CAPTURE") do |xml|
           add_order_id(xml, options)
           xml.transactionRequest do
-            xml.transactionType 'authCaptureTransaction'
-            xml.amount amount(amount)
+            xml.transactionType('authCaptureTransaction')
+            xml.amount(amount(amount))
+
             add_payment_source(xml, payment)
             add_invoice(xml, options)
             add_customer_data(xml, payment, options)
@@ -57,8 +58,9 @@ module ActiveMerchant #:nodoc:
         commit("AUTH_ONLY") do |xml|
           add_order_id(xml, options)
           xml.transactionRequest do
-            xml.transactionType 'authOnlyTransaction'
-            xml.amount amount(amount)
+            xml.transactionType('authOnlyTransaction')
+            xml.amount(amount(amount))
+
             add_payment_source(xml, payment)
             add_invoice(xml, options)
             add_customer_data(xml, payment, options)
@@ -72,9 +74,10 @@ module ActiveMerchant #:nodoc:
         commit("PRIOR_AUTH_CAPTURE") do |xml|
           add_order_id(xml, options)
           xml.transactionRequest do
-            xml.transactionType 'priorAuthCaptureTransaction'
-            xml.amount amount(amount)
-            xml.refTransId split_authorization(authorization)[0]
+            xml.transactionType('priorAuthCaptureTransaction')
+            xml.amount(amount(amount))
+            xml.refTransId(split_authorization(authorization)[0])
+
             add_invoice(xml, options)
             add_user_fields(xml, amount, options)
           end
@@ -85,15 +88,16 @@ module ActiveMerchant #:nodoc:
         transaction_id, card_number = split_authorization(authorization)
         commit("CREDIT") do |xml|
           xml.transactionRequest do
-            xml.transactionType 'refundTransaction'
-            xml.amount (amount.nil? ? 0 : amount(amount))
+            xml.transactionType('refundTransaction')
+            xml.amount(amount.nil? ? 0 : amount(amount))
             xml.payment do
               xml.creditCard do
                 xml.cardNumber(card_number || options[:card_number])
-                xml.expirationDate 'XXXX'
+                xml.expirationDate('XXXX')
               end
             end
-            xml.refTransId transaction_id
+            xml.refTransId(transaction_id)
+
             add_customer_data(xml, nil, options)
             add_user_fields(xml, amount, options)
           end
@@ -104,8 +108,9 @@ module ActiveMerchant #:nodoc:
         commit("VOID") do |xml|
           add_order_id(xml, options)
           xml.transactionRequest do
-            xml.transactionType 'voidTransaction'
-            xml.refTransId split_authorization(authorization)[0]
+            xml.transactionType('voidTransaction')
+            xml.refTransId(split_authorization(authorization)[0])
+
             add_user_fields(xml, nil, options)
           end
         end
@@ -133,33 +138,40 @@ module ActiveMerchant #:nodoc:
 
       def add_settings(xml, source, options)
         xml.transactionSettings do
-          if(card_brand(source) == "check" && options[:recurring])
+          if card_brand(source) == "check" && options[:recurring]
             xml.setting do
-              xml.settingName "recurringBilling"
-              xml.settingValue "true"
+              xml.settingName("recurringBilling")
+              xml.settingValue("true")
             end
           end
-          if(self.class.duplicate_window)
-            xml.setting do
-              xml.settingName "duplicateWindow"
-              xml.settingValue self.class.duplicate_window
-            end
+          if options[:duplicate_window]
+            set_duplicate_window(xml, options[:duplicate_window])
+          elsif self.class.duplicate_window
+            ActiveMerchant.deprecated "Using the duplicate_window class_attribute is deprecated. Use the transaction options hash instead."
+            set_duplicate_window(xml, self.class.duplicate_window)
           end
         end
       end
 
+      def set_duplicate_window(xml, value)
+        xml.setting do
+          xml.settingName("duplicateWindow")
+          xml.settingValue(value)
+        end
+      end
+
       def add_user_fields(xml, amount, options)
         xml.userFields do
-          if(currency = (options[:currency] || currency(amount)))
+          if currency = (options[:currency] || currency(amount))
             xml.userField do
-              xml.name "x_currency_code"
-              xml.value currency
+              xml.name("x_currency_code")
+              xml.value(currency)
             end
           end
-          if(application_id.present? && application_id != "ActiveMerchant")
+          if application_id.present? && application_id != "ActiveMerchant"
             xml.userField do
-              xml.name "x_solution_id"
-              xml.value application_id
+              xml.name("x_solution_id")
+              xml.value(application_id)
             end
           end
         end
@@ -171,10 +183,10 @@ module ActiveMerchant #:nodoc:
         else
           xml.payment do
             xml.creditCard do
-              xml.cardNumber credit_card.number
-              xml.expirationDate (format(credit_card.month, :two_digits) + '/' + format(credit_card.year, :four_digits))
+              xml.cardNumber(credit_card.number)
+              xml.expirationDate(format(credit_card.month, :two_digits) + '/' + format(credit_card.year, :four_digits))
               unless empty?(credit_card.verification_value)
-                xml.cardCode credit_card.verification_value
+                xml.cardCode(credit_card.verification_value)
               end
             end
           end
@@ -198,8 +210,8 @@ module ActiveMerchant #:nodoc:
       def add_apple_pay_payment_token(xml, apple_pay_payment_token)
         xml.payment do
           xml.opaqueData do
-            xml.dataDescriptor APPLE_PAY_DATA_DESCRIPTOR
-            xml.dataValue Base64.strict_encode64(apple_pay_payment_token.payment_data.to_json)
+            xml.dataDescriptor(APPLE_PAY_DATA_DESCRIPTOR)
+            xml.dataValue(Base64.strict_encode64(apple_pay_payment_token.payment_data.to_json))
           end
         end
       end
@@ -208,7 +220,7 @@ module ActiveMerchant #:nodoc:
         return unless valid_track_data
         xml.retail do
           # As per http://www.authorize.net/support/CP_guide.pdf, '2' is for Retail, the only current market_type
-          xml.marketType 2
+          xml.marketType(2)
         end
       end
 
@@ -219,12 +231,12 @@ module ActiveMerchant #:nodoc:
       def add_check(xml, check)
         xml.payment do
           xml.bankAccount do
-            xml.routingNumber check.routing_number
-            xml.accountNumber check.account_number
-            xml.nameOnAccount check.name
-            xml.echeckType "WEB"
-            xml.bankName check.bank_name
-            xml.checkNumber check.number
+            xml.routingNumber(check.routing_number)
+            xml.accountNumber(check.account_number)
+            xml.nameOnAccount(check.name)
+            xml.echeckType("WEB")
+            xml.bankName(check.bank_name)
+            xml.checkNumber(check.number)
           end
         end
       end
@@ -271,19 +283,19 @@ module ActiveMerchant #:nodoc:
         xml.customerIP(options[:ip]) unless empty?(options[:ip])
 
         xml.cardholderAuthentication do
-          xml.authenticationIndicator options[:authentication_indicator]
-          xml.cardholderAuthenticationValue options[:cardholder_authentication_value]
+          xml.authenticationIndicator(options[:authentication_indicator])
+          xml.cardholderAuthenticationValue(options[:cardholder_authentication_value])
         end
       end
 
       def add_order_id(xml, options)
-        xml.refId truncate(options[:order_id], 20)
+        xml.refId(truncate(options[:order_id], 20))
       end
 
       def add_invoice(xml, options)
         xml.order do
-          xml.invoiceNumber truncate(options[:order_id], 20)
-          xml.description truncate(options[:description], 255)
+          xml.invoiceNumber(truncate(options[:order_id], 20))
+          xml.description(truncate(options[:description], 255))
         end
       end
 
@@ -318,8 +330,8 @@ module ActiveMerchant #:nodoc:
         Nokogiri::XML::Builder.new do |xml|
           xml.createTransactionRequest('xmlns' => 'AnetApi/xml/v1/schema/AnetApiSchema.xsd') do
             xml.merchantAuthentication do
-              xml.name @options[:login]
-              xml.transactionKey @options[:password]
+              xml.name(@options[:login])
+              xml.transactionKey(@options[:password])
             end
             yield(xml)
           end
@@ -413,7 +425,6 @@ module ActiveMerchant #:nodoc:
         return nil unless value
         value.to_s[0, max_size]
       end
-
     end
   end
 end