activemerchant 1.29.1 → 1.29.2

data/CHANGELOG

@@ -1,5 +1,12 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.29.3
+
+== Version 1.29.2 (December 7, 2012)
+
+* Moneris: fix issue with the default options not being merged [jduff]
+* Sage Pay: Make 0000 default post code for everyone if missing [BlakeMesdag]
+
 == Version 1.29.1 (December 5, 2012)
 
 * Add eWay Rapid 3.0 gateway [ntalbott]

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

@@ -22,7 +22,7 @@ module ActiveMerchant #:nodoc:
       # password is your API Token
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = { :crypt_type => 7 }.update(options)
+        options = { :crypt_type => 7 }.merge(options)
         super
       end
 

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

@@ -22,7 +22,7 @@ module ActiveMerchant #:nodoc:
       # password is your API Token
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = { :crypt_type => 7 }.update(options)
+        options = { :crypt_type => 7 }.merge(options)
         super
       end
 

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

@@ -64,8 +64,8 @@ module ActiveMerchant #:nodoc:
 
             fields['FailureURL'] ||= fields['SuccessURL']
 
-            fields['BillingPostCode'] ||= "0000" if fields['BillingCountry'] == "IE"
-            fields['DeliveryPostCode'] ||= "0000" if fields['DeliveryCountry'] == "IE"
+            fields['BillingPostCode'] ||= "0000"
+            fields['DeliveryPostCode'] ||= "0000"
 
             crypt_skip = ['Vendor', 'EncryptKey', 'SendEmail']
             crypt_skip << 'BillingState'  unless fields['BillingCountry']  == 'US'

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.29.1"
+  VERSION = "1.29.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.29.1
+  version: 1.29.2
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,11 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70335632813660 !ruby/object:Gem::Requirement
+  requirement: &70328397930860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70335632813660
+  version_requirements: *70328397930860
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70335632813220 !ruby/object:Gem::Requirement
+  requirement: &70328397930420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,10 +60,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335632813220
+  version_requirements: *70328397930420
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70335632812700 !ruby/object:Gem::Requirement
+  requirement: &70328397929920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,10 +71,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335632812700
+  version_requirements: *70328397929920
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70335632812180 !ruby/object:Gem::Requirement
+  requirement: &70328397929380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335632812180
+  version_requirements: *70328397929380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70335632811640 !ruby/object:Gem::Requirement
+  requirement: &70328397928860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70335632811640
+  version_requirements: *70328397928860
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &70335632811140 !ruby/object:Gem::Requirement
+  requirement: &70328397928360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70335632811140
+  version_requirements: *70328397928360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70335632810740 !ruby/object:Gem::Requirement
+  requirement: &70328397927960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335632810740
+  version_requirements: *70328397927960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335632810240 !ruby/object:Gem::Requirement
+  requirement: &70328397927460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335632810240
+  version_requirements: *70328397927460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70335632809700 !ruby/object:Gem::Requirement
+  requirement: &70328397926920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *70335632809700
+  version_requirements: *70328397926920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70335632809180 !ruby/object:Gem::Requirement
+  requirement: &70328397926380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 2.3.14
   type: :development
   prerelease: false
-  version_requirements: *70335632809180
+  version_requirements: *70328397926380
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70335632808760 !ruby/object:Gem::Requirement
+  requirement: &70328397925980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,7 +159,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335632808760
+  version_requirements: *70328397925980
 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