activemerchant 1.29.1 → 1.30.0

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

@@ -1,16 +1,17 @@
 require 'net/http'
+require 'time'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Paypal
-        # Parser and handler for incoming Instant payment notifications from paypal. 
+        # Parser and handler for incoming Instant payment notifications from paypal.
         # The Example shows a typical handler in a rails application. Note that this
         # is an example, please read the Paypal API documentation for all the details
         # on creating a safe payment controller.
         #
         # Example
-        #  
+        #
         #   class BackendController < ApplicationController
         #     include ActiveMerchant::Billing::Integrations
         #
@@ -20,28 +21,28 @@ module ActiveMerchant #:nodoc:
         #       if notify.masspay?
         #         masspay_items = notify.items
         #       end
-        #   
+        #
         #       order = Order.find(notify.item_id)
-        #     
-        #       if notify.acknowledge 
+        #
+        #       if notify.acknowledge
         #         begin
-        #           
+        #
         #           if notify.complete? and order.total == notify.amount
-        #             order.status = 'success' 
-        #             
+        #             order.status = 'success'
+        #
         #             shop.ship(order)
         #           else
         #             logger.error("Failed to verify Paypal's notification, please investigate")
         #           end
-        #   
+        #
         #         rescue => e
-        #           order.status        = 'failed'      
+        #           order.status        = 'failed'
         #           raise
         #         ensure
         #           order.save
         #         end
         #       end
-        #   
+        #
         #       render :nothing
         #     end
         #   end
@@ -52,7 +53,7 @@ module ActiveMerchant #:nodoc:
             super
             extend MassPayNotification if masspay?
           end
-          
+
           # Was the transaction complete?
           def complete?
             status == "Completed"
@@ -63,13 +64,20 @@ module ActiveMerchant #:nodoc:
             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 
+          # 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
           # times an hour to inform us about the notification
           def received_at
-            parsed_time_fields = DateTime._strptime(params['payment_date'], "%H:%M:%S %b %d, %Y %z")
-            Time.mktime(*parsed_time_fields.values_at(:year, :mon, :mday, :hour, :min, :sec, :zone))
+            parsed_time_fields = DateTime._strptime(params['payment_date'], "%H:%M:%S %b %d, %Y %Z")
+            Time.gm(
+              parsed_time_fields[:year],
+              parsed_time_fields[:mon],
+              parsed_time_fields[:mday],
+              parsed_time_fields[:hour],
+              parsed_time_fields[:min],
+              parsed_time_fields[:sec]
+            ) + Time.zone_offset(parsed_time_fields[:zone])
           end
 
           # Status of transaction. List of possible values:
@@ -94,8 +102,8 @@ module ActiveMerchant #:nodoc:
             params['txn_id']
           end
 
-          # What type of transaction are we dealing with? 
-          #  "cart" "send_money" "web_accept" are possible here. 
+          # What type of transaction are we dealing with?
+          #  "cart" "send_money" "web_accept" are possible here.
           def type
             params['txn_type']
           end
@@ -115,37 +123,37 @@ module ActiveMerchant #:nodoc:
             params['mc_currency']
           end
 
-          # This is the item number which we submitted to paypal 
+          # This is the item number which we submitted to paypal
           # The custom field is also mapped to item_id because PayPal
           # doesn't return item_number in dispute notifications
           def item_id
             params['item_number'] || params['custom']
           end
 
-          # This is the invoice which you passed to paypal 
+          # This is the invoice which you passed to paypal
           def invoice
             params['invoice']
-          end   
+          end
 
           # Was this a test transaction?
           def test?
             params['test_ipn'] == '1'
           end
-          
+
           def account
             params['business'] || params['receiver_email']
           end
 
-          # Acknowledge the transaction to paypal. This method has to be called after a new 
-          # ipn arrives. Paypal will verify that all the information we received are correct and will return a 
-          # ok or a fail. 
-          # 
+          # Acknowledge the transaction to paypal. This method has to be called after a new
+          # ipn arrives. Paypal will verify that all the information we received are correct and will return a
+          # ok or a fail.
+          #
           # Example:
-          # 
+          #
           #   def paypal_ipn
           #     notify = PaypalNotification.new(request.raw_post)
           #
-          #     if notify.acknowledge 
+          #     if notify.acknowledge
           #       ... process order ... if notify.complete?
           #     else
           #       ... log possible hacking attempt ...
@@ -153,11 +161,11 @@ module ActiveMerchant #:nodoc:
           def acknowledge
             payload =  raw
 
-            response = ssl_post(Paypal.service_url + '?cmd=_notify-validate', payload, 
+            response = ssl_post(Paypal.service_url + '?cmd=_notify-validate', payload,
               'Content-Length' => "#{payload.size}",
               'User-Agent'     => "Active Merchant -- http://activemerchant.org"
             )
-            
+
             raise StandardError.new("Faulty paypal result: #{response}") unless ["VERIFIED", "INVALID"].include?(response)
 
             response == "VERIFIED"

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

@@ -7,39 +7,40 @@ module ActiveMerchant #:nodoc:
           def initialize(order, account, options = {})
             md5secret options.delete(:credential2)
             super
-            add_field('protocol', '3')
+            add_field('protocol', '6')
             add_field('msgtype', 'authorize')
             add_field('language', 'da')
             add_field('autocapture', 0)
             add_field('testmode', test? ? 1 : 0)
             add_field('ordernumber', format_order_number(order))
           end
-              
+
           def md5secret(value)
             @md5secret = value
           end
-          
+
           def form_fields
             @fields.merge('md5check' => generate_md5check)
           end
-            
+
           def generate_md5string
             MD5_CHECK_FIELDS.map {|key| @fields[key.to_s]} * "" + @md5secret
           end
-          
+
           def generate_md5check
             Digest::MD5.hexdigest(generate_md5string)
           end
 
           # Limited to 20 digits max
           def format_order_number(number)
-            number.to_s.gsub(/[^\w_]/, '').rjust(4, "0")[0...20]
+            number.to_s.gsub(/[^\w]/, '').rjust(4, "0")[0...20]
           end
-          
+
           MD5_CHECK_FIELDS = [
-            :protocol, :msgtype, :merchant, :language, :ordernumber, 
+            :protocol, :msgtype, :merchant, :language, :ordernumber,
             :amount, :currency, :continueurl, :cancelurl, :callbackurl,
-            :autocapture, :cardtypelock, :description, :ipaddress, :testmode
+            :autocapture, :cardtypelock, :description, :ipaddress, :testmode,
+            :deadline, :cardhash
           ]
 
           mapping :protocol, 'protocol'
@@ -48,7 +49,7 @@ module ActiveMerchant #:nodoc:
           mapping :language, 'language'
           mapping :amount, 'amount'
           mapping :currency, 'currency'
-          
+
           mapping :return_url, 'continueurl'
           mapping :cancel_return_url, 'cancelurl'
           mapping :notify_url, 'callbackurl'
@@ -59,6 +60,8 @@ module ActiveMerchant #:nodoc:
           mapping :description, 'description'
           mapping :ipaddress, 'ipaddress'
           mapping :testmode, 'testmode'
+          mapping :deadline, 'deadline'
+          mapping :cardhash, 'cardhash'
 
           mapping :customer, ''
           mapping :billing_address, {}

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification
           def complete?
             status == '000'
-          end 
+          end
 
           def item_id
             params['ordernumber']
@@ -18,7 +18,10 @@ module ActiveMerchant #:nodoc:
           end
 
           def received_at
-            Time.parse("20#{params['time']}")
+            time = params['time']
+            # If time only contains 12 integers then it's pre v5 format
+            time = "20#{params['time']}" if /[0-9]{12}/.match(params['time'])
+            Time.parse(time)
           end
 
           def gross
@@ -29,10 +32,6 @@ module ActiveMerchant #:nodoc:
             params['amount'].to_i
           end
 
-          def test?
-            params['testmode'] == 'Yes'
-          end
-
           def status
             params['qpstat']
           end
@@ -40,9 +39,9 @@ module ActiveMerchant #:nodoc:
           def currency
             params['currency']
           end
-          
+
           # Provide access to raw fields from quickpay
-          %w(msgtype ordernumber state chstat chstatmsg qpstat qpstatmsg merchant merchantemail cardtype cardnumber).each do |attr|
+          %w(msgtype ordernumber state chstat chstatmsg qpstat qpstatmsg merchant merchantemail cardtype cardnumber splitpayment fraudprobability fraudremarks fraudreport fee).each do |attr|
             define_method(attr) do
               params[attr]
             end
@@ -50,21 +49,22 @@ module ActiveMerchant #:nodoc:
 
           MD5_CHECK_FIELDS = [
             :msgtype, :ordernumber, :amount, :currency, :time, :state,
-            :chstat, :chstatmsg, :qpstat, :qpstatmsg, :merchant, :merchantemail,
-            :transaction, :cardtype, :cardnumber, :testmode
+            :qpstat, :qpstatmsg, :chstat, :chstatmsg, :merchant, :merchantemail,
+            :transaction, :cardtype, :cardnumber, :splitpayment, :fraudprobability,
+            :fraudremarks, :fraudreport, :fee
           ]
 
           def generate_md5string
-            MD5_CHECK_FIELDS.map { |key| params[key.to_s] } * "" + @options[:credential2]
+            MD5_CHECK_FIELDS.map { |key| params[key.to_s] } * "" + @options[:credential2].to_s
           end
-          
+
           def generate_md5check
             Digest::MD5.hexdigest(generate_md5string)
           end
-          
+
           # Quickpay doesn't do acknowledgements of callback notifications
           # Instead it uses and MD5 hash of all parameters
-          def acknowledge      
+          def acknowledge
             generate_md5check == params['md5check']
           end
         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.30.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.29.1
   prerelease: 
+  version: 1.30.0
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,129 +37,184 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70335632813660 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
+    none: false
+  name: activesupport
   type: :runtime
   prerelease: false
-  version_requirements: *70335632813660
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70335632813220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.14
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: i18n
   type: :runtime
   prerelease: false
-  version_requirements: *70335632813220
-- !ruby/object:Gem::Dependency
-  name: money
-  requirement: &70335632812700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: money
   type: :runtime
   prerelease: false
-  version_requirements: *70335632812700
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: &70335632812180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
+    none: false
+  name: builder
   type: :runtime
   prerelease: false
-  version_requirements: *70335632812180
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70335632811640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
+    none: false
+  name: json
   type: :runtime
   prerelease: false
-  version_requirements: *70335632811640
-- !ruby/object:Gem::Dependency
-  name: active_utils
-  requirement: &70335632811140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
+    none: false
+  name: active_utils
   type: :runtime
   prerelease: false
-  version_requirements: *70335632811140
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70335632810740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: nokogiri
   type: :runtime
   prerelease: false
-  version_requirements: *70335632810740
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70335632810240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: *70335632810240
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70335632809700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.3
+    none: false
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: *70335632809700
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70335632809180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.3
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
+    none: false
+  name: rails
   type: :development
   prerelease: false
-  version_requirements: *70335632809180
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70335632808760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.14
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: thor
   type: :development
   prerelease: false
-  version_requirements: *70335632808760
+  requirement: !ruby/object:Gem::Requirement
+    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
@@ -213,6 +268,7 @@ files:
 - lib/active_merchant/billing/gateways/fat_zebra.rb
 - lib/active_merchant/billing/gateways/federated_canada.rb
 - lib/active_merchant/billing/gateways/first_pay.rb
+- lib/active_merchant/billing/gateways/firstdata_e4.rb
 - lib/active_merchant/billing/gateways/garanti.rb
 - lib/active_merchant/billing/gateways/hdfc.rb
 - lib/active_merchant/billing/gateways/ideal/ideal_base.rb
@@ -228,6 +284,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/merchant_warrior.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
@@ -240,6 +297,7 @@ files:
 - lib/active_merchant/billing/gateways/net_registry.rb
 - lib/active_merchant/billing/gateways/netaxept.rb
 - lib/active_merchant/billing/gateways/netbilling.rb
+- lib/active_merchant/billing/gateways/netpay.rb
 - lib/active_merchant/billing/gateways/nmi.rb
 - lib/active_merchant/billing/gateways/ogone.rb
 - lib/active_merchant/billing/gateways/optimal_payment.rb
@@ -268,6 +326,7 @@ files:
 - lib/active_merchant/billing/gateways/paypal_express_common.rb
 - lib/active_merchant/billing/gateways/paystation.rb
 - lib/active_merchant/billing/gateways/payway.rb
+- lib/active_merchant/billing/gateways/pin.rb
 - lib/active_merchant/billing/gateways/plugnpay.rb
 - lib/active_merchant/billing/gateways/psigate.rb
 - lib/active_merchant/billing/gateways/psl_card.rb
@@ -289,6 +348,7 @@ files:
 - lib/active_merchant/billing/gateways/secure_pay_tech.rb
 - lib/active_merchant/billing/gateways/skip_jack.rb
 - lib/active_merchant/billing/gateways/smart_ps.rb
+- lib/active_merchant/billing/gateways/spreedly_core.rb
 - lib/active_merchant/billing/gateways/stripe.rb
 - lib/active_merchant/billing/gateways/trans_first.rb
 - lib/active_merchant/billing/gateways/transax.rb
@@ -452,20 +512,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Framework and tools for dealing with credit card transactions.