activemerchant 1.52.0 → 1.53.0

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

@@ -83,6 +83,16 @@ module ActiveMerchant
         commit(request)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+        gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+        gsub(%r((<number>)\d+(</number>))i, '\1[FILTERED]\2')
+      end
+
       private
       def commit(request)
         response = parse(ssl_post(self.live_url, request))

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

@@ -38,6 +38,7 @@ module ActiveMerchant #:nodoc:
       self.display_name        = "Redsys"
 
       CURRENCY_CODES = {
+        "AED" => '784',
         "ARS" => '32',
         "AUD" => '36',
         "BRL" => '986',
@@ -46,16 +47,22 @@ module ActiveMerchant #:nodoc:
         "CHF" => '756',
         "CLP" => '152',
         "COP" => '170',
+        "CZK" => '203',
         "EUR" => '978',
         "GBP" => '826',
         "GTQ" => '320',
+        "HUF" => '348',
         "JPY" => '392',
         "MYR" => '458',
         "MXN" => '484',
+        "NOK" => '578',
         "NZD" => '554',
         "PEN" => '604',
+        "PLN" => '616',
         "RUB" => '643',
+        "SEK" => '752',
         "SGD" => '702',
+        "THB" => '764',
         "USD" => '840',
         "UYU" => '858'
       }
@@ -228,6 +235,19 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((%3CDS_MERCHANT_PAN%3E)\d+(%3C%2FDS_MERCHANT_PAN%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3CDS_MERCHANT_CVV2%3E)\d+(%3C%2FDS_MERCHANT_CVV2%3E))i, '\1[FILTERED]\2').
+          gsub(%r((<DS_MERCHANT_PAN>)\d+(</DS_MERCHANT_PAN>))i, '\1[FILTERED]\2').
+          gsub(%r((<DS_MERCHANT_CVV2>)\d+(</DS_MERCHANT_CVV2>))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def add_action(data, action)

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

@@ -81,6 +81,7 @@ module ActiveMerchant #:nodoc:
           xml.Payment(code: SUPPORTED_TRANSACTIONS["store"])
           add_account(xml, payment)
           add_customer(xml, payment, options)
+          add_recurrence_mode(xml, options)
         end
 
         commit(request)

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

@@ -145,6 +145,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((&?CardNumber=)\d+(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?CV2=)\d+(&?)), '\1[FILTERED]\2')
+      end
+
       private
       def add_reference(post, identification)
         order_id, transaction_id, authorization, security_key = identification.split(';')

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

@@ -212,6 +212,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'TEST', 'TRUE' if test?
         xml.tag! 'TOTAL_INSTALLMENTCOUNT', 0
         xml.tag! 'TRANSACTION_SERVICE', 0
+        xml.tag! 'DEVELOPERID', options[:developer_id] if options[:developer_id]
       end
 
       def success?(response)

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

@@ -63,7 +63,11 @@ module ActiveMerchant #:nodoc:
           end
           r.process do
             post = create_post_for_auth_or_purchase(money, payment, options)
-            post[:capture] = "false" unless emv_payment?(payment)
+            if emv_payment?(payment)
+              add_application_fee(post, options)
+            else
+              post[:capture] = "false"
+            end
             commit(:post, 'charges', post, options)
           end
         end.responses.last
@@ -92,12 +96,11 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options = {})
         post = {}
 
-        add_application_fee(post, options)
-
         if emv_tc_response = options.delete(:icc_data)
           post[:card] = { emv_approval_data: emv_tc_response }
           commit(:post, "charges/#{CGI.escape(authorization)}", post, options)
         else
+          add_application_fee(post, options)
           add_amount(post, money, options)
           commit(:post, "charges/#{CGI.escape(authorization)}/capture", post, options)
         end
@@ -159,6 +162,7 @@ module ActiveMerchant #:nodoc:
           add_creditcard(card_params, payment, options)
         end
 
+        post[:validate] = options[:validate] unless options[:validate].nil?
         post[:description] = options[:description] if options[:description]
         post[:email] = options[:email] if options[:email]
 
@@ -383,7 +387,7 @@ module ActiveMerchant #:nodoc:
         return nil unless params
 
         params.map do |key, value|
-          next if value.blank?
+          next if value != false && value.blank?
           if value.is_a?(Hash)
             h = {}
             value.each do |k, v|
@@ -460,6 +464,8 @@ module ActiveMerchant #:nodoc:
           [response["id"], response["sources"]["data"].first["id"]].join("|")
         elsif method == :post && url.match(/customers\/.*\/cards/)
           [response["customer"], response["id"]].join("|")
+        elsif url.include?("refund") && response["refunds"]
+          response["refunds"]["data"].first["id"]
         else
           response["id"]
         end

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

@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
           billing[:address][:city]          = billing_address[:city]
           billing[:address][:stateProvince] = billing_address[:state]
           billing[:address][:postcodeZip]   = billing_address[:zip]
-          billing[:address][:country]       = billing_address[:country]
+          billing[:address][:country]       = country_code(billing_address[:country])
           billing[:phone]                   = billing_address[:phone]
 
           customer[:email]                  = options[:email] if options[:email]
@@ -132,7 +132,7 @@ module ActiveMerchant #:nodoc:
           shipping[:address][:city]          = shipping_address[:city]
           shipping[:address][:stateProvince] = shipping_address[:state]
           shipping[:address][:postcodeZip]   = shipping_address[:zip]
-          shipping[:address][:shipcountry]   = shipping_address[:country]
+          shipping[:address][:shipcountry]   = country_code(shipping_address[:country])
 
           last_name, first_middle_names = split_name(shipping_address[:name])
           shipping[:firstName]  = first_middle_names if first_middle_names
@@ -143,6 +143,14 @@ module ActiveMerchant #:nodoc:
         post[:customer].merge!(customer)
       end
 
+      def country_code(country)
+        if country
+          country = ActiveMerchant::Country.find(country)
+          country.code(:alpha3).value
+        end
+      rescue InvalidCountryCodeError
+      end
+
       def commit(action, post)
         url = build_url(post.delete(:orderid), post.delete(:transactionid))
         headers = {
@@ -150,8 +158,11 @@ module ActiveMerchant #:nodoc:
           'Content-Type' => 'application/json',
         }
         post[:apiOperation] = action.upcase
-        raw = parse(ssl_request(:put, url, build_request(post), headers))
-
+        begin
+          raw = parse(ssl_request(:put, url, build_request(post), headers))
+        rescue ResponseError => e
+          raw = parse(e.response.body)
+        end
         succeeded = success_from(raw['result'])
         Response.new(
           succeeded,

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

@@ -292,6 +292,17 @@ module ActiveMerchant #:nodoc:
         commit('unstore', parameters)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((&?cc=)\d*(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?cvv=)\d*(&?)), '\1[FILTERED]\2')
+      end
+
       private
       def add_payment_source(params, source)
         if source.is_a?(String)

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

@@ -141,9 +141,10 @@ module ActiveMerchant #:nodoc:
 
       def add_address_for_type(type, post, credit_card, address)
         prefix = address_key_prefix(type)
+        first_name, last_name = split_names(address[:name])
 
-        post[address_key(prefix, 'fname')]    = credit_card.first_name
-        post[address_key(prefix, 'lname')]    = credit_card.last_name
+        post[address_key(prefix, 'fname')]    = first_name.blank? && last_name.blank? ? credit_card.first_name : first_name
+        post[address_key(prefix, 'lname')]    = first_name.blank? && last_name.blank? ? credit_card.last_name : last_name
         post[address_key(prefix, 'company')]  = address[:company]   unless address[:company].blank?
         post[address_key(prefix, 'street')]   = address[:address1]  unless address[:address1].blank?
         post[address_key(prefix, 'street2')]  = address[:address2]  unless address[:address2].blank?
@@ -154,6 +155,15 @@ module ActiveMerchant #:nodoc:
         post[address_key(prefix, 'phone')]    = address[:phone]     unless address[:phone].blank?
       end
 
+      def split_names(full_name)
+        names = (full_name || '').split
+        return [nil, nil] if names.size == 0
+
+        last_name = names.pop
+        first_name = names.join(' ')
+        [first_name, last_name]
+      end
+
       def address_key_prefix(type)
         case type
         when :shipping then 'ship'

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

@@ -126,6 +126,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((<CreditCardNumber>)\d+(</CreditCardNumber>)), '\1[FILTERED]\2').
+          gsub(%r((<CVC2>)[^<]+(</CVC2>)), '\1[FILTERED]\2')
+      end
+
       private
       def clean_description(description)
         description.to_s.slice(0,32).encode("US-ASCII", invalid: :replace, undef: :replace, replace: '?')
@@ -417,4 +428,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -65,6 +65,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((<cardNumber>)\d+(</cardNumber>)), '\1[FILTERED]\2').
+          gsub(%r((<cvc>)[^<]+(</cvc>)), '\1[FILTERED]\2')
+      end
+
       private
 
       def authorize_request(money, payment_method, options)

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
 
       self.money_format = :cents
 
-      self.supported_countries = %w(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)
+      self.supported_countries = %w(HK US GB BE CH CZ DE DK ES FI FR GR HU IE IT LU MT NL NO PL PT SE SG TR)
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :laser, :switch]
 
       self.homepage_url = 'http://online.worldpay.com'

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.52.0"
+  VERSION = "1.53.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.52.0
+  version: 1.53.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -196,6 +196,7 @@ files:
 - lib/active_merchant/billing/gateways/checkout_v2.rb
 - lib/active_merchant/billing/gateways/commercegate.rb
 - lib/active_merchant/billing/gateways/conekta.rb
+- lib/active_merchant/billing/gateways/creditcall.rb
 - lib/active_merchant/billing/gateways/cyber_source.rb
 - lib/active_merchant/billing/gateways/data_cash.rb
 - lib/active_merchant/billing/gateways/dibs.rb
@@ -216,6 +217,7 @@ files:
 - lib/active_merchant/billing/gateways/firstdata_e4.rb
 - lib/active_merchant/billing/gateways/flo2cash.rb
 - lib/active_merchant/billing/gateways/flo2cash_simple.rb
+- lib/active_merchant/billing/gateways/forte.rb
 - lib/active_merchant/billing/gateways/garanti.rb
 - lib/active_merchant/billing/gateways/global_transport.rb
 - lib/active_merchant/billing/gateways/hdfc.rb
@@ -242,6 +244,7 @@ files:
 - 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/micropayment.rb
 - lib/active_merchant/billing/gateways/migs.rb
 - lib/active_merchant/billing/gateways/migs/migs_codes.rb
 - lib/active_merchant/billing/gateways/modern_payments.rb