activemerchant 1.33.0 → 1.34.0

data/CHANGELOG

@@ -1,5 +1,11 @@
 = ActiveMerchant CHANGELOG
 
+* PayPal Express gateway: Add unstore support [duff]
+* Stripe: Send application_fee with capture requests [melari]
+* Make #unstore method signature consistent across gateways [duff]
+* Dwolla: Major bug fixes. [capablemonkey, melari]
+* Stripe: Add support for including track data [melari]
+
 == Version 1.33.0 (May 30, 2013)
 
 * Netaxept: Completely revamped to use the "M" service type [rbjordan3, ntalbott]

data/lib/active_merchant/billing/credit_card.rb

@@ -112,6 +112,11 @@ module ActiveMerchant #:nodoc:
       # @return [String] the verification value
       attr_accessor :verification_value
 
+      # Returns or sets the track data for the card
+      #
+      # @return [String]
+      attr_accessor :track_data
+
       def type
         self.class.deprecated "CreditCard#type is deprecated and will be removed from a future release of ActiveMerchant. Please use CreditCard#brand instead."
         brand

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

@@ -422,8 +422,6 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, options)
         if address = (options[:shipping_address] || options[:billing_address] || options[:address])
-          post[:NAME1]        = address[:first_name]
-          post[:NAME2]        = address[:last_name]
           post[:ADDR1]        = address[:address1]
           post[:ADDR2]        = address[:address2]
           post[:COMPANY_NAME] = address[:company]

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

@@ -172,7 +172,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def unstore(customer_vault_id)
+      def unstore(customer_vault_id, options = {})
         commit do
           Braintree::Customer.delete(customer_vault_id)
           Response.new(true, "OK")

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

@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
         commit('T', nil, post)
       end
 
-      def unstore(card_id)
+      def unstore(card_id, options = {})
         post = {}
         post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
         post[:card_id] = card_id

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

@@ -101,7 +101,7 @@ module ActiveMerchant #:nodoc:
         commit('res_add_cc', post)
       end
 
-      def unstore(data_key)
+      def unstore(data_key, options = {})
         post = {}
         post[:data_key] = data_key
         commit('res_delete', post)

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -122,8 +122,7 @@ module ActiveMerchant #:nodoc:
       def add_address(xml, tag, address, options)
         return if address.nil?
         xml.tag! tag do
-          xml.tag! 'FirstName', address[:first_name] unless address[:first_name].blank?
-          xml.tag! 'LastName', address[:last_name] unless address[:last_name].blank?
+          xml.tag! 'Name', address[:name] unless address[:name].blank?
           xml.tag! 'EMail', options[:email] unless options[:email].blank?
           xml.tag! 'Phone', address[:phone] unless address[:phone].blank?
           xml.tag! 'CustCode', options[:customer] if !options[:customer].blank? && tag == 'BillTo'

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

@@ -63,6 +63,10 @@ module ActiveMerchant #:nodoc:
         commit 'CreateBillingAgreement', build_create_billing_agreement_request(token, options)
       end
 
+      def unstore(token, options = {})
+        commit 'BAUpdate', build_cancel_billing_agreement_request(token)
+      end
+
       def authorize_reference_transaction(money, options = {})
         requires!(options, :reference_id, :payment_type, :invoice_id, :description, :ip)
 
@@ -188,6 +192,19 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_cancel_billing_agreement_request(token)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag! 'BillAgreementUpdateReq', 'xmlns' => PAYPAL_NAMESPACE do
+          xml.tag! 'BAUpdateRequest', 'xmlns:n2' => EBAY_NAMESPACE do
+            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'ReferenceID', token
+            xml.tag! 'BillingAgreementStatus', "Canceled"
+          end
+        end
+
+        xml.target!
+      end
+
       def build_reference_transaction_request(action, money, options)
         currency_code = options[:currency] || currency(money)
 

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

@@ -1,5 +1,3 @@
-require 'json'
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class StripeGateway < Gateway
@@ -58,7 +56,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        commit(:post, "charges/#{CGI.escape(authorization)}/capture", {:amount => amount(money)})
+        post = {}
+        post[:amount] = amount(money)
+        add_application_fee(post, options)
+
+        commit(:post, "charges/#{CGI.escape(authorization)}/capture", post)
       end
 
       def void(identification, options = {})
@@ -109,8 +111,8 @@ module ActiveMerchant #:nodoc:
         add_customer(post, options)
         add_customer_data(post,options)
         post[:description] = options[:description] || options[:email]
-        post[:application_fee] = options[:application_fee] if options[:application_fee]
         add_flags(post, options)
+        add_application_fee(post, options)
         post
       end
 
@@ -119,6 +121,10 @@ module ActiveMerchant #:nodoc:
         post[:currency] = (options[:currency] || currency(money)).downcase
       end
 
+      def add_application_fee(post, options)
+        post[:application_fee] = options[:application_fee] if options[:application_fee]
+      end
+
       def add_customer_data(post, options)
         metadata_options = [:description,:browser_ip,:user_agent,:referrer]
         post.update(options.slice(*metadata_options))
@@ -140,19 +146,27 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_creditcard(post, creditcard, options)
+        card = {}
         if creditcard.respond_to?(:number)
-          card = {}
-          card[:number] = creditcard.number
-          card[:exp_month] = creditcard.month
-          card[:exp_year] = creditcard.year
-          card[:cvc] = creditcard.verification_value if creditcard.verification_value?
-          card[:name] = creditcard.name if creditcard.name
-          post[:card] = card
+          if creditcard.respond_to?(:track_data) && creditcard.track_data.present?
+            card[:swipe_data] = creditcard.track_data
+          else
+            card[:number] = creditcard.number
+            card[:exp_month] = creditcard.month
+            card[:exp_year] = creditcard.year
+            card[:cvc] = creditcard.verification_value if creditcard.verification_value?
+            card[:name] = creditcard.name if creditcard.name
+          end
 
           add_address(post, options)
         elsif creditcard.kind_of?(String)
-          post[:card] = creditcard
+          if options[:track_data]
+            card[:swipe_data] = options[:track_data]
+          else
+            card[:number] = creditcard
+          end
         end
+        post[:card] = card
       end
 
       def add_customer(post, options)

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
         autoload :Helper, 'active_merchant/billing/integrations/dwolla/helper.rb'
         autoload :Notification, 'active_merchant/billing/integrations/dwolla/notification.rb'
         autoload :Common, 'active_merchant/billing/integrations/dwolla/common.rb'
-
+        
         mattr_accessor :service_url
         self.service_url = 'https://www.dwolla.com/payment/pay'
 

data/lib/active_merchant/billing/integrations/dwolla/common.rb

@@ -1,3 +1,5 @@
+require "openssl"
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
@@ -8,7 +10,7 @@ module ActiveMerchant #:nodoc:
               raise ArgumentError, "You need to provide the Application secret as the option :credential3 to verify that the notification originated from Dwolla"
             end
 
-            expected_signature = Digest::SHA1.hexdigest(secret + ('%s&%.2f' % [checkoutId, amount]))
+            expected_signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, "%s&%.2f" % [checkoutId, amount])
 
             if notification_signature != expected_signature
               raise StandardError, "Dwolla signature verification failed."

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

@@ -1,4 +1,4 @@
-require 'digest/sha1'
+require "openssl"
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -9,18 +9,21 @@ module ActiveMerchant #:nodoc:
             super
             add_field('name', 'Store Purchase')
 
+            timestamp = Time.now.to_i.to_s
+
             if ActiveMerchant::Billing::Base.integration_mode == :test || options[:test]
               add_field('test', 'true')
+              # timestamp used for test signature generation:
+              timestamp = "1370726016"
             end
 
-            timestamp = Time.now.to_i.to_s
             add_field('timestamp', timestamp)
             add_field('allowFundingSources', 'true')
 
             key = options[:credential2].to_s
             secret = options[:credential3].to_s
             orderid = order.to_s
-            signature = Digest::SHA1.hexdigest(secret + "#{key}&#{timestamp}&#{orderid}")
+            signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, "#{key}&#{timestamp}&#{orderid}")
             add_field('signature', signature)
           end
 

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

@@ -8,6 +8,10 @@ module ActiveMerchant #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification
           include Common
 
+          def initialize(data, options)
+            super
+          end
+
           def complete?
             (status == "Completed")
           end
@@ -37,14 +41,14 @@ module ActiveMerchant #:nodoc:
           end
 
           def test?
-            params['TestMode']
+            params['TestMode'] != "false"
           end
 
           def acknowledge
             true
           end
-
-          private
+        
+        private
 
           def parse(post)
             @raw = post.to_s

data/lib/active_merchant/billing/integrations/dwolla/return.rb

@@ -7,7 +7,10 @@ module ActiveMerchant #:nodoc:
 
           def initialize(data, options)
             params = parse(data)
-            verify_signature(params['checkoutId'], params['amount'], params['signature'], options[:credential3])
+
+            if params['error'] != 'failure'
+              verify_signature(params['checkoutId'], params['amount'], params['signature'], options[:credential3])
+            end
 
             super
           end
@@ -33,7 +36,7 @@ module ActiveMerchant #:nodoc:
           end
 
           def test?
-            params['test']
+            params['test'] != nil
           end
 
           def callback_success?

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.33.0"
+  VERSION = "1.34.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: activemerchant
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.33.0
+  version: 1.34.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement