exact4r 1.2 → 1.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+== v1.4
+	Added support for specifying alternative SSL certificates
+
+== v1.3
+	Added support for TaggedUpdate transactions
+	Added support for ReferencedVoid transactions
+
 == v1.2
   Updated with new SSL certificates for https://api.e-xact.com
 

data/VERSION

@@ -1 +1 @@
-1.2
+1.4

data/lib/ews/certificate_helper.rb

@@ -0,0 +1,63 @@
+module EWS # :nodoc:
+  module CertificateHelper
+    
+    EXACT_ISSUER_CERT_FILE = File.dirname(__FILE__)+"/../../certs/valicert_class2_root.crt" unless defined?(EXACT_ISSUER_CERT_FILE)
+    EXACT_SERVER_CERT_FILE = File.dirname(__FILE__)+"/../../certs/e-xact.com.crt" unless defined?(EXACT_SERVER_CERT_FILE)
+    
+    attr_accessor :issuer_cert_file, :server_cert
+    
+    def configure_certificates(options)
+      self.issuer_cert_file = (options[:issuer_cert] || EXACT_ISSUER_CERT_FILE)
+      server_cert_file = (options[:server_cert] || EXACT_SERVER_CERT_FILE)
+      self.server_cert = File.new(server_cert_file).read
+    end
+    private :configure_certificates
+    
+    def validate_certificate(is_ok, ctx)
+      cert = ctx.current_cert
+      return false if cert.nil?
+
+      # preverify failed?
+      return false unless is_ok
+
+      self_signed = false
+      ca = false
+      pathlen = nil
+      server_auth = true
+      self_signed = (cert.subject.cmp(cert.issuer) == 0)
+
+      # Check extensions for the certificate purpose according to http://www.openssl.org/docs/apps/x509.html (Certificate Extensions) and
+      # http://www.ietf.org/rfc/rfc3280.txt.
+      cert.extensions.each do |ex|
+        case ex.oid
+        when 'basicConstraints'
+          /CA:(TRUE|FALSE)(?:, pathlen:)*(\d*)/  =~ ex.value
+          ca ||= ($1 == 'TRUE')
+          pathlen = $2.to_i
+        when 'keyUsage'
+          usage = ex.value.split(/\s*,\s*/)
+          # a CA must have
+          ca &&= !usage.grep(/Certificate Sign/i).empty?
+          # Server Cert Must have
+          server_auth &&= !usage.grep(/Key Encipherment/i).empty?
+        when 'extendedKeyUsage'
+          usage = ex.value.split(/\s*,\s*/)
+          # Server Cert Must have
+          server_auth &&= !usage.grep(/TLS Web Server Authentication/i).empty?
+        when 'nsCertType'
+          usage = ex.value.split(/\s*,\s*/)
+          ca ||= !usage.grep(/SSL CA/i).empty?
+          server_auth ||= !usage.grep(/SSL Server/i).empty?
+        end
+      end
+
+      # We're looking for the server cert, so accept all CAs (which have already passed pre-verification)
+      return true if self_signed || ca
+      
+      # ensure the server cert is the one we're expecting
+      return server_auth && self.server_cert == cert.to_pem
+    end
+    private :validate_certificate
+    
+  end
+end

data/lib/ews/transaction/request.rb

@@ -37,6 +37,8 @@ module EWS # :nodoc:
     #  :tagged_void
     #  :tagged_refund
     #  :tagged_online_debit_refund
+    #  :tagged_update
+    #  :referenced_void
     #  :recurring_seed_pre_auth
     #  :recurring_seed_purchase
     #  :idebit_purchase
@@ -113,6 +115,8 @@ METHOD_EOS
         :tagged_void => '33',
         :tagged_refund => '34',
         :tagged_online_debit_refund => '35',
+        :referenced_void => '36',
+        :tagged_update => '37',
         :recurring_seed_pre_auth => '40',
         :recurring_seed_purchase => '41',
         :idebit_purchase => '50',

data/lib/ews/transaction/validator.rb

@@ -40,6 +40,8 @@ module EWS  # :nodoc:
         
         if self.transaction_type == "CR"
           append_error(:transaction_tag, "transaction_tag must be supplied") if self.transaction_tag.to_i < 1
+        elsif self.transaction_type == "36"
+          validate_referenced_void
         elsif %w(80 81).include?(self.transaction_type)
           # do nothing, no validation required
         elsif %w(50 54).include?(self.transaction_type)
@@ -166,12 +168,13 @@ module EWS  # :nodoc:
       def validate_for_transaction_tag
         tt = self.transaction_type
 
-        # mandatory: transaction_type must == (30, 31, 32, 33, 34, 35)
-        append_error(:transaction_tag, "transaction_tag must only be set for tagged transactions") unless %w(30 31 32 33 34 35 CR).include?(tt)
+        # mandatory: transaction_type must == (30, 31, 32, 33, 34, 35, 37, CR)
+        append_error(:transaction_tag, "transaction_tag must only be set for tagged transactions") unless %w(30 31 32 33 34 35 37 CR).include?(tt)
         
         # transaction_tag, auth_num & amount mandatory
         mandatory = [:transaction_tag]
-        mandatory << [:authorization_num, :amount] unless tt == 'CR'
+        mandatory << :authorization_num unless tt == 'CR'
+        mandatory << :amount unless %w(CR 37).include?(tt)
         
         # ensure no cc details sent
         append_error(:cc_number, "do not set cc_number for tagged transactions") unless self.cc_number.blank?
@@ -227,6 +230,15 @@ module EWS  # :nodoc:
         check_mandatory(mandatory)
       end
       
+      def validate_referenced_void
+        [:cc_number, :pan, :track1, :track2, :transaction_tag].each do |attr_name|
+          append_error(attr_name, "#{attr_name} must not be set for referenced_void transactions") unless self.send(attr_name).nil?
+        end
+
+        check_mandatory([:reference_no, :customer_ref, :amount])
+      end
+      
+      
       def check_mandatory(mandatory)
         mandatory.each do |key|
           append_error(key, "#{key} must be supplied") if self.send(key).blank?

data/lib/ews/transporter.rb

@@ -1,4 +1,5 @@
 require 'net/https'
+require File.dirname(__FILE__) + '/certificate_helper'
 
 module EWS # :nodoc:
 
@@ -15,6 +16,7 @@ module EWS # :nodoc:
   # Once configured to connect to a particular service, it can be used repeatedly
   # to send as many transactions as required.
   class Transporter
+    include CertificateHelper
     
     # Initialize a Transporter.
     #
@@ -23,6 +25,8 @@ module EWS # :nodoc:
     #
     # You can also specify a hash of options as follows:
     #   :transport_type   the transport_type for this transporter (defaults to :rest)
+    #   :server_cert      the path to the server's certificate file (defaults to E-xact's Server Cert)
+    #   :issuer_cert      the path to the issuer's certificate file (defaults to E-xact's Issuer's Cert)
     #
     # The default certificates are those required to connect to https://api.e-xact.com and the
     # default <tt>transport_type</tt> is <tt>:rest</tt>. The default <tt>transport_type</tt> can be overridden on a per-transaction
@@ -31,8 +35,7 @@ module EWS # :nodoc:
       @url = URI.parse(url.gsub(/\/$/,''))
       @transport_type = options[:transport_type] || :rest
       
-      @@issuer_cert ||= File.dirname(__FILE__)+"/../../certs/valicert_class2_root.crt"
-      @@server_cert ||= File.new(File.dirname(__FILE__)+"/../../certs/e-xact.com.crt").read
+      configure_certificates(options)
     end
 
     # Submit a transaction request to the server
@@ -52,7 +55,7 @@ module EWS # :nodoc:
       request = build_http_request(transaction, transport_type, transport_details[:suffix])
       request.basic_auth(transaction.gateway_id, transaction.password)
       request.add_field "Accept", transport_details[:content_type]
-      request.add_field "User-Agent", "exact4r v1.2"
+      request.add_field "User-Agent", "exact4r v1.4"
       request.add_field "Content-type", "#{transport_details[:content_type]}; charset=UTF-8"
 
       response = get_connection.request(request)
@@ -106,56 +109,11 @@ private
         @connection.use_ssl = true
         @connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
         @connection.verify_callback = method(:validate_certificate)
-        @connection.ca_file = @@issuer_cert
+        @connection.ca_file = self.issuer_cert_file
       end
       @connection
     end
 
-    def validate_certificate(is_ok, ctx)
-      cert = ctx.current_cert
-      return false if cert.nil?
-
-      # preverify failed?
-      return false unless is_ok
-
-      self_signed = false
-      ca = false
-      pathlen = nil
-      server_auth = true
-      self_signed = (cert.subject.cmp(cert.issuer) == 0)
-
-      # Check extensions for the certificate purpose according to http://www.openssl.org/docs/apps/x509.html (Certificate Extensions) and
-      # http://www.ietf.org/rfc/rfc3280.txt.
-      cert.extensions.each do |ex|
-        case ex.oid
-        when 'basicConstraints'
-          /CA:(TRUE|FALSE)(?:, pathlen:)*(\d*)/  =~ ex.value
-          ca ||= ($1 == 'TRUE')
-          pathlen = $2.to_i
-        when 'keyUsage'
-          usage = ex.value.split(/\s*,\s*/)
-          # a CA must have
-          ca &&= !usage.grep(/Certificate Sign/i).empty?
-          # Server Cert Must have
-          server_auth &&= !usage.grep(/Key Encipherment/i).empty?
-        when 'extendedKeyUsage'
-          usage = ex.value.split(/\s*,\s*/)
-          # Server Cert Must have
-          server_auth &&= !usage.grep(/TLS Web Server Authentication/i).empty?
-        when 'nsCertType'
-          usage = ex.value.split(/\s*,\s*/)
-          ca ||= !usage.grep(/SSL CA/i).empty?
-          server_auth ||= !usage.grep(/SSL Server/i).empty?
-        end
-      end
-
-      # We're looking for the server cert, so accept all CAs (which have already passed pre-verification)
-      return true if self_signed || ca
-      
-      # ensure the server cert is the one we're expecting
-      return server_auth && @@server_cert == cert.to_pem
-    end
-
     # what transport types we support, and their corresponding suffixes
     @@transport_types = {
       :rest => {:suffix => "xml", :content_type => "application/xml"},

data/test/credentials.yml

@@ -1,5 +1,5 @@
 DEV:
-  location: http://ws.local/
+  location: http://localhost:3000/
   tsys:
     :gateway_id: AD0156-01
     :password: 4apitest
@@ -16,6 +16,24 @@ DEV:
     :gateway_id: AD0158-01
     :password: 4apitest
 
+QA:
+  location: https://api.qa.e-xact.com/
+  tsys:
+    :gateway_id: A04766-01
+    :password: 4apitest
+  emergis:
+    :gateway_id: A04763-01
+    :password: 4apitest
+  moneris:
+    :gateway_id: A04760-01
+    :password: 4apitest
+  chase:
+    :gateway_id: A04757-02
+    :password: 4apitest
+  chase_batch:
+    :gateway_id: A04757-01
+    :password: 4apitest
+
 PROD:
   location: https://api.e-xact.com/
   tsys:

data/test/exhaustive/forced_post_test.rb

@@ -39,7 +39,9 @@ class ForcedPostTest < Test::Unit::TestCase
     assert request.valid?
   end
   
-  def test_by_credit_card    
+  def test_by_credit_card
+    return if @@credentials.chase? || @@credentials.moneris?
+    
     request = EWS::Transaction::Request.new(cc_number_params.merge(:transaction_type => :forced_post))
     request.amount = 11.25
     request.authorization_num = "1234"
@@ -51,6 +53,8 @@ class ForcedPostTest < Test::Unit::TestCase
   end
   
   def test_by_track1
+    return if @@credentials.chase? || @@credentials.moneris?
+
     request = EWS::Transaction::Request.new(track1_params.merge(:transaction_type => :forced_post))
     request.amount = 11.25
     request.authorization_num = "1234"
@@ -62,6 +66,8 @@ class ForcedPostTest < Test::Unit::TestCase
   end
   
   def test_by_track2
+    return if @@credentials.chase? || @@credentials.moneris?
+
     request = EWS::Transaction::Request.new(track2_params.merge(:transaction_type => :forced_post))
     request.amount = 11.25
     request.authorization_num = "1234"

data/test/exhaustive/referenced_void_test.rb

@@ -0,0 +1,131 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+#
+# A ReferencedVoid behaves the same as a TaggedVoid, except, instead of using transaction_tag,
+# authorization_num and amount to lookup the transaction to be voided, you use reference_no,
+# customer_ref and amount.
+#
+class ReferencedVoidTest < Test::Unit::TestCase
+  
+  def setup
+    @transporter = EWS::Transporter.new(@@credentials.config['location'])
+
+    # do initial purchase
+    request = EWS::Transaction::Request.new(cc_number_params.merge({
+      :transaction_type => :purchase,
+      :amount => 11.25,
+      :reference_no => "reference_no_#{rand(10)}",
+      :customer_ref => "customer_ref_#{rand(10)}"
+    }))
+    assert request.valid?, request.errors.inspect
+    
+    @purchase = @transporter.submit(request, :json)
+    assert @purchase.approved?
+  end
+  
+  def test_mandatory
+    request = EWS::Transaction::Request.new(:transaction_type => :referenced_void)
+    assert !request.valid?
+    assert_equal "gateway_id must be supplied", request.errors[:gateway_id]
+    
+    request.gateway_id = @@credentials.current_gateway[:gateway_id]
+    assert !request.valid?
+    assert_equal "password must be supplied", request.errors[:password]
+    
+    request.password = @@credentials.current_gateway[:password]
+    assert !request.valid?    
+    assert_equal "reference_no must be supplied", request.errors[:reference_no]
+    
+    request.reference_no = "something"
+    assert !request.valid?
+    assert_equal "customer_ref must be supplied", request.errors[:customer_ref]
+    
+    request.customer_ref = "something"
+    assert !request.valid?
+    assert_equal "amount must be supplied", request.errors[:amount]
+    
+    request.amount = 11.25
+    assert request.valid?
+    
+    # don't set any CC information
+    [:cc_number, :pan, :track1, :track2, :transaction_tag].each do |attr_name|
+      request.send("#{attr_name}=", "something")
+      assert !request.valid?
+      assert_equal "#{attr_name} must not be set for referenced_void transactions", request.errors[attr_name]
+      request.send("#{attr_name}=", nil)
+    end
+  end
+
+  def test_json
+    request = EWS::Transaction::Request.new({
+      :transaction_type => :referenced_void,
+      :amount => 11.25,
+      :reference_no => @purchase.reference_no,
+      :customer_ref => @purchase.customer_ref
+    }.merge(@@credentials.current_gateway))
+    assert request.valid?, request.errors.inspect
+    
+    assert_details_correct request, @transporter.submit(request, :json)
+  end
+
+  def test_rest
+    request = EWS::Transaction::Request.new({
+      :transaction_type => :referenced_void,
+      :amount => 11.25,
+      :reference_no => @purchase.reference_no,
+      :customer_ref => @purchase.customer_ref
+    }.merge(@@credentials.current_gateway))
+    assert request.valid?, request.errors.inspect
+    
+    assert_details_correct request, @transporter.submit(request, :rest)
+  end
+
+  def test_soap
+    request = EWS::Transaction::Request.new({
+      :transaction_type => :referenced_void,
+      :amount => 11.25,
+      :reference_no => @purchase.reference_no,
+      :customer_ref => @purchase.customer_ref
+    }.merge(@@credentials.current_gateway))
+    assert request.valid?, request.errors.inspect
+    
+    assert_details_correct request, @transporter.submit(request, :soap)
+  end
+  
+  def test_requires_correct_amount
+    request = EWS::Transaction::Request.new({
+      :transaction_type => :referenced_void,
+      :amount => 3.50,
+      :reference_no => @purchase.reference_no,
+      :customer_ref => @purchase.customer_ref
+    }.merge(@@credentials.current_gateway))
+    assert request.valid?, request.errors.inspect
+    
+    response = @transporter.submit(request, :json)
+    assert !response.approved?
+
+    request.amount = 13.50
+    response = @transporter.submit(request, :rest)
+    assert !response.approved?
+
+    request.amount = 11.25
+    assert_details_correct request, @transporter.submit(request, :soap)
+  end
+
+  def test_multiple_voids_against_one_transaction
+    request = EWS::Transaction::Request.new({
+      :transaction_type => :referenced_void,
+      :amount => 11.25,
+      :reference_no => @purchase.reference_no,
+      :customer_ref => @purchase.customer_ref
+    }.merge(@@credentials.current_gateway))
+    assert request.valid?, request.errors.inspect
+    
+    assert_details_correct request, @transporter.submit(request, :json)
+
+    # can't void an already-voided transaction
+    response = @transporter.submit(request, :json)
+    assert !response.approved?
+  end
+
+end

data/test/exhaustive/refund_correction_test.rb

@@ -43,7 +43,7 @@ class RefundCorrectionTest < Test::Unit::TestCase
     assert request.valid?
   end
   
-  def test_by_credit_card    
+  def test_by_credit_card
     return unless @@credentials.moneris?
     
     request = EWS::Transaction::Request.new(cc_number_params.merge(:transaction_type => :refund_correction).merge(@@credentials.current_gateway))

data/test/exhaustive/tagged_update_test.rb

@@ -0,0 +1,158 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+#
+# A TaggedUpdate request allows a merchant to edit the reference_no and customer_ref values of a
+# previous transaction. Please note that this is NOT a financial transaction, it merely allows
+# you to change the values stored in our DB for a given transaction.
+#
+# In common with all other tagged transactions, you supply the transaction_tag and authorization_num
+# for the transaction whose values you wish to change, along with the new values for reference_no
+# and/or customer_ref.
+#
+# NOTE: nil, empty string ("") or whitespace string ("   ") are not permitted, and, although the
+# request will be approved, the relevant attribute WILL NOT CHANGE.
+#
+class TaggedUpdateTest < Test::Unit::TestCase
+  
+  def setup
+    @transporter = EWS::Transporter.new(@@credentials.config['location'])
+
+    # do initial purchase request
+    request = EWS::Transaction::Request.new(cc_number_params.merge(:transaction_type => :purchase))
+    request.amount = 11.25
+    request.reference_no = "reference_no"
+    request.customer_ref = "customer_ref"
+    assert request.valid?, request.errors.inspect
+    
+    @purchase = @transporter.submit(request, :json)
+    assert @purchase.approved?, @purchase.to_yaml
+  end
+  
+  def test_mandatory
+    request = EWS::Transaction::Request.new(:transaction_type => :tagged_update)
+    assert !request.valid?
+    assert_equal "gateway_id must be supplied", request.errors[:gateway_id]
+    
+    request.gateway_id = @@credentials.current_gateway[:gateway_id]
+    assert !request.valid?
+    assert_equal "password must be supplied", request.errors[:password]
+    
+    request.password = @@credentials.current_gateway[:password]
+    assert !request.valid?
+    assert_equal "One of the following must be supplied: cc_number, track1, track2 or transaction_tag.", request.errors[:base]
+    
+    request.transaction_tag = 1234
+    assert !request.valid?
+    assert_equal "authorization_num must be supplied", request.errors[:authorization_num]
+        
+    request.authorization_num = "TH6754"
+    assert request.valid?, request.errors.inspect
+    
+    request.cc_number = "4111111111111111"
+    assert !request.valid?
+    assert_equal "do not set cc_number for tagged transactions", request.errors[:cc_number]
+  end
+  
+  def test_json
+    request = tagged_update_request(@purchase)
+    assert request.valid?, request.errors.inspect
+    
+    response = @transporter.submit(request, :json)
+    assert response.approved?
+    
+    # we're getting the details of the original transction returned
+    assert_equal @purchase.transaction_tag, response.transaction_tag
+    assert_equal "something_new", response.reference_no
+    assert_equal "something_old", response.customer_ref
+  end
+
+  def test_rest
+    request = tagged_update_request(@purchase)
+    assert request.valid?, request.errors.inspect
+
+    response = @transporter.submit(request, :rest)
+    
+    # we're getting the details of the original transction returned
+    assert_equal @purchase.transaction_tag, response.transaction_tag
+    assert_equal "something_new", response.reference_no
+    assert_equal "something_old", response.customer_ref
+  end
+
+  def test_soap
+    request = tagged_update_request(@purchase)
+    assert request.valid?, request.errors.inspect
+
+    response = @transporter.submit(request, :soap)
+    
+    # we're getting the details of the original transction returned
+    assert_equal @purchase.transaction_tag, response.transaction_tag
+    assert_equal "something_new", response.reference_no
+    assert_equal "something_old", response.customer_ref
+  end
+  
+  def test_multiple_updates
+    request1 = tagged_update_request(@purchase)
+    assert request1.valid?, request1.errors.inspect
+
+    response1 = @transporter.submit(request1, :soap)
+    assert_equal "something_new", response1.reference_no
+    assert_equal "something_old", response1.customer_ref
+
+    request2 = tagged_update_request(@purchase, {
+      :reference_no => "bananas",
+      :customer_ref => "oranges"
+    })
+    assert request2.valid?, request2.errors.inspect
+
+    response2 = @transporter.submit(request2, :soap)
+    assert_equal "bananas", response2.reference_no
+    assert_equal "oranges", response2.customer_ref
+  end
+  
+  def test_updating_single_attribute
+    # change only reference_no
+    request1 = tagged_update_request(@purchase, {:customer_ref => nil})
+    assert request1.valid?, request1.errors.inspect
+
+    response1 = @transporter.submit(request1, :soap)
+    assert_equal "something_new", response1.reference_no
+    assert_equal "customer_ref", response1.customer_ref
+
+    # change only customer_ref
+    request2 = tagged_update_request(@purchase, {:reference_no => nil})
+    assert request2.valid?, request2.errors.inspect
+
+    response2 = @transporter.submit(request2, :soap)
+    assert_equal "something_new", response2.reference_no
+    assert_equal "something_old", response2.customer_ref
+  end
+  
+  def test_empty_strings_ignored
+    request1 = tagged_update_request(@purchase, {:customer_ref => ""})
+    assert request1.valid?, request1.errors.inspect
+
+    response1 = @transporter.submit(request1, :soap)
+    assert_equal "something_new", response1.reference_no
+    assert_equal "customer_ref", response1.customer_ref
+  end
+
+  def test_whitepaces_strings_ignored
+    request1 = tagged_update_request(@purchase, {:customer_ref => "       "})
+    assert request1.valid?, request1.errors.inspect
+
+    response1 = @transporter.submit(request1, :soap)
+    assert_equal "something_new", response1.reference_no
+    assert_equal "customer_ref", response1.customer_ref
+  end
+
+  def tagged_update_request(original_txn, options = {})
+    EWS::Transaction::Request.new({
+      :transaction_type => :tagged_update,
+      :transaction_tag => original_txn.transaction_tag,
+      :authorization_num => original_txn.authorization_num,
+      :reference_no => "something_new",
+      :customer_ref => "something_old"
+    }.merge(options).merge(@@credentials.current_gateway))
+  end
+  private :tagged_update_request
+end

data/test/exhaustive/transaction_details_test.rb

@@ -70,18 +70,19 @@ class TransactionDetailsTest < Test::Unit::TestCase
   end
   
   def assert_details_match_original_response(original_response, details_response)
+    # exclude: client_ip, pan
     [:logon_message, :error_number, :error_description, :transaction_error, :transaction_approved, :exact_resp_code, :exact_message,
       :bank_resp_code, :bank_message, :bank_resp_code_2, :sequence_no, :avs, :cvv2, :retrieval_ref_no, :cavv_response, :merchant_name,
       :merchant_address, :merchant_city, :merchant_province, :merchant_country, :merchant_postal, :merchant_url, :gateway_id, :password,
-      :transaction_type, :amount, :surcharge_amount, :cc_number, :transaction_tag, :track1, :track2, :pan, :authorization_num, :cc_expiry,
+      :transaction_type, :amount, :surcharge_amount, :cc_number, :transaction_tag, :track1, :track2, :authorization_num, :cc_expiry,
       :cardholder_name, :cc_verification_str1, :cc_verification_str2, :cvd_presence_ind, :tax1_amount, :tax1_number, :tax2_amount,
       :tax2_number, :secure_auth_required, :secure_auth_result, :ecommerce_flag, :xid, :cavv, :cavv_algorithm, :reference_no, :customer_ref,
-      :reference_3, :language, :client_ip, :client_email, :user_name, :zip_code].each do |attr_name|
+      :reference_3, :language, :client_email, :user_name, :zip_code].each do |attr_name|
+        next if attr_name == :cc_expiry && %(35 50 54).include?(original_response.transaction_type)
+        
       o_value = original_response.send(attr_name).to_s
       d_value = details_response.send(attr_name).to_s
-      unless o_value == d_value
-        puts "#{attr_name}: #{o_value} / #{d_value}"
-      end
+      assert_equal o_value, d_value, "#{attr_name}: #{o_value} / #{d_value}"
     end
   end
   private :assert_details_match_original_response

data/test/exhaustive/void_test.rb

@@ -40,42 +40,79 @@ class VoidTest < Test::Unit::TestCase
   end
   
   def test_by_credit_card    
-    return if @@credentials.chase? || @@credentials.moneris?
-    
+    return if @@credentials.moneris?
+
+    response = send_purchase(cc_number_params)
+
     request = EWS::Transaction::Request.new(cc_number_params.merge(:transaction_type => :void))
     request.amount = 11.25
-    request.authorization_num = "1234"
+    request.authorization_num = response.authorization_num
     assert request.valid?, request.errors.inspect
     
     assert_details_correct request, @transporter.submit(request, :json)
+    
+    response = send_purchase(cc_number_params)
+    request.authorization_num = response.authorization_num
+    
     assert_details_correct request, @transporter.submit(request, :rest)
+    
+    response = send_purchase(cc_number_params)
+    request.authorization_num = response.authorization_num
+    
     assert_details_correct request, @transporter.submit(request, :soap)
   end
   
   def test_by_track1
-    return if @@credentials.chase? || @@credentials.moneris?
+    return if @@credentials.moneris?
     
+    response = send_purchase(track1_params)
+
     request = EWS::Transaction::Request.new(track1_params.merge(:transaction_type => :void))
     request.amount = 11.25
-    request.authorization_num = "1234"
+    request.authorization_num = response.authorization_num
     assert request.valid?, request.errors.inspect
     
     assert_details_correct request, @transporter.submit(request, :json)
+    
+    response = send_purchase(track1_params)
+    request.authorization_num = response.authorization_num
+    
     assert_details_correct request, @transporter.submit(request, :rest)
+    
+    response = send_purchase(track1_params)
+    request.authorization_num = response.authorization_num
+    
     assert_details_correct request, @transporter.submit(request, :soap)
   end
   
   def test_by_track2
-    return if @@credentials.chase? || @@credentials.moneris?
+    return if @@credentials.moneris?
     
+    response = send_purchase(track2_params)
+
     request = EWS::Transaction::Request.new(track2_params.merge(:transaction_type => :void))
     request.amount = 11.25
-    request.authorization_num = "1234"
+    request.authorization_num = response.authorization_num
     assert request.valid?, request.errors.inspect
     
     assert_details_correct request, @transporter.submit(request, :json)
+    
+    response = send_purchase(track2_params)
+    request.authorization_num = response.authorization_num
+    
     assert_details_correct request, @transporter.submit(request, :rest)
+    
+    response = send_purchase(track2_params)
+    request.authorization_num = response.authorization_num
+    
     assert_details_correct request, @transporter.submit(request, :soap)
   end
   
+  def send_purchase(params)
+    request = EWS::Transaction::Request.new(params.merge(:transaction_type => :purchase, :amount => 11.25))
+    assert request.valid?, request.errors.inspect
+    response = @transporter.submit(request, :json)
+    assert response.approved?
+    response
+  end
 end

data/test/general/transporter_test.rb

@@ -48,7 +48,27 @@ class TransporterTest < Test::Unit::TestCase
     
     assert_not_nil resp
     assert_equal 404, resp.error_number
-    assert_equal "Not Found", resp.error_description
+    assert_equal "Not Found", resp.error_description.strip
+  end
+  
+  def test_uses_supplied_certificates
+    req = ::EWS::Transaction::Request.new({
+      :transaction_type => :purchase,
+      :amount => "10.13",
+      :cardholder_name => "Simon Brown",
+      :cc_number => "4111111111111111",
+      :cc_expiry => "1012",
+      :reference_no => "987987",
+    }.merge(@@credentials.current_gateway))    
+    
+    tr = ::EWS::Transporter.new(@@credentials.config['location'], {
+      :issuer_cert => File.dirname(__FILE__)+"/../../certs/valicert_class2_root.crt",
+      :server_cert => File.dirname(__FILE__)+"/../../certs/e-xact.com.crt"
+    })
+    resp = tr.submit(req, :json)
+    
+    assert_not_nil resp
+    assert resp.approved?
   end
 
 end

data/test/test_helper.rb

@@ -38,7 +38,7 @@ end
 
 def assert_details_correct(request, response)
   assert_not_nil response, "response should not be nil"
-  assert response.approved?, "#{response.error_number} / #{response.error_description} / #{response.exact_message} / #{response.bank_message}"
+  assert response.approved?, "#{response.error_number} / #{response.error_description} / #{response.exact_resp_code} / #{response.exact_message} / #{response.bank_message}"
   
   assert_not_nil response.transaction_tag
   assert_not_nil response.authorization_num
@@ -49,9 +49,11 @@ def assert_details_correct(request, response)
 end
 
 def assert_card_details(response)
-  assert_match /............1111/, response.cc_number
-  assert_equal TEST_CARD_HOLDER, response.cardholder_name
-  assert_equal TEST_CARD_EXPIRY, response.cc_expiry unless %w(35 50 54).include?(response.transaction_type)
+  unless %w(35 50 54).include?(response.transaction_type)
+    assert_match /............1111/, response.cc_number
+    assert_equal TEST_CARD_HOLDER, response.cardholder_name
+    assert_equal TEST_CARD_EXPIRY, response.cc_expiry
+  end
 end
 
 def basic_params(options = {})

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: exact4r
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - E-xact Transactions Ltd.
@@ -9,29 +13,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 +11:00
+date: 2010-07-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: dredmond@e-xact.com
 executables: []
@@ -49,6 +61,7 @@ files:
 - ./certs/exact.cer
 - ./certs/valicert_class2_root.crt
 - ./CHANGELOG
+- ./lib/ews/certificate_helper.rb
 - ./lib/ews/transaction/fake_response.rb
 - ./lib/ews/transaction/mapping.rb
 - ./lib/ews/transaction/request.rb
@@ -58,6 +71,7 @@ files:
 - ./lib/ews/transporter.rb
 - ./lib/exact4r.rb
 - ./LICENCE
+- ./pkg/exact4r-1.2.gem
 - ./Rakefile
 - ./README
 - ./test/credentials.rb
@@ -73,6 +87,7 @@ files:
 - ./test/exhaustive/purchase_test.rb
 - ./test/exhaustive/recurring_seed_pre_auth_test.rb
 - ./test/exhaustive/recurring_seed_purchase_test.rb
+- ./test/exhaustive/referenced_void_test.rb
 - ./test/exhaustive/refund_correction_test.rb
 - ./test/exhaustive/refund_test.rb
 - ./test/exhaustive/secure_storage_test.rb
@@ -81,6 +96,7 @@ files:
 - ./test/exhaustive/tagged_pre_auth_test.rb
 - ./test/exhaustive/tagged_purchase_test.rb
 - ./test/exhaustive/tagged_refund_test.rb
+- ./test/exhaustive/tagged_update_test.rb
 - ./test/exhaustive/tagged_void_test.rb
 - ./test/exhaustive/transaction_details_test.rb
 - ./test/exhaustive/void_test.rb
@@ -122,18 +138,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: exact4r
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: E-xact Web Services Client Library.