libis-services 1.0.5 → 1.0.11

data/spec/scope_search_spec.rb

@@ -18,7 +18,7 @@ describe 'Scope search service' do
     it 'by repcode' do
       data = {
           'dc:title' => 'Archief Sint-Vincentius a Paulogenootschap, Conferentie Onze-Lieve-Vrouw van de Rozenkrans Antwerpen',
-          'dc:identifier' => ['BE/942855/580 (ref.code)'],
+          'dc:identifier' => ['BE/942855/580'],
           'dc:source' => ['BE/942855']
       }
       result = subject.query 'BE-942855-580', type: 'REPCODE'
@@ -29,7 +29,7 @@ describe 'Scope search service' do
     it 'by id' do
       data = {
           'dc:title' => 'Archief Constant Guillaume Van Crombrugghe',
-          'dc:identifier' => ['BE/942855/1569 (ref.code)'],
+          'dc:identifier' => ['BE/942855/1569'],
           'dc:source' => ['BE/942855/1569']
       }
       result = subject.query '332785', type: 'ID'

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ RSpec::Matchers.define :deep_include do
   match {|actual| deep_include?(actual, expected)}
 
   def deep_include?(actual, expected, path = [])
+
     return true if actual == expected
 
     @failing_actual = actual
@@ -25,45 +26,71 @@ RSpec::Matchers.define :deep_include do
 
     case expected
       when Array
-        return false unless actual.is_a? Array
+        unless actual.is_a? Array
+          @failure ||= :not_an_array
+          return false 
+        end
         expected.each_with_index do |expected_item, index|
           match_found = actual.any? do |actual_item|
             deep_include? actual_item, expected_item, path + [index]
           end
           unless match_found
-            @failing_array = actual
-            @failing_array_path = path + [index]
-            @failing_expected_array_item = expected_item
+            @failure ||= :item_not_found
+            @failing_array_item = expected_item
             return false
           end
         end
       when Hash
-        return false unless actual.is_a? Hash
+        unless actual.is_a? Hash
+          @failure ||= :not_a_hash
+          return false
+        end
         expected.all? do |key, expected_value|
-          return false unless actual.has_key? key
-          deep_include? actual[key], expected_value, path + [key]
+          unless actual.has_key? key
+            @failure ||= :key_not_found
+            @failing_key = key
+            return false
+          end
+          v = deep_include? actual[key], expected_value, path + [key]
+          v
         end
       else
+        @failure ||= :no_match
         false
     end
+
   end
 
   failure_message do |_actual|
-    if @failing_array_path
-      path = @failing_array_path.map {|p| "[#{p.inspect}]"}.join
-      path = "root" if path.blank?
-      message = "Actual array did not include value at #{path}: \n" +
-          "  expected #{@failing_expected_array_item.inspect}\n" +
-          "  but matching value not found in array: #{@failing_array}\n"
+    path = @failing_path.map {|p| "[#{p.inspect}]"}.join
+    path = "root" if path.blank?
+    case @failure
+    when :no_match
+      "Actual value did not match expected value at #{path}: \n" +
+      "  expected #{@failing_expected.inspect}\n" +
+      "  got #{@failing_actual.inspect}\n"
+    when :not_an_array
+      "Actual object is not an Array at #{path}: \n" +
+      "  expected: #{@failing_expected.inspect}\n" +
+      "  got: #{@failing_actual}"
+    when :not_a_hash
+      "Actual object is not a Hash at #{path}: \n" +
+      "  expected: #{@failing_expected.inspect}\n" +
+      "  got: #{@failing_actual}"
+    when :item_not_found
+      "Actual array did not include value at #{path}: \n" +
+      "  expected #{@failing_array_item.inspect}\n" +
+      "  but matching value not found in array: #{@failing_actual.inspect}\n"
+    when :key_not_found
+      "Actual hash did not include expected key at #{path}: \n" +
+      "  key #{@failing_key}\n" +
+      "  expected #{@failing_expected.inspect}\n" +
+      "  got #{@failing_actual.inspect}\n"
     else
-      path = @failing_path.map {|p| "[#{p.inspect}]"}.join
-      path = "root" if path.blank?
-      message = "Actual hash did not include expected value at #{path}: \n" +
-          "  expected #{@failing_expected.inspect}\n" +
-          "  got #{@failing_actual.inspect}\n"
+      "Mismatch at #{path}: \n" +
+      "  expected #{@failing_expected.inspect}\n" +
+      "  got #{@failing_actual.inspect}\n"
     end
-
-    message
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.11
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: libis-tools
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +281,7 @@ files:
 - lib/libis/services/rosetta/oai_set.rb
 - lib/libis/services/rosetta/pds_handler.rb
 - lib/libis/services/rosetta/producer.rb
+- lib/libis/services/rosetta/producer_agent.rb
 - lib/libis/services/rosetta/producer_handler.rb
 - lib/libis/services/rosetta/service.rb
 - lib/libis/services/rosetta/sip.rb
@@ -317,8 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: LIBIS Services toolbox.