exact4r 0.6 → 0.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+== v0.7
+  Updated with latest certificates for api.e-xact.com
+  Fixed SOAP namespace issue
+  Ensured expiry_date always submitted at MMYY
+
 == v0.6
   Added client-side request validation
   

data/Rakefile

@@ -1,7 +1,7 @@
 require 'spec/rake/spectask'
 require 'rake/rdoctask'
 require "rubygems"
-Gem::manage_gems
+# Gem::manage_gems
 require "rake/gempackagetask"
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.6
+0.7

data/certs/exact.cer

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIDCFDUMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
+MIIC7DCCAlWgAwIBAgIDCqSQMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
 MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMTE1MDA0MDAyWhcNMDkwMjE0MDA0MDAy
+aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDkwMjEzMDAxMDQ2WhcNMTAwMzE1MjMxMDQ2
 WjB3MQswCQYDVQQGEwJDQTEZMBcGA1UECBMQQnJpdGlzaCBDb2x1bWJpYTESMBAG
 A1UEBxMJVmFuY291dmVyMSIwIAYDVQQKExlFLXhhY3QgVHJhbnNhY3Rpb25zLCBM
 dGQuMRUwEwYDVQQDFAwqLmUteGFjdC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAKDWJW7DQ9EAkYE0j8QKZtGyRPx84NHaMLA9uJsqG9EMPfNCRd8Puafx
-dJ6phUS/gP/ELRmJLlKO7qg6hTfLB3UwvAoMfF8VZM8jNbd3/b+SQD6CiPX0vETH
-85qIegdNrRQNm0ZKhq10bQlzKyoOrk0MDzDd6a98NyrLhVvb1nDlAgMBAAGjga4w
-gaswDgYDVR0PAQH/BAQDAgTwMB0GA1UdDgQWBBTsLqYhwlm0BeEOq0Mhl6P5lxWP
-cTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxz
+MIGJAoGBAKAEtyoEOQMqbYNTo/XGXx68vElKFb3lhQ9qimRlggadSCA3F1P40dMz
+3PlXDtKN9TcvqYalvmrntjmtY7/QgBu59AJOIoFDXe/XCtW16XAlANIrTvS9zhHd
+nnLhCHcLAhEJIssWb3ddXiK8NDIyHtIbWYRIdzT0aPOLtoUXfcBLAgMBAAGjga4w
+gaswDgYDVR0PAQH/BAQDAgTwMB0GA1UdDgQWBBSTkCQC1iSGLxD/+kL5elS75kLe
+hDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxz
 L3NlY3VyZWNhLmNybDAfBgNVHSMEGDAWgBRI5mj5K9KylddH2CMgEE8zmJCf1DAd
 BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEA
-X5PCTOTdEnxbG3qcrpgiwnh3ax0Orgy8VUEv3q08GlTu8b+p96/p9e4pWFnZ1FtH
-F8B9PGPeDGZDu0+d3HcMuPBgdl/qyVPI7BIfED7V/PXLj92QQP5VI49R9DI1dj+O
-bWaptb3x1gcxEP7ifBLl4fg080RlxAJmFrHTF2h9TQ4=
+iHFOvsHR2SZ93jry4TaDWXXVN3gBuK9S7j4ubcGbT4HZe/1OJXE8Hpdc6lFaBgdi
+ZK2qHFzZ7suhcOiF6f7HCtDDXdoGAhYJVWGvhd/2CsvaRzdVWkUQzfRgDXKoYU9W
+BEQs/Y5lG23rmq4WJe6HSVN0FMaZS3aVIr54821hKPc=
 -----END CERTIFICATE-----

data/lib/ews/transaction/mapping.rb

@@ -1,5 +1,4 @@
 require 'builder'
-require 'activesupport'
 
 module EWS # :nodoc:
   module Transaction # :nodoc:
@@ -105,7 +104,7 @@ module EWS # :nodoc:
     
       def self.json_to_response(content)
         response = EWS::Transaction::Response.new
-        ActiveSupport::JSON.decode(content).each { |k,v| response.send "#{k}=", v if response.respond_to?(k) }
+        ActiveSupport::JSON.decode(content).each { |k,v| response.send "#{k}=", v if response.respond_to?("#{k}=") }
         response
       end
       def self.rest_to_response(content)
@@ -169,21 +168,17 @@ module EWS # :nodoc:
       # type-conversion from strings for certain attributes
       ATTR_FORMATS = {
         :transaction_tag => "i",
-        :transaction_approved => "i",
-        :amount => "f",
-        :surcharge_amount => "f",
-        :tax1_amount => "f",
-        :tax2_amount => "f"
+        :transaction_approved => "i"
       }
     
       REQUEST_ENVELOPE_NAMESPACES = {
         "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema",
-        "xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/",
+        "xmlns:soap" => "http://schemas.xmlsoap.org/soap/envelope/",
         "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
       }
       REQUEST_SAC_ATTRIBUTES = {
         "xmlns:n1" => "http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Request",
-        "env:encodingStyle" => "http://schemas.xmlsoap.org/soap/encoding/"
+        "soap:encodingStyle" => "http://schemas.xmlsoap.org/soap/encoding/"
       }
       REQUEST_SAC_SOURCE_ATTRIBUTES = {
         "xmlns:n2" => "http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes",

data/lib/ews/transaction/validator.rb

@@ -47,10 +47,10 @@ module EWS  # :nodoc:
         append_error(:tax2_amount, "invalid tax2_amount supplied") unless valid_amount?(self.tax2_amount)
 
         # ensure our amounts are within range
-        append_error(:amount, "amount must be between 0.00 and 99999.99") unless amount_too_big?(self.amount)
-        append_error(:surcharge_amount, "amount must be between 0.00 and 99999.99") unless amount_too_big?(self.surcharge_amount)
-        append_error(:tax1_amount, "amount must be between 0.00 and 99999.99") unless amount_too_big?(self.tax1_amount)
-        append_error(:tax2_amount, "amount must be between 0.00 and 99999.99") unless amount_too_big?(self.tax2_amount)
+        append_error(:amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.amount)
+        append_error(:surcharge_amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.surcharge_amount)
+        append_error(:tax1_amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.tax1_amount)
+        append_error(:tax2_amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.tax2_amount)
         
         # ensure our credit card information is valid
         append_error(:cc_number, "invalid cc_number supplied") unless valid_card_number?
@@ -63,7 +63,7 @@ module EWS  # :nodoc:
       def validate_lengths
         @@valid_lengths.each do |k,len|
           value = self.send k
-          append_error(k, "#{k.to_s} is too long. maximum allowed length is #{len} characters") unless value.nil? or (value.length <= len)
+          append_error(k, "#{k.to_s} is too long. Maximum allowed length is #{len} characters") unless value.nil? or (value.length <= len)
         end
       end
       
@@ -76,15 +76,10 @@ module EWS  # :nodoc:
       # c) encoded in a track1 value, or
       # d) encoded in a track2 value
       def validate_mandatory_fields
-        if !self.cc_number.blank?
-          validate_for_card
-        elsif !self.transaction_tag.blank?
-          validate_for_transaction_tag
-        elsif !self.track1.blank?
-          validate_for_track1
-        elsif !self.track2.blank?
-          validate_for_track2
-        end
+        validate_for_card unless self.cc_number.blank?
+        validate_for_transaction_tag unless self.transaction_tag.blank?
+        validate_for_track1 unless self.track1.blank?
+        validate_for_track2 unless self.track2.blank?
       end
       
       def valid_amount?(amount)
@@ -92,7 +87,7 @@ module EWS  # :nodoc:
 
         ((amount.class == Float) or (amount.class == Fixnum) or !amount.match(/[^0-9.]/))        
       end
-      def amount_too_big?(amount)
+      def amount_in_range?(amount)
         return true if amount.blank?
 
         return ((amount.to_f <= 99999.99) and (amount.to_f >= 0.0))
@@ -124,7 +119,8 @@ module EWS  # :nodoc:
         return false unless self.cc_expiry.match(/^\d{4}$/)
       
         # check date is not in past
-        year, month = 2000 + self.cc_expiry[2..3].to_i, self.cc_expiry[0..1].to_i
+        year, month = self.cc_expiry[2..3].to_i, self.cc_expiry[0..1].to_i
+        year += (year > 79) ? 1900 : 2000
 
     		# CC is still considered valid during the month of expiry,
     		# so just compare year and month, ignoring the rest.
@@ -146,7 +142,7 @@ module EWS  # :nodoc:
         end
       end
 
-      # validate presence of mandatort fields when cc_number present
+      # validate presence of mandatory fields when cc_number present
       def validate_for_card
         tt = self.transaction_type.to_i
         
@@ -208,7 +204,7 @@ module EWS  # :nodoc:
         tt = self.transaction_type.to_i
 
         # mandatory: transaction_type must != (30, 31, 32, 34, 35, 50, 54)
-        append_error(:track1, "track1 must not be set for tagged transactions") if [30,31,32,34,35,50,54].include?(tt)
+        append_error(:track2, "track2 must not be set for tagged transactions") if [30,31,32,34,35,50,54].include?(tt)
 
         # track2, expiry_date, cardholder_name, amount mandatory
         mandatory = [:track2, :cc_expiry, :cardholder_name, :amount]

data/lib/ews/transporter.rb

@@ -22,19 +22,17 @@ module EWS # :nodoc:
     # to https://api.e-xact.com, the location of our transaction processing web service.
     #
     # You can also specify a hash of options as follows:
-    #   :server_cert      the path to the server's certificate
-    #   :issuer_cert      the path to the certificate of the issuer of the server certificate
     #   :transport_type   the transport_type for this transporter (defaults to :rest)
     #
     # 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
     # basis, if you choose to do so, by specifying it as a parameter to the <tt>submit</tt> method.
-    def initialize(url = "https://api.e-xact.com/", options = {})
+    def initialize(url = "https://api.e-xact.com", options = {})
       @url = URI.parse(url.gsub(/\/$/,''))
-      base = File.dirname(__FILE__)
-      @server_cert = options[:server_cert] || base+"/../../certs/exact.cer"
-      @issuer_cert = options[:issuer_cert] || base+"/../../certs/equifax_ca.cer"
-      @transport_type = options[:transport_type] || :json
+      @transport_type = options[:transport_type] || :rest
+
+      @@issuer_cert ||= File.dirname(__FILE__)+"/../../certs/equifax_ca.cer"
+      @@server_cert ||= File.new(File.dirname(__FILE__)+"/../../certs/exact.cer").read
     end
 
     # Submit a transaction request to the server
@@ -107,29 +105,21 @@ private
       if @url.scheme == 'https'
         @connection.use_ssl = true
         @connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        @connection.ca_file = @issuer_cert
         @connection.verify_callback = method(:validate_certificate)
+        @connection.ca_file = @@issuer_cert
       end
       @connection
     end
 
-    # from OpenSSL doco:
-    # peer cert is always at chain[0], root CA at chain[n-1]
-    # OpenSSL validates signatures, and issuer attributes at each step in the chain; is_ok reflects the status of these checks
     def validate_certificate(is_ok, ctx)
-      # if OpenSSL has flagged an issue, then fail
-      return false unless is_ok
-      
-      peer_cert = ctx.chain[0].to_pem
-      current_cert = ctx.current_cert
-      
-      # we're not interested in additional checking of the CA certs
-      return is_ok unless peer_cert == current_cert.to_pem
+      cert = ctx.current_cert
+
+      # Only check the server certificate, not the issuer.
+      unless (cert.subject.to_s == cert.issuer.to_s)
+        is_ok &&= (@@server_cert == cert.to_pem)
+      end
 
-      # check that the peer_cert is the same as the one we expect for this URL
-      contents = File.open(@server_cert).read
-      cert = OpenSSL::X509::Certificate.new(contents)
-      return OpenSSL::Digest::SHA1.new(current_cert.to_der) == OpenSSL::Digest::SHA1.new(cert.to_der)
+      is_ok
     end
 
     # what transport types we support, and their corresponding suffixes

data/lib/exact4r.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'activesupport'
 
 require 'ews/transaction/mapping'
 require 'ews/transaction/request'

data/spec/spec_helper.rb

@@ -2,16 +2,18 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 
 require 'spec'
 require 'lib/exact4r'
+require 'ruby-debug'
 
 REPLICATION_TIME = 20
 
 # address & authentication for testing against api.e-xact.com
-# LOCATION = "https://api.e-xact.com/"
-# BASIC_AUTH = {:gateway_id => "A00049-01", :password => "test1"}
+LOCATION = "https://api.e-xact.com/"
+BASIC_AUTH = {:gateway_id => "A00049-01", :password => "test1"}
 
 # address & authentication for local testing
-LOCATION = "http://localhost:3000/"
-BASIC_AUTH = {:gateway_id => "AD0008-01", :password => "7nfcpc7n"}
+# LOCATION = "http://ws.local/"   # I am a Passenger...
+# LOCATION = "http://localhost:3000/"   # old skool
+# BASIC_AUTH = {:gateway_id => "AD0008-01", :password => "7nfcpc7n"}
 
 Spec::Runner.configure do |config|
   include EWS::Transaction

data/spec/transporter_spec.rb

@@ -22,8 +22,6 @@ describe "Transporter creating transactions" do
     req = basic_find_transaction
     req.transaction_tag = 9000  # non-existent txn
     
-    puts req.errors.inspect unless req.valid?
-    
     tr = ::EWS::Transporter.new(LOCATION)
     resp = tr.submit(req, :json)
     

data/spec/validator_spec.rb

@@ -141,5 +141,10 @@ describe "credit card validation" do
     EWS::Transaction::Request.new(basic_params(:cc_expiry => sprintf("%02d%02d", month, year))).should be_valid
     EWS::Transaction::Request.new(basic_params(:cc_expiry => sprintf("%02d%02d", month+1, year))).should be_valid
     EWS::Transaction::Request.new(basic_params(:cc_expiry => sprintf("%02d%02d", month, year+1))).should be_valid
+
+    # we've chosen 1980 as our cutoff in the past, so check around this date
+    EWS::Transaction::Request.new(basic_params(:cc_expiry => "1279")).should be_valid     # Dec 2079
+    EWS::Transaction::Request.new(basic_params(:cc_expiry => "0180")).should_not be_valid # Jan 1980
+    EWS::Transaction::Request.new(basic_params(:cc_expiry => "0199")).should_not be_valid # Jan 1999
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exact4r
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: "0.7"
 platform: ruby
 authors: 
 - E-xact Transactions Ltd.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-14 00:00:00 +10:00
+date: 2009-03-10 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,36 +48,6 @@ files:
 - ./certs/equifax_ca.cer
 - ./certs/exact.cer
 - ./CHANGELOG
-- ./doc
-- ./doc/classes
-- ./doc/classes/EWS
-- ./doc/classes/EWS/Transaction
-- ./doc/classes/EWS/Transaction/FakeResponse.html
-- ./doc/classes/EWS/Transaction/Request.html
-- ./doc/classes/EWS/Transaction/Response.html
-- ./doc/classes/EWS/Transaction/Validator.html
-- ./doc/classes/EWS/Transporter.html
-- ./doc/created.rid
-- ./doc/files
-- ./doc/files/CHANGELOG.html
-- ./doc/files/lib
-- ./doc/files/lib/ews
-- ./doc/files/lib/ews/transaction
-- ./doc/files/lib/ews/transaction/fake_response_rb.html
-- ./doc/files/lib/ews/transaction/mapping_rb.html
-- ./doc/files/lib/ews/transaction/request_rb.html
-- ./doc/files/lib/ews/transaction/response_rb.html
-- ./doc/files/lib/ews/transaction/validator_rb.html
-- ./doc/files/lib/ews/transporter_rb.html
-- ./doc/files/lib/exact4r_rb.html
-- ./doc/files/LICENCE.html
-- ./doc/files/README.html
-- ./doc/files/VERSION.html
-- ./doc/fr_class_index.html
-- ./doc/fr_file_index.html
-- ./doc/fr_method_index.html
-- ./doc/index.html
-- ./doc/rdoc-style.css
 - ./lib
 - ./lib/ews
 - ./lib/ews/transaction
@@ -92,7 +62,6 @@ files:
 - ./Rakefile
 - ./README
 - ./spec
-- ./spec/donncha_spec.rb
 - ./spec/mapping_spec.rb
 - ./spec/request_spec.rb
 - ./spec/spec_helper.rb
@@ -128,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: exact4r
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: E-xact Web Services Client Library.