activemerchant 1.28.0 → 1.29.0

data/lib/active_merchant/billing/integrations/paypal/notification.rb

@@ -16,6 +16,10 @@ module ActiveMerchant #:nodoc:
         #
         #     def paypal_ipn
         #       notify = Paypal::Notification.new(request.raw_post)
+        #
+        #       if notify.masspay?
+        #         masspay_items = notify.items
+        #       end
         #   
         #       order = Order.find(notify.item_id)
         #     
@@ -43,12 +47,22 @@ module ActiveMerchant #:nodoc:
         #   end
         class Notification < ActiveMerchant::Billing::Integrations::Notification
           include PostsData
+
+          def initialize(post, options = {})
+            super
+            extend MassPayNotification if masspay?
+          end
           
           # Was the transaction complete?
           def complete?
             status == "Completed"
           end
 
+          # Is it a masspay notification?
+          def masspay?
+            type == "masspay"
+          end
+
           # When was this payment received by the client. 
           # sometimes it can happen that we get the notification much later. 
           # One possible scenario is that our web application was down. In this case paypal tries several 
@@ -149,6 +163,56 @@ module ActiveMerchant #:nodoc:
             response == "VERIFIED"
           end
         end
+
+        module MassPayNotification
+          # Mass pay returns a collection of MassPay Items, so inspect items to get the values
+          def transaction_id
+          end
+
+          # Mass pay returns a collection of MassPay Items, so inspect items to get the values
+          def gross
+          end
+
+          # Mass pay returns a collection of MassPay Items, so inspect items to get the values
+          def fee
+          end
+
+          # Mass pay returns a collection of MassPay Items, so inspect items to get the values
+          def currency
+          end
+
+          # Mass pay returns a collection of MassPay Items, so inspect items to get the values
+          def item_id
+          end
+
+          # Mass pay returns a collection of MassPay Items, so inspect items to get the values
+          def account
+          end
+
+          # Collection of notification items returned for MassPay transactions
+          def items
+            @items ||= (1..number_of_mass_pay_items).map do |item_number|
+              MassPayItem.new(
+                params["masspay_txn_id_#{item_number}"],
+                params["mc_gross_#{item_number}"],
+                params["mc_fee_#{item_number}"],
+                params["mc_currency_#{item_number}"],
+                params["unique_id_#{item_number}"],
+                params["receiver_email_#{item_number}"],
+                params["status_#{item_number}"]
+              )
+            end
+          end
+
+          private
+
+          def number_of_mass_pay_items
+            @number_of_mass_pay_items ||= params.keys.select { |k| k.start_with? 'masspay_txn_id' }.size
+          end
+        end
+
+        class MassPayItem < Struct.new(:transaction_id, :gross, :fee, :currency, :item_id, :account, :status)
+        end
       end
     end
   end

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

@@ -6,13 +6,13 @@ module ActiveMerchant #:nodoc:
       module SagePayForm
         class Helper < ActiveMerchant::Billing::Integrations::Helper
           include Encryption
-          
+
           mapping :credential2, 'EncryptKey'
-          
+
           mapping :account, 'Vendor'
           mapping :amount, 'Amount'
           mapping :currency, 'Currency'
-        
+
           mapping :order, 'VendorTxCode'
 
           mapping :customer,
@@ -64,13 +64,16 @@ module ActiveMerchant #:nodoc:
 
             fields['FailureURL'] ||= fields['SuccessURL']
 
+            fields['BillingPostCode'] ||= "0000" if fields['BillingCountry'] == "IE"
+            fields['DeliveryPostCode'] ||= "0000" if fields['DeliveryCountry'] == "IE"
+
             crypt_skip = ['Vendor', 'EncryptKey', 'SendEmail']
             crypt_skip << 'BillingState'  unless fields['BillingCountry']  == 'US'
             crypt_skip << 'DeliveryState' unless fields['DeliveryCountry'] == 'US'
             crypt_skip << 'CustomerEMail' unless fields['SendEmail']
             key = fields['EncryptKey']
             @crypt ||= create_crypt_field(fields.except(*crypt_skip), key)
-            
+
             {
               'VPSProtocol' => '2.23',
               'TxType' => 'PAYMENT',
@@ -89,7 +92,7 @@ module ActiveMerchant #:nodoc:
 
           def sanitize(key, value)
             reject = exact = nil
-            
+
             case key
             when /URL$/
               # allow all
@@ -108,11 +111,11 @@ module ActiveMerchant #:nodoc:
             when /State$/
               exact = /^[A-Z]{2}$/
             when 'Description'
-              value = value.truncate(100)
+              value = value[0...100]
             else
               reject = /&+/
             end
-            
+
             if exact
               raise ArgumentError, "Invalid value for #{key}: #{value.inspect}" unless value =~ exact
               value

data/lib/active_merchant/billing/integrations/webmoney/notification.rb

@@ -9,10 +9,22 @@ module ActiveMerchant #:nodoc:
             (params.has_key?('LMI_PAYMENT_NO') && params.has_key?('LMI_PAYMENT_AMOUNT'))
           end
 
+          def amount
+            BigDecimal.new(gross)
+          end
+
           def key_present?
             params["LMI_HASH"].present?
           end
 
+          def item_id
+            params['LMI_PAYMENT_NO']
+          end
+
+          def gross
+            params['LMI_PAYMENT_AMOUNT']
+          end
+
           def security_key
             params["LMI_HASH"]
           end

data/lib/active_merchant/billing/response.rb

@@ -1,6 +1,5 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-
     class Error < ActiveMerchantError #:nodoc:
     end
 
@@ -24,12 +23,28 @@ module ActiveMerchant #:nodoc:
         @test = options[:test] || false
         @authorization = options[:authorization]
         @fraud_review = options[:fraud_review]
-        @avs_result = AVSResult.new(options[:avs_result]).to_hash
-        @cvv_result = CVVResult.new(options[:cvv_result]).to_hash
+
+        avs_result_builder = if options[:avs_result].kind_of?(Hash)
+          AVSResult.new(options[:avs_result])
+        else
+          options[:avs_result] || {}
+        end
+        @avs_result = avs_result_builder.to_hash
+
+        cvv_result_builder = if options[:cvv_result].kind_of?(String)
+          CVVResult.new(options[:cvv_result])
+        else
+          options[:cvv_result] || {}
+        end
+        @cvv_result = cvv_result_builder.to_hash
       end
     end
 
     class MultiResponse < Response
+      def self.run(&block)
+        new.tap(&block)
+      end
+
       attr_reader :responses
 
       def initialize
@@ -55,7 +70,7 @@ module ActiveMerchant #:nodoc:
       %w(params message test authorization avs_result cvv_result test? fraud_review?).each do |m|
         class_eval %(
           def #{m}
-            @responses.last.#{m}
+            (@responses.empty? ? nil : @responses.last.#{m})
           end
         )
       end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.28.0"
+  VERSION = "1.29.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,22 +37,22 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70160952962180 !ruby/object:Gem::Requirement
+  requirement: &70188791610980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70160952962180
+  version_requirements: *70188791610980
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70160952961760 !ruby/object:Gem::Requirement
+  requirement: &70188791610560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,10 +60,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160952961760
+  version_requirements: *70188791610560
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70160952961300 !ruby/object:Gem::Requirement
+  requirement: &70188791610100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,10 +71,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160952961300
+  version_requirements: *70188791610100
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70160952960800 !ruby/object:Gem::Requirement
+  requirement: &70188791609600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70160952960800
+  version_requirements: *70188791609600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70160952960300 !ruby/object:Gem::Requirement
+  requirement: &70188791609100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70160952960300
+  version_requirements: *70188791609100
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &70160952959840 !ruby/object:Gem::Requirement
+  requirement: &70188791608640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70160952959840
+  version_requirements: *70188791608640
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70160952959460 !ruby/object:Gem::Requirement
+  requirement: &70188791608260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160952959460
+  version_requirements: *70188791608260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70160952959000 !ruby/object:Gem::Requirement
+  requirement: &70188791607800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160952959000
+  version_requirements: *70188791607800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70160952958500 !ruby/object:Gem::Requirement
+  requirement: &70188791607300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,21 +137,21 @@ dependencies:
         version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *70160952958500
+  version_requirements: *70188791607300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70160952958000 !ruby/object:Gem::Requirement
+  requirement: &70188791606800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: 2.3.14
   type: :development
   prerelease: false
-  version_requirements: *70160952958000
+  version_requirements: *70188791606800
 - !ruby/object:Gem::Dependency
-  name: rubigen
-  requirement: &70160952957620 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &70188791606420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,7 +159,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160952957620
+  version_requirements: *70188791606420
 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
@@ -213,6 +213,7 @@ files:
 - lib/active_merchant/billing/gateways/federated_canada.rb
 - lib/active_merchant/billing/gateways/first_pay.rb
 - lib/active_merchant/billing/gateways/garanti.rb
+- lib/active_merchant/billing/gateways/hdfc.rb
 - lib/active_merchant/billing/gateways/ideal/ideal_base.rb
 - lib/active_merchant/billing/gateways/ideal/ideal_rabobank.pem
 - lib/active_merchant/billing/gateways/ideal/ideal_response.rb
@@ -226,6 +227,7 @@ files:
 - lib/active_merchant/billing/gateways/litle.rb
 - lib/active_merchant/billing/gateways/merchant_e_solutions.rb
 - lib/active_merchant/billing/gateways/merchant_ware.rb
+- lib/active_merchant/billing/gateways/mercury.rb
 - lib/active_merchant/billing/gateways/metrics_global.rb
 - lib/active_merchant/billing/gateways/migs/migs_codes.rb
 - lib/active_merchant/billing/gateways/migs.rb
@@ -240,6 +242,7 @@ files:
 - lib/active_merchant/billing/gateways/nmi.rb
 - lib/active_merchant/billing/gateways/ogone.rb
 - lib/active_merchant/billing/gateways/optimal_payment.rb
+- lib/active_merchant/billing/gateways/orbital/avs_result.rb
 - lib/active_merchant/billing/gateways/orbital/orbital_soft_descriptors.rb
 - lib/active_merchant/billing/gateways/orbital.rb
 - lib/active_merchant/billing/gateways/pay_gate_xml.rb
@@ -271,6 +274,7 @@ files:
 - lib/active_merchant/billing/gateways/quantum.rb
 - lib/active_merchant/billing/gateways/quickpay.rb
 - lib/active_merchant/billing/gateways/realex.rb
+- lib/active_merchant/billing/gateways/redsys.rb
 - lib/active_merchant/billing/gateways/sage/sage_bankcard.rb
 - lib/active_merchant/billing/gateways/sage/sage_core.rb
 - lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb
@@ -294,9 +298,14 @@ files:
 - lib/active_merchant/billing/gateways/verifi.rb
 - lib/active_merchant/billing/gateways/viaklix.rb
 - lib/active_merchant/billing/gateways/vindicia.rb
+- lib/active_merchant/billing/gateways/webpay.rb
 - lib/active_merchant/billing/gateways/wirecard.rb
 - lib/active_merchant/billing/gateways/worldpay.rb
 - lib/active_merchant/billing/gateways.rb
+- lib/active_merchant/billing/integrations/a1agregator/helper.rb
+- lib/active_merchant/billing/integrations/a1agregator/notification.rb
+- lib/active_merchant/billing/integrations/a1agregator/status.rb
+- lib/active_merchant/billing/integrations/a1agregator.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
@@ -349,6 +358,10 @@ files:
 - lib/active_merchant/billing/integrations/hi_trust/notification.rb
 - lib/active_merchant/billing/integrations/hi_trust/return.rb
 - lib/active_merchant/billing/integrations/hi_trust.rb
+- lib/active_merchant/billing/integrations/liqpay/helper.rb
+- lib/active_merchant/billing/integrations/liqpay/notification.rb
+- lib/active_merchant/billing/integrations/liqpay/return.rb
+- lib/active_merchant/billing/integrations/liqpay.rb
 - lib/active_merchant/billing/integrations/maksuturva/helper.rb
 - lib/active_merchant/billing/integrations/maksuturva/notification.rb
 - lib/active_merchant/billing/integrations/maksuturva.rb
@@ -364,6 +377,11 @@ files:
 - lib/active_merchant/billing/integrations/paxum/helper.rb
 - lib/active_merchant/billing/integrations/paxum/notification.rb
 - lib/active_merchant/billing/integrations/paxum.rb
+- lib/active_merchant/billing/integrations/pay_fast/common.rb
+- lib/active_merchant/billing/integrations/pay_fast/helper.rb
+- lib/active_merchant/billing/integrations/pay_fast/notification.rb
+- lib/active_merchant/billing/integrations/pay_fast/return.rb
+- lib/active_merchant/billing/integrations/pay_fast.rb
 - lib/active_merchant/billing/integrations/payflow_link/helper.rb
 - lib/active_merchant/billing/integrations/payflow_link/notification.rb
 - lib/active_merchant/billing/integrations/payflow_link.rb