orias 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2eff4a09534ebe0f400f5dbece87f1ee526750
-  data.tar.gz: 1f3a5c974e5e3943d633cfd2ee678e79be8ada9b
+  metadata.gz: 7c42f8d5d084f92ee196de4e196d5174eb69e32b
+  data.tar.gz: 32a429628c656c9e0eea95092a4f5f36ce3ec333
 SHA512:
-  metadata.gz: a3ed5329adbedbbdfe24d9568c54c074841548e95ce7951fa70a6be4d60a5766add809a2ae63e4f9f4fb3248eda907c3b216f95d5c149c0b3a7437cd51df3b18
-  data.tar.gz: a2ccc2dc4054440621714f553244fb94fc3155af8e028cb39bfc86547455bade0b2ba79ef9f60f70a7b18f7d90700e1ffd3be72c97f264873e1bbf403c062879
+  metadata.gz: 47bedfe300e4284c64513793f99e6e15e319e732fbf2beae7018796e360acec02b4f73438119928714ed4df8e88323c8bf803cea75fc17dfa0806ab88e1bf583
+  data.tar.gz: c4a74fa5c6edb5ebd752fc9e016d464a2fd213faa3e763338fc480908dc8a43d29a6c90bc9c9d953093ee02ce4e42ea08e3d2123e98d9ac3699f99e19ed0c2ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orias (0.1.0)
+    orias (0.2.3)
       libxml-to-hash
 
 GEM

data/lib/orias/client.rb

@@ -2,12 +2,13 @@ module Orias
   # Dedicated to request handling to ORIAS API
   #
   class Client < Base
-    attr_accessor :api_endpoint, :private_key
+    attr_accessor :api_endpoint, :per_request, :private_key
 
     # Initialize an Orias::Client instance
     def initialize(attributes = {})
       super
       @api_endpoint ||= Orias.configuration.api_endpoint
+      @per_request ||= Orias.configuration.per_request
       @private_key ||= Orias.configuration.private_key
     end
   end

data/lib/orias/configuration.rb

@@ -3,13 +3,15 @@ module Orias
   #
   class Configuration < Base
     DEFAULT_API_ENDPOINT = 'https://ws.orias.fr/service?wsdl'.freeze
+    DEFAULT_PER_REQUEST = 1000.freeze
 
-    attr_accessor :private_key, :api_endpoint
+    attr_accessor :private_key, :api_endpoint, :per_request
 
     # Initialize an Orias::Configuration instance
     def initialize(attributes = {})
       super
       @api_endpoint ||= DEFAULT_API_ENDPOINT
+      @per_request ||= DEFAULT_PER_REQUEST
     end
   end
 end

data/lib/orias/response.rb

@@ -6,12 +6,13 @@ module Orias
   class Response < Base
     VALID_TYPES = [:intermediary_search].freeze
 
-    attr_accessor :type, :raw_response, :raw_hash_response, :results
+    attr_accessor :type, :raw, :raw_hash, :results
 
     # Initialize an Orias::Response instance
     def initialize(attributes = {})
       super
-      self.process_raw_response!
+      self.process_raw_response! if results.nil?
+      self.check_type
     end
 
     # Result collections
@@ -54,10 +55,25 @@ module Orias
 
     end
 
+    class << self
+      def merge(instances)
+        if instances.map(&:type).uniq.compact.length != 1
+          raise 'Orias::Response - Error merging Orias::Response collection.'
+        end
+
+        self.new(
+          raw: instances.map(&:raw),
+          raw_hash: instances.map(&:raw_hash),
+          results: instances.map(&:results).flatten,
+          type: instances.map(&:type).uniq.first
+        )
+      end
+    end
+
     protected
 
     def process_raw_response!
-      self.raw_hash_response = Hash.from_libxml(self.raw_response)['Envelope']['Body']
+      self.raw_hash = Hash.from_libxml(self.raw)['Envelope']['Body']
 
       if @type == :intermediary_search
         process_intermediary_search!
@@ -66,13 +82,21 @@ module Orias
       end
     end
 
+    def check_type
+      raise 'Orias::Response - Wrong type.' unless VALID_TYPES.include?(type)
+    end
+
     private
 
     def process_intermediary_search!
-      results_hash = self.raw_hash_response['intermediarySearchResponse']
-      results_hash = results_hash['intermediaries']['intermediary']
+      begin
+        results_hash = self.raw_hash['intermediarySearchResponse']
+        results_hash = results_hash['intermediaries']['intermediary']
+      rescue
+        raise 'Orias::Response - API response error.' unless results_hash
+      end
 
-      @results = results_hash.map do |h|
+      @results = [results_hash].flatten.map do |h|
         Orias::Intermediary.new(h)
       end
 

data/lib/orias/search.rb

@@ -15,26 +15,30 @@ module Orias
     end
 
     # Alias for #find_by with an :orias type
-    def find_by_orias(*terms)
+    def find_by_orias(terms)
       find_by(:orias, terms)
     end
 
     # Alias for #find_by with an :siren type
-    def find_by_siren(*terms)
+    def find_by_siren(terms)
       find_by(:siren, terms)
     end
 
     # Request building for intermediarySearchRequest
     def find_by(type, terms)
-      request = Orias::Request.new(
-        api_endpoint: @client.api_endpoint,
-        body: raw_find(raw_intermediaries(type, terms))
-      ).build!
-
-      Orias::Response.new(
-        type: :intermediary_search,
-        raw_response: request.response.body
-      )
+      responses = [terms].flatten.each_slice(@client.per_request).map do |term_collection|
+        request = Orias::Request.new(
+          api_endpoint: @client.api_endpoint,
+          body: raw_find(raw_intermediaries(type, term_collection))
+        ).build!
+
+        Orias::Response.new(
+          type: :intermediary_search,
+          raw: request.response.body
+        )
+      end
+
+      Orias::Response.merge(responses)
     end
 
     # Build the raw request body of a search
@@ -86,7 +90,7 @@ module Orias
 
       # Check & Set an intermediaries list
       def set_terms(type, terms)
-        terms.map!{ |t| t.gsub(/\D/,'') }
+        terms.map!{ |t| t.to_s.gsub(/\D/,'') }
         lgts = terms.map(&:length).uniq
         valid_lgth = VALID_INTERMEDIARIES_TYPE[type]
 

data/lib/orias/version.rb

@@ -1,3 +1,3 @@
 module Orias
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orias
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - 01max
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-to-hash