smulube-activemerchant 1.5.1.4 → 1.7.0

data/CHANGELOG

@@ -1,5 +1,14 @@
 = ActiveMerchant CHANGELOG
 
+* Pull in only the necessary components of Active Support. Enables use of ActiveMerchant with Rails 3 [railsjedi]
+
+== Version 1.7.0 (July 9, 2010)
+
+* Add support for new Braintree Blue Gateway (using the braintree gem) [Braintree]
+
+== Version 1.6.0 (July 6, 2010)
+
+* Add a task rake gateways:hosts to get a list of all outbound hosts and ports [cody]
 * Fix test failure in chronopay helper in Ruby 1.9.1 [cody]
 * Fix timezone issue in credit card test. [cody]
 * Fix failing unit test for Garanti gateway [cody]

data/CONTRIBUTORS

@@ -135,4 +135,8 @@ SallieMae (October 2, 2009)
 
 Garanti (May 05, 2010)
 
-* Selem Delul (moon@mac.home)
+* Selem Delul (moon@mac.home)
+
+Braintree Blue Gateway (May 19th, 2010)
+
+* Braintree (code@getbraintree.com)

data/gem-public_cert.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApjb2R5
-ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
-b20wHhcNMDcwMjIyMTcyMTI3WhcNMDgwMjIyMTcyMTI3WjBBMRMwEQYDVQQDDApj
-b2R5ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
-FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6T4Iqt5iWvAlU
-iXI6L8UO0URQhIC65X/gJ9hL/x4lwSl/ckVm/R/bPrJGmifT+YooFv824N3y/TIX
-25o/lZtRj1TUZJK4OCb0aVzosQVxBHSe6rLmxO8cItNTMOM9wn3thaITFrTa1DOQ
-O3wqEjvW2L6VMozVfK1MfjL9IGgy0rCnl+2g4Gh4jDDpkLfnMG5CWI6cTCf3C1ye
-ytOpWgi0XpOEy8nQWcFmt/KCQ/kFfzBo4QxqJi54b80842EyvzWT9OB7Oew/CXZG
-F2yIHtiYxonz6N09vvSzq4CvEuisoUFLKZnktndxMEBKwJU3XeSHAbuS7ix40OKO
-WKuI54fHAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-BBR9QQpefI3oDCAxiqJW/3Gg6jI6qjANBgkqhkiG9w0BAQUFAAOCAQEAs0lX26O+
-HpyMp7WL+SgZuM8k76AjfOHuKajl2GEn3S8pWYGpsa0xu07HtehJhKLiavrfUYeE
-qlFtyYMUyOh6/1S2vfkH6VqjX7mWjoi7XKHW/99fkMS40B5SbN+ypAUst+6c5R84
-w390mjtLHpdDE6WQYhS6bFvBN53vK6jG3DLyCJc0K9uMQ7gdHWoxq7RnG92ncQpT
-ThpRA+fky5Xt2Q63YJDnJpkYAz79QIama1enSnd4jslKzSl89JS2luq/zioPe/Us
-hbyalWR1+HrhgPoSPq7nk+s2FQUBJ9UZFK1lgMzho/4fZgzJwbu+cO8SNuaLS/bj
-hPaSTyVU0yCSnw==
+MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApzYW0u
+bXVsdWJlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMTAwNzE0MjM1NTQzWhcNMTEwNzE0MjM1NTQzWjBBMRMwEQYDVQQDDApz
+YW0ubXVsdWJlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1S20wOTx1+MCv
+8c/XMt8w+TgzIHkArMnmX0gb6ePapYYIk2kuW2sLeREqoBOjrMLJKKtdqTlp6jva
+Xy/UP3dxh/jD1NDojv2HmCDP7ZFwLulLnsOgEPxM9bkwNAN3bgJNYOuQ0c41KqAO
+F4A5apElftxZPmi7gobf+JiXwQKkw227gf0nwNMD3B1SIv34KiYIz4jLZm2lkGZf
+tXT1GsRZTEwFDRMDoF9vxHJleCT0PbO8sw+IVWrP31sj5o4BR81N/y3uvXxiQUou
+uy2LH4tNxukujkPapvmNxb/ElLkpCc4HDWH60IFQx6gkq0poJlkc8BrDQhA1yYYz
+f2dA4XSxAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+BBSyF2LdgO72sQWoE6NRc02ZCeop1DANBgkqhkiG9w0BAQUFAAOCAQEALPXospc4
+BO7pvZVz1kmSigS5dVaP/KubPjh+OLG6D83Iw4lzu2BrY/MMWaWUglRugj2y4giv
+tgxZ6xZVHDDoaxbF3jf+iICgYCh1QnAWCqpHurcqbQrTWS9nNRUEIRyh2BNVLlR3
+O5+kB0iyU0s/PEtPSLcAME7kwEugSU+CwRYohE3zBAa2STKKRLQk3Z/TBSmLX587
+3tT9qmIz/NBeg8PJ3gbS3hrcm84s7htXoHfoKqeNnavTbDiZ9AJOIv3RniR0wo0K
+dHld/h3mnLtULVKWxy1CkMLCLvKm7WN1IZMhmOBMtSfVvUHnBC2/DtIOvYmp4g8V
+RGv1VYD5jSaHiQ==
 -----END CERTIFICATE-----

data/lib/active_merchant.rb

@@ -24,19 +24,19 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'active_support'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/delegating_attributes'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/kernel/requires'
+require 'active_support/inflector'
+
 require 'builder'
 require 'cgi'
 require 'rexml/document'
 
-require 'active_merchant/lib/utils'
-require 'active_merchant/lib/error'
-require 'active_merchant/lib/validateable'
-require 'active_merchant/lib/connection'
-require 'active_merchant/lib/posts_data'
-require 'active_merchant/lib/post_data'
-require 'active_merchant/lib/requires_parameters'
-require 'active_merchant/lib/country'
-
+require 'active_merchant/common'
 require 'active_merchant/billing'
 require 'active_merchant/version'
 

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

@@ -1,17 +1,17 @@
-require File.join(File.dirname(__FILE__),'smart_ps.rb')
+require File.dirname(__FILE__) + '/braintree/braintree_common'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    class BraintreeGateway < SmartPs
-      def api_url 
-        'https://secure.braintreepaymentgateway.com/api/transact.php'
+    class BraintreeGateway < Gateway
+      include BraintreeCommon
+      
+      def self.new(options={})
+        if options.has_key?(:login)
+          BraintreeOrangeGateway.new(options)
+        else
+          BraintreeBlueGateway.new(options)
+        end
       end
-    
-      self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      self.homepage_url = 'http://www.braintreepaymentsolutions.com'
-      self.display_name = 'Braintree'
-      self.default_currency = 'USD'
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/braintree/braintree_common.rb

@@ -0,0 +1,9 @@
+module BraintreeCommon
+  def self.included(base)
+    base.supported_countries = ['US']
+    base.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb]
+    base.homepage_url = 'http://www.braintreepaymentsolutions.com'
+    base.display_name = 'Braintree'
+    base.default_currency = 'USD'
+  end
+end

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

@@ -0,0 +1,210 @@
+require File.dirname(__FILE__) + '/braintree/braintree_common'
+
+begin
+  require "braintree"
+rescue LoadError
+  raise "Could not load the braintree gem.  Use `gem install braintree` to install it."
+end
+
+raise "Need braintree gem 2.x.y. Run `gem install braintree --version '~>2.0'` to get the correct version." unless Braintree::Version::Major == 2
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class BraintreeBlueGateway < Gateway
+      include BraintreeCommon
+      
+      self.display_name = 'Braintree (Blue Platform)'
+
+      def initialize(options = {})
+        requires!(options, :merchant_id, :public_key, :private_key)
+        @options = options
+        Braintree::Configuration.merchant_id = options[:merchant_id]
+        Braintree::Configuration.public_key = options[:public_key]
+        Braintree::Configuration.private_key = options[:private_key]
+        Braintree::Configuration.environment = test? ? :sandbox : :production
+        Braintree::Configuration.logger.level = Logger::ERROR#DEBUG
+        Braintree::Configuration.custom_user_agent = "ActiveMerchant #{ActiveMerchant::VERSION}"
+        super
+      end
+
+      def authorize(money, credit_card_or_vault_id, options = {})
+        create_transaction(:sale, money, credit_card_or_vault_id, options)
+      end
+
+      def capture(money, authorization, options = {})
+        commit do
+          result = Braintree::Transaction.submit_for_settlement(authorization, amount(money).to_s)
+          Response.new(result.success?, message_from_result(result))
+        end
+      end
+
+      def purchase(money, credit_card_or_vault_id, options = {})
+        authorize(money, credit_card_or_vault_id, options.merge(:submit_for_settlement => true))
+      end
+
+      def credit(money, credit_card_or_vault_id, options = {})
+        create_transaction(:credit, money, credit_card_or_vault_id, options)
+      end
+
+      def refund(transaction_id, options = {})
+        commit do
+          result = Braintree::Transaction.find(transaction_id).refund
+          Response.new(result.success?, message_from_result(result))
+        end
+      end
+
+      def void(authorization, options = {})
+        commit do
+          result = Braintree::Transaction.void(authorization)
+          Response.new(result.success?, message_from_result(result),
+            :braintree_transaction => (result.transaction if result.success?)
+          )
+        end
+      end
+
+      def store(creditcard, options = {})
+        commit do
+          result = Braintree::Customer.create(
+            :first_name => creditcard.first_name,
+            :last_name => creditcard.last_name,
+            :email => options[:email],
+            :credit_card => {
+              :number => creditcard.number,
+              :cvv => creditcard.verification_value,
+              :expiration_month => creditcard.month.to_s.rjust(2, "0"),
+              :expiration_year => creditcard.year.to_s
+            }
+          )
+          Response.new(result.success?, message_from_result(result),
+            {
+              :braintree_customer => (result.customer if result.success?),
+              :customer_vault_id => (result.customer.id if result.success?)
+            }
+          )
+        end
+      end
+
+      def update(vault_id, creditcard, options = {})
+        braintree_credit_card = nil
+        customer_update_result = commit do
+          braintree_credit_card = Braintree::Customer.find(vault_id).credit_cards.detect { |cc| cc.default? }
+          return Response.new(false, 'Braintree::NotFoundError') if braintree_credit_card.nil?
+          result = Braintree::Customer.update(vault_id,
+            :first_name => creditcard.first_name,
+            :last_name => creditcard.last_name,
+            :email => options[:email]
+          )
+          Response.new(result.success?, message_from_result(result),
+            :braintree_customer => (Braintree::Customer.find(vault_id) if result.success?)
+          )
+        end
+        return customer_update_result unless customer_update_result.success?
+        credit_card_update_result = commit do
+          result = Braintree::CreditCard.update(braintree_credit_card.token,
+              :number => creditcard.number,
+              :expiration_month => creditcard.month.to_s.rjust(2, "0"),
+              :expiration_year => creditcard.year.to_s
+          )
+          Response.new(result.success?, message_from_result(result),
+            :braintree_customer => (Braintree::Customer.find(vault_id) if result.success?)
+          )
+        end
+      end
+
+      def unstore(customer_vault_id)
+        commit do
+          Braintree::Customer.delete(customer_vault_id)
+          Response.new(true, "OK")
+        end
+      end
+      alias_method :delete, :unstore
+
+      private
+
+      def map_address(address)
+        return {} if address.nil?
+        {
+          :street_address => address[:address1],
+          :extended_address => address[:address2],
+          :company => address[:company],
+          :locality => address[:city],
+          :region => address[:state],
+          :postal_code => address[:zip],
+          :country_name => address[:country]
+        }
+      end
+
+      def commit(&block)
+        yield
+      rescue Braintree::BraintreeError => ex
+        Response.new(false, ex.class.to_s)
+      end
+
+      def message_from_result(result)
+        if result.success?
+          "OK"
+        else
+          result.errors.map { |e| "#{e.message} (#{e.code})" }.join(" ")
+        end
+      end
+
+      def create_transaction(transaction_type, money, credit_card_or_vault_id, options)
+        parameters = {
+          :amount => amount(money).to_s,
+          :order_id => options[:order_id],
+          :customer => {
+            :id => options[:store] == true ? "" : options[:store],
+            :email => options[:email]
+          },
+          :options => {
+            :store_in_vault => options[:store] ? true : false,
+            :submit_for_settlement => options[:submit_for_settlement]
+          }
+        }
+        if credit_card_or_vault_id.is_a?(String) || credit_card_or_vault_id.is_a?(Integer)
+          parameters[:customer_id] = credit_card_or_vault_id
+        else
+          parameters[:customer].merge!(
+            :first_name => credit_card_or_vault_id.first_name,
+            :last_name => credit_card_or_vault_id.last_name
+          )
+          parameters[:credit_card] = {
+            :number => credit_card_or_vault_id.number,
+            :cvv => credit_card_or_vault_id.verification_value,
+            :expiration_month => credit_card_or_vault_id.month.to_s.rjust(2, "0"),
+            :expiration_year => credit_card_or_vault_id.year.to_s
+          }
+        end
+        parameters[:billing] = map_address(options[:billing_address]) if options[:billing_address]
+        parameters[:shipping] = map_address(options[:shipping_address]) if options[:shipping_address]
+        commit do
+          result = Braintree::Transaction.send(transaction_type, parameters)
+          response_params, response_options, avs_result, cvv_result = {}, {}, {}, {}
+          if result.success?
+            response_params[:braintree_transaction] = result.transaction
+            response_params[:customer_vault_id] = result.transaction.customer_details.id
+            response_options[:authorization] = result.transaction.id
+          end
+          if result.transaction
+            avs_result = {
+              'code' => '', 'message' => '',
+              'street_match' => result.transaction.avs_street_address_response_code == 'M',
+              'postal_match' => result.transaction.avs_postal_code_response_code == 'M'
+            }
+            cvv_result = {
+              'code' => result.transaction.cvv_response_code, 'message' => ''
+            }
+            message = result.transaction.processor_response_code + " " + result.transaction.processor_response_text
+          else
+            message = message_from_result(result)
+          end
+          response = Response.new(result.success?, message, response_params, response_options)
+          response.instance_variable_set("@avs_result", avs_result)
+          response.instance_variable_set("@cvv_result", cvv_result)
+          response
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) +  '/smart_ps.rb'
+require File.dirname(__FILE__) + '/braintree/braintree_common'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class BraintreeOrangeGateway < SmartPs
+      include BraintreeCommon
+
+      self.display_name = 'Braintree (Orange Platform)'
+      
+      def api_url
+        'https://secure.braintreepaymentgateway.com/api/transact.php'
+      end
+    end
+  end
+end
+

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

@@ -308,14 +308,19 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_recurring_info(post, creditcard, options)
-        post[:action] = options.has_key?(:profile_id) ? RECURRING_ACTIONS[:modify] : RECURRING_ACTIONS[:create]
-        post[:start] = format_date(options[:starting_at])
+        if options.has_key?(:profile_id)
+          post[:action] = RECURRING_ACTIONS[:modify]
+          post[:origprofileid] = options[:profile_id]
+        else
+          post[:action] = RECURRING_ACTIONS[:create]
+        end
+        post[:start] = format_date(options[:starting_at]) unless options[:starting_at].nil?
         post[:term] = options[:payments] unless options[:payments].nil?
-        post[:payperiod] = PERIODS[options[:periodicity]]
+        post[:payperiod] = PERIODS[options[:periodicity]] unless options[:periodicity].nil?
         post[:desc] = options[:comment] unless options[:comment].nil?
         post[:maxfailpayments] = options[:max_failed_payments] unless options[:max_failed_payments].nil?
-        post[:profilename] = (options[:name] || creditcard.name).to_s.slice(0,128)
-        post[:desc] = options[:description]
+        post[:profilename] = (options[:name] || creditcard.name).to_s.slice(0,128) unless options[:name].nil? && creditcard.nil?
+        post[:desc] = options[:description] unless options[:description].nil?
       end
 
       def format_date(time)

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

@@ -71,7 +71,7 @@ module ActiveMerchant #:nodoc:
         
         private
         def ignore_binding?
-          ActionPack::VERSION::MAJOR >= 2 && ActionPack::VERSION::MINOR >= 2
+          ActionPack::VERSION::MAJOR >= 3 || (ActionPack::VERSION::MAJOR >= 2 && ActionPack::VERSION::MINOR >= 2)
         end
       end
     end

data/lib/active_merchant/common.rb

@@ -0,0 +1,14 @@
+module ActiveMerchant  
+  autoload :Connection,                'active_merchant/common/connection'
+  autoload :Country,                   'active_merchant/common/country'
+  autoload :ActiveMerchantError,       'active_merchant/common/error'
+  autoload :ConnectionError,           'active_merchant/common/error'
+  autoload :RetriableConnectionError,  'active_merchant/common/error'
+  autoload :ResponseError,             'active_merchant/common/error'
+  autoload :ClientCertificateError,    'active_merchant/common/error'
+  autoload :PostData,                  'active_merchant/common/post_data'
+  autoload :PostsData,                 'active_merchant/common/posts_data'
+  autoload :RequiresParameters,        'active_merchant/common/requires_parameters'
+  autoload :Utils,                     'active_merchant/common/utils'
+  autoload :Validateable,              'active_merchant/common/validateable'
+end

data/lib/active_merchant/{lib → common}/connection.rb

@@ -4,9 +4,6 @@ require 'net/https'
 require 'benchmark'
 
 module ActiveMerchant  
-  class ClientCertificateError < ActiveMerchantError # :nodoc
-  end
-  
   class ConnectionError < ActiveMerchantError # :nodoc:
   end
   
@@ -83,10 +80,10 @@ module ActiveMerchant
           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"
         rescue OpenSSL::X509::CertificateError => e
           raise ClientCertificateError, "The remote server did not accept the provided SSL certificate"
+        rescue Timeout::Error, Errno::ETIMEDOUT => e
+          raise ConnectionError, "The connection to the remote server timed out"
         end
       end
     end

data/lib/active_merchant/{lib → common}/country.rb

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
     end
 
     def code(format)
-      @codes.find{|c| c.format == format}
+      @codes.select{|c| c.format == format}
     end
 
     def to_s