activemerchant 1.105.0 → 1.107.4

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

@@ -196,8 +196,8 @@ module ActiveMerchant #:nodoc:
           succeeded,
           message_from(succeeded, raw),
           raw,
-          :authorization => authorization_from(raw),
-          :test => test?
+          authorization: authorization_from(raw),
+          test: test?
         )
       end
 

data/lib/active_merchant/billing/network_tokenization_credit_card.rb

@@ -17,7 +17,7 @@ module ActiveMerchant #:nodoc:
       attr_accessor :payment_cryptogram, :eci, :transaction_id
       attr_writer :source
 
-      SOURCES = %i(apple_pay android_pay google_pay)
+      SOURCES = %i(apple_pay android_pay google_pay network_token)
 
       def source
         if defined?(@source) && SOURCES.include?(@source)

data/lib/active_merchant/connection.rb

@@ -72,7 +72,7 @@ module ActiveMerchant
       headers = headers.dup
       headers['connection'] ||= 'close'
 
-      retry_exceptions(:max_retries => max_retries, :logger => logger, :tag => tag) do
+      retry_exceptions(max_retries: max_retries, logger: logger, tag: tag) do
         begin
           info "connection_http_method=#{method.to_s.upcase} connection_uri=#{endpoint}", tag
 

data/lib/active_merchant/network_connection_retries.rb

@@ -52,17 +52,17 @@ module ActiveMerchant
       begin
         request_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         result = yield
-        log_with_retry_details(options[:logger], initial_retries-retries + 1, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, 'success', options[:tag])
+        log_with_retry_details(options[:logger], initial_retries - retries + 1, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, 'success', options[:tag])
         result
       rescue ActiveMerchant::RetriableConnectionError => e
         retries -= 1
 
-        log_with_retry_details(options[:logger], initial_retries-retries, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, e.message, options[:tag])
+        log_with_retry_details(options[:logger], initial_retries - retries, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, e.message, options[:tag])
         retry unless retries.zero?
         raise ActiveMerchant::ConnectionError.new(e.message, e)
       rescue ActiveMerchant::ConnectionError, ActiveMerchant::InvalidResponseError => e
         retries -= 1
-        log_with_retry_details(options[:logger], initial_retries-retries, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, e.message, options[:tag])
+        log_with_retry_details(options[:logger], initial_retries - retries, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, e.message, options[:tag])
         retry if (options[:retry_safe] || retry_safe) && !retries.zero?
         raise
       end

data/lib/active_merchant/post_data.rb

@@ -2,7 +2,7 @@ require 'cgi'
 
 module ActiveMerchant
   class PostData < Hash
-    class_attribute :required_fields, :instance_writer => false
+    class_attribute :required_fields, instance_writer: false
     self.required_fields = []
 
     def []=(key, value)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.105.0'
+  VERSION = '1.107.4'
 end

data/lib/certs/cacert.pem

@@ -3986,3 +3986,78 @@ QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
 0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
 NVOFBkpdn627G190
 -----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
+MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
+3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
+tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
+Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
+VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
+79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
+c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
+Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
+c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
+UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
+Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
+Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
+VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
+ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
+8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
+iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
+Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
+XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
+qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
+VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
+L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
+jjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+Sectigo RSA Organization Validation Secure Server CA
+====================================================
+-----BEGIN CERTIFICATE-----
+MIIGGTCCBAGgAwIBAgIQE31TnKp8MamkM3AZaIR6jTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx
+MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBlTELMAkGA1UEBhMCR0IxGzAZBgNV
+BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE
+ChMPU2VjdGlnbyBMaW1pdGVkMT0wOwYDVQQDEzRTZWN0aWdvIFJTQSBPcmdhbml6
+YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnJMCRkVKUkiS/FeN+S3qU76zLNXYqKXsW2kDwB0Q
+9lkz3v4HSKjojHpnSvH1jcM3ZtAykffEnQRgxLVK4oOLp64m1F06XvjRFnG7ir1x
+on3IzqJgJLBSoDpFUd54k2xiYPHkVpy3O/c8Vdjf1XoxfDV/ElFw4Sy+BKzL+k/h
+fGVqwECn2XylY4QZ4ffK76q06Fha2ZnjJt+OErK43DOyNtoUHZZYQkBuCyKFHFEi
+rsTIBkVtkuZntxkj5Ng2a4XQf8dS48+wdQHgibSov4o2TqPgbOuEQc6lL0giE5dQ
+YkUeCaXMn2xXcEAG2yDoG9bzk4unMp63RBUJ16/9fAEc2wIDAQABo4IBbjCCAWow
+HwYDVR0jBBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFBfZ1iUn
+Z/kxwklD2TA2RIxsqU/rMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/
+AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYG
+BFUdIAAwCAYGZ4EMAQICMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNl
+cnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNy
+bDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRy
+dXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZ
+aHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAThNA
+lsnD5m5bwOO69Bfhrgkfyb/LDCUW8nNTs3Yat6tIBtbNAHwgRUNFbBZaGxNh10m6
+pAKkrOjOzi3JKnSj3N6uq9BoNviRrzwB93fVC8+Xq+uH5xWo+jBaYXEgscBDxLmP
+bYox6xU2JPti1Qucj+lmveZhUZeTth2HvbC1bP6mESkGYTQxMD0gJ3NR0N6Fg9N3
+OSBGltqnxloWJ4Wyz04PToxcvr44APhL+XJ71PJ616IphdAEutNCLFGIUi7RPSRn
+R+xVzBv0yjTqJsHe3cQhifa6ezIejpZehEU4z4CqN2mLYBd0FUiRnG3wTqN3yhsc
+SPr5z0noX0+FCuKPkBurcEya67emP7SsXaRfz+bYipaQ908mgWB2XQ8kd5GzKjGf
+FlqyXYwcKapInI5v03hAcNt37N3j0VcFcC3mSZiIBYRiBXBWdoY5TtMibx3+bfEO
+s2LEPMvAhblhHrrhFYBZlAyuBbuMf1a+HNJav5fyakywxnB2sJCNwQs2uRHY1ihc
+6k/+JLcYCpsM0MF8XPtpvcyiTcaQvKZN8rG61ppnW5YCUtCC+cQKXA0o4D/I+pWV
+idWkvklsQLI+qGu41SWyxP7x09fn1txDAXYw+zuLXfdKiXyaNb78yvBXAfCNP6CH
+MntHWpdLgtJmwsQt6j8k9Kf5qLnjatkYYaA7jBU=
+-----END CERTIFICATE-----

data/lib/support/ssl_verify.rb

@@ -27,10 +27,10 @@ class SSLVerify
         success << g
       when :fail
         print 'F'
-        failed << {:gateway => g, :message => message}
+        failed << {gateway: g, message: message}
       when :error
         print 'E'
-        errored << {:gateway => g, :message => message}
+        errored << {gateway: g, message: message}
       end
     end
 

data/lib/support/ssl_version.rb

@@ -29,10 +29,10 @@ class SSLVersion
         success << g
       when :fail
         print 'F'
-        failed << {:gateway => g, :message => message}
+        failed << {gateway: g, message: message}
       when :error
         print 'E'
-        errored << {:gateway => g, :message => message}
+        errored << {gateway: g, message: message}
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.105.0
+  version: 1.107.4
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -281,7 +281,6 @@ files:
 - lib/active_merchant/billing/gateways/modern_payments_cim.rb
 - lib/active_merchant/billing/gateways/monei.rb
 - lib/active_merchant/billing/gateways/moneris.rb
-- lib/active_merchant/billing/gateways/moneris_us.rb
 - lib/active_merchant/billing/gateways/money_movers.rb
 - lib/active_merchant/billing/gateways/mundipagg.rb
 - lib/active_merchant/billing/gateways/nab_transact.rb
@@ -413,7 +412,8 @@ files:
 homepage: http://activemerchant.org/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:

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

@@ -1,352 +0,0 @@
-require 'rexml/document'
-
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    # To learn more about the Moneris (US) gateway, please contact
-    # ussales@moneris.com for a copy of their integration guide. For
-    # information on remote testing, please see "Test Environment Penny Value
-    # Response Table", and "Test Environment eFraud (AVS and CVD) Penny
-    # Response Values", available at Moneris' {eSelect Plus Documentation
-    # Centre}[https://www3.moneris.com/connect/en/documents/index.html].
-    class MonerisUsGateway < Gateway
-      self.test_url = 'https://esplusqa.moneris.com/gateway_us/servlet/MpgRequest'
-      self.live_url = 'https://esplus.moneris.com/gateway_us/servlet/MpgRequest'
-
-      self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover]
-      self.homepage_url = 'http://www.monerisusa.com/'
-      self.display_name = 'Moneris (US)'
-
-      # Initialize the Gateway
-      #
-      # The gateway requires that a valid login and password be passed
-      # in the +options+ hash.
-      #
-      # ==== Options
-      #
-      # * <tt>:login</tt> -- Your Store ID
-      # * <tt>:password</tt> -- Your API Token
-      # * <tt>:cvv_enabled</tt> -- Specify that you would like the CVV passed to the gateway.
-      #                            Only particular account types at Moneris will allow this.
-      #                            Defaults to false.  (optional)
-      def initialize(options = {})
-        requires!(options, :login, :password)
-        @cvv_enabled = options[:cvv_enabled]
-        @avs_enabled = options[:avs_enabled]
-        options = { :crypt_type => 7 }.merge(options)
-        super
-      end
-
-      def verify(creditcard_or_datakey, options = {})
-        MultiResponse.run(:use_first_response) do |r|
-          r.process { authorize(100, creditcard_or_datakey, options) }
-          r.process(:ignore_result) { capture(0, r.authorization) }
-        end
-      end
-
-      # Referred to as "PreAuth" in the Moneris integration guide, this action
-      # verifies and locks funds on a customer's card, which then must be
-      # captured at a later date.
-      #
-      # Pass in +order_id+ and optionally a +customer+ parameter.
-      def authorize(money, creditcard_or_datakey, options = {})
-        requires!(options, :order_id)
-        post = {}
-        add_payment_source(post, creditcard_or_datakey, options)
-        post[:amount]     = amount(money)
-        post[:order_id]   = options[:order_id]
-        post[:address]    = options[:billing_address] || options[:address]
-        post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        action = post[:data_key].blank? ? 'us_preauth' : 'us_res_preauth_cc'
-        commit(action, post)
-      end
-
-      # This action verifies funding on a customer's card and readies them for
-      # deposit in a merchant's account.
-      #
-      # Pass in <tt>order_id</tt> and optionally a <tt>customer</tt> parameter
-      def purchase(money, creditcard_or_datakey, options = {})
-        requires!(options, :order_id)
-        post = {}
-        add_payment_source(post, creditcard_or_datakey, options)
-        post[:amount]     = amount(money)
-        post[:order_id]   = options[:order_id]
-        add_address(post, creditcard_or_datakey, options)
-        post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        action = if creditcard_or_datakey.is_a?(String)
-                   'us_res_purchase_cc'
-                 elsif card_brand(creditcard_or_datakey) == 'check'
-                   'us_ach_debit'
-                 elsif post[:data_key].blank?
-                   'us_purchase'
-                 end
-        commit(action, post)
-      end
-
-      # This method retrieves locked funds from a customer's account (from a
-      # PreAuth) and prepares them for deposit in a merchant's account.
-      #
-      # Note: Moneris requires both the order_id and the transaction number of
-      # the original authorization.  To maintain the same interface as the other
-      # gateways the two numbers are concatenated together with a ; separator as
-      # the authorization number returned by authorization
-      def capture(money, authorization, options = {})
-        commit 'us_completion', crediting_params(authorization, :comp_amount => amount(money))
-      end
-
-      # Voiding requires the original transaction ID and order ID of some open
-      # transaction. Closed transactions must be refunded. Note that the only
-      # methods which may be voided are +capture+ and +purchase+.
-      #
-      # Concatenate your transaction number and order_id by using a semicolon
-      # (';'). This is to keep the Moneris interface consistent with other
-      # gateways. (See +capture+ for details.)
-      def void(authorization, options = {})
-        commit 'us_purchasecorrection', crediting_params(authorization)
-      end
-
-      # Performs a refund. This method requires that the original transaction
-      # number and order number be included. Concatenate your transaction
-      # number and order_id by using a semicolon (';'). This is to keep the
-      # Moneris interface consistent with other gateways. (See +capture+ for
-      # details.)
-      def credit(money, authorization, options = {})
-        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, authorization, options)
-      end
-
-      def refund(money, authorization, options = {})
-        commit 'us_refund', crediting_params(authorization, :amount => amount(money))
-      end
-
-      def store(payment_source, options = {})
-        post = {}
-        add_payment_source(post, payment_source, options)
-        post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        card_brand(payment_source) == 'check' ? commit('us_res_add_ach', post) : commit('us_res_add_cc', post)
-      end
-
-      def unstore(data_key, options = {})
-        post = {}
-        post[:data_key] = data_key
-        commit('us_res_delete', post)
-      end
-
-      def update(data_key, payment_source, options = {})
-        post = {}
-        add_payment_source(post, payment_source, options)
-        post[:data_key] = data_key
-        card_brand(payment_source) == 'check' ? commit('us_res_update_ach', post) : commit('us_res_update_cc', post)
-      end
-
-      def supports_scrubbing?
-        true
-      end
-
-      def scrub(transcript)
-        transcript.
-          gsub(%r((<pan>)[^<]*(</pan>))i, '\1[FILTERED]\2').
-          gsub(%r((<api_token>)[^<]*(</api_token>))i, '\1[FILTERED]\2').
-          gsub(%r((<cvd_value>)[^<]*(</cvd_value>))i, '\1[FILTERED]\2')
-      end
-
-      private # :nodoc: all
-
-      def expdate(creditcard)
-        sprintf('%.4i', creditcard.year)[-2..-1] + sprintf('%.2i', creditcard.month)
-      end
-
-      def add_address(post, payment_method, options)
-        if !payment_method.is_a?(String) && card_brand(payment_method) == 'check'
-          post[:ach_info][:cust_first_name] = payment_method.first_name if payment_method.first_name
-          post[:ach_info][:cust_last_name] = payment_method.last_name if payment_method.last_name
-          if address = options[:billing_address] || options[:address]
-            post[:ach_info][:cust_address1] = address[:address1] if address[:address1]
-            post[:ach_info][:cust_address2] = address[:address2] if address[:address2]
-            post[:ach_info][:city] = address[:city] if address[:city]
-            post[:ach_info][:state] = address[:state] if address[:state]
-            post[:ach_info][:zip] = address[:zip] if address[:zip]
-          end
-        else
-          post[:address] = options[:billing_address] || options[:address]
-        end
-      end
-
-      def add_payment_source(post, source, options)
-        if source.is_a?(String)
-          post[:data_key]   = source
-          post[:cust_id]    = options[:customer]
-        elsif card_brand(source) == 'check'
-          ach_info = {}
-          ach_info[:sec] = 'web'
-          ach_info[:routing_num] = source.routing_number
-          ach_info[:account_num] = source.account_number
-          ach_info[:account_type] = source.account_type
-          ach_info[:check_num] = source.number if source.number
-          post[:ach_info] = ach_info
-        else
-          post[:pan]        = source.number
-          post[:expdate]    = expdate(source)
-          post[:cvd_value]  = source.verification_value if source.verification_value?
-          if crypt_type = options[:crypt_type] || @options[:crypt_type]
-            post[:crypt_type] = crypt_type
-          end
-          post[:cust_id] = options[:customer] || source.name
-        end
-      end
-
-      # Common params used amongst the +credit+, +void+ and +capture+ methods
-      def crediting_params(authorization, options = {})
-        {
-          :txn_number => split_authorization(authorization).first,
-          :order_id   => split_authorization(authorization).last,
-          :crypt_type => options[:crypt_type] || @options[:crypt_type]
-        }.merge(options)
-      end
-
-      # Splits an +authorization+ param and retrieves the order id and
-      # transaction number in that order.
-      def split_authorization(authorization)
-        if authorization.nil? || authorization.empty? || authorization !~ /;/
-          raise ArgumentError, 'You must include a valid authorization code (e.g. "1234;567")'
-        else
-          authorization.split(';')
-        end
-      end
-
-      def commit(action, parameters = {})
-        data = post_data(action, parameters)
-        url = test? ? self.test_url : self.live_url
-        raw = ssl_post(url, data)
-        response = parse(raw)
-
-        Response.new(successful?(response), message_from(response[:message]), response,
-          :test          => test?,
-          :avs_result    => { :code => response[:avs_result_code] },
-          :cvv_result    => response[:cvd_result_code] && response[:cvd_result_code][-1, 1],
-          :authorization => authorization_from(response)
-        )
-      end
-
-      # Generates a Moneris authorization string of the form 'trans_id;receipt_id'.
-      def authorization_from(response = {})
-        "#{response[:trans_id]};#{response[:receipt_id]}" if response[:trans_id] && response[:receipt_id]
-      end
-
-      # Tests for a successful response from Moneris' servers
-      def successful?(response)
-        response[:response_code] &&
-          response[:complete] &&
-          (0..49).cover?(response[:response_code].to_i)
-      end
-
-      def parse(xml)
-        response = { :message => 'Global Error Receipt', :complete => false }
-        hashify_xml!(xml, response)
-        response
-      end
-
-      def hashify_xml!(xml, response)
-        xml = REXML::Document.new(xml)
-        return if xml.root.nil?
-
-        xml.elements.each('//receipt/*') do |node|
-          response[node.name.underscore.to_sym] = normalize(node.text)
-        end
-      end
-
-      def post_data(action, parameters = {})
-        xml   = REXML::Document.new
-        root  = xml.add_element('request')
-        root.add_element('store_id').text  = options[:login]
-        root.add_element('api_token').text = options[:password]
-        root.add_element(transaction_element(action, parameters))
-
-        xml.to_s
-      end
-
-      def transaction_element(action, parameters)
-        transaction = REXML::Element.new(action)
-
-        # Must add the elements in the correct order
-        actions[action].each do |key|
-          case key
-          when :avs_info
-            transaction.add_element(avs_element(parameters[:address])) if @avs_enabled && parameters[:address]
-          when :cvd_info
-            transaction.add_element(cvd_element(parameters[:cvd_value])) if @cvv_enabled
-          when :ach_info
-            transaction.add_element(ach_element(parameters[:ach_info]))
-          else
-            transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
-          end
-        end
-
-        transaction
-      end
-
-      def avs_element(address)
-        full_address = "#{address[:address1]} #{address[:address2]}"
-        tokens = full_address.split(/\s+/)
-
-        element = REXML::Element.new('avs_info')
-        element.add_element('avs_street_number').text = tokens.select { |x| x =~ /\d/ }.join(' ')
-        element.add_element('avs_street_name').text = tokens.reject { |x| x =~ /\d/ }.join(' ')
-        element.add_element('avs_zipcode').text = address[:zip]
-        element
-      end
-
-      def cvd_element(cvd_value)
-        element = REXML::Element.new('cvd_info')
-        if cvd_value
-          element.add_element('cvd_indicator').text = '1'
-          element.add_element('cvd_value').text = cvd_value
-        else
-          element.add_element('cvd_indicator').text = '0'
-        end
-        element
-      end
-
-      def ach_element(ach_info)
-        element = REXML::Element.new('ach_info')
-        actions['ach_info'].each do |key|
-          element.add_element(key.to_s).text = ach_info[key] unless ach_info[key].blank?
-        end
-        element
-      end
-
-      def message_from(message)
-        return 'Unspecified error' if message.blank?
-
-        message.gsub(/[^\w]/, ' ').split.join(' ').capitalize
-      end
-
-      def actions
-        {
-          'us_purchase'           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info],
-          'us_preauth'            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info],
-          'us_command'            => [:order_id],
-          'us_refund'             => [:order_id, :amount, :txn_number, :crypt_type],
-          'us_indrefund'          => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          'us_completion'         => [:order_id, :comp_amount, :txn_number, :crypt_type],
-          'us_purchasecorrection' => [:order_id, :txn_number, :crypt_type],
-          'us_cavvpurcha'         => [:order_id, :cust_id, :amount, :pan, :expdate, :cav],
-          'us_cavvpreaut'         => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv],
-          'us_transact'           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          'us_Batchcloseall'      => [],
-          'us_opentotals'         => [:ecr_number],
-          'us_batchclose'         => [:ecr_number],
-          'us_res_add_cc'         => [:pan, :expdate, :crypt_type],
-          'us_res_delete'         => [:data_key],
-          'us_res_update_cc'      => [:data_key, :pan, :expdate, :crypt_type],
-          'us_res_purchase_cc'    => [:data_key, :order_id, :cust_id, :amount, :crypt_type],
-          'us_res_preauth_cc'     => [:data_key, :order_id, :cust_id, :amount, :crypt_type],
-          'us_ach_debit'          => [:order_id, :cust_id, :amount, :ach_info],
-          'us_res_add_ach'        => [:order_id, :cust_id, :amount, :ach_info],
-          'us_res_update_ach'     => [:order_id, :data_key, :cust_id, :amount, :ach_info],
-          'ach_info'              => [:sec, :cust_first_name, :cust_last_name, :cust_address1, :cust_address2, :cust_city, :cust_state, :cust_zip, :routing_num, :account_num, :check_num, :account_type]
-        }
-      end
-    end
-  end
-end