activemerchant 1.14.0 → 1.15.0

data/CHANGELOG

@@ -1,5 +1,23 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.15.0 (May 12, 2011)
+* DirecPay: Fix address to not include address2 twice in some cases [Soleone]
+* DirecPay: Send company if available [Soleone]
+* Realex: Fix hash signature [ntalbott/Soleone]
+* SecurePay AU: Update remote tests [ntalbott]
+* SecurePay AU: Fix method arity for #capture, #refund, #credit and #void [Soleone]
+* Barclays ePDQ: Make response parsing more robust [Soleone]
+* Payflow Express: Add line item support [wolframarnold]
+* Payflow Express: Add comment field support [wolframarnold]
+* Payflow: Add more optional fields [wolframarnold]
+* Beanstream/Paypal: Fix CREDIT_DEPRECATION_MESSAGE errors [Jonathan Rudenberg]
+* BraintreeBlue: Return a hash instead of a transaction object [braintreeps]
+* BraintreeBlue: Return proper AVS/CVV values [braintreeps]
+* Bogus: Add #recurring [trwomey]
+* Make Validateable compatible with ActiveModel [CodeMonkeySteve]
+* Add DirectEBanking offsite gateway [Gerwin Brunner/Soleone]
+* ActiveSupport 3.1 beta support [cgriego]
+
 == Version 1.14.0 (Apr 29, 2011)
 
 * SagePayForm: Implement #cancelled? for Return. [wisq]

data/CONTRIBUTORS

@@ -227,3 +227,7 @@ WorldPay Gateway
 Orbital Paymentech Gateway (July, 2009)
 
 * Sam Vincent - http://ecommerce.versapay.com
+
+DIRECTebanking - Payment Network AG (May, 2011)
+
+* Gerwin Brunner (Vilango)

data/README.rdoc

@@ -83,6 +83,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {2 Checkout}[http://www.2checkout.com]
 * {Banca Sella GestPay}[https://www.sella.it/banca/ecommerce/gestpay/gestpay.jsp]
 * {Chronopay}[http://www.chronopay.com]
+* {Direct-eBanking / sofortueberweisung.de by Payment-Networks AG}[https://www.payment-network.com/deb_com_en/merchantarea/home] - DE, AT, CH, BE, UK, NL
 * {DirecPay}[http://www.timesofmoney.com/direcpay/jsp/home.jsp]
 * {HiTRUST}[http://www.hitrust.com.hk/]
 * {Moneybookers}[http://www.moneybookers.com]

data/lib/active_merchant.rb

@@ -27,7 +27,7 @@ require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/module/attribute_accessors'

data/lib/active_merchant/billing/credit_card.rb

@@ -7,49 +7,49 @@ module ActiveMerchant #:nodoc:
     # == Description
     # This credit card object can be used as a stand alone object. It acts just like an ActiveRecord object
     # but doesn't support the .save method as its not backed by a database.
-    # 
-    # For testing purposes, use the 'bogus' credit card type. This card skips the vast majority of 
-    # validations. This allows you to focus on your core concerns until you're ready to be more concerned 
+    #
+    # For testing purposes, use the 'bogus' credit card type. This card skips the vast majority of
+    # validations. This allows you to focus on your core concerns until you're ready to be more concerned
     # with the details of particular creditcards or your gateway.
-    # 
+    #
     # == Testing With CreditCard
-    # Often when testing we don't care about the particulars of a given card type. When using the 'test' 
-    # mode in your Gateway, there are six different valid card numbers: 1, 2, 3, 'success', 'fail', 
+    # Often when testing we don't care about the particulars of a given card type. When using the 'test'
+    # mode in your Gateway, there are six different valid card numbers: 1, 2, 3, 'success', 'fail',
     # and 'error'.
-    # 
+    #
     #--
     # For details, see CreditCardMethods#valid_number?
     #++
-    # 
+    #
     # == Example Usage
     #   cc = CreditCard.new(
-    #     :first_name => 'Steve', 
-    #     :last_name  => 'Smith', 
-    #     :month      => '9', 
-    #     :year       => '2010', 
-    #     :type       => 'visa', 
+    #     :first_name => 'Steve',
+    #     :last_name  => 'Smith',
+    #     :month      => '9',
+    #     :year       => '2010',
+    #     :type       => 'visa',
     #     :number     => '4242424242424242'
     #   )
-    #   
+    #
     #   cc.valid? # => true
     #   cc.display_number # => XXXX-XXXX-XXXX-4242
     #
     class CreditCard
       include CreditCardMethods
       include Validateable
-      
+
       ## Attributes
-      
+
       cattr_accessor :require_verification_value
       self.require_verification_value = true
-      
+
       # Essential attributes for a valid, non-bogus creditcards
       attr_accessor :number, :month, :year, :type, :first_name, :last_name
-      
+
       # Required for Switch / Solo cards
       attr_accessor :start_month, :start_year, :issue_number
 
-      # Optional verification_value (CVV, CVV2 etc). Gateways will try their best to 
+      # Optional verification_value (CVV, CVV2 etc). Gateways will try their best to
       # run validation on the passed in value if it is supplied
       attr_accessor :verification_value
 
@@ -63,23 +63,23 @@ module ActiveMerchant #:nodoc:
       def expired?
         expiry_date.expired?
       end
-      
+
       def name?
         first_name? || last_name?
       end
-      
+
       def first_name?
         @first_name.present?
       end
-      
+
       def last_name?
         @last_name.present?
       end
-            
+
       def name
         [@first_name, @last_name].compact.join(' ')
       end
-            
+
       def verification_value?
         !@verification_value.blank?
       end
@@ -88,11 +88,11 @@ module ActiveMerchant #:nodoc:
       def display_number
         self.class.mask(number)
       end
-      
+
       def last_digits
         self.class.last_digits(number)
       end
-      
+
       def validate
         validate_essential_attributes
 
@@ -104,14 +104,14 @@ module ActiveMerchant #:nodoc:
         validate_verification_value
         validate_switch_or_solo_attributes
       end
-      
+
       def self.requires_verification_value?
         require_verification_value
       end
-      
+
       private
-      
-      def before_validate #:nodoc: 
+
+      def before_validate #:nodoc:
         self.month = month.to_i
         self.year  = year.to_i
         self.start_month = start_month.to_i unless start_month.nil?
@@ -120,27 +120,38 @@ module ActiveMerchant #:nodoc:
         self.type.downcase! if type.respond_to?(:downcase)
         self.type = self.class.type?(number) if type.blank?
       end
-      
+
       def validate_card_number #:nodoc:
-        errors.add :number, "is not a valid credit card number" unless CreditCard.valid_number?(number)
+        if number.blank?
+          errors.add :number, "is required"
+        elsif !CreditCard.valid_number?(number)
+          errors.add :number, "is not a valid credit card number"
+        end
+
         unless errors.on(:number) || errors.on(:type)
           errors.add :type, "is not the correct card type" unless CreditCard.matching_type?(number, type)
         end
       end
-      
+
       def validate_card_type #:nodoc:
-        errors.add :type, "is required" if type.blank?
-        errors.add :type, "is invalid"  unless CreditCard.card_companies.keys.include?(type)
+        errors.add :type, "is required" if type.blank? && number.present?
+        errors.add :type, "is invalid"  unless type.blank? || CreditCard.card_companies.keys.include?(type)
       end
-      
+
       def validate_essential_attributes #:nodoc:
         errors.add :first_name, "cannot be empty"      if @first_name.blank?
         errors.add :last_name,  "cannot be empty"      if @last_name.blank?
-        errors.add :month,      "is not a valid month" unless valid_month?(@month)
-        errors.add :year,       "expired"              if expired?
-        errors.add :year,       "is not a valid year"  unless valid_expiry_year?(@year)
+
+        if @month.to_i.zero? || @year.to_i.zero?
+          errors.add :month, "is required"  if @month.to_i.zero?
+          errors.add :year,  "is required"  if @year.to_i.zero?
+        else
+          errors.add :month,      "is not a valid month" unless valid_month?(@month)
+          errors.add :year,       "expired"              if expired?
+          errors.add :year,       "is not a valid year"  unless valid_expiry_year?(@year)
+        end
       end
-      
+
       def validate_switch_or_solo_attributes #:nodoc:
         if %w[switch solo].include?(type)
           unless valid_month?(@start_month) && valid_start_year?(@start_year) || valid_issue_number?(@issue_number)
@@ -150,10 +161,10 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-      
+
       def validate_verification_value #:nodoc:
         if CreditCard.requires_verification_value?
-          errors.add :verification_value, "is required" unless verification_value? 
+          errors.add :verification_value, "is required" unless verification_value?
         end
       end
     end

data/lib/active_merchant/billing/gateway.rb

@@ -76,22 +76,22 @@ module ActiveMerchant #:nodoc:
       # The format of the amounts used by the gateway
       # :dollars => '12.50'
       # :cents => '1250'
-      class_inheritable_accessor :money_format
+      class_attribute :money_format
       self.money_format = :dollars
       
       # The default currency for the transactions if no currency is provided
-      class_inheritable_accessor :default_currency
+      class_attribute :default_currency
       
       # The countries of merchants the gateway supports
-      class_inheritable_accessor :supported_countries
+      class_attribute :supported_countries
       self.supported_countries = []
       
       # The supported card types for the gateway
-      class_inheritable_accessor :supported_cardtypes
+      class_attribute :supported_cardtypes
       self.supported_cardtypes = []
       
-      class_inheritable_accessor :homepage_url
-      class_inheritable_accessor :display_name
+      class_attribute :homepage_url
+      class_attribute :display_name
       
       # The application making the calls to the gateway
       # Useful for things like the PayPal build notation (BN) id fields

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

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
     class AuthorizeNetGateway < Gateway
       API_VERSION = '3.1'
 
-      class_inheritable_accessor :test_url, :live_url, :arb_test_url, :arb_live_url
+      class_attribute :test_url, :live_url, :arb_test_url, :arb_live_url
 
       self.test_url = "https://test.authorize.net/gateway/transact.dll"
       self.live_url = "https://secure.authorize.net/gateway/transact.dll"
@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
       self.arb_test_url = 'https://apitest.authorize.net/xml/v1/request.api'
       self.arb_live_url = 'https://api.authorize.net/xml/v1/request.api'
       
-      class_inheritable_accessor :duplicate_window
+      class_attribute :duplicate_window
 
       APPROVED, DECLINED, ERROR, FRAUD_REVIEW = 1, 2, 3, 4
 
@@ -131,6 +131,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>authorization</tt> - The authorization returned from the previous authorize request.
       def void(authorization, options = {})
         post = {:trans_id => authorization}
+        add_duplicate_window(post)
         commit('VOID', nil, post)
       end
 
@@ -155,6 +156,7 @@ module ActiveMerchant #:nodoc:
                  :card_num => options[:card_number]
                }
         add_invoice(post, options)
+        add_duplicate_window(post)
 
         commit('CREDIT', money, post)
       end

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

@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
     # 5. Click Submit
     class AuthorizeNetCimGateway < Gateway
     
-      class_inheritable_accessor :test_url, :live_url
+      class_attribute :test_url, :live_url
 
       self.test_url = 'https://apitest.authorize.net/xml/v1/request.api'
       self.live_url = 'https://api.authorize.net/xml/v1/request.api'

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

@@ -136,15 +136,15 @@ module ActiveMerchant #:nodoc:
 
         def parse
           doc = REXML::Document.new(@response)
-          auth_type = find(doc, "//Transaction/Type").to_sym
+          auth_type = find(doc, "//Transaction/Type").to_s
 
           message = find(doc, "//Message/Text")
           if message.blank?
             message = find(doc, "//Transaction/CardProcResp/CcReturnMsg")
           end
 
-          case auth_type.to_sym
-          when :Credit, :Void
+          case auth_type
+          when 'Credit', 'Void'
             success = find(doc, "//CcReturnMsg") == "Approved."
           else
             success = find(doc, "//Transaction/AuthCode").present?

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

@@ -84,7 +84,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, source, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, source, options)
       end
     

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

@@ -42,6 +42,18 @@ module ActiveMerchant #:nodoc:
         end
       end
  
+      def recurring(money, creditcard, options = {})
+        money = amount(money)
+        case creditcard.number
+        when '1'
+          Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true)
+        when '2'
+          Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE },:test => true)
+        else
+          raise Error, ERROR_MESSAGE
+        end
+      end
+ 
       def credit(money, creditcard, options = {})
         if creditcard.is_a?(String)
           deprecated CREDIT_DEPRECATION_MESSAGE

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class BraintreeBlueGateway < Gateway
       include BraintreeCommon
-      
+
       self.display_name = 'Braintree (Blue Platform)'
 
       def initialize(options = {})
@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
         commit do
           result = Braintree::Transaction.refund(transaction_id, money)
           Response.new(result.success?, message_from_result(result),
-            {:braintree_transaction => (result.transaction if result.success?)},
+            {:braintree_transaction => (transaction_hash(result.transaction) if result.success?)},
             {:authorization => (result.transaction.id if result.success?)}
            )
         end
@@ -65,7 +65,7 @@ module ActiveMerchant #:nodoc:
         commit do
           result = Braintree::Transaction.void(authorization)
           Response.new(result.success?, message_from_result(result),
-            {:braintree_transaction => (result.transaction if result.success?)},
+            {:braintree_transaction => (transaction_hash(result.transaction) if result.success?)},
             {:authorization => (result.transaction.id if result.success?)}
           )
         end
@@ -86,7 +86,7 @@ module ActiveMerchant #:nodoc:
           )
           Response.new(result.success?, message_from_result(result),
             {
-              :braintree_customer => (result.customer if result.success?),
+              :braintree_customer => (customer_hash(result.customer) if result.success?),
               :customer_vault_id => (result.customer.id if result.success?)
             }
           )
@@ -104,7 +104,7 @@ module ActiveMerchant #:nodoc:
             :email => options[:email]
           )
           Response.new(result.success?, message_from_result(result),
-            :braintree_customer => (Braintree::Customer.find(vault_id) if result.success?)
+            :braintree_customer => (customer_hash(Braintree::Customer.find(vault_id)) if result.success?)
           )
         end
         return customer_update_result unless customer_update_result.success?
@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
               :expiration_year => creditcard.year.to_s
           )
           Response.new(result.success?, message_from_result(result),
-            :braintree_customer => (Braintree::Customer.find(vault_id) if result.success?)
+            :braintree_customer => (customer_hash(Braintree::Customer.find(vault_id)) if result.success?)
           )
         end
       end
@@ -190,26 +190,23 @@ module ActiveMerchant #:nodoc:
           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[:braintree_transaction] = transaction_hash(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' => ''
+            response_options[:avs_result] = {
+              :code => nil, :message => nil,
+              :street_match => result.transaction.avs_street_address_response_code,
+              :postal_match => result.transaction.avs_postal_code_response_code
             }
+            response_options[:cvv_result] = result.transaction.cvv_response_code
             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.cvv_result['message'] = ''
           response
         end
       end
@@ -226,6 +223,70 @@ module ActiveMerchant #:nodoc:
           raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
         end
       end
+
+      def customer_hash(customer)
+        credit_cards = customer.credit_cards.map do |cc|
+          {
+            "bin" => cc.bin,
+            "expiration_date" => cc.expiration_date
+          }
+        end
+
+        {
+          "email" => customer.email,
+          "first_name" => customer.first_name,
+          "last_name" => customer.last_name,
+          "credit_cards" => credit_cards
+        }
+      end
+
+      def transaction_hash(transaction)
+        if transaction.vault_customer
+          vault_customer = {
+          }
+          vault_customer["credit_cards"] = transaction.vault_customer.credit_cards.map do |cc|
+            {
+              "bin" => cc.bin
+            }
+          end
+        else
+          vault_customer = nil
+        end
+
+        customer_details = {
+          "id" => transaction.customer_details.id,
+          "email" => transaction.customer_details.email
+        }
+
+        billing_details = {
+          "street_address"   => transaction.billing_details.street_address,
+          "extended_address" => transaction.billing_details.extended_address,
+          "company"          => transaction.billing_details.company,
+          "locality"         => transaction.billing_details.locality,
+          "region"           => transaction.billing_details.region,
+          "postal_code"      => transaction.billing_details.postal_code,
+          "country_name"     => transaction.billing_details.country_name,
+        }
+
+        shipping_details = {
+          "street_address"   => transaction.shipping_details.street_address,
+          "extended_address" => transaction.shipping_details.extended_address,
+          "company"          => transaction.shipping_details.company,
+          "locality"         => transaction.shipping_details.locality,
+          "region"           => transaction.shipping_details.region,
+          "postal_code"      => transaction.shipping_details.postal_code,
+          "country_name"     => transaction.shipping_details.country_name,
+        }
+
+        {
+          "order_id"         => transaction.order_id,
+          "status"           => transaction.status,
+          "customer_details" => customer_details,
+          "billing_details"  => billing_details,
+          "shipping_details" => shipping_details,
+          "vault_customer"   => vault_customer
+        }
+      end
     end
   end
 end