activemerchant 1.42.6 → 1.42.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzkyMTMwMmZlNGQ4MDhiNTI0NDFmYjIzOTI1ZjZjNTNjNTIwY2E1Yw==
+    NDRjYjY2NmNjZWUyNDMwMjdhOTZjOGMyMzJjOTUxYWMxNjFlNjVkNw==
   data.tar.gz: !binary |-
-    ZDg2OWFmMzE4NTA0NjI0MTJkZWQyYzYyZDVkMzk0MTYwODYwNDI4YQ==
+    ZTFjN2I2ZjQ3ZTdkZTIwZWY0ZGY0OTFhNzhjOTkwYWIxNDFlYTI3OA==
 SHA512:
   metadata.gz: !binary |-
-    YzM5NTgxYTc4MzU3MjY1Y2MwNGExZjAyMzVlNWIyZTJlNmI3ZWY2MzhhZjE5
-    ODc5OGIxMGFjMGRhZmNkOTc5YmZjNzUyZmY5ZGEwZTVhMDUzMTFkNjljYWIz
-    MDQzMmU3MDlmNDhkMjkxMDIwOTVkNzFjZTkyMDBjZGY0NzU4Nzg=
+    OTZiMWRlNzE0OWZmOWQwZjk2NjNlZmJjYmYxOGNhMWIzMjk4ZDAxMDg5MjZk
+    Y2I3ZDVhYjkzZDA4NTAyYjk0ZDU3ZjZkODAyMmEzOWVjMjg1OTJlNmRiYzg4
+    YTQ5YTc4ZGRjMmVmZGU5N2ZlMWI0MjdiNmRjZjUyZmVlN2NhMzU=
   data.tar.gz: !binary |-
-    MWFmNTMzZWNhMDhmOTE3MDQzYTU1ZTFlZTFkYjQ4NTMxZWM3YTBlNGU5YWM1
-    ZjgzMzc3MTEzOWY5ZjhkYTFmMDY5ZmI4NWFmMjI0YTA1YjMzOTM4YjUyMGEz
-    Y2M4YWVjOWNhZjVjMTZjOTNlMWQ4NzQ4ZjRiMWRiYWJhYjcyNTQ=
+    YTY3ZGViYTg2MTIxOTFhZmFhMzE5Y2JiZmYxNzZlMzMzMDJhNDYwNTA1OTE0
+    ZDEzNWQ1OGYyZjJkOTM5ODE0OGViNGFiNmFmNjg3NDczMmQyOTI1OWYyMDZi
+    ZTZjYzVkZWM5ZTFhNzhkOGU4MTc3YWY1NGI3OWMyM2Q0OGIzYTA=

data/CHANGELOG

@@ -1,5 +1,17 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.42.7 (March 18, 2014)
+
+* SagePay: Add support for ReferrerID [markabe]
+* Cecabank: Fix expiration date formatting [duff]
+* Add WePay gateway [faizalzakaria]
+* SmartPs: Add ECI option to SmartPs [odorcicd]
+* Rescue and re-raise ActionViewHelperError when offsite helpers raise an error [odorcicd]
+* Add FirstGiving gateway [faizalzakaria]
+* FirstGiving: Fix refunds [ntalbott]
+* Samurai: Handle server errors [ntalbott]
+* WePay: Fix refund [duff]
+
 == Version 1.42.6 (February 24, 2014)
 
 * Litle: Truncate order_id [duff]

data/CONTRIBUTORS

@@ -460,3 +460,11 @@ Openpay (February 2014)
 maxiPago (February 2014)
 
 * (alexandremcosta)
+
+WePay (March 2014)
+
+* Faizal Zakaria (faizalzakaria)
+
+FirstGiving (March 2014)
+
+* Faizal Zakaria (faizalzakaria)

data/README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.org/Shopify/active_merchant.png?branch=master)](https://travis-ci.org/Shopify/active_merchant)
 [![Code Climate](https://codeclimate.com/github/Shopify/active_merchant.png)](https://codeclimate.com/github/Shopify/active_merchant)
 
-Active Merchant is an extraction from the e-commerce system [Shopify](http://www.shopify.com).
+Active Merchant is an extraction from the ecommerce system [Shopify](http://www.shopify.com).
 Shopify's requirements for a simple and unified API to access dozens of different payment
 gateways with very different internal APIs was the chief principle in designing the library.
 
@@ -40,39 +40,41 @@ Or, if you're using Bundler, just add the following to your Gemfile:
 This simple example demonstrates how a purchase can be made using a person's
 credit card details.
 
-    require 'rubygems'
-    require 'active_merchant'
-
-    # Use the TrustCommerce test servers
-    ActiveMerchant::Billing::Base.mode = :test
-
-    gateway = ActiveMerchant::Billing::TrustCommerceGateway.new(
-                :login => 'TestMerchant',
-                :password => 'password')
-
-    # ActiveMerchant accepts all amounts as Integer values in cents
-    amount = 1000  # $10.00
-
-    # The card verification value is also known as CVV2, CVC2, or CID
-    credit_card = ActiveMerchant::Billing::CreditCard.new(
-                    :first_name         => 'Bob',
-                    :last_name          => 'Bobsen',
-                    :number             => '4242424242424242',
-                    :month              => '8',
-                    :year               => Time.now.year+1,
-                    :verification_value => '000')
-
-    # Validating the card automatically detects the card type
-    if credit_card.valid?
-      # Capture $10 from the credit card
-      response = gateway.purchase(amount, credit_card)
-
-      if response.success?
-        puts "Successfully charged $#{sprintf("%.2f", amount / 100)} to the credit card #{credit_card.display_number}"
-      else
-        raise StandardError, response.message
-      end
-    end
+```ruby
+require 'rubygems'
+require 'active_merchant'
+
+# Use the TrustCommerce test servers
+ActiveMerchant::Billing::Base.mode = :test
+
+gateway = ActiveMerchant::Billing::TrustCommerceGateway.new(
+            :login => 'TestMerchant',
+            :password => 'password')
+
+# ActiveMerchant accepts all amounts as Integer values in cents
+amount = 1000  # $10.00
+
+# The card verification value is also known as CVV2, CVC2, or CID
+credit_card = ActiveMerchant::Billing::CreditCard.new(
+                :first_name         => 'Bob',
+                :last_name          => 'Bobsen',
+                :number             => '4242424242424242',
+                :month              => '8',
+                :year               => Time.now.year+1,
+                :verification_value => '000')
+
+# Validating the card automatically detects the card type
+if credit_card.valid?
+  # Capture $10 from the credit card
+  response = gateway.purchase(amount, credit_card)
+
+  if response.success?
+    puts "Successfully charged $#{sprintf("%.2f", amount / 100)} to the credit card #{credit_card.display_number}"
+  else
+    raise StandardError, response.message
+  end
+end
+```
 
 For more in-depth documentation and tutorials, see [GettingStarted.md](GettingStarted.md) and the
 [API documentation](http://rubydoc.info/github/Shopify/active_merchant/master/file/README.md).
@@ -83,7 +85,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 
 * [App55](https://www.app55.com/) - AU, BR, CA, CH, CL, CN, CO, CZ, DK, EU, GB, HK, HU, ID, IS, JP, KE, KR, MX, MY, NO, NZ, PH, PL, TH, TW, US, VN, ZA
 * [Authorize.Net CIM](http://www.authorize.net/) - US
-* [Authorize.Net](http://www.authorize.net/) - US, CA, GB
+* [Authorize.Net](http://www.authorize.net/) - AD, AT, AU, BE, BG, CA, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GB, GI, GR, HU, IE, IT, LI, LU, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, SM, TR, US, VA
 * [Balanced](https://www.balancedpayments.com/) - US
 * [Banwire](http://www.banwire.com/) - MX
 * [Barclays ePDQ Extra Plus](http://www.barclaycard.co.uk/business/accepting-payments/epdq-ecomm/) - GB
@@ -111,6 +113,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Finansbank WebPOS](https://www.fbwebpos.com/) - US, TR
 * [First Pay](http://www.first-pay.com) - US
 * [FirstData Global Gateway e4](http://www.firstdata.com) - CA, US
+* [FirstGiving](http://www.firstgiving.com/) - US
 * [Garanti Sanal POS](https://sanalposweb.garanti.com.tr) - US, TR
 * [HDFC](http://www.hdfcbank.com/sme/sme-details/merchant-services/guzh6m0i) - IN
 * [IATSPayments](http://www.iatspayments.com/) - US, CA, GB
@@ -191,6 +194,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [ViaKLIX](http://viaklix.com) - US
 * [Vindicia](http://www.vindicia.com/) - US, CA, GB, AU, MX, BR, DE, KR, CN, HK
 * [WebPay](https://webpay.jp/) - JP
+* [WePay](https://www.wepay.com/) - US
 * [Wirecard](http://www.wirecard.com) - AD, CY, GI, IM, MT, RO, CH, AT, DK, GR, IT, MC, SM, TR, BE, EE, HU, LV, NL, SK, GB, BG, FI, IS, LI, NO, SI, VA, FR, IL, LT, PL, ES, CZ, DE, IE, LU, PT, SE
 * [WorldPay](http://www.worldpay.com/) - HK, US, GB, AU, AD, BE, CH, CY, CZ, DE, DK, ES, FI, FR, GI, GR, HU, IE, IL, IT, LI, LU, MC, MT, NL, NO, NZ, PL, PT, SE, SG, SI, SM, TR, UM, VA
 

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

@@ -43,7 +43,7 @@ module ActiveMerchant #:nodoc:
 
       self.default_currency = 'USD'
 
-      self.supported_countries = ['US', 'CA', 'GB']
+      self.supported_countries = %w(AD AT AU BE BG CA CH CY CZ DE DK ES FI FR GB GB GI GR HU IE IT LI LU MC MT NL NO PL PT RO SE SI SK SM TR US VA)
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
       self.homepage_url = 'http://www.authorize.net/'
       self.display_name = 'Authorize.Net'

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

@@ -98,11 +98,15 @@ module ActiveMerchant #:nodoc:
 
       def add_creditcard(post, creditcard)
         post['PAN'] = creditcard.number
-        post['Caducidad'] = "#{creditcard.year}#{creditcard.month}"
+        post['Caducidad'] = expdate(creditcard)
         post['CVV2'] = creditcard.verification_value
         post['Pago_elegido'] = CECA_MODE
       end
 
+      def expdate(creditcard)
+        "#{format(creditcard.year, :four_digits)}#{format(creditcard.month, :two_digits)}"
+      end
+
       def parse(body)
         response = {}
 

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

@@ -0,0 +1,143 @@
+require 'nokogiri'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class FirstGivingGateway < Gateway
+      self.test_url = 'http://usapisandbox.fgdev.net'
+      self.live_url = 'https://api.firstgiving.com'
+
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.homepage_url = 'http://www.firstgiving.com/'
+      self.default_currency = 'USD'
+      self.display_name = 'FirstGiving'
+
+      def initialize(options = {})
+        requires!(options, :application_key, :security_token, :charity_id)
+        super
+      end
+
+      def purchase(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
+        add_customer_data(post, options)
+        add_donation_data(post, money, options)
+        commit('/donation/creditcard', post)
+      end
+
+      def refund(money, identifier, options = {})
+        get = {}
+        get[:transactionId] = identifier
+        get[:tranType]     = 'REFUNDREQUEST'
+        commit("/transaction/refundrequest?" + encode(get))
+      end
+
+      private
+
+      def add_donation_data(post, money, options)
+        post[:amount] = amount(money)
+        post[:charityId] = @options[:charity_id]
+        post[:description] = (options[:description] || "Purchase")
+        post[:currencyCode] = (options[:currency] || currency(money))
+      end
+
+      def add_customer_data(post, options)
+        post[:billToEmail] = (options[:email] || "activemerchant@example.com")
+        post[:remoteAddr]  = (options[:ip] || "127.0.0.1")
+      end
+
+      def add_address(post, options)
+        if(billing_address = (options[:billing_address] || options[:address]))
+          post[:billToAddressLine1]  = billing_address[:address1]
+          post[:billToCity]          = billing_address[:city]
+          post[:billToState]         = billing_address[:state]
+          post[:billToZip]           = billing_address[:zip]
+          post[:billToCountry]       = billing_address[:country]
+        end
+      end
+
+      def add_invoice(post, options)
+        post[:orderId] = options[:order_id]
+      end
+
+      def add_creditcard(post, creditcard)
+        post[:billToFirstName]     = creditcard.first_name
+        post[:billToLastName]      = creditcard.last_name
+        post[:ccNumber]            = creditcard.number
+        post[:ccType]              = creditcard_brand(creditcard.brand)
+        post[:ccExpDateMonth]      = creditcard.month
+        post[:ccExpDateYear]       = creditcard.year
+        post[:ccCardValidationNum] = creditcard.verification_value
+      end
+
+      def parse(body)
+        response = {}
+
+        xml = Nokogiri::XML(body)
+        element = xml.xpath("//firstGivingDonationApi/firstGivingResponse").first
+
+        element.attributes.each do |name, attribute|
+          response[name] = attribute.content
+        end
+        element.children.each do |child|
+          next if child.text?
+          response[child.name] = child.text
+        end
+
+        response
+      end
+
+      def commit(action, post=nil)
+        url = (test? ? self.test_url : self.live_url) + action
+
+        begin
+          if post
+            response = parse(ssl_post(url, post_data(post), headers))
+          else
+            response = parse(ssl_get(url, headers))
+          end
+        rescue ResponseError => e
+          response = parse(e.response.body)
+        end
+
+        Response.new(
+          (response["acknowledgement"] == "Success"),
+          (response["friendlyErrorMessage"] || response["verboseErrorMessage"] || response["acknowledgement"]),
+          response,
+          authorization: response["transactionId"],
+          test: test?,
+        )
+      end
+
+      def post_data(post)
+        post.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+      end
+
+      def encode(hash)
+        hash.collect{|(k,v)| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"}.join('&')
+      end
+
+      def creditcard_brand(brand)
+        case brand
+        when "visa" then "VI"
+        when "master" then "MC"
+        when "discover" then "DI"
+        when "american_express" then "AX"
+        else
+          raise "Unhandled credit card brand #{brand}"
+        end
+      end
+
+      def headers
+        {
+          "User-Agent"        => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          "JG_APPLICATIONKEY" => "#{@options[:application_key]}",
+          "JG_SECURITYTOKEN"  => "#{@options[:security_token]}"
+        }
+      end
+    end
+  end
+end
+

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

@@ -177,6 +177,8 @@ module ActiveMerchant #:nodoc:
       USE_ORDER_ID         = 'O' #  Use OrderID field
       USE_COMMENTS         = 'D' #  Use Comments field
 
+      SENSITIVE_FIELDS = [:account_num]
+
       def initialize(options = {})
         requires!(options, :merchant_id)
         requires!(options, :login, :password) unless options[:ip_authentication]
@@ -431,7 +433,8 @@ module ActiveMerchant #:nodoc:
             recurring_parse_element(response, node)
           end
         end
-        response
+
+        response.delete_if { |k,_| SENSITIVE_FIELDS.include?(k) }
       end
 
       def recurring_parse_element(response, node)

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

@@ -293,6 +293,10 @@ module ActiveMerchant #:nodoc:
           :VPSProtocol => "2.23"
         )
 
+        if(application_id && (application_id != Gateway.application_id))
+          parameters.update(:ReferrerID => application_id)
+        end
+
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
 

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

@@ -32,6 +32,8 @@ module ActiveMerchant #:nodoc:
 
         authorize = Samurai::Processor.authorize(token, amount(money), processor_options(options))
         handle_result(authorize)
+      rescue ActiveResource::ServerError => e
+        Response.new(false, e.message, {}, test: test?)
       end
 
       def purchase(money, credit_card_or_vault_id, options = {})
@@ -40,21 +42,29 @@ module ActiveMerchant #:nodoc:
 
         purchase = Samurai::Processor.purchase(token, amount(money), processor_options(options))
         handle_result(purchase)
+      rescue ActiveResource::ServerError => e
+        Response.new(false, e.message, {}, test: test?)
       end
 
       def capture(money, authorization_id, options = {})
         transaction = Samurai::Transaction.find(authorization_id)
         handle_result(transaction.capture(amount(money)))
+      rescue ActiveResource::ServerError => e
+        Response.new(false, e.message, {}, test: test?)
       end
 
       def refund(money, transaction_id, options = {})
         transaction = Samurai::Transaction.find(transaction_id)
         handle_result(transaction.credit(amount(money)))
+      rescue ActiveResource::ServerError => e
+        Response.new(false, e.message, {}, test: test?)
       end
 
       def void(transaction_id, options = {})
         transaction = Samurai::Transaction.find(transaction_id)
         handle_result(transaction.void)
+      rescue ActiveResource::ServerError => e
+        Response.new(false, e.message, {}, test: test?)
       end
 
       def store(creditcard, options = {})
@@ -78,6 +88,8 @@ module ActiveMerchant #:nodoc:
         Response.new(result.is_sensitive_data_valid,
                      message_from_result(result),
                      { :payment_method_token => result.is_sensitive_data_valid && result.payment_method_token })
+      rescue ActiveResource::ServerError => e
+        Response.new(false, e.message, {}, test: test?)
       end
 
       private

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

@@ -43,6 +43,7 @@ module ActiveMerchant #:nodoc:
         add_currency(post, money, options)
         add_taxes(post, options)
         add_processor(post, options)
+        add_eci(post, options)
         commit('sale', money, post)
       end
 
@@ -207,6 +208,10 @@ module ActiveMerchant #:nodoc:
         post[:transactionid] = auth
       end
 
+      def add_eci(post, options)
+        post[:billing_method] = options[:eci] if options[:eci]
+      end
+
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|

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

@@ -0,0 +1,189 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class WepayGateway < Gateway
+      self.test_url = 'https://stage.wepayapi.com/v2'
+      self.live_url = 'https://wepayapi.com/v2'
+
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.homepage_url = 'https://www.wepay.com/'
+      self.default_currency = 'USD'
+      self.display_name = 'WePay'
+
+      def initialize(options = {})
+        requires!(options, :client_id, :account_id, :access_token)
+        super(options)
+      end
+
+      def purchase(money, payment_method, options = {})
+        post = {}
+        if payment_method.is_a?(String)
+          purchase_with_token(post, money, payment_method, options)
+        else
+          MultiResponse.run do |r|
+            r.process { store(payment_method, options) }
+            r.process { purchase_with_token(post, money, split_authorization(r.authorization).first, options) }
+          end
+        end
+      end
+
+      def authorize(money, payment_method, options = {})
+        post = {auto_capture: 0}
+        if payment_method.is_a?(String)
+          purchase_with_token(post, money, payment_method, options)
+        else
+          MultiResponse.run do |r|
+            r.process { store(payment_method, options) }
+            r.process { purchase_with_token(post, money, split_authorization(r.authorization).first, options) }
+          end
+        end
+      end
+
+      def capture(money, identifier, options = {})
+        post = {}
+        post[:checkout_id] = split_authorization(identifier).first
+        commit('/checkout/capture', post)
+      end
+
+      def void(identifier, options = {})
+        post = {}
+        post[:checkout_id] = split_authorization(identifier).first
+        post[:cancel_reason] = (options[:description] || "Void")
+        commit('/checkout/cancel', post)
+      end
+
+      def refund(money, identifier, options = {})
+        checkout_id, original_amount = split_authorization(identifier)
+
+        post = {}
+        post[:checkout_id] = checkout_id
+        if(money && (original_amount != amount(money)))
+          post[:amount] = amount(money)
+        end
+        post[:refund_reason] = (options[:description] || "Refund")
+        post[:app_fee] = options[:application_fee] if options[:application_fee]
+        post[:payer_email_message] = options[:payer_email_message] if options[:payer_email_message]
+        post[:payee_email_message] = options[:payee_email_message] if options[:payee_email_message]
+        commit("/checkout/refund", post)
+      end
+
+      def store(creditcard, options = {})
+        requires!(options, :email)
+
+        post = {}
+        post[:client_id] = @options[:client_id]
+        post[:user_name] = "#{creditcard.first_name} #{creditcard.last_name}"
+        post[:email] = options[:email]
+        post[:cc_number] = creditcard.number
+        post[:cvv] = creditcard.verification_value
+        post[:expiration_month] = creditcard.month
+        post[:expiration_year] = creditcard.year
+        post[:original_ip] = options[:ip] if options[:ip]
+        post[:original_device] = options[:device_fingerprint] if options[:device_fingerprint]
+        if(billing_address = (options[:billing_address] || options[:address]))
+          post[:address] = {
+            "address1" => billing_address[:address1],
+            "city"     => billing_address[:city],
+            "state"    => billing_address[:state],
+            "country"  => billing_address[:country]
+          }
+          if(post[:country] == "US")
+            post[:address]["zip"] = billing_address[:zip]
+          else
+            post[:address]["postcode"] = billing_address[:zip]
+          end
+        end
+        commit('/credit_card/create', post)
+      end
+
+      private
+
+      def purchase_with_token(post, money, token, options)
+        add_token(post, token)
+        add_product_data(post, money, options)
+        commit('/checkout/create', post)
+      end
+
+      def add_product_data(post, money, options)
+        post[:account_id] = @options[:account_id]
+        post[:amount] = amount(money)
+        post[:short_description] = (options[:description] || "Purchase")
+        post[:type] = (options[:type] || "GOODS")
+        post[:currency] = (options[:currency] || currency(money))
+        post[:long_description] = options[:long_description] if options[:long_description]
+        post[:payer_email_message] = options[:payer_email_message] if options[:payer_email_message]
+        post[:payee_email_message] = options[:payee_email_message] if options[:payee_email_message]
+        post[:reference_id] = options[:order_id] if options[:order_id]
+        post[:app_fee] = options[:application_fee] if options[:application_fee]
+        post[:fee_payer] = options[:fee_payer] if options[:fee_payer]
+        post[:redirect_uri] = options[:redirect_uri] if options[:redirect_uri]
+        post[:callback_uri] = options[:callback_uri] if options[:callback_uri]
+        post[:fallback_uri] = options[:fallback_uri] if options[:fallback_uri]
+        post[:require_shipping] = options[:require_shipping] if options[:require_shipping]
+        post[:shipping_fee] = options[:shipping_fee] if options[:shipping_fee]
+        post[:charge_tax] = options[:charge_tax] if options[:charge_tax]
+        post[:mode] = options[:mode] if options[:mode]
+        post[:preapproval_id] = options[:preapproval_id] if options[:preapproval_id]
+        post[:prefill_info] = options[:prefill_info] if options[:prefill_info]
+        post[:funding_sources] = options[:funding_sources] if options[:funding_sources]
+      end
+
+      def add_token(post, token)
+        post[:payment_method_id]   = token
+        post[:payment_method_type] = "credit_card"
+      end
+
+      def parse(response)
+        JSON.parse(response)
+      end
+
+      def commit(action, params, options={})
+        begin
+          response = parse(ssl_post(
+            ((test? ? test_url : live_url) + action),
+            params.to_json,
+            headers
+          ))
+        rescue ResponseError => e
+          response = parse(e.response.body)
+        end
+
+        Response.new(
+          success_from(response),
+          message_from(response),
+          response,
+          authorization: authorization_from(response, params),
+          test: test?
+        )
+      end
+
+      def success_from(response)
+        (!response["error"])
+      end
+
+      def message_from(response)
+        (response["error"] ? response["error_description"] : "Success")
+      end
+
+      def authorization_from(response, params)
+        return response["credit_card_id"].to_s if response["credit_card_id"]
+
+        [response["checkout_id"], params[:amount]].join('|')
+      end
+
+      def split_authorization(authorization)
+        auth, original_amount = authorization.to_s.split("|")
+        [auth, original_amount]
+      end
+
+      def headers
+        {
+          "Content-Type"  => "application/json",
+          "User-Agent"    => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          "Authorization" => "Bearer #{@options[:access_token]}"
+        }
+      end
+    end
+  end
+end
+

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

@@ -3,6 +3,8 @@ require 'action_pack'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
+      ActionViewHelperError = Class.new(StandardError)
+
       module ActionViewHelper
         # This helper allows the usage of different payment integrations
         # through a single form helper.  Payment integrations are the
@@ -67,6 +69,8 @@ module ActiveMerchant #:nodoc:
           
           concat(result.respond_to?(:html_safe) ? result.html_safe : result)
           nil
+        rescue => e
+          raise ActionViewHelperError.new(e)
         end
       end
     end

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

@@ -38,6 +38,8 @@ module ActiveMerchant #:nodoc:
           def form_fields
             invoice = create_invoice
 
+            raise StandardError, "Invalid response while retrieving BitPay Invoice ID. Please try again." unless invoice
+
             {"id" => invoice['id']}
           end
 

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

@@ -36,8 +36,12 @@ module ActiveMerchant #:nodoc:
 
           def acknowledge(authcode = nil)
             # paydollar supports multiple signature keys, therefore we need to check if any
-            # of their signatures matches ours
-            @params['secureHash'].split(',').include? generate_secure_hash
+            # of their signatures match ours
+            hash = @params['secureHash']
+            if !hash
+              return false
+            end
+            hash.split(',').include? generate_secure_hash
           end
 
           private

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.42.6"
+  VERSION = "1.42.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.42.6
+  version: 1.42.7
 platform: ruby
 authors:
 - Tobias Luetke
@@ -38,7 +38,7 @@ cert_chain:
   U1BPVm5oYkZKM3ZTWFkxdWxQL1I2WFc5dm53CjZra1FpMmZIaFUyMHVnTXpw
   ODgxRWl4citUakMwUnZVZXJMRzdnPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUt
   LS0tLQo=
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -272,6 +272,7 @@ files:
 - 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_giving.rb
 - lib/active_merchant/billing/gateways/first_pay.rb
 - lib/active_merchant/billing/gateways/firstdata_e4.rb
 - lib/active_merchant/billing/gateways/garanti.rb
@@ -379,6 +380,7 @@ files:
 - 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/wepay.rb
 - lib/active_merchant/billing/gateways/wirecard.rb
 - lib/active_merchant/billing/gateways/worldpay.rb
 - lib/active_merchant/billing/gateways.rb
@@ -387,9 +389,6 @@ files:
 - 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/alipay/helper.rb
-- lib/active_merchant/billing/integrations/alipay/notification.rb
-- lib/active_merchant/billing/integrations/alipay.rb
 - lib/active_merchant/billing/integrations/authorize_net_sim/helper.rb
 - lib/active_merchant/billing/integrations/authorize_net_sim/notification.rb
 - lib/active_merchant/billing/integrations/authorize_net_sim.rb

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

@@ -1,18 +0,0 @@
-require File.dirname(__FILE__) + '/alipay/helper.rb'
-require File.dirname(__FILE__) + '/alipay/notification.rb'
-
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    module Integrations #:nodoc:
-      module Alipay
-
-        mattr_accessor :service_url
-        self.service_url = 'https://www.example.com'
-
-        def self.notification(post)
-          Notification.new(post)
-        end
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    module Integrations #:nodoc:
-      module Alipay
-        class Helper < ActiveMerchant::Billing::Integrations::Helper
-          # Replace with the real mapping
-          mapping :account, ''
-          mapping :amount, ''
-        
-          mapping :order, ''
-
-          mapping :customer, :first_name => '',
-                             :last_name  => '',
-                             :email      => '',
-                             :phone      => ''
-
-          mapping :billing_address, :city     => '',
-                                    :address1 => '',
-                                    :address2 => '',
-                                    :state    => '',
-                                    :zip      => '',
-                                    :country  => ''
-
-          mapping :notify_url, ''
-          mapping :return_url, ''
-          mapping :cancel_return_url, ''
-          mapping :description, ''
-          mapping :tax, ''
-          mapping :shipping, ''
-        end
-      end
-    end
-  end
-end

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

@@ -1,101 +0,0 @@
-require 'net/http'
-
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    module Integrations #:nodoc:
-      module Alipay
-        class Notification < ActiveMerchant::Billing::Integrations::Notification
-          def complete?
-            params['']
-          end
-
-          def item_id
-            params['']
-          end
-
-          def transaction_id
-            params['']
-          end
-
-          # When was this payment received by the client.
-          def received_at
-            params['']
-          end
-
-          def payer_email
-            params['']
-          end
-
-          def receiver_email
-            params['']
-          end
-
-          def security_key
-            params['']
-          end
-
-          # the money amount we received in X.2 decimal.
-          def gross
-            params['']
-          end
-
-          # Was this a test transaction?
-          def test?
-            params[''] == 'test'
-          end
-
-          def status
-            params['']
-          end
-
-          # Acknowledge the transaction to Alipay. This method has to be called after a new
-          # apc arrives. Alipay will verify that all the information we received are correct and will return a
-          # ok or a fail.
-          #
-          # Example:
-          #
-          #   def ipn
-          #     notify = AlipayNotification.new(request.raw_post)
-          #
-          #     if notify.acknowledge
-          #       ... process order ... if notify.complete?
-          #     else
-          #       ... log possible hacking attempt ...
-          #     end
-          def acknowledge(authcode = nil)
-            payload = raw
-
-            uri = URI.parse(Alipay.notification_confirmation_url)
-
-            request = Net::HTTP::Post.new(uri.path)
-
-            request['Content-Length'] = "#{payload.size}"
-            request['User-Agent'] = "Active Merchant -- http://home.leetsoft.com/am"
-            request['Content-Type'] = "application/x-www-form-urlencoded"
-
-            http = Net::HTTP.new(uri.host, uri.port)
-            http.verify_mode    = OpenSSL::SSL::VERIFY_NONE unless @ssl_strict
-            http.use_ssl        = true
-
-            response = http.request(request, payload)
-
-            # Replace with the appropriate codes
-            raise StandardError.new("Faulty Alipay result: #{response.body}") unless ["AUTHORISED", "DECLINED"].include?(response.body)
-            response.body == "AUTHORISED"
-          end
-
-          private
-
-          # Take the posted data and move the relevant data into a hash
-          def parse(post)
-            @raw = post.to_s
-            for line in @raw.split('&')
-              key, value = *line.scan( %r{^([A-Za-z0-9_.-]+)\=(.*)$} ).flatten
-              params[key] = CGI.unescape(value.to_s) if key.present?
-            end
-          end
-        end
-      end
-    end
-  end
-end