libis-services 0.1.11 → 0.1.12

data/spec/rosetta_sip_spec.rb

@@ -20,7 +20,7 @@ describe 'Rosetta SIP Service' do
     { module: 'PER', stage: 'Finished', status: 'FINISHED' }
   }
 
-  let(:expected_ies) { [{pid: 'IE433994'}] }
+  let(:expected_ies) { [{pid: 'IE403595'}] }
 
   it 'should get SIP info' do
 

data/spec/spec_helper.rb

@@ -8,21 +8,85 @@ require 'bundler/setup'
 Bundler.setup
 
 require 'rspec'
+require 'rspec/matchers'
 require 'libis-services'
 
+# adapted from https://gist.github.com/mltsy/21fd5e15ae12a004c8b13d6ec4534458
+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
+    @failing_expected = expected
+    @failing_path = path
+
+    case expected
+      when Array
+        return false unless actual.is_a? Array
+        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
+            return false
+          end
+        end
+      when Hash
+        return false unless actual.is_a? Hash
+        expected.all? do |key, expected_value|
+          return false unless actual.has_key? key
+          deep_include? actual[key], expected_value, path + [key]
+        end
+      else
+        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"
+    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"
+    end
+
+    message
+  end
+end
+
 def check_container(expected, result)
+  # puts "Checking expected: #{expected} vs result: #{result}"
   case expected
     when Array
+      # puts "Checking if result is an array"
       expect(result).to be_a Array
-      expected.each_with_index { |value, i| check_container(value, result[i]) }
+      expected.each do |value|
+        # puts "Checking if expected value: #{value} included in result"
+        expect(result).to include(value)
+      end
     when Hash
+      # puts "Checking if result is a hash"
       expect(result).to be_a Hash
       expected.each_key do |key|
-        expect(result[key]).not_to be_nil
+        # puts "Checking if expected key: #{key} included in result"
+        expect(result).to include(key)
         check_container(expected[key], result[key])
       end
     else
+      # puts "Checking if expected equals result"
       expect(result).to eq expected
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 description: Set of classes that simplify connection to different LIBIS services.
 email:
 - kris.dekeyser@libis.be
@@ -273,6 +287,7 @@ files:
 - lib/libis/services/rosetta/sip_handler.rb
 - lib/libis/services/rosetta/user.rb
 - lib/libis/services/rosetta/user_manager.rb
+- lib/libis/services/rosetta_db/client.rb
 - lib/libis/services/scope/search.rb
 - lib/libis/services/search_factory.rb
 - lib/libis/services/service_error.rb
@@ -287,6 +302,7 @@ files:
 - spec/ie_data.rb
 - spec/primo_limo_spec.rb
 - spec/primo_search_spec.rb
+- spec/rosetta_auth_spec.rb
 - spec/rosetta_collection_spec.rb
 - spec/rosetta_deposit_spec.rb
 - spec/rosetta_ie_spec.rb
@@ -324,6 +340,7 @@ test_files:
 - spec/ie_data.rb
 - spec/primo_limo_spec.rb
 - spec/primo_search_spec.rb
+- spec/rosetta_auth_spec.rb
 - spec/rosetta_collection_spec.rb
 - spec/rosetta_deposit_spec.rb
 - spec/rosetta_ie_spec.rb