activemerchant 1.18.0 → 1.18.1

data/CHANGELOG

@@ -1,5 +1,10 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.18.1 (September 23, 2011)
+
+* Braintree: allow setting merchant_account_id on initialize [jduff]
+* Realex: only send letters and numbers in shipping code field [Soleone]
+
 == Version 1.18.0 (September 23, 2011)
 
 * NoChex: Update the URL that payment requests are posted to [caseywhalen/jduff]

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

@@ -18,6 +18,7 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :merchant_id, :public_key, :private_key)
         @options = options
+        @merchant_account_id = options[:merchant_account_id]
         Braintree::Configuration.merchant_id = options[:merchant_id]
         Braintree::Configuration.public_key = options[:public_key]
         Braintree::Configuration.private_key = options[:private_key]
@@ -276,8 +277,8 @@ module ActiveMerchant #:nodoc:
             :submit_for_settlement => options[:submit_for_settlement]
           }
         }
-        if options.has_key?(:merchant_account_id)
-          parameters[:merchant_account_id] = options[:merchant_account_id]
+        if merchant_account_id = (options[:merchant_account_id] || @merchant_account_id)
+          parameters[:merchant_account_id] = merchant_account_id
         end
         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

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

@@ -197,7 +197,7 @@ module ActiveMerchant
 
           if shipping_address
             xml.tag! 'address', 'type' => 'shipping' do
-              xml.tag! 'code', avs_input_code( shipping_address )
+              xml.tag! 'code', format_shipping_zip_code(shipping_address[:zip])
               xml.tag! 'country', shipping_address[:country]
             end
           end
@@ -247,6 +247,10 @@ module ActiveMerchant
         address.values_at(:zip, :address1).map{ |v| extract_digits(v) }.join('|')
       end
 
+      def format_shipping_zip_code(zip)
+        zip.to_s.gsub(/\W/, '')
+      end
+
       def extract_digits(string)
         return "" if string.nil?
         string.gsub(/[\D]/,'')

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.18.0"
+  VERSION = "1.18.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 1
   - 18
-  - 0
-  version: 1.18.0
+  - 1
+  version: 1.18.1
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: 
 - gem-public_cert.pem
-date: 2011-09-23 00:00:00 -04:00
+date: 2011-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency