deltavista_crif_dva_interface 0.1.27 → 0.2.00

data/lib/deltavista_crif_dva_interface/collection_check.rb

@@ -3,21 +3,26 @@ module DeltavistaCrifDvaInterface
 
     def initialize(options)
       options.action = :get_report
+      options.response = :get_report_response
       super(options)
     end
 
     def private_collection_check(address, collection)
       insert_private_address address
       envelope[:report_type] = 'COLLECTION_CHECK_CONSUMER'
+      envelope[:target_report_format] = 'NONE'
       insert_collection collection
       commit
+      result[:data]
     end
 
     def business_collection_check(address, collection)
       insert_company_address address
       envelope[:report_type] = 'COLLECTION_CHECK_BUSINESS'
+      envelope[:target_report_format] = 'NONE'
       insert_collection collection
       commit
+      result[:data]
     end
 
     private

data/lib/deltavista_crif_dva_interface/delta_vista_service.rb

@@ -32,7 +32,7 @@ module DeltavistaCrifDvaInterface
       if language == 'de'
         [
           ['Unbekannt', 0],
-          ['Männlich', 1],
+          ['Männlich', 1],
           ['Weiblich', 2]
         ]
       end

data/lib/deltavista_crif_dva_interface/soap_config.rb

@@ -1,15 +1,17 @@
 module DeltavistaCrifDvaInterface
   class SoapConfig
-    attr_accessor :endpoint, :wsdl, :user_name, :password, :action, :logger
+    attr_accessor :endpoint, :wsdl, :user_name, :password, :action, :response, :logger
 
     def initialize(options)
       default_endpoint = 'https://preprodservices.crif-online.ch/CrifSS/CrifSoapServiceV1'
       default_wsdl = File.expand_path('../../wsdl/crif-soap-service_v1.0.wsdl', File.dirname(__FILE__))
+
       @endpoint = options[:endpoint] ? options[:endpoint] : default_endpoint
       @wsdl = options[:wsdl] ? options[:wsdl] : default_wsdl
       @user_name = options[:user_name]
       @password = options[:password]
-      @action = options[:action] ? options[:action] : ''
+      @action = options[:action] ? options[:action] : nil
+      @response = options[:response] ? options[:response] : nil
       @logger = options[:logger] ? options[:logger] : Logger.new(STDOUT)
     end
 

data/lib/deltavista_crif_dva_interface/soap_converter.rb

@@ -3,27 +3,33 @@ require 'savon'
 module DeltavistaCrifDvaInterface
   class SoapConverter
 
-    attr_reader :options, :client, :action, :envelope, :result, :logger
+    attr_reader :options, :client, :action, :response, :attributes, :envelope, :result, :logger
 
     def initialize(options)
       @options = options
       @logger = options.logger ? options.logger : Logger.new(STDOUT)
-      @envelope = Hash.new
+      @envelope = {
+          :attributes! => Hash.new
+      }
+      @attributes = Hash.new
       @client = Savon.client(
           :wsdl => options.wsdl,
           :endpoint => options.endpoint,
-          :pretty_print_xml => true,
           :soap_version => 2,
           :env_namespace => 'soapenv',
+          :pretty_print_xml => true,
           :namespace_identifier => 'ns1',
+          :element_form_default => :qualified,
           :logger => logger
       )
       @result = {
           :committed => false,
           :success => false,
+          :response => nil,
           :data => Hash.new
       }
       @action = options.action
+      @response = options.response
       insert_control
       insert_identity
       insert_reference_number
@@ -31,14 +37,14 @@ module DeltavistaCrifDvaInterface
 
     def commit
       begin
-        result[:data] = @client.call(action, :message => envelope)
+        result[:response] = @client.call(action, :message => envelope, :attributes => attributes)
+        result[:data] = result[:response].body[options.response]
         result[:success] = true
       rescue StandardError => e
         logger.error e.message
         logger.error e.backtrace.join('\n') if e.backtrace
         raise e
       end
-      result
     end
 
     def insert_reference_number
@@ -66,27 +72,26 @@ module DeltavistaCrifDvaInterface
           :last_name => address[:last_name],
           :maiden_name => address[:maiden_name],
           :sex => address[:sex],
-          :birth_date => format_date(address[:birth_date]),
-          :attributes! => {
-              'xsi:type' => 'PersonAddressDescription'
-          }
+          :birth_date => format_date(address[:birth_date])
       }
+      map_attribute({
+          'xsi:type' => 'ns1:PersonAddressDescription'
+      }, :searched_address)
     end
 
     def insert_company_address(address)
       envelope[:searched_address] = {
           :location => parse_location(address),
-          :company_name => address[:company_name],
-          :attributes! => {
-              'xsi:type' => 'CompanyAddressDescription'
-          }
+          :company_name => address[:company_name]
       }
+      map_attribute({
+          'xsi:type' => 'ns1:CompanyAddressDescription'
+      }, :searched_address)
     end
 
     def additional_input(key, value)
-      envelope[:additional_inputs] = Hash.new unless envelope[:additional_inputs]
-      envelope[:additional_inputs][:additional_input] = Array.new unless envelope[:additional_inputs][:additional_input]
-      envelope[:additional_inputs][:additional_input] << {
+      envelope[:additional_input] = Array.new unless envelope[:additional_input]
+      envelope[:additional_input] << {
           :key => key,
           :value => value
       }
@@ -117,5 +122,16 @@ module DeltavistaCrifDvaInterface
       }
     end
 
+    def map_attribute(hash, *path)
+      target = envelope
+      last_child = path.slice!(-1)
+      path.each do |children|
+        target[children] = Hash.new unless target[children]
+        target = target[children]
+      end
+      target[:attributes!] = Hash.new unless target[:attributes!]
+      target[:attributes!][last_child] = hash
+    end
+
   end
 end

data/lib/deltavista_crif_dva_interface/version.rb

@@ -1,3 +1,3 @@
 module DeltavistaCrifDvaInterface
-  VERSION = '0.1.27'
+  VERSION = '0.2.00'
 end

data/wsdl/crif-soap-service_v1.0.wsdl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.crif-online.ch/webservices/crifsoapservice/wsdl/v1.00" xmlns:crifss10="http://www.crif-online.ch/webservices/crifsoapservice/v1.00" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" name="CrifSoapServiceV1_0" targetNamespace="http://www.crif-online.ch/webservices/crifsoapservice/wsdl/v1.00">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.crif-online.ch/webservices/crifsoapservice/v1.00" xmlns:crifss10="http://www.crif-online.ch/webservices/crifsoapservice/v1.00" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" name="CrifSoapServiceV1_0" targetNamespace="http://www.crif-online.ch/webservices/crifsoapservice/v1.00">
 	<documentation>Crif Soap Service V1.0</documentation>
 	<types>
 		<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deltavista_crif_dva_interface
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.2.00
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec