activemerchant 1.20.4 → 1.21.0

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

@@ -14,8 +14,9 @@ module ActiveMerchant #:nodoc:
         self.application_id = 'ActiveMerchant'
 
         def initialize(order, account, options = {})
-          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name])
+          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :transaction_type])
           @fields          = {}
+          @raw_html_fields = []
           @test            = options[:test]
           self.order       = order
           self.account     = account
@@ -43,6 +44,17 @@ module ActiveMerchant #:nodoc:
           end
         end
 
+        # Add a field that has characters that CGI::escape would mangle. Allows
+        # for multiple fields with the same name (e.g., to support line items).
+        def add_raw_html_field(name, value)
+          return if name.blank? || value.blank?
+          @raw_html_fields << [name, value]
+        end
+        
+        def raw_html_fields
+          @raw_html_fields
+        end
+
         def billing_address(params = {})
           add_address(:billing_address, params)
         end

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

@@ -13,7 +13,7 @@ module ActiveMerchant #:nodoc:
             add_field('invoice', order)
             add_field('vendor', account)
             add_field('user', options[:credential4] || account)
-            add_field('trxtype', 'S')
+            add_field('trxtype', options[:transaction_type] || 'S')
           end
 
           mapping :account, 'login'

data/lib/active_merchant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.20.4
+  version: 1.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160908620 !ruby/object:Gem::Requirement
+  requirement: &2152126080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2160908620
+  version_requirements: *2152126080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160906200 !ruby/object:Gem::Requirement
+  requirement: &2152125500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160906200
+  version_requirements: *2152125500
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &2160903920 !ruby/object:Gem::Requirement
+  requirement: &2152124420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -84,10 +84,10 @@ dependencies:
         version: 3.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160903920
+  version_requirements: *2152124420
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2160903260 !ruby/object:Gem::Requirement
+  requirement: &2152123920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,21 +95,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160903260
-- !ruby/object:Gem::Dependency
-  name: braintree
-  requirement: &2160902360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2160902360
+  version_requirements: *2152123920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160901520 !ruby/object:Gem::Requirement
+  requirement: &2152123260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,10 +106,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160901520
+  version_requirements: *2152123260
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &2160900860 !ruby/object:Gem::Requirement
+  requirement: &2152122720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -128,10 +117,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160900860
+  version_requirements: *2152122720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160900340 !ruby/object:Gem::Requirement
+  requirement: &2152122340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -139,10 +128,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160900340
+  version_requirements: *2152122340
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2160899500 !ruby/object:Gem::Requirement
+  requirement: &2152121880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,10 +139,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160899500
+  version_requirements: *2152121880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160898320 !ruby/object:Gem::Requirement
+  requirement: &2152121340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -161,7 +150,18 @@ dependencies:
         version: 2.3.11
   type: :development
   prerelease: false
-  version_requirements: *2160898320
+  version_requirements: *2152121340
+- !ruby/object:Gem::Dependency
+  name: rubigen
+  requirement: &2152143380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152143380
 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
@@ -199,6 +199,7 @@ files:
 - lib/active_merchant/billing/gateways/braintree_orange.rb
 - lib/active_merchant/billing/gateways/card_save.rb
 - lib/active_merchant/billing/gateways/card_stream.rb
+- lib/active_merchant/billing/gateways/certo_direct.rb
 - lib/active_merchant/billing/gateways/cyber_source.rb
 - lib/active_merchant/billing/gateways/data_cash.rb
 - lib/active_merchant/billing/gateways/efsnet.rb
@@ -224,6 +225,7 @@ files:
 - lib/active_merchant/billing/gateways/modern_payments.rb
 - lib/active_merchant/billing/gateways/modern_payments_cim.rb
 - lib/active_merchant/billing/gateways/moneris.rb
+- lib/active_merchant/billing/gateways/nab_transact.rb
 - lib/active_merchant/billing/gateways/net_registry.rb
 - lib/active_merchant/billing/gateways/netaxept.rb
 - lib/active_merchant/billing/gateways/netbilling.rb
@@ -247,6 +249,7 @@ files:
 - lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb
 - lib/active_merchant/billing/gateways/paypal.rb
 - lib/active_merchant/billing/gateways/paypal_ca.rb
+- lib/active_merchant/billing/gateways/paypal_digital_goods.rb
 - lib/active_merchant/billing/gateways/paypal_express.rb
 - lib/active_merchant/billing/gateways/paypal_express_common.rb
 - lib/active_merchant/billing/gateways/paystation.rb
@@ -283,6 +286,9 @@ files:
 - lib/active_merchant/billing/gateways/worldpay.rb
 - lib/active_merchant/billing/gateways.rb
 - lib/active_merchant/billing/integrations/action_view_helper.rb
+- lib/active_merchant/billing/integrations/authorize_net_sim/helper.rb
+- lib/active_merchant/billing/integrations/authorize_net_sim/notification.rb
+- lib/active_merchant/billing/integrations/authorize_net_sim.rb
 - lib/active_merchant/billing/integrations/bogus/helper.rb
 - lib/active_merchant/billing/integrations/bogus/notification.rb
 - lib/active_merchant/billing/integrations/bogus/return.rb