activemerchant 1.4.2 → 1.5.0

data/lib/active_merchant/billing/integrations/bogus.rb

@@ -1,11 +1,12 @@
-require 'active_merchant/billing/integrations/bogus/helper.rb'
-require 'active_merchant/billing/integrations/bogus/notification.rb'
-require 'active_merchant/billing/integrations/bogus/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Bogus
+        autoload :Return, 'active_merchant/billing/integrations/bogus/return.rb'
+        autoload :Helper, 'active_merchant/billing/integrations/bogus/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/bogus/notification.rb'
+
         mattr_accessor :service_url
         self.service_url = 'http://www.bogus.com'
 

data/lib/active_merchant/billing/integrations/chronopay.rb

@@ -1,11 +1,12 @@
-require 'active_merchant/billing/integrations/chronopay/helper.rb'
-require 'active_merchant/billing/integrations/chronopay/notification.rb'
-require 'active_merchant/billing/integrations/chronopay/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Chronopay
+        autoload :Return, 'active_merchant/billing/integrations/chronopay/return.rb'
+        autoload :Helper, 'active_merchant/billing/integrations/chronopay/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/chronopay/notification.rb'
+
         mattr_accessor :service_url
         self.service_url = 'https://secure.chronopay.com/index_shop.cgi'
 

data/lib/active_merchant/billing/integrations/chronopay/notification.rb

@@ -59,7 +59,9 @@ module ActiveMerchant #:nodoc:
           end
 
           def received_at
-            Time.parse("#{date} #{time}") unless date.blank? || time.blank?
+            # Date should be formatted "dd-mm-yy" to be parsed by 1.8 and 1.9 the same way
+            formatted_date = Date.strptime(date, "%m/%d/%Y").strftime("%d-%m-%Y")
+            Time.parse("#{formatted_date} #{time}") unless date.blank? || time.blank?
           end
 
           # Date of transaction in MM/DD/YYYY format

data/lib/active_merchant/billing/integrations/gestpay.rb

@@ -1,14 +1,13 @@
 # With help from Giovanni Intini and his code for RGestPay - http://medlar.it/it/progetti/rgestpay
 
-require File.dirname(__FILE__) + '/gestpay/common.rb'
-require File.dirname(__FILE__) + '/gestpay/helper.rb'
-require File.dirname(__FILE__) + '/gestpay/notification.rb'
-require File.dirname(__FILE__) + '/gestpay/return.rb'
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Gestpay 
+        autoload :Return, File.dirname(__FILE__) + '/gestpay/return.rb'
+        autoload :Common, File.dirname(__FILE__) + '/gestpay/common.rb'
+        autoload :Helper, File.dirname(__FILE__) + '/gestpay/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/gestpay/notification.rb'
        
         mattr_accessor :service_url
         self.service_url = 'https://ecomm.sella.it/gestpay/pagam.asp'

data/lib/active_merchant/billing/integrations/gestpay/notification.rb

@@ -26,7 +26,9 @@ module ActiveMerchant #:nodoc:
           end
           
           def currency
-            CURRENCY_MAPPING.index(params['PAY1_UICCODE'])
+            # Ruby 1.9 compat
+            method = CURRENCY_MAPPING.respond_to?(:key) ? :key : :index
+            CURRENCY_MAPPING.send(method, params['PAY1_UICCODE'])
           end
 
           def test?

data/lib/active_merchant/billing/integrations/hi_trust.rb

@@ -1,11 +1,12 @@
-require File.dirname(__FILE__) + '/hi_trust/helper.rb'
-require File.dirname(__FILE__) + '/hi_trust/notification.rb'
-require File.dirname(__FILE__) + '/hi_trust/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module HiTrust 
+        autoload :Helper, File.dirname(__FILE__) + '/hi_trust/helper.rb'
+        autoload :Return, File.dirname(__FILE__) + '/hi_trust/return.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/hi_trust/notification.rb'
+
         TEST_URL = 'https://testtrustlink.hitrust.com.tw/TrustLink/TrxReq'
         LIVE_URL = 'https://trustlink.hitrust.com.tw/TrustLink/TrxReq'
         

data/lib/active_merchant/billing/integrations/nochex.rb

@@ -1,6 +1,3 @@
-require File.dirname(__FILE__) + '/nochex/helper.rb'
-require File.dirname(__FILE__) + '/nochex/notification.rb'
-require File.dirname(__FILE__) + '/nochex/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -65,6 +62,10 @@ module ActiveMerchant #:nodoc:
       #     end
       #   end
       module Nochex
+        autoload :Return, File.dirname(__FILE__) + '/nochex/return.rb'
+        autoload :Helper, File.dirname(__FILE__) + '/nochex/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/nochex/notification.rb'
+        
        
         mattr_accessor :service_url
         self.service_url = 'https://www.nochex.com/nochex.dll/checkout'

data/lib/active_merchant/billing/integrations/nochex/notification.rb

@@ -48,7 +48,7 @@ module ActiveMerchant #:nodoc:
 
           # the money amount we received in X.2 decimal.
           def gross
-            params['amount']
+            sprintf("%.2f", params['amount'].to_f)
           end
 
           # Was this a test transaction?

data/lib/active_merchant/billing/integrations/paypal.rb

@@ -1,11 +1,10 @@
-require 'active_merchant/billing/integrations/paypal/helper.rb'
-require 'active_merchant/billing/integrations/paypal/notification.rb'
-require 'active_merchant/billing/integrations/paypal/return.rb'
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Paypal
+        autoload :Return, 'active_merchant/billing/integrations/paypal/return.rb'
+        autoload :Helper, 'active_merchant/billing/integrations/paypal/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/paypal/notification.rb'
         
         # Overwrite this if you want to change the Paypal test url
         mattr_accessor :test_url

data/lib/active_merchant/billing/integrations/paypal/helper.rb

@@ -60,25 +60,26 @@ module ActiveMerchant #:nodoc:
                                       :country => 'country'
           
           def shipping_address(params = {})
+
+            # Get the country code in the correct format
+            # Use what we were given if we can't find anything
+            country_code = lookup_country_code(params.delete(:country))
+            add_field(mappings[:shipping_address][:country], country_code)
             
             if params.has_key?(:phone)
               phone = params.delete(:phone).to_s
           
               # Whipe all non digits
               phone.gsub!(/\D+/, '')
-          
-              # Parse in the us style (555 555 5555) which seems to be the only format paypal supports. Ignore anything before this. 
-              if phone =~ /(\d{3})(\d{3})(\d{4})$/
+              
+              if ['US', 'CA'].include?(country_code) && phone =~ /(\d{3})(\d{3})(\d{4})$/
                 add_field('night_phone_a', $1) 
                 add_field('night_phone_b', $2) 
                 add_field('night_phone_c', $3) 
+              else
+                add_field('night_phone_b', phone)                
               end
             end
-            
-            # Get the country code in the correct format
-            # Use what we were given if we can't find anything
-            country_code = lookup_country_code(params.delete(:country))
-            add_field(mappings[:shipping_address][:country], country_code)
               
             province_code = params.delete(:state)
                        

data/lib/active_merchant/billing/integrations/quickpay.rb

@@ -1,10 +1,9 @@
-require File.dirname(__FILE__) + '/quickpay/helper.rb'
-require File.dirname(__FILE__) + '/quickpay/notification.rb'
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Quickpay 
+        autoload :Helper, File.dirname(__FILE__) + '/quickpay/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/quickpay/notification.rb'
        
         mattr_accessor :service_url
         self.service_url = 'https://secure.quickpay.dk/form/'

data/lib/active_merchant/billing/integrations/quickpay/helper.rb

@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
           mapping :md5secret, 'md5secret'
 
           mapping :customer, ''
-          mapping :billing_address, ''
+          mapping :billing_address, {}
           mapping :tax, ''
           mapping :shipping, ''
         end

data/lib/active_merchant/billing/integrations/two_checkout.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/two_checkout/helper.rb'
-require File.dirname(__FILE__) + '/two_checkout/notification.rb'
-require File.dirname(__FILE__) + '/two_checkout/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module TwoCheckout 
+        autoload 'Helper', File.dirname(__FILE__) + '/two_checkout/helper'
+        autoload 'Return', File.dirname(__FILE__) + '/two_checkout/return'
+        autoload 'Notification', File.dirname(__FILE__) + '/two_Checkout/notification'        
        
         mattr_accessor :service_url
         self.service_url = 'https://www.2checkout.com/2co/buyer/purchase'

data/lib/active_merchant/lib/connection.rb

@@ -0,0 +1,170 @@
+require 'uri'
+require 'net/http'
+require 'net/https'
+require 'benchmark'
+
+module ActiveMerchant  
+  class ConnectionError < ActiveMerchantError # :nodoc:
+  end
+  
+  class RetriableConnectionError < ConnectionError # :nodoc:
+  end
+  
+  class ResponseError < ActiveMerchantError # :nodoc:
+    attr_reader :response
+
+    def initialize(response, message = nil)
+      @response = response
+      @message  = message
+    end
+
+    def to_s
+      "Failed with #{response.code} #{response.message if response.respond_to?(:message)}"
+    end
+  end
+  
+  class Connection
+    MAX_RETRIES = 3
+    OPEN_TIMEOUT = 60
+    READ_TIMEOUT = 60
+    VERIFY_PEER = true
+    RETRY_SAFE = false
+    RUBY_184_POST_HEADERS = { "Content-Type" => "application/x-www-form-urlencoded" }
+  
+    attr_accessor :endpoint
+    attr_accessor :open_timeout
+    attr_accessor :read_timeout
+    attr_accessor :verify_peer
+    attr_accessor :retry_safe
+    attr_accessor :pem
+    attr_accessor :pem_password
+    attr_accessor :wiredump_device
+    attr_accessor :logger
+    attr_accessor :tag
+    
+    def initialize(endpoint)
+      @endpoint     = endpoint.is_a?(URI) ? endpoint : URI.parse(endpoint)
+      @open_timeout = OPEN_TIMEOUT
+      @read_timeout = READ_TIMEOUT
+      @retry_safe   = RETRY_SAFE
+      @verify_peer  = VERIFY_PEER
+    end
+    
+    def request(method, body, headers = {})
+      retry_exceptions do 
+        begin
+          info "#{method.to_s.upcase} #{endpoint}", tag
+
+          result = nil
+          
+          realtime = Benchmark.realtime do
+            result = case method
+            when :get
+              raise ArgumentError, "GET requests do not support a request body" if body
+              http.get(endpoint.request_uri, headers)
+            when :post
+              debug body
+              http.post(endpoint.request_uri, body, RUBY_184_POST_HEADERS.merge(headers))
+            else
+              raise ArgumentError, "Unsupported request method #{method.to_s.upcase}"
+            end
+          end
+          
+          info "--> %d %s (%d %.4fs)" % [result.code, result.message, result.body ? result.body.length : 0, realtime], tag
+          response = handle_response(result)
+          debug response
+          response
+        rescue EOFError => e
+          raise ConnectionError, "The remote server dropped the connection"
+        rescue Errno::ECONNRESET => e
+          raise ConnectionError, "The remote server reset the connection"
+        rescue Errno::ECONNREFUSED => e
+          raise RetriableConnectionError, "The remote server refused the connection"
+        rescue Timeout::Error, Errno::ETIMEDOUT => e
+          raise ConnectionError, "The connection to the remote server timed out"
+        end
+      end
+    end
+    
+    private
+    def http
+      http = Net::HTTP.new(endpoint.host, endpoint.port)
+      configure_debugging(http)
+      configure_timeouts(http)
+      configure_ssl(http)
+      configure_cert(http)
+      http
+    end
+    
+    def configure_debugging(http)
+      http.set_debug_output(wiredump_device)
+    end
+    
+    def configure_timeouts(http)
+      http.open_timeout = open_timeout
+      http.read_timeout = read_timeout
+    end
+    
+    def configure_ssl(http)
+      return unless endpoint.scheme == "https"
+
+      http.use_ssl = true
+      
+      if verify_peer
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.ca_file     = File.dirname(__FILE__) + '/../../certs/cacert.pem'
+      else               
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+    end
+    
+    def configure_cert(http)
+      return if pem.blank?
+      
+      http.cert = OpenSSL::X509::Certificate.new(pem)
+      
+      if pem_password
+        http.key = OpenSSL::PKey::RSA.new(pem, pem_password)
+      else
+        http.key = OpenSSL::PKey::RSA.new(pem)
+      end
+    end
+        
+    def retry_exceptions
+      retries = MAX_RETRIES
+      begin
+        yield
+      rescue RetriableConnectionError => e
+        retries -= 1
+        retry unless retries.zero?
+        raise ConnectionError, e.message
+      rescue ConnectionError
+        retries -= 1
+        retry if retry_safe && !retries.zero?
+        raise
+      end
+    end
+    
+    def handle_response(response)
+      case response.code.to_i
+      when 200...300
+        response.body
+      else
+        raise ResponseError.new(response)
+      end
+    end
+    
+    def debug(message, tag = nil)
+      log(:debug, message, tag)
+    end
+    
+    def info(message, tag = nil)
+      log(:info, message, tag)
+    end
+    
+    def log(level, message, tag)
+      message = "[#{tag}] #{message}" if tag
+      logger.send(level, message) if logger
+    end
+  end
+end

data/lib/active_merchant/lib/country.rb

@@ -1,3 +1,6 @@
+#!ruby19
+# encoding: utf-8
+
 module ActiveMerchant #:nodoc:
   class InvalidCountryCodeError < StandardError
   end
@@ -43,7 +46,7 @@ module ActiveMerchant #:nodoc:
     end
 
     def code(format)
-      @codes.select{|c| c.format == format}
+      @codes.find{|c| c.format == format}
     end
 
     def to_s

data/lib/active_merchant/lib/posts_data.rb

@@ -1,108 +1,46 @@
 module ActiveMerchant #:nodoc:
-  class ConnectionError < ActiveMerchantError
-  end
-  
-  class RetriableConnectionError < ConnectionError
-  end
-  
   module PostsData  #:nodoc:
-    MAX_RETRIES = 3
-    OPEN_TIMEOUT = 60
-    READ_TIMEOUT = 60
-    
+
     def self.included(base)
       base.superclass_delegating_accessor :ssl_strict
       base.ssl_strict = true
       
-      base.class_inheritable_accessor :pem_password
-      base.pem_password = false
-      
       base.class_inheritable_accessor :retry_safe
       base.retry_safe = false
 
       base.superclass_delegating_accessor :open_timeout
-      base.open_timeout = OPEN_TIMEOUT
+      base.open_timeout = 60
 
       base.superclass_delegating_accessor :read_timeout
-      base.read_timeout = READ_TIMEOUT
+      base.read_timeout = 60
+      
+      base.superclass_delegating_accessor :logger
+      base.superclass_delegating_accessor :wiredump_device
     end
     
-    def ssl_get(url, headers={})
-      ssl_request(:get, url, nil, headers)
+    def ssl_get(endpoint, headers={})
+      ssl_request(:get, endpoint, nil, headers)
     end
     
-    def ssl_post(url, data, headers = {})
-      ssl_request(:post, url, data, headers)
+    def ssl_post(endpoint, data, headers = {})
+      ssl_request(:post, endpoint, data, headers)
     end
     
     private
-    def retry_exceptions
-      retries = MAX_RETRIES
-      begin
-        yield
-      rescue RetriableConnectionError => e
-        retries -= 1
-        retry unless retries.zero?
-        raise ConnectionError, e.message
-      rescue ConnectionError
-        retries -= 1
-        retry if retry_safe && !retries.zero?
-        raise
-      end
-    end
-    
-    def ssl_request(method, url, data, headers = {})
-      if method == :post
-        # Ruby 1.8.4 doesn't automatically set this header
-        headers['Content-Type'] ||= "application/x-www-form-urlencoded"
-      end
+    def ssl_request(method, endpoint, data, headers = {})
+      connection = Connection.new(endpoint)
+      connection.open_timeout = open_timeout
+      connection.read_timeout = read_timeout
+      connection.retry_safe   = retry_safe
+      connection.verify_peer  = ssl_strict
+      connection.logger       = logger
+      connection.tag          = self.class.name
+      connection.wiredump_device = wiredump_device
       
-      uri   = URI.parse(url)
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.open_timeout = self.class.open_timeout
-      http.read_timeout = self.class.read_timeout
+      connection.pem          = @options[:pem] if @options
+      connection.pem_password = @options[:pem_password] if @options
       
-      if uri.scheme == "https"
-        http.use_ssl = true
-        
-        if ssl_strict
-          http.verify_mode    = OpenSSL::SSL::VERIFY_PEER
-          http.ca_file        = File.dirname(__FILE__) + '/../../certs/cacert.pem'
-        else
-          http.verify_mode    = OpenSSL::SSL::VERIFY_NONE
-        end
-      
-        if @options && !@options[:pem].blank?
-          http.cert           = OpenSSL::X509::Certificate.new(@options[:pem])
-        
-          if pem_password
-            raise ArgumentError, "The private key requires a password" if @options[:pem_password].blank?
-            http.key            = OpenSSL::PKey::RSA.new(@options[:pem], @options[:pem_password])
-          else
-            http.key            = OpenSSL::PKey::RSA.new(@options[:pem])
-          end
-        end
-      end
-
-      retry_exceptions do 
-        begin
-          case method
-          when :get
-            http.get(uri.request_uri, headers).body
-          when :post
-            http.post(uri.request_uri, data, headers).body
-          end
-        rescue EOFError => e
-          raise ConnectionError, "The remote server dropped the connection"
-        rescue Errno::ECONNRESET => e
-          raise ConnectionError, "The remote server reset the connection"
-        rescue Errno::ECONNREFUSED => e
-          raise RetriableConnectionError, "The remote server refused the connection"
-        rescue Timeout::Error, Errno::ETIMEDOUT => e
-          raise ConnectionError, "The connection to the remote server timed out"
-        end
-      end
+      connection.request(method, data, headers)
     end
     
   end