deltavista_crif_dva_interface 0.0.12 → 0.0.13

data/lib/deltavista_crif_dva_interface.rb

@@ -2,6 +2,7 @@ require "country_iso_translater"
 
 require "deltavista_crif_dva_interface/version"
 require "deltavista_crif_dva_interface/config"
+require "deltavista_crif_dva_interface/errors"
 require "deltavista_crif_dva_interface/restful_service"
 require "deltavista_crif_dva_interface/delta_vista_service"
 require "deltavista_crif_dva_interface/xml_converter"

data/lib/deltavista_crif_dva_interface/address_update.rb

@@ -1,27 +1,34 @@
 module DeltavistaCrifDvaInterface
   class AddressUpdate < XmlConverter
+    DEFAULT_OPTIONS = {
+      :encoding => 'UTF-8',
+      :request_type => 'AddressUpdate'
+    }.freeze
 
-    # XML request and response encoding
-    @@encoding = 'UTF-8'
     # unique id for each request
     @@reference_id = 1000
 
-    def initialize config
-      @username = config.username
-      @password = config.password
-      @request_type = "AddressUpdate"
+    def initialize(options)
+      @config = {}
+      if options.is_a? Hash
+        @config = DEFAULT_OPTIONS.merge(options)
+      else
+        @config[:username] = options.username
+        @config[:password] = options.password
+        @config = DEFAULT_OPTIONS.merge(@config)
+      end
     end
 
     def to_xml(address)
       puts address.inspect
-      builder = Nokogiri::XML::Builder.new(:encoding => @@encoding) do |xml|
+      builder = Nokogiri::XML::Builder.new(:encoding => @config[:encoding]) do |xml|
         xml.dvaCheckRequest {
           xml.identity {
-            xml.username @username
-            xml.password @password
+            xml.username @config[:username]
+            xml.password @config[:password]
           }
           xml.reference @@reference_id
-          xml.requestType @request_type
+          xml.requestType @config[:request_type]
           xml.private {
             %w(title lastName firstName maidenName street house poBox zip city country phone birthDate sex).each do |key|
               value = to_string(address[key.downcase])
@@ -35,52 +42,58 @@ module DeltavistaCrifDvaInterface
     end
 
     def to_hash(xml_body)
-      puts xml_body
-      xml_doc = Nokogiri::XML(xml_body, @@encoding)
+      xml_doc = Nokogiri.XML(xml_body, nil, @config[:encoding])
       if valid_response? xml_doc
-        # private tag
         address = {}
+        metadata = {}
         xml_doc.xpath("//private").each do |private_node|
-          %w(addressId birthDate sex).each do |key|
-            address[key.downcase] = get_value(private_node, key)
+          %w(addressId birthDate sex title lastName firstName maidenName street house poBox zip city country phone).each do |key|
+            if key == "country"
+              address[key.downcase.to_sym] = convert_country(get_value(private_node, key))
+            else
+              address[key.downcase.to_sym] = get_value(private_node, key)
+            end
           end
         end
 
         xml_doc.xpath("//private/payLoad/highestAddress/private").each do |private_node|
           %w(title lastName firstName maidenName street house poBox zip city country phone).each do |key|
             if key == "country"
-              address[key.downcase] = convert_country(get_value(private_node, key))
+              address[key.downcase.to_sym] = convert_country(get_value(private_node, key))
             else
-              address[key.downcase] = get_value(private_node, key)
+              address[key.downcase.to_sym] = get_value(private_node, key)
             end
           end
         end
 
         xml_doc.xpath("//private/payLoad").each do |payload_node|
           %w(matchLevel isDeceased dateOfDeath reqDeliverabilityClass higherDelivKnown).each do |key|
-            address[key.downcase] = get_value(payload_node, key)
+            metadata[key.downcase.to_sym] = get_value(payload_node, key)
           end
         end
 
         xml_doc.xpath("//private/payLoad/highestAddress").each do |highestaddress_node|
           %w(deliverabilityClass).each do |key|
-            address[key.downcase] = get_value(highestaddress_node, key)
+            metadata[key.downcase.to_sym] = get_value(highestaddress_node, key)
           end
         end
 
-        address
+        [address, metadata]
       else
-        puts "Response not valid!"
-        nil
+        raise NotFoundError
       end
     end
 
-    def response_code(xml)
-      xml.xpath("//response/responseCode").collect(&:text)[0]
+    def match_level(xml)
+      get_value(xml, "//private/payLoad/matchLevel")
+    end
+
+    def higher_delivery_known(xml)
+      get_value(xml, "//private/payLoad/higherDelivKnown")
     end
 
-    def valid_response?(xml)
-      response_code(xml) == '0' ? true : false
+    def newer_address_found?(xml)
+      higher_delivery_known(xml) != '0.0' ? true : false
     end
   end
 end

data/lib/deltavista_crif_dva_interface/credit_check_short_v02.rb

@@ -35,7 +35,7 @@ module DeltavistaCrifDvaInterface
 
     def to_hash(xml_body)
       puts xml_body
-      xml_doc = Nokogiri::XML(xml_body, @@encoding)
+      xml_doc = Nokogiri.XML(xml_body, nil, @@encoding)
       if valid_response? xml_doc
         # private tag
         address = {}

data/lib/deltavista_crif_dva_interface/delta_vista_service.rb

@@ -32,8 +32,9 @@ module DeltavistaCrifDvaInterface
     end
 
     def extract_response(xml_body)
-      address = @parser.to_hash(xml_body)
-      address
+      puts "XML-Body #{xml_body.class}"
+      puts xml_body
+      @parser.to_hash(xml_body)
     end
   end
 end

data/lib/deltavista_crif_dva_interface/errors.rb

@@ -0,0 +1,9 @@
+module DeltavistaCrifDvaInterface
+  class ServiceNotAvailableError < StandardError
+
+  end
+
+  class NotFoundError < StandardError
+
+  end
+end

data/lib/deltavista_crif_dva_interface/restful_service.rb

@@ -40,7 +40,7 @@ module DeltavistaCrifDvaInterface
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-      return http
+      http
     end
 
     def check_response!(response)
@@ -48,7 +48,7 @@ module DeltavistaCrifDvaInterface
         raise NotFoundError if response.class == Net::HTTPNotFound
         raise ServiceNotAvailableError
       end
-      return response
+      response
     end
 
     def valid_response?(response)

data/lib/deltavista_crif_dva_interface/version.rb

@@ -1,3 +1,3 @@
 module DeltavistaCrifDvaInterface
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/deltavista_crif_dva_interface/xml_converter.rb

@@ -16,6 +16,19 @@ module DeltavistaCrifDvaInterface
         return value.to_s.strip
       end
     end
+
+    def response_code(xml)
+      get_value xml, "//response/responseCode"
+    end
+
+    def response_text(xml)
+      get_value xml, "//response/responseText"
+    end
+
+    def valid_response?(xml)
+      response_code(xml) == '0' ? true : false
+    end
+
     # Returns the value of a XPATH expression
     def get_value(node, key)
       node.xpath(key).collect(&:text)[0]

metadata

@@ -2,7 +2,7 @@
 name: deltavista_crif_dva_interface
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
   - Marc Cadalbert
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 +02:00
+date: 2012-03-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
   - lib/deltavista_crif_dva_interface/config.rb
   - lib/deltavista_crif_dva_interface/credit_check_short_v02.rb
   - lib/deltavista_crif_dva_interface/delta_vista_service.rb
+  - lib/deltavista_crif_dva_interface/errors.rb
   - lib/deltavista_crif_dva_interface/restful_service.rb
   - lib/deltavista_crif_dva_interface/version.rb
   - lib/deltavista_crif_dva_interface/xml_converter.rb