activemerchant 1.5.1 → 1.6.0

data/CHANGELOG

@@ -1,5 +1,19 @@
 = ActiveMerchant CHANGELOG
 
+* 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]
+* Fix failing CyberSource remote test [Patrick Joyce]
+* Support for Garanti Sanal Pos: Turkish bank and billing gateway [Selem Delul]
+* Add deprecation note for Money objects to Bogus gateway [Soleone]
+* Updated test URL for Merchant eSolutions and added valid remote test credentials [Soleone]
+* Add new error class for SSL certificate problems in connection class  [Soleone]
+* Update valid_month and valid_expiry_year to coerce string arguments to integers [cody]
+* Add support for displaying credit cards with PayPal Express. Use the :allow_guest_checkout => true option when setting up the transaction [Edward Ocampo-Gooding]
+* Use card_brand method for checking for checks in Sage and Beanstream [cody]
+* Add JCB and Diners Club to LinkPoint [Soleone]
+
 == Version 1.5.1 (February 14, 2010)
 
 * Cleanup Rakefile, add gemspec and prepare for 1.5.1 release [cody]

data/CONTRIBUTORS

@@ -132,3 +132,7 @@ JetPay (September 29, 2009)
 SallieMae (October 2, 2009)
 
 * iamjwc
+
+Garanti (May 05, 2010)
+
+* Selem Delul (moon@mac.home)

data/lib/active_merchant.rb

@@ -28,15 +28,7 @@ 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'
 
 module ActiveMerchant #:nodoc:

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -22,11 +22,11 @@ module ActiveMerchant #:nodoc:
       end
       
       def valid_month?(month)
-        (1..12).include?(month)
+        (1..12).include?(month.to_i)
       end
       
       def valid_expiry_year?(year)
-        (Time.now.year..Time.now.year + 20).include?(year)
+        (Time.now.year..Time.now.year + 20).include?(year.to_i)
       end
       
       def valid_start_year?(year)

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -78,7 +78,7 @@ module ActiveMerchant #:nodoc:
     
       private
       def purchase_action(source)
-        source.type.to_s == "check" ? :check_purchase : :purchase
+        card_brand(source) == "check" ? :check_purchase : :purchase
       end
       
       def void_action(original_transaction_type)
@@ -221,7 +221,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def add_source(post, source)
-        source.type == "check" ? add_check(post, source) : add_credit_card(post, source)
+        card_brand(source) == "check" ? add_check(post, source) : add_credit_card(post, source)
       end
       
       def add_transaction_type(post, action)

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

@@ -18,46 +18,50 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Bogus'
       
       def authorize(money, creditcard, options = {})
+        money = amount(money)
         case creditcard.number
         when '1'
-          Response.new(true, SUCCESS_MESSAGE, {:authorized_amount => money.to_s}, :test => true, :authorization => AUTHORIZATION )
+          Response.new(true, SUCCESS_MESSAGE, {:authorized_amount => money}, :test => true, :authorization => AUTHORIZATION )
         when '2'
-          Response.new(false, FAILURE_MESSAGE, {:authorized_amount => money.to_s, :error => FAILURE_MESSAGE }, :test => true)
+          Response.new(false, FAILURE_MESSAGE, {:authorized_amount => money, :error => FAILURE_MESSAGE }, :test => true)
         else
           raise Error, ERROR_MESSAGE
         end      
       end
   
       def purchase(money, creditcard, options = {})
+        money = amount(money)
         case creditcard.number
         when '1'
-          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money.to_s}, :test => true)
+          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true)
         when '2'
-          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money.to_s, :error => FAILURE_MESSAGE },:test => true)
+          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE },:test => true)
         else
           raise Error, ERROR_MESSAGE
         end
       end
  
       def credit(money, ident, options = {})
+        money = amount(money)
         case ident
         when '1'
           raise Error, CREDIT_ERROR_MESSAGE
         when '2'
-          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money.to_s, :error => FAILURE_MESSAGE }, :test => true)
+          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE }, :test => true)
         else
-          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money.to_s}, :test => true)
+          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true)
         end
       end
  
       def capture(money, ident, options = {})
+        money = amount(money)
         case ident
         when '1'
           raise Error, CAPTURE_ERROR_MESSAGE
         when '2'
-          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money.to_s, :error => FAILURE_MESSAGE }, :test => true)
+          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE }, :test => true)
         else
-          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money.to_s}, :test => true)
+          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true)
         end
       end
 

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

@@ -0,0 +1,222 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class GarantiGateway < Gateway
+      URL = 'https://ccpos.garanti.com.tr/servlet/cc5ApiServer'
+
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['US','TR']
+
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+
+      # The homepage URL of the gateway
+      self.homepage_url = 'https://ccpos.garanti.com.tr/ccRaporlar/garanti/ccReports'
+
+      # The name of the gateway
+      self.display_name = 'Garanti Sanal POS'
+
+      self.default_currency = 'TRL'
+
+      CURRENCY_CODES = {
+        'YTL' => 949,
+        'TRL' => 949,
+        'USD' => 840,
+        'EUR' => 978
+      }
+
+
+      def initialize(options = {})
+        requires!(options, :login, :password, :client_id)
+        @options = options
+        super
+      end
+
+      def purchase(money, credit_card, options = {})
+        commit(money, build_sale_request(money, credit_card, options))
+      end
+
+      def authorize(money, credit_card, options = {})
+        commit(money, build_authorize_request(money, credit_card, options))
+      end
+
+      def capture(money, reference, options = {})
+        commit(money, build_capture_request(money,reference,options))
+      end
+
+      private
+
+      def build_xml_request(transaction_type,&block)
+        xml = Builder::XmlMarkup.new
+        xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+
+        xml.tag! 'CC5Request' do
+          xml.tag! 'Name', @options[:login]
+          xml.tag! 'Password', @options[:password]
+          xml.tag! 'ClientId', @options[:client_id]
+          xml.tag! 'Mode', if test? then 'R' else 'P' end
+          xml.tag! 'Type', transaction_type
+
+          if block_given?
+            yield xml
+          else
+            xml.target!
+          end
+        end
+      end
+
+      def build_sale_request(money, credit_card, options)
+        build_xml_request('Auth') do |xml|
+          add_customer_data(xml,options)
+          add_order_data(xml,options)
+          add_credit_card(xml, credit_card)
+          add_addresses(xml, options)
+
+          xml.tag! 'Total', amount(money)
+          xml.tag! 'Currency', currency_code(options[:currency])
+
+          xml.target!
+        end
+      end
+
+      def build_authorize_request(money, credit_card, options)
+         build_xml_request('PreAuth') do |xml|
+          add_customer_data(xml,options)
+          add_order_data(xml,options)
+          add_credit_card(xml, credit_card)
+          add_addresses(xml, options)
+
+          xml.tag! 'Total', amount(money)
+          xml.tag! 'Currency', currency_code(options[:currency])
+
+          xml.target!
+
+        end
+      end
+
+      def build_capture_request(money, reference, options = {})
+        build_xml_request('PostAuth') do |xml|
+          add_customer_data(xml,options)
+          xml.tag! 'OrderId', reference
+          xml.tag! 'Total', amount(money)
+          xml.tag! 'Currency', currency_code(options[:currency])
+
+          xml.target!
+        end
+      end
+
+      def build_void_request(reference, options = {})
+         build_xml_request('Void') do |xml|
+          add_customer_data(xml,options)
+          xml.tag! 'OrderId', reference
+          xml.tag! 'Total', amount(money)
+          xml.tag! 'Currency', currency_code(options[:currency])
+
+          xml.target!
+        end
+      end
+
+      def build_credit_request(money, reference, options = {})
+        build_xml_request('Credit') do |xml|
+          add_customer_data(xml,options)
+          xml.tag! 'OrderId', reference
+          xml.tag! 'Total', amount(money)
+          xml.tag! 'Currency', currency_code(options[:currency])
+
+          xml.target!
+        end
+      end
+
+      def add_customer_data(xml, options)
+        xml.tag! 'IPAddress', options[:ip_]
+        xml.tag! 'Email', options[:email]
+      end
+
+      def add_order_data(xml,options)
+        xml.tag! 'OrderId', options[:order_id]
+        xml.tag! 'GroupId', nil
+        xml.tag! 'TransId', nil
+      end
+
+      def add_credit_card(xml, credit_card)
+        xml.tag! 'Number', credit_card.number
+        xml.tag! 'Expires', [format_exp(credit_card.month),format_exp(credit_card.year)].join('/')
+        xml.tag! 'Cvv2Val', credit_card.verification_value
+      end
+
+      def format_exp(value)
+        format(value, :two_digits)
+      end
+
+      def add_addresses(xml,options)
+        if billing_address = options[:billing_address] || options[:address]
+          xml.tag! 'BillTo' do
+            xml.tag! 'Name', billing_address[:name]
+            xml.tag! 'Street1', billing_address[:address1]
+            xml.tag! 'Street2', billing_address[:address2]
+            xml.tag! 'City', billing_address[:city]
+            xml.tag! 'StateProv', billing_address[:state]
+            xml.tag! 'PostalCode', billing_address[:zip]
+            xml.tag! 'Country', billing_address[:country]
+            xml.tag! 'Company', billing_address[:company]
+            xml.tag! 'TelVoice', billing_address[:phone]
+          end
+        end
+
+        if shipping_address = options[:shipping_address]
+          xml.tag! 'ShipTo' do
+            xml.tag! 'Name', shipping_address[:name]
+            xml.tag! 'Street1', shipping_address[:address1]
+            xml.tag! 'Street2', shipping_address[:address2]
+            xml.tag! 'City', shipping_address[:city]
+            xml.tag! 'StateProv',shipping_address[:state]
+            xml.tag! 'PostalCode',shipping_address[:zip]
+            xml.tag! 'Country', shipping_address[:country]
+            xml.tag! 'Company', shipping_address[:company]
+            xml.tag! 'TelVoice', shipping_address[:phone]
+          end
+        end
+      end
+
+      def currency_code(currency)
+        CURRENCY_CODES[currency] || CURRENCY_CODES[default_currency]
+      end
+
+      def commit(money,request)
+        raw_response = ssl_post(URL,"DATA=" + request)
+        response = parse(raw_response)
+
+        success = success?(response)
+
+        Response.new(success,
+                     success ? 'Approved' : 'Declined',
+                     response,
+                     :test => test?,
+                     :authorization => response[:order_id])
+      end
+
+      def parse(body)
+        xml = REXML::Document.new(body)
+
+        response = {}
+        xml.root.elements.to_a.each do |node|
+          parse_element(response, node)
+        end
+        response
+      end
+
+      def parse_element(response, node)
+        if node.has_elements?
+          node.elements.each{|element| parse_element(response, element) }
+        else
+          response[node.name.underscore.to_sym] = node.text
+        end
+      end
+
+      def success?(response)
+        response[:response] == "Approved"
+      end
+
+    end
+  end
+end
+

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

@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
       self.ssl_strict = false
       
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
       self.homepage_url = 'http://www.linkpoint.com/'
       self.display_name = 'LinkPoint'
            

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

@@ -2,7 +2,7 @@ module ActiveMerchant #:nodoc:
 	module Billing #:nodoc:
 		class MerchantESolutionsGateway < Gateway
 
-			TEST_URL = 'https://test.merchante-solutions.com/mes-api/tridentApi'
+			TEST_URL = 'https://cert.merchante-solutions.com/mes-api/tridentApi'
 			LIVE_URL = 'https://api.merchante-solutions.com/mes-api/tridentApi'
       
 			# The countries the gateway supports merchants from as 2 digit ISO country codes

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

@@ -114,6 +114,11 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:cpp-header-border-color', options[:header_border_color] unless options[:header_border_color].blank?
               xml.tag! 'n2:cpp-payflow-color', options[:background_color] unless options[:background_color].blank?
               
+              if options[:allow_guest_checkout]
+                xml.tag! 'n2:SolutionType', 'Sole'
+                xml.tag! 'n2:LandingPage', 'Billing'
+              end
+              
               xml.tag! 'n2:LocaleCode', options[:locale] unless options[:locale].blank?
             end
           end

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

@@ -88,7 +88,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>:drivers_license_number</tt> - The customer's drivers license number.
       # * <tt>:date_of_birth</tt> - The customer's date of birth as a Time or Date object or a string in the format <tt>mm/dd/yyyy</tt>.
       def purchase(money, source, options = {})
-        if source.type == "check"
+        if card_brand(source) == "check"
           virtual_check.purchase(money, source, options)
         else
           bankcard.purchase(money, source, options)
@@ -125,7 +125,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>money</tt> - The amount to be authorized as an integer value in cents.
       # * <tt>source</tt> - The CreditCard or Check object to be used as the target for the credit.
       def credit(money, source, options = {})
-        if source.type == "check"
+        if card_brand(source) == "check"
           virtual_check.credit(money, source, options)
         else
           bankcard.credit(money, source, options)

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

@@ -18,9 +18,9 @@ module ActiveMerchant #:nodoc:
             'DE'  => %w( DE AT CH LI ),
             'PT'  => %w( AO BR CV GW MZ PT ST TL),
             'RU'  => %w( BY KG KZ RU ),
-            'LV'  => 'LV',
-            'CN1' => 'CN',
-            'NL'  => 'NL'
+            'LV'  => %w( LV ),
+            'CN1' => %w( CN ),
+            'NL'  => %w( NL )
           }
           
           LANG_FOR_COUNTRY = COUNTRIES_FOR_LANG.inject(Hash.new("EN")) do |memo, (lang, countries)|

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

@@ -80,6 +80,8 @@ module ActiveMerchant
           raise ConnectionError, "The remote server reset the connection"
         rescue Errno::ECONNREFUSED => e
           raise RetriableConnectionError, "The remote server refused the connection"
+        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