activemerchant 1.42.8 → 1.42.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81edb8d2513f065dd9170ead1d0d6f72d4fc39c8
-  data.tar.gz: b14933f6c29ebd5ed555e12238a29828a959687a
+  metadata.gz: baa3b2ef41f3fd7b7ee93ae111090938ffee872a
+  data.tar.gz: 3104e5e77e0895fc86563e6ada9381b37d827f05
 SHA512:
-  metadata.gz: 9350271f4a9016fd5c8d0113def4e0ec6a654578d63d824b07647a59128110f6b9bd2a33c3205ad2c89debe1b013b555d08cbd51e68b2333a24a0f98a7a20326
-  data.tar.gz: 3ce7cf004ee44048d02e6805dd2b63808c104a6cad0d42980246707fb8d50a302d4798c63ced00a2ff7526bedf93e84dfd88ebf2adac2326f10a5a51666bc32c
+  metadata.gz: 5eb2c499dad2b3d33e7c820ce3c2afa77ea7376e19a84a348e4577d7ec10f7b8bbc8c8c6facf881ed65ea32de8762b3a1638ad7e5e7d4019545455364c36e323
+  data.tar.gz: 97f099bce96fa830eccc9be8d2b2a5934a01e58c4dcb94811827fff49321f48506f1e326f9d7797570af726298664d688241cfaf59e7627627727f1eff497455

data/CHANGELOG

@@ -1,5 +1,13 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.42.9 (April 15, 2014)
+
+* Spreedly: Add ip, description and gateway_specific_fields [faizalzakaria]
+* Sage (US): Support store/unstore of cards. [rwdaigle]
+* Pin: Add american express to supported cards [nagash]
+* Raven: Update handling of CVV/AVS [bslobodin]
+* Raven: Use UUID for RequestID [bslobodin]
+
 == Version 1.42.8 (April 4, 2014)
 
 * Cecabank: Handle invalid xml response body [duff]

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

@@ -1,11 +1,35 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PacNetRavenGateway < Gateway
+
+      AVS_ADDRESS_CODES = {
+        'avs_address_unavailable'   => 'X',
+        'avs_address_not_checked'   => 'X',
+        'avs_address_matched'       => 'Y',
+        'avs_address_not_matched'   => 'N',
+        'avs_address_partial_match' => 'N'
+      }
+
+      AVS_POSTAL_CODES = {
+        'avs_postal_unavailable'   => 'X',
+        'avs_postal_not_checked'   => 'X',
+        'avs_postal_matched'       => 'Y',
+        'avs_postal_not_matched'   => 'N',
+        'avs_postal_partial_match' => 'N'
+      }
+
+      CVV2_CODES = {
+        'cvv2_matched'     => 'Y',
+        'cvv2_not_matched' => 'N',
+        'cvv2_unavailable' => 'X',
+        'cvv2_not_checked' => 'X'
+      }
+
       self.test_url = 'https://demo.deepcovelabs.com/realtime/'
       self.live_url = 'https://raven.pacnetservices.com/realtime/'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = [:visa, :master]
       self.money_format = :cents
       self.default_currency = 'USD'
       self.homepage_url = 'http://www.pacnetservices.com/'
@@ -102,8 +126,11 @@ module ActiveMerchant #:nodoc:
           :test => test_mode,
           :authorization => response['TrackingNumber'],
           :fraud_review => fraud_review?(response),
-          :avs_result => { :postal_match => response['AVSPostalResponseCode'], :street_match => response['AVSAddressResponseCode'] },
-          :cvv_result => response['CVV2ResponseCode']
+          :avs_result => {
+                          :postal_match => AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
+                          :street_match => AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
+                         },
+          :cvv_result => CVV2_CODES[response['CVV2ResponseCode']]
         )
       end
 
@@ -161,7 +188,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def request_id
-        (0...21).map{(65+rand(26)).chr}.join.downcase
+        SecureRandom.uuid
       end
 
       def signature(action, post, parameters = {})

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'AUD'
       self.money_format = :cents
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = [:visa, :master, :american_express]
       self.homepage_url = 'http://www.pin.net.au/'
       self.display_name = 'Pin'
 

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

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/sage/sage_bankcard'
 require File.dirname(__FILE__) + '/sage/sage_virtual_check'
+require File.dirname(__FILE__) + '/sage/sage_vault'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -138,7 +139,26 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      # Stores a credit card in the Sage vault.
+      #
+      # ==== Parameters
+      #
+      # * <tt>credit_card</tt> - The CreditCard object to be stored.
+      def store(credit_card, options = {})
+        vault.store(credit_card, options)
+      end
+
+      # Deletes a stored card from the Sage vault.
+      #
+      # ==== Parameters
+      #
+      # * <tt>identification</tt> - The 'GUID' identifying the stored card.
+      def unstore(identification, options = {})
+        vault.unstore(identification, options)
+      end
+
       private
+
       def bankcard
         @bankcard ||= SageBankcardGateway.new(@options)
       end
@@ -146,7 +166,10 @@ module ActiveMerchant #:nodoc:
       def virtual_check
         @virtual_check ||= SageVirtualCheckGateway.new(@options)
       end
+
+      def vault
+        @vault ||= SageVaultGateway.new(@options)
+      end
     end
   end
 end
-

data/lib/active_merchant/billing/gateways/sage/sage_vault.rb

@@ -0,0 +1,149 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class SageVaultGateway < Gateway #:nodoc:
+      self.live_url = 'https://www.sagepayments.net/web_services/wsVault/wsVault.asmx'
+
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        super
+      end
+
+      def store(credit_card, options = {})
+        request = build_store_request(credit_card, options)
+        commit(:store, request)
+      end
+
+      def unstore(identification, options = {})
+        request = build_unstore_request(identification, options)
+        commit(:unstore, request)
+      end
+
+      private
+
+      # A valid request example, since the Sage docs have none:
+      #
+      # <?xml version="1.0" encoding="UTF-8" ?>
+      # <SOAP-ENV:Envelope
+      #   xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+      #   xmlns:ns1="https://www.sagepayments.net/web_services/wsVault/wsVault">
+      #   <SOAP-ENV:Body>
+      #     <ns1:INSERT_CREDIT_CARD_DATA>
+      #       <ns1:M_ID>279277516172</ns1:M_ID>
+      #       <ns1:M_KEY>O3I8G2H8V6A3</ns1:M_KEY>
+      #       <ns1:CARDNUMBER>4111111111111111</ns1:CARDNUMBER>
+      #       <ns1:EXPIRATION_DATE>0915</ns1:EXPIRATION_DATE>
+      #     </ns1:INSERT_CREDIT_CARD_DATA>
+      #   </SOAP-ENV:Body>
+      # </SOAP-ENV:Envelope>
+      def build_store_request(credit_card, options)
+        xml = Builder::XmlMarkup.new
+        add_credit_card(xml, credit_card, options)
+        xml.target!
+      end
+
+      def build_unstore_request(identification, options)
+        xml = Builder::XmlMarkup.new
+        add_identification(xml, identification, options)
+        xml.target!
+      end
+
+      def add_customer_data(xml)
+        xml.tag! 'ns1:M_ID', @options[:login]
+        xml.tag! 'ns1:M_KEY', @options[:password]
+      end
+
+      def add_credit_card(xml, credit_card, options)
+        xml.tag! 'ns1:CARDNUMBER', credit_card.number
+        xml.tag! 'ns1:EXPIRATION_DATE', exp_date(credit_card)
+      end
+
+      def add_identification(xml, identification, options)
+        xml.tag! 'ns1:GUID', identification
+      end
+
+      def exp_date(credit_card)
+        year  = sprintf("%.4i", credit_card.year)
+        month = sprintf("%.2i", credit_card.month)
+
+        "#{month}#{year[-2..-1]}"
+      end
+
+      def commit(action, request)
+        response = parse(ssl_post(live_url,
+          build_soap_request(action, request),
+          build_headers(action))
+        )
+
+        case action
+        when :store
+          success = response[:success] == 'true'
+          message = response[:message].downcase.capitalize if response[:message]
+        when :unstore
+          success = response[:delete_data_result] == 'true'
+          message = success ? 'Succeeded' : 'Failed'
+        end
+
+        Response.new(success, message, response,
+          authorization: response[:guid]
+        )
+      end
+
+      ENVELOPE_NAMESPACES = {
+        'xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/",
+        'xmlns:ns1' => "https://www.sagepayments.net/web_services/wsVault/wsVault"
+      }
+
+      ACTION_ELEMENTS = {
+        store: 'INSERT_CREDIT_CARD_DATA',
+        unstore: 'DELETE_DATA'
+      }
+
+      def build_soap_request(action, body)
+        xml = Builder::XmlMarkup.new
+
+        xml.instruct!
+        xml.tag! 'SOAP-ENV:Envelope', ENVELOPE_NAMESPACES do
+          xml.tag! 'SOAP-ENV:Body' do
+            xml.tag! "ns1:#{ACTION_ELEMENTS[action]}" do
+              add_customer_data(xml)
+              xml << body
+            end
+          end
+        end
+        xml.target!
+      end
+
+      SOAP_ACTIONS = {
+        store: 'https://www.sagepayments.net/web_services/wsVault/wsVault/INSERT_CREDIT_CARD_DATA',
+        unstore: 'https://www.sagepayments.net/web_services/wsVault/wsVault/DELETE_DATA'
+      }
+
+      def build_headers(action)
+        {
+          "SOAPAction" => SOAP_ACTIONS[action],
+          "Content-Type" => "text/xml; charset=utf-8"
+        }
+      end
+
+      def parse(body)
+        response = {}
+        hashify_xml!(body, response)
+        response
+      end
+
+      def hashify_xml!(xml, response)
+        xml = REXML::Document.new(xml)
+
+        # Store
+        xml.elements.each("//Table1/*") do |node|
+          response[node.name.underscore.to_sym] = node.text
+        end
+
+        # Unstore
+        xml.elements.each("//DELETE_DATAResponse/*") do |node|
+          response[node.name.underscore.to_sym] = node.text
+        end
+      end
+    end
+  end
+end

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

@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
       def save_card(retain, credit_card, options)
         request = build_xml_request('payment_method') do |doc|
           add_credit_card(doc, credit_card, options)
-          add_data(doc, options)
+          add_extra_options(:data, doc, options)
           doc.retained(true) if retain
         end
 
@@ -130,6 +130,8 @@ module ActiveMerchant #:nodoc:
       def auth_purchase_request(money, payment_method_token, options)
         build_xml_request('transaction') do |doc|
           add_invoice(doc, money, options)
+          doc.ip(options[:ip])
+          add_extra_options(:gateway_specific_fields, doc, options)
           doc.payment_method_token(payment_method_token)
           doc.retain_on_success(true) if options[:store]
         end
@@ -139,6 +141,7 @@ module ActiveMerchant #:nodoc:
         doc.amount amount(money)
         doc.currency_code(options[:currency] || currency(money) || default_currency)
         doc.order_id(options[:order_id])
+        doc.description(options[:description])
       end
 
       def add_credit_card(doc, credit_card, options)
@@ -159,17 +162,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_data(doc, options)
-        doc.data do
-          data_to_doc(doc, options[:data])
+      def add_extra_options(type, doc, options)
+        doc.send(type) do
+          extra_options_to_doc(doc, options[type])
         end
       end
 
-      def data_to_doc(doc, value)
+      def extra_options_to_doc(doc, value)
         return doc.text value unless value.kind_of? Hash
         value.each do |k, v|
           doc.send(k) do
-            data_to_doc(doc, v)
+            extra_options_to_doc(doc, v)
           end
         end
       end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.42.8"
+  VERSION = "1.42.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.42.8
+  version: 1.42.9
 platform: ruby
 authors:
 - Tobias Luetke
@@ -30,7 +30,7 @@ cert_chain:
   ZJB9YPQZG+vWBdDSca3sUMtvFxpLUFwdKF5APSPOVnhbFJ3vSXY1ulP/R6XW9vnw
   6kkQi2fHhU20ugMzp881Eixr+TjC0RvUerLG7g==
   -----END CERTIFICATE-----
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -350,6 +350,7 @@ files:
 - lib/active_merchant/billing/gateways/sage.rb
 - lib/active_merchant/billing/gateways/sage/sage_bankcard.rb
 - lib/active_merchant/billing/gateways/sage/sage_core.rb
+- lib/active_merchant/billing/gateways/sage/sage_vault.rb
 - lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb
 - lib/active_merchant/billing/gateways/sage_pay.rb
 - lib/active_merchant/billing/gateways/sallie_mae.rb