activemerchant 1.31.1 → 1.32.0

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

@@ -32,14 +32,15 @@ module ActiveMerchant #:nodoc:
                                      :phone   => 'phone',
                                      :name    => 'name'
 
-          mapping :customer, :name => 'name'
+          mapping :customer, { :first_name => 'first_name', :last_name => 'last_name' }
 
           def description(value)
             add_field('description', "#{value}".delete("#"))
           end
 
           def customer(params = {})
-            add_field(mappings[:customer][:name], [params.delete(:first_name), params.delete(:last_name)].compact.join(' '))
+            add_field(mappings[:customer][:first_name], params[:first_name])
+            add_field(mappings[:customer][:last_name], params[:last_name])
           end
 
           def billing_address(params = {})

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

@@ -80,6 +80,7 @@ module ActiveMerchant #:nodoc:
             root = xml.add_element('GenerateRequest')
 
             @fields.each do | k, v |
+              v = v.slice(0, 50) if k == "MerchantReference"
               root.add_element(k).text = v
             end
 

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
           def generate_signature_string
             custom_param_keys = params.keys.select {|key| key =~ /^shp/}.sort
             custom_params = custom_param_keys.map {|key| "#{key}=#{params[key]}"}
-            [main_params, secret, custom_params].flatten.compact.join(':')
+            [main_params, secret, custom_params.compact].flatten.join(':')
           end
 
           def generate_signature

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

@@ -41,6 +41,8 @@ module ActiveMerchant #:nodoc:
           mapping :return_url, 'SuccessURL'
           mapping :description, 'Description'
 
+          class_attribute :referrer_id
+
           def shipping_address(params = {})
             @shipping_address_set = true unless params.empty?
 
@@ -74,12 +76,14 @@ module ActiveMerchant #:nodoc:
             key = fields['EncryptKey']
             @crypt ||= create_crypt_field(fields.except(*crypt_skip), key)
 
-            {
+            result = {
               'VPSProtocol' => '2.23',
               'TxType' => 'PAYMENT',
               'Vendor' => @fields['Vendor'],
               'Crypt'  => @crypt
             }
+            result['ReferrerID'] = referrer_id if referrer_id
+            result
           end
 
           private

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

@@ -4,20 +4,27 @@ require File.dirname(__FILE__) + '/world_pay/notification.rb'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
-      module WorldPay 
-       
-        # production and test have the same endpoint
-        mattr_accessor :production_url
-        self.production_url = 'https://secure.wp3.rbsworldpay.com/wcc/purchase'
-        
+      module WorldPay
+
+        mattr_accessor :production_url, :test_url
+        self.production_url = 'https://secure.worldpay.com/wcc/purchase'
+        self.test_url = 'https://secure-test.worldpay.com/wcc/purchase'
+
         def self.service_url
-          production_url
+          case ActiveMerchant::Billing::Base.integration_mode
+          when :production
+            self.production_url
+          when :test
+            self.test_url
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
         end
 
         def self.notification(post, options = {})
           Notification.new(post, options)
         end
-        
+
         def self.return(post, options = {})
           Return.new(post, options)
         end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.31.1"
+  VERSION = "1.32.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
+  version: 1.32.0
   prerelease: 
-  version: 1.31.1
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,184 +37,184 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
-  name: activesupport
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: i18n
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: money
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
-  name: builder
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
-    none: false
-  name: json
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: active_utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
-  name: active_utils
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: nokogiri
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.3
-    none: false
-  name: mocha
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.3
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
-  name: rails
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: thor
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 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
@@ -255,6 +255,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/cc5.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
@@ -268,6 +269,7 @@ files:
 - lib/active_merchant/billing/gateways/exact.rb
 - lib/active_merchant/billing/gateways/fat_zebra.rb
 - lib/active_merchant/billing/gateways/federated_canada.rb
+- lib/active_merchant/billing/gateways/finansbank.rb
 - lib/active_merchant/billing/gateways/first_pay.rb
 - lib/active_merchant/billing/gateways/firstdata_e4.rb
 - lib/active_merchant/billing/gateways/garanti.rb
@@ -514,20 +516,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Framework and tools for dealing with credit card transactions.