activemerchant 1.20.3 → 1.20.4

data/CHANGELOG

@@ -1,5 +1,9 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.20.4 (February 22, 2012)
+
+* Fix json dependency
+
 == Version 1.20.3 (February 7, 2012)
 
 * Various fixes to support Ruby 1.9 [wisq]

data/lib/active_merchant.rb

@@ -30,7 +30,22 @@ 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'
-require 'active_support/base64'
+
+begin
+  require 'active_support/base64'
+
+  unless defined?(Base64)
+    Base64 = ActiveSupport::Base64
+  end
+
+  unless Base64.respond_to?(:strict_encode64)
+    def Base64.strict_encode64(v)
+      ActiveSupport::Base64.encode64s(v)
+    end
+  end
+rescue LoadError
+  require 'base64'
+end
 
 require 'securerandom'
 require 'builder'

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

@@ -60,7 +60,7 @@ module ActiveMerchant #:nodoc:
       def void(identification, options = {})
         requires!(options, :order_id)
         original_transaction_id, original_transaction_amount = identification.split(";")
-        commit(:void_transaction, {:reference_number => format_reference_number(options[:order_id]), :transaction_ID => original_transaction_id})
+        commit(:void_transaction, {:reference_number => format_reference_number(options[:order_id]), :transaction_id => original_transaction_id})
       end
       
       def voice_authorize(money, authorization_code, creditcard, options = {})
@@ -90,7 +90,7 @@ module ActiveMerchant #:nodoc:
           :reference_number => format_reference_number(options[:order_id]),
           :transaction_amount => amount(money),
           :original_transaction_amount => original_transaction_amount,
-          :original_transaction_ID => original_transaction_id,
+          :original_transaction_id => original_transaction_id,
           :client_ip_address => options[:ip]
         }
       end
@@ -191,7 +191,7 @@ module ActiveMerchant #:nodoc:
         transaction = root.add_element(action.to_s.camelize)
 
         actions[action].each do |key|
-          transaction.add_element(key.to_s.camelize).text = parameters[key] unless parameters[key].blank?
+          transaction.add_element(key).text = parameters[key.underscore.to_sym] unless parameters[key.underscore.to_sym].blank?
         end
 
         xml.to_s
@@ -217,18 +217,18 @@ module ActiveMerchant #:nodoc:
         ACTIONS
       end
 
-      CREDIT_CARD_FIELDS =  [:authorization_number, :client_ip_address, :billing_address, :billing_city, :billing_state, :billing_postal_code, :billing_country, :billing_name, :card_verification_value, :expiration_month, :expiration_year, :reference_number, :transaction_amount, :account_number ]
+      CREDIT_CARD_FIELDS =  %w(AuthorizationNumber ClientIpAddress BillingAddress BillingCity BillingState BillingPostalCode BillingCountry BillingName CardVerificationValue ExpirationMonth ExpirationYear ReferenceNumber TransactionAmount AccountNumber )
 
       ACTIONS = {
            :credit_card_authorize		=> CREDIT_CARD_FIELDS,
            :credit_card_charge			=> CREDIT_CARD_FIELDS,
            :credit_card_voice_authorize		=> CREDIT_CARD_FIELDS,
            :credit_card_capture			=> CREDIT_CARD_FIELDS,
-           :credit_card_credit			=> CREDIT_CARD_FIELDS << :original_transaction_amount,
-           :credit_card_refund			=> [:reference_number, :transaction_amount, :original_transaction_amount, :original_transaction_ID, :client_ip_address],
-           :void_transaction			=> [:reference_number, :transaction_ID],
-           :credit_card_settle			=> [:reference_number, :transaction_amount, :original_transaction_amount, :original_transaction_ID, :client_ip_address],
-           :system_check			=> [:system_check],
+           :credit_card_credit			=> CREDIT_CARD_FIELDS + ["OriginalTransactionAmount"],
+           :credit_card_refund			=> %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
+           :void_transaction			=> %w(ReferenceNumber TransactionID),
+           :credit_card_settle			=> %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
+           :system_check			=> %w(SystemCheck),
       }    
     end
   end

data/lib/active_merchant/billing/gateways/ideal/ideal_base.rb

@@ -219,7 +219,7 @@ module ActiveMerchant #:nodoc:
         cert_data   = OpenSSL::X509::Certificate.new(cert_file).to_s
         cert_data   = cert_data.sub(/-----BEGIN CERTIFICATE-----/, '')
         cert_data   = cert_data.sub(/-----END CERTIFICATE-----/, '')
-        fingerprint = ActiveSupport::Base64.decode64(cert_data)
+        fingerprint = Base64.decode64(cert_data)
         fingerprint = Digest::SHA1.hexdigest(fingerprint)
         return fingerprint.upcase
       end
@@ -227,12 +227,12 @@ module ActiveMerchant #:nodoc:
       def sign_message(private_key_data, password, data)
         private_key  = OpenSSL::PKey::RSA.new(private_key_data, password)
         signature = private_key.sign(OpenSSL::Digest::SHA1.new, data.gsub('\s', ''))
-        return ActiveSupport::Base64.encode64(signature).gsub(/\n/, '')
+        return Base64.encode64(signature).gsub(/\n/, '')
       end
 
       def verify_message(cert_file, data, signature)
         public_key = OpenSSL::X509::Certificate.new(cert_file).public_key
-        return public_key.verify(OpenSSL::Digest::SHA1.new, ActiveSupport::Base64.decode64(signature), data)
+        return public_key.verify(OpenSSL::Digest::SHA1.new, Base64.decode64(signature), data)
       end
 
       def status_response_verified?(response)

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -313,8 +313,8 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:CityName', address[:city]
           xml.tag! 'n2:StateOrProvince', address[:state].blank? ? 'N/A' : address[:state]
           xml.tag! 'n2:Country', address[:country]
-          xml.tag! 'n2:PostalCode', address[:zip]
           xml.tag! 'n2:Phone', address[:phone]
+          xml.tag! 'n2:PostalCode', address[:zip]
         end
       end
       

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

@@ -98,12 +98,39 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'SetExpressCheckoutRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'n2:SetExpressCheckoutRequestDetails' do
+              xml.tag! 'n2:ReturnURL', options[:return_url]
+              xml.tag! 'n2:CancelURL', options[:cancel_return_url]
               if options[:max_amount]
                 xml.tag! 'n2:MaxAmount', localized_amount(options[:max_amount], currency_code), 'currencyID' => currency_code
               end
+              xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
+              xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'
+              xml.tag! 'n2:LocaleCode', options[:locale] unless options[:locale].blank?
+              # Customization of the payment page
+              xml.tag! 'n2:PageStyle', options[:page_style] unless options[:page_style].blank?
+              xml.tag! 'n2:cpp-header-image', options[:header_image] unless options[:header_image].blank?
+              xml.tag! 'n2:cpp-header-border-color', options[:header_border_color] unless options[:header_border_color].blank?
+              xml.tag! 'n2:cpp-header-back-color', options[:header_background_color] unless options[:header_background_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:BuyerEmail', options[:email] unless options[:email].blank?
+
+              if options[:billing_agreement]
+                xml.tag! 'n2:BillingAgreementDetails' do
+                  xml.tag! 'n2:BillingType', options[:billing_agreement][:type]
+                  xml.tag! 'n2:BillingAgreementDescription', options[:billing_agreement][:description]
+                  xml.tag! 'n2:PaymentType', options[:billing_agreement][:payment_type] || 'InstantOnly'
+                end
+              end
+
               if !options[:allow_note].nil?
                 xml.tag! 'n2:AllowNote', options[:allow_note] ? '1' : '0'
               end
+              xml.tag! 'n2:CallbackURL', options[:callback_url] unless options[:callback_url].blank?
+
               xml.tag! 'n2:PaymentDetails' do
                 xml.tag! 'n2:OrderTotal', amount(money).to_f.zero? ? localized_amount(100, currency_code) : localized_amount(money, currency_code), 'currencyID' => currency_code
                 # All of the values must be included together and add up to the order total
@@ -117,41 +144,25 @@ module ActiveMerchant #:nodoc:
                 xml.tag! 'n2:OrderDescription', options[:description]
                 xml.tag! 'n2:InvoiceID', options[:order_id]
 
-                add_items_xml(xml, options, currency_code) if options[:items]
-
                 add_address(xml, 'n2:ShipToAddress', options[:shipping_address] || options[:address])
 
+                add_items_xml(xml, options, currency_code) if options[:items]
+
                 xml.tag! 'n2:PaymentAction', action
               end
 
-              xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'
-              xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
-              xml.tag! 'n2:ReturnURL', options[:return_url]
-              xml.tag! 'n2:CancelURL', options[:cancel_return_url]
-              xml.tag! 'n2:IPAddress', options[:ip] unless options[:ip].blank?
-              xml.tag! 'n2:BuyerEmail', options[:email] unless options[:email].blank?
-              
-              if options[:billing_agreement]
-                xml.tag! 'n2:BillingAgreementDetails' do
-                  xml.tag! 'n2:BillingType', options[:billing_agreement][:type]
-                  xml.tag! 'n2:BillingAgreementDescription', options[:billing_agreement][:description]
-                  xml.tag! 'n2:PaymentType', options[:billing_agreement][:payment_type] || 'InstantOnly'
+              if options[:shipping_options]
+                options[:shipping_options].each do |shipping_option|
+                  xml.tag! 'n2:FlatRateShippingOptions' do
+                    xml.tag! 'n2:ShippingOptionIsDefault', shipping_option[:default]
+                    xml.tag! 'n2:ShippingOptionAmount', localized_amount(shipping_option[:amount], currency_code), 'currencyID' => currency_code
+                    xml.tag! 'n2:ShippingOptionName', shipping_option[:name]
+                  end
                 end
               end
-        
-              # Customization of the payment page
-              xml.tag! 'n2:PageStyle', options[:page_style] unless options[:page_style].blank?
-              xml.tag! 'n2:cpp-header-image', options[:header_image] unless options[:header_image].blank?
-              xml.tag! 'n2:cpp-header-back-color', options[:header_background_color] unless options[:header_background_color].blank?
-              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?
+
+              xml.tag! 'n2:CallbackTimeout', options[:callback_timeout] unless options[:callback_timeout].blank?
+              xml.tag! 'n2:CallbackVersion', options[:callback_version] unless options[:callback_version].blank?
             end
           end
         end
@@ -181,4 +192,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

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

@@ -177,7 +177,7 @@ module ActiveMerchant #:nodoc:
         })
 
         {
-          "Authorization" => "Basic " + ActiveSupport::Base64.encode64(@api_key.to_s + ":").strip,
+          "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
           "User-Agent" => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "X-Stripe-Client-User-Agent" => @@ua
         }

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

@@ -173,15 +173,15 @@ module ActiveMerchant #:nodoc:
           end
           
           def encode_value(value)
-            encoded = ActiveSupport::Base64.encode64s(value)
+            encoded = Base64.strict_encode64(value)
             string_to_encode = encoded[0, 1] + "T" + encoded[1, encoded.length]
-            ActiveSupport::Base64.encode64s(string_to_encode)
+            Base64.strict_encode64(string_to_encode)
           end
           
           def decode_value(value)
-            decoded = ActiveSupport::Base64.decode64(value)
+            decoded = Base64.decode64(value)
             string_to_decode = decoded[0, 1] + decoded[2, decoded.length]
-            ActiveSupport::Base64.decode64(string_to_decode)
+            Base64.decode64(string_to_decode)
           end
           
           def phone_code_for_country(country)

data/lib/active_merchant/billing/integrations/sage_pay_form/encryption.rb

@@ -4,11 +4,11 @@ module ActiveMerchant #:nodoc:
       module SagePayForm
         module Encryption
           def sage_encrypt(plaintext, key)
-            ActiveSupport::Base64.encode64s(sage_encrypt_xor(plaintext, key))
+            Base64.strict_encode64(sage_encrypt_xor(plaintext, key))
           end
 
           def sage_decrypt(ciphertext, key)
-            sage_encrypt_xor(ActiveSupport::Base64.decode64(ciphertext), key)
+            sage_encrypt_xor(Base64.decode64(ciphertext), key)
           end
           
           def sage_encrypt_salt(min, max)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.20.3"
+  VERSION = "1.20.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.20.3
+  version: 1.20.4
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152209620 !ruby/object:Gem::Requirement
+  requirement: &2160908620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2152209620
+  version_requirements: *2160908620
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152209000 !ruby/object:Gem::Requirement
+  requirement: &2160906200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152209000
+  version_requirements: *2160906200
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &2152208380 !ruby/object:Gem::Requirement
+  requirement: &2160903920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -84,10 +84,10 @@ dependencies:
         version: 3.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152208380
+  version_requirements: *2160903920
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152207880 !ruby/object:Gem::Requirement
+  requirement: &2160903260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152207880
+  version_requirements: *2160903260
 - !ruby/object:Gem::Dependency
   name: braintree
-  requirement: &2152207380 !ruby/object:Gem::Requirement
+  requirement: &2160902360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,10 +106,21 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152207380
+  version_requirements: *2160902360
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2160901520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160901520
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &2152206900 !ruby/object:Gem::Requirement
+  requirement: &2160900860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,10 +128,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152206900
+  version_requirements: *2160900860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152206500 !ruby/object:Gem::Requirement
+  requirement: &2160900340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -128,10 +139,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152206500
+  version_requirements: *2160900340
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152206040 !ruby/object:Gem::Requirement
+  requirement: &2160899500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -139,10 +150,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152206040
+  version_requirements: *2160899500
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152205540 !ruby/object:Gem::Requirement
+  requirement: &2160898320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,7 +161,7 @@ dependencies:
         version: 2.3.11
   type: :development
   prerelease: false
-  version_requirements: *2152205540
+  version_requirements: *2160898320
 description: Active Merchant is a simple payment abstraction library used in and sponsored
   by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim
   of the project is to feel natural to Ruby users and to abstract as many parts as
@@ -370,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 1.8.11
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Framework and tools for dealing with credit card transactions.