activemerchant 1.34.0 → 1.34.1

data/CHANGELOG

@@ -1,5 +1,16 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.34.1 (June 28, 2013)
+
+* WorldPay: Add dynamic return URL [jordanwheeler]
+* Merchant One: New gateway [coteyr, melari]
+* Balanced: Fix exception for invalid email [duff]
+* Update supported countries for Paymill & PaymentExpress [duff]
+* Worldpay: Add support for diners club [duff]
+* Stripe: Include address with card data [melari]
+
+== Version 1.34.0 (June 20, 2013)
+
 * PayPal Express gateway: Add unstore support [duff]
 * Stripe: Send application_fee with capture requests [melari]
 * Make #unstore method signature consistent across gateways [duff]

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

@@ -310,6 +310,7 @@ module ActiveMerchant #:nodoc:
             # lookup account from Balanced, account_uri should be in the
             # exception in a dictionary called extras
             account_uri = response['extras']['account_uri']
+            raise Error.new(response) unless account_uri
           end
         end
 

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

@@ -0,0 +1,115 @@
+require "cgi"
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class MerchantOneGateway < Gateway
+
+      class MerchantOneSslConnection < ActiveMerchant::Connection
+        def configure_ssl(http)
+          super(http)
+          http.use_ssl = true
+          http.ssl_version = :SSLv3
+        end
+      end
+
+      BASE_URL = 'https://secure.merchantonegateway.com/api/transact.php'
+
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.homepage_url = 'http://merchantone.com/'
+      self.display_name = 'Merchant One Gateway'
+      self.money_format = :dollars
+
+      def initialize(options = {})
+        requires!(options, :username, :password)
+        super
+      end
+
+      def authorize(money, creditcard, options = {})
+        post = {}
+        add_customer_data(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, creditcard, options)
+        add_customer_data(post, options)
+        add_amount(post, money, options)
+        commit('auth', money, post)
+      end
+
+      def purchase(money, creditcard, options = {})
+        post = {}
+        add_customer_data(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, creditcard, options)
+        add_customer_data(post, options)
+        add_amount(post, money, options)
+        commit('sale', money, post)
+      end
+
+      def capture(money, authorization, options = {})
+        post = {}
+        post.merge!(:transactionid => authorization)
+        add_amount(post, money, options)
+        commit('capture', money, post)
+      end
+
+      def new_connection(endpoint)
+        MerchantOneSslConnection.new(endpoint)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        post['firstname'] = options[:billing_address][:first_name]
+        post['lastname'] = options[:billing_address][:last_name]
+      end
+
+      def add_amount(post, money, options)
+        post['amount'] = amount(money)
+      end
+
+      def add_address(post, creditcard, options)
+        post['address1'] = options[:billing_address][:address1]
+        post['city'] = options[:billing_address][:city]
+        post['state'] = options[:billing_address][:state]
+        post['zip'] = options[:billing_address][:zip]
+        post['country'] = options[:billing_address][:country]
+      end
+
+      def add_creditcard(post, creditcard)
+       post['cvv'] = creditcard.verification_value
+       post['ccnumber'] = creditcard.number
+       post['ccexp'] =  "#{sprintf("%02d", creditcard.month)}#{"#{creditcard.year}"[-2, 2]}"
+      end
+
+      def commit(action, money, parameters={})
+        parameters['username'] = @options[:username]
+        parameters['password'] = @options[:password]
+        parse(ssl_post(BASE_URL,post_data(action, parameters)))
+      end
+
+      def post_data(action, parameters = {})
+        parameters.merge!({:type => action})
+        ret = ""
+        for key in parameters.keys
+          ret += "#{key}=#{CGI.escape(parameters[key].to_s)}"
+          if key != parameters.keys.last
+            ret += "&"
+          end
+        end
+        ret.to_s
+      end
+
+      def parse(data)
+        responses =  CGI.parse(data).inject({}){|h,(k, v)| h[k] = v.first; h}
+        Response.new(
+          (responses["response"].to_i == 1),
+          responses["responsetext"],
+          responses,
+          :test => test?,
+          :authorization => responses["transactionid"]
+        )
+      end
+    end
+  end
+end
+

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

@@ -16,7 +16,7 @@ module ActiveMerchant #:nodoc:
       # However, regular accounts with DPS only support VISA and Mastercard
       self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb ]
 
-      self.supported_countries = %w[ AU MY NZ SG ZA GB US ]
+      self.supported_countries = %w[ AU CA DE ES FR GB HK IE MY NL NZ SG US ZA ]
 
       self.homepage_url = 'http://www.paymentexpress.com/'
       self.display_name = 'PaymentExpress'

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

@@ -1,9 +1,9 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaymillGateway < Gateway
-      self.supported_countries = %w(AD AT BE CH CY CZ DE DK EE ES FI FO FR GB GR
-                                    HU IE IL IS IT LI LT LU LV MT NL NO PL PT SE
-                                    SI SK TR VA)
+      self.supported_countries = %w(AD AT BE BG CH CY CZ DE DK EE ES FI FO FR GB
+                                    GI GR HU IE IL IS IT LI LT LU LV MT NL NO PL
+                                    PT RO SE SI SK TR VA)
 
       self.supported_cardtypes = [:visa, :master]
       self.homepage_url = 'https://paymill.com'

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

@@ -158,6 +158,7 @@ module ActiveMerchant #:nodoc:
             card[:name] = creditcard.name if creditcard.name
           end
 
+          post[:card] = card
           add_address(post, options)
         elsif creditcard.kind_of?(String)
           if options[:track_data]
@@ -165,8 +166,8 @@ module ActiveMerchant #:nodoc:
           else
             card[:number] = creditcard
           end
+          post[:card] = card
         end
-        post[:card] = card
       end
 
       def add_customer(post, options)

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

@@ -18,7 +18,8 @@ module ActiveMerchant #:nodoc:
         'american_express' => 'AMEX-SSL',
         'jcb'              => 'JCB-SSL',
         'maestro'          => 'MAESTRO-SSL',
-        'laser'            => 'LASER-SSL'
+        'laser'            => 'LASER-SSL',
+        'diners_club'      => 'DINERS-SSL'
       }
 
       def initialize(options = {})

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

@@ -16,6 +16,7 @@ module ActiveMerchant #:nodoc:
 
           mapping :description, 'desc'
           mapping :notify_url, 'MC_callback'
+          mapping :return_url, 'MC_return'
           
           
           # WorldPay supports two different test modes - :always_succeed and :always_fail

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.34.0"
+  VERSION = "1.34.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: activemerchant
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.34.0
+  version: 1.34.1
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,18 +138,18 @@ dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
     none: false
   name: nokogiri
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
     none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -287,6 +287,7 @@ files:
 - lib/active_merchant/billing/gateways/linkpoint.rb
 - lib/active_merchant/billing/gateways/litle.rb
 - lib/active_merchant/billing/gateways/merchant_e_solutions.rb
+- lib/active_merchant/billing/gateways/merchant_one.rb
 - lib/active_merchant/billing/gateways/merchant_ware.rb
 - lib/active_merchant/billing/gateways/merchant_warrior.rb
 - lib/active_merchant/billing/gateways/mercury.rb