activemerchant 1.17.0 → 1.18.0

data/CHANGELOG

@@ -1,5 +1,15 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.18.0 (September 23, 2011)
+
+* NoChex: Update the URL that payment requests are posted to [caseywhalen/jduff]
+* QBMS: fixed test mode check [Soleone]
+* Realex: encode avs info with shipping address [Soleone]
+* Add Dwolla offsite gateway [armsteadj1/jduff]
+* Eway: pass email, customer, description and options to store [moklett/tobi]
+* New dependency: active_utils gem [odorcicd]
+* Optimal Payments: fix test mode check [jduff]
+
 == Version 1.17.0 (August 23, 2011)
 
 * Add Payflow Link integration [jduff]

data/CONTRIBUTORS

@@ -248,6 +248,10 @@ Optimal Payments (August, 2011)
 
 * Jamie Macey (jamie)
 
-CardSave (August 2011,)
+CardSave (August, 2011)
 
 * Tom Crinson (MrJaba)
+
+Dwolla (September, 2011)
+
+* James Armstead (armsteadj1)

data/lib/active_merchant.rb

@@ -36,7 +36,7 @@ require 'builder'
 require 'cgi'
 require 'rexml/document'
 
-require 'active_merchant/common'
+require 'active_utils'
 require 'active_merchant/billing'
 require 'active_merchant/version'
 

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

@@ -180,15 +180,21 @@ module ActiveMerchant #:nodoc:
       end
 
       def do_authorize(params)
-        headers = {
-          'Referer' => options[:password]
-        }
+        headers = {}
+        headers['Referer'] = options[:password] if options[:password]
 
         response = raw_ssl_request(:post, 'https://' + API_HOST + '/auth/default.aspx', authorize_post_data(params), headers)
 
         # Authorize gives the response back by redirecting with the values in
         # the URL query
-        query = CGI::parse(URI.parse(response['Location'].gsub(' ', '%20')).query)
+        if location = response['Location']
+          query = CGI::parse(URI.parse(location.gsub(' ', '%20')).query)
+        else
+          return {
+            'accept' => '0',
+            'errortext' => 'No Location header returned.'
+          }
+        end
 
         result = {}
         query.each_pair do |k,v|

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

@@ -45,7 +45,7 @@ module ActiveMerchant #:nodoc:
         
         add_creditcard(post, creditcard)
         add_address(post, billing_address)
-        add_misc_fields(post, billing_address)
+        add_misc_fields(post, options)
              
         commit("CreateCustomer", post)
       end
@@ -63,17 +63,30 @@ module ActiveMerchant #:nodoc:
         post[:managedCustomerID]=billing_id
         add_creditcard(post, creditcard)
         add_address(post, billing_address)
-        add_misc_fields(post, billing_address)
+        add_misc_fields(post, options)
              
         commit("UpdateCustomer", post)
       end
       
-      #process payment for given amount from stored CC "ManagedCustomerID = billing_id"
+      # Process a payment in the given amount against the stored credit card given by billing_id
+      #
+      # ==== Parameters
+      #
+      # * <tt>money</tt> -- The amount to be purchased as an Integer value in cents.
+      # * <tt>billing_id</tt> -- The eWay provided card/customer token to charge (managedCustomerID)
+      # * <tt>options</tt> -- A hash of optional parameters.
+      #
+      # ==== Options
+      #
+      # * <tt>:order_id</tt> -- The order number, passed to eWay as the "Invoice Reference"
+      # * <tt>:invoice</tt> -- The invoice number, passed to eWay as the "Invoice Reference" unless :order_id is also given
+      # * <tt>:description</tt> -- A description of the payment, passed to eWay as the "Invoice Description"
       def purchase(money, billing_id, options={})        
         post = {}  
         post[:managedCustomerID] = billing_id.to_s
         post[:amount]=money
-             
+        add_invoice(post, options)
+        
         commit("ProcessPayment", post)
       end
       
@@ -102,14 +115,21 @@ private
       end
       
       def add_misc_fields(post, options)
-        post[:CustomerRef]=options[:customer_ref].to_s
-        post[:Title]=options[:title]
-        post[:Company]=options[:company]
-        post[:JobDesc]=options[:job_desc]
-        post[:Email]=options[:email]
-        post[:URL]=options[:url]
+        post[:CustomerRef]=options[:billing_address][:customer_ref] || options[:customer]
+        post[:Title]=options[:billing_address][:title]
+        post[:Company]=options[:billing_address][:company]
+        post[:JobDesc]=options[:billing_address][:job_desc]
+        post[:Email]=options[:billing_address][:email] || options[:email]
+        post[:URL]=options[:billing_address][:url]
+        post[:Comments]=options[:description]
+      end
+      
+      def add_invoice(post, options)
+        post[:invoiceReference] = options[:order_id] || options[:invoice]
+        post[:invoiceDescription] = options[:description]
       end
       
+      
       # add credit card details to be stored by eway. NOTE eway requires "title" field
       def add_creditcard(post, creditcard)
         post[:CCNumber]  = creditcard.number
@@ -188,7 +208,12 @@ private
       # Where we build the full SOAP 1.2 request using builder
       def soap_request(arguments, action)
         # eWay demands all fields be sent, but contain an empty string if blank
-        post=default_fields.merge(arguments)
+        post = case action
+        when 'ProcessPayment'
+          default_payment_fields.merge(arguments)
+        else    
+          default_customer_fields.merge(arguments)
+        end
         
         xml = Builder::XmlMarkup.new :indent => 2
           xml.instruct!
@@ -211,7 +236,7 @@ private
         xml.target!
       end
       
-      def default_fields
+      def default_customer_fields
         hash={}
         %w( CustomerRef Title FirstName LastName Company JobDesc Email Address Suburb State PostCode Country Phone Mobile Fax URL Comments CCNumber CCNameOnCard CCExpiryMonth CCExpiryYear ).each do |field|
           hash[field.to_sym]=''
@@ -219,6 +244,14 @@ private
         return hash
       end
       
+      def default_payment_fields
+        hash={}
+        %w( managedCustomerID amount invoiceReference invoiceDescription ).each do |field|
+          hash[field.to_sym]=''
+        end
+        return hash
+      end
+      
       class EwayResponse < Response
         # add a method to response so we can easily get the eway token "ManagedCustomerID"
         def token

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

@@ -49,6 +49,10 @@ module ActiveMerchant #:nodoc:
         commit('ccSettlement', money, options)
       end
 
+      def test?
+        super || @options[:test]
+      end
+
     private
 
       def parse_card_or_auth(card_or_auth, options)

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

@@ -115,6 +115,10 @@ module ActiveMerchant #:nodoc:
         commit(:query, nil, {})
       end
 
+      def test?
+        @options[:test] || super  
+      end
+
       private
 
       def hosted?

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

@@ -197,7 +197,7 @@ module ActiveMerchant
 
           if shipping_address
             xml.tag! 'address', 'type' => 'shipping' do
-              xml.tag! 'code', shipping_address[:zip]
+              xml.tag! 'code', avs_input_code( shipping_address )
               xml.tag! 'country', shipping_address[:country]
             end
           end

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

@@ -0,0 +1,30 @@
+# All mappings in helper.rb are required fields to be sent to Dwolla.
+# :account = 'Dwolla Id of merchant'
+# :credential1 = 'key from Dwolla Application'
+# :credential2 = 'secret from Dwolla Application'
+# :redirect_url = 'can be different that what is specified on Dwolla Application creation'
+# :return_url = 'can be different that what is specified on Dwolla Application creation'
+# :order_id = must be unique for each transaction
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Dwolla 
+        autoload :Return, 'active_merchant/billing/integrations/dwolla/return.rb'
+        autoload :Helper, 'active_merchant/billing/integrations/dwolla/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/dwolla/notification.rb'
+       
+        mattr_accessor :service_url
+        self.service_url = 'https://www.dwolla.com/payment/pay'
+
+        def self.notification(post)
+          Notification.new(post)
+        end
+
+        def self.return(query_string)
+          Return.new(query_string)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Dwolla
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+
+          def initialize(order, account, options = {})
+            super
+            add_field('name', 'Store Purchase')
+          end
+          
+          # Replace with the real mapping
+          mapping :credential1, 'key'
+          mapping :credential2, 'secret'
+          mapping :notify_url, 'callback'
+          mapping :return_url, 'redirect'
+          mapping :test_mode, 'test'
+          mapping :description, 'description'
+          mapping :account, 'destinationid'
+          mapping :amount, 'amount'
+          mapping :tax, 'tax'
+          mapping :shipping, 'shipping'
+          mapping :order, 'orderid'          
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+require 'net/http'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Dwolla
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          def complete?
+            status == "Completed"
+          end
+
+          def status
+            params["Status"]
+          end
+
+          def transaction_id
+            params['OrderId']
+          end
+
+          def currency
+            "USD"
+          end
+
+          def gross
+            params['Amount']
+          end
+
+          def error
+            params['Message']
+          end
+
+          # Was this a test transaction?
+          def test?
+            params['TestMode']
+          end
+
+          def acknowledge      
+            true
+          end
+ private
+          # Take the posted data and move the relevant data into a hash
+          def parse(post)
+            json_post = JSON.parse(post)
+            params.merge!(json_post)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/dwolla/return.rb

@@ -0,0 +1,38 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Dwolla
+        class Return < ActiveMerchant::Billing::Integrations::Return
+
+          def success?
+            self.error.nil? && self.callback_success?
+          end
+
+          def error
+            params['error']
+          end
+
+          def error_description
+            params['error_description']
+          end
+
+          def checkout_id
+            params['checkoutid']
+          end
+
+          def transaction
+            params['transaction']
+          end
+
+          def test?
+            params['test']
+          end
+
+          def callback_success?
+            params['postback'] != "failure"
+          end
+	      end
+      end
+    end
+  end
+end

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

@@ -68,7 +68,7 @@ module ActiveMerchant #:nodoc:
         
        
         mattr_accessor :service_url
-        self.service_url = 'https://www.nochex.com/nochex.dll/checkout'
+        self.service_url = 'https://secure.nochex.com'
 
         mattr_accessor :notification_confirmation_url
         self.notification_confirmation_url = 'https://www.nochex.com/nochex.dll/apc/apc'

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.17.0"
+  VERSION = "1.18.0"
 end

metadata

@@ -1,42 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 95
   prerelease: 
   segments: 
   - 1
-  - 17
+  - 18
   - 0
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors: 
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApjb2R5
-  ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMDcwMjIyMTcyMTI3WhcNMDgwMjIyMTcyMTI3WjBBMRMwEQYDVQQDDApj
-  b2R5ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6T4Iqt5iWvAlU
-  iXI6L8UO0URQhIC65X/gJ9hL/x4lwSl/ckVm/R/bPrJGmifT+YooFv824N3y/TIX
-  25o/lZtRj1TUZJK4OCb0aVzosQVxBHSe6rLmxO8cItNTMOM9wn3thaITFrTa1DOQ
-  O3wqEjvW2L6VMozVfK1MfjL9IGgy0rCnl+2g4Gh4jDDpkLfnMG5CWI6cTCf3C1ye
-  ytOpWgi0XpOEy8nQWcFmt/KCQ/kFfzBo4QxqJi54b80842EyvzWT9OB7Oew/CXZG
-  F2yIHtiYxonz6N09vvSzq4CvEuisoUFLKZnktndxMEBKwJU3XeSHAbuS7ix40OKO
-  WKuI54fHAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBR9QQpefI3oDCAxiqJW/3Gg6jI6qjANBgkqhkiG9w0BAQUFAAOCAQEAs0lX26O+
-  HpyMp7WL+SgZuM8k76AjfOHuKajl2GEn3S8pWYGpsa0xu07HtehJhKLiavrfUYeE
-  qlFtyYMUyOh6/1S2vfkH6VqjX7mWjoi7XKHW/99fkMS40B5SbN+ypAUst+6c5R84
-  w390mjtLHpdDE6WQYhS6bFvBN53vK6jG3DLyCJc0K9uMQ7gdHWoxq7RnG92ncQpT
-  ThpRA+fky5Xt2Q63YJDnJpkYAz79QIama1enSnd4jslKzSl89JS2luq/zioPe/Us
-  hbyalWR1+HrhgPoSPq7nk+s2FQUBJ9UZFK1lgMzho/4fZgzJwbu+cO8SNuaLS/bj
-  hPaSTyVU0yCSnw==
-  -----END CERTIFICATE-----
-
-date: 2011-08-23 00:00:00 -04:00
+- gem-public_cert.pem
+date: 2011-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +37,34 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: i18n
+  version_requirements: *id002
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: money
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -69,11 +76,11 @@ dependencies:
         - 0
         version: 2.0.0
   name: builder
-  version_requirements: *id002
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,11 +92,11 @@ dependencies:
         - 0
         version: 2.0.0
   name: braintree
-  version_requirements: *id003
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,7 +108,67 @@ dependencies:
         - 1
         version: 1.5.1
   name: json
-  version_requirements: *id004
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  name: active_utils
+  version_requirements: *id007
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  version_requirements: *id008
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: mocha
+  version_requirements: *id009
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 3
+        - 11
+        version: 2.3.11
+  name: rails
+  version_requirements: *id010
   prerelease: 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 possible away from the user to offer a consistent interface across all supported gateways.
 email: tobi@leetsoft.com
@@ -237,6 +304,10 @@ files:
 - lib/active_merchant/billing/integrations/directebanking/notification.rb
 - lib/active_merchant/billing/integrations/directebanking/return.rb
 - lib/active_merchant/billing/integrations/directebanking.rb
+- lib/active_merchant/billing/integrations/dwolla/helper.rb
+- lib/active_merchant/billing/integrations/dwolla/notification.rb
+- lib/active_merchant/billing/integrations/dwolla/return.rb
+- lib/active_merchant/billing/integrations/dwolla.rb
 - lib/active_merchant/billing/integrations/e_payment_plans/helper.rb
 - lib/active_merchant/billing/integrations/e_payment_plans/notification.rb
 - lib/active_merchant/billing/integrations/e_payment_plans.rb
@@ -289,19 +360,9 @@ files:
 - lib/active_merchant/billing/integrations.rb
 - lib/active_merchant/billing/response.rb
 - lib/active_merchant/billing.rb
-- lib/active_merchant/common/connection.rb
-- lib/active_merchant/common/country.rb
-- lib/active_merchant/common/error.rb
-- lib/active_merchant/common/post_data.rb
-- lib/active_merchant/common/posts_data.rb
-- lib/active_merchant/common/requires_parameters.rb
-- lib/active_merchant/common/utils.rb
-- lib/active_merchant/common/validateable.rb
-- lib/active_merchant/common.rb
 - lib/active_merchant/version.rb
 - lib/active_merchant.rb
 - lib/activemerchant.rb
-- lib/certs/cacert.pem
 - lib/support/gateway_support.rb
 - lib/support/outbound_hosts.rb
 has_rdoc: true