libis-services 1.0.10 → 1.0.11

data/spec/rosetta_auth_spec.rb

@@ -22,7 +22,7 @@ describe 'Rosetta Services' do
     expect {handler.producer(producer_id)}.to raise_error(Libis::Services::ServiceError)
   end
 
-  let!(:credentials) {Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-test.yml')}
+  let!(:credentials) {Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-prod.yml')}
 
   # noinspection RubyResolve
   let(:admin) {credentials.admin}
@@ -34,6 +34,7 @@ describe 'Rosetta Services' do
   let(:admin_pwd) {admin.password}
   # noinspection RubyResolve
   let(:admin_ins) {admin.institute}
+  let(:admin_pds_ins) {admin.institute_pds}
 
   let(:bad_cred) { 'deadbeaf' }
 
@@ -99,7 +100,7 @@ describe 'Rosetta Services' do
     end
 
     describe 'with correct credentials' do
-      let(:handle) {pds_handler.login(admin_usr, admin_pwd, admin_ins)}
+      let(:handle) {pds_handler.login(admin_usr, admin_pwd, admin_pds_ins)}
 
       it 'should login and return a handle' do
         expect(handle).to_not be_nil
@@ -109,7 +110,7 @@ describe 'Rosetta Services' do
         bor_info = pds_handler.user_info handle
         expect(bor_info[:bor_info][:id]).to eq admin_usr
         expect(bor_info[:bor_info][:name]).to eq admin_usr
-        expect(bor_info[:bor_info][:institute]).to eq admin_ins
+        expect(bor_info[:bor_info][:institute]).to eq admin_pds_ins
 
       end
 
@@ -125,7 +126,7 @@ describe 'Rosetta Services' do
     end
 
     describe 'with wrong user name' do
-      let(:handle) {pds_handler.login(bad_cred, admin_pwd, admin_ins)}
+      let(:handle) {pds_handler.login(bad_cred, admin_pwd, admin_pds_ins)}
 
       it 'should not login' do
         expect(handle).to be_nil

data/spec/rosetta_collection_spec.rb

@@ -4,7 +4,6 @@ require_relative 'spec_helper'
 require 'libis/tools/config_file'
 require 'libis/tools/extend/hash'
 
-require 'libis/services/rosetta/pds_handler'
 require 'libis/services/rosetta/collection_handler'
 
 require 'rspec/matchers'
@@ -39,11 +38,6 @@ end
 describe 'Rosetta Collection Service' do
 
   let(:credentials) { Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-test.yml') }
-  let(:pds_handler) do
-    # noinspection RubyResolve
-    Libis::Services::Rosetta::PdsHandler.new(credentials.pds_url)
-  end
-
   let(:handle) do
     # noinspection RubyResolve
     pds_handler.login(
@@ -63,7 +57,6 @@ describe 'Rosetta Collection Service' do
     collection_service = Libis::Services::Rosetta::CollectionHandler.new credentials.rosetta_url,
                                                                          log: credentials.debug,
                                                                          log_level: credentials.debug_level
-    # collection_service.pds_handle = handle
     collection_service
   end
 
@@ -196,13 +189,6 @@ describe 'Rosetta Collection Service' do
 
   context 'check errors' do
 
-    it 'not authorized' do
-      collection_service.pds_handle = 'foobar'
-      expect do
-        collection_service.create({name: 'foo'})
-      end.to raise_error(Libis::Services::SoapError, /user_authorize_exception.*Invalid PDS Handle Number:foobar/)
-    end
-
     it 'invalid collection info' do
       expect do
         collection_service.create({name: 'foo', parent_id: 0})

data/spec/rosetta_ie_spec.rb

@@ -5,26 +5,13 @@ require 'awesome_print'
 require 'pp'
 
 require 'libis/tools/config_file'
-require 'libis/services/rosetta/pds_handler'
 require 'libis/services/rosetta/ie_handler'
 
 require_relative 'ie_data'
+
 describe 'Rosetta IE Service' do
 
   let(:credentials) { Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-test.yml') }
-  let(:pds_handler) do
-    # noinspection RubyResolve
-    Libis::Services::Rosetta::PdsHandler.new(credentials.pds_url)
-  end
-
-  let(:handle) do
-    # noinspection RubyResolve
-    pds_handler.login(
-        credentials.admin.user,
-        credentials.admin.password,
-        credentials.admin.institute
-    )
-  end
 
   subject(:ie_handler) do
     # noinspection RubyResolve
@@ -34,14 +21,14 @@ describe 'Rosetta IE Service' do
   end
 
   before :each do
-    ie_handler.pds_handle = handle
+    # noinspection RubyResolve
+    ie_handler.authenticate(credentials.admin.user, credentials.admin.password, credentials.admin.institute)
   end
 
   it 'should get IE info' do
 
     mets = ie_handler.get_mets('IE403595')
     expect(mets).not_to be_nil
-    # ap mets
     expect(mets).to deep_include(expected_mets)
     # check_container expected_mets, mets
   end
@@ -50,7 +37,6 @@ describe 'Rosetta IE Service' do
 
     metadata = ie_handler.get_metadata('IE403595')
     expect(metadata).not_to be_nil
-    # ap metadata
     expect(metadata).to deep_include(expected_ies)
     # check_container(expected_ies, metadata)
   end

data/spec/rosetta_oai_spec.rb

@@ -2,6 +2,7 @@
 require_relative 'spec_helper'
 
 require 'libis/tools/config_file'
+require 'libis/tools/extend/symbol'
 require 'libis/services/rosetta/oai_pmh'
 
 describe 'Rosetta OAI-PMH Service' do
@@ -13,42 +14,80 @@ describe 'Rosetta OAI-PMH Service' do
     Libis::Services::Rosetta::OaiPmh.new credentials.rosetta_url
   end
 
+  let(:expected_identify) {
+    {
+      repository_name: 'LIBIS Teneo Sandbox Repository',
+      base_url: "#{credentials.rosetta_url}/oaiprovider/request"
+    }
+  }
+
+  let(:expected_metadata_formats) {
+    [ 'oai_dc' ]
+  }
+
   let(:expected_sets) {
     [
-        {name:'TESTINS-collections', spec: 'TESTINS-collections'}
+      'TESTINS-collections',
+      'INS00-collections'
     ]
   }
 
   let(:expected_collections) {
     [
-        'Kerk & Leven',
-        'Kerk en leven. Bisdom Antwerpen (0991).',
+        'E-periodieken',
+        'Parochiebladen',
+        'Kerk en leven. Puurs (4635)',
     ]
   }
 
+  let(:expected_identifiers) {
+    [ 'oai:sandbox.teneo.libis.be:IE403595']
+  }
+
   let(:expected_records) {
     [
         {
-            id: 'oai:d4I1-pubam:IE405650',
+          header: {identifier: 'oai:sandbox.teneo.libis.be:IE403595'},
+          metadata: {
+            'metadata' => {
+              'oai_dc:dc' => {
+                'dc:title' => 'Denemarken 2015',
+                'dcterms:spatial' => ['Denemarken', 'Fyn', 'Sinebjerg']
+              }
+            }
+          }
         }
     ]
   }
 
+  it 'should identify' do
+    id = oai_handler.identify
+    expect(id).to deep_include(expected_identify)
+  end
+
+  it 'should get metata formats' do
+    formats = oai_handler.metadata_formats
+    expect(formats[:entries].map(&:dig.(:prefix)).compact).to deep_include(expected_metadata_formats)
+  end
+
   it 'should get set list' do
     sets = oai_handler.sets
-    expect(sets[:entries]).to deep_include(expected_sets)
+    expect(sets[:entries].map(&:dig.(:name)).compact).to deep_include(expected_sets)
   end
 
   it 'should get list of collections' do
-    status = {}
-    collections = oai_handler.collections('TESTINS', status)
-    expect(collections).to deep_include(expected_collections)
+    collections = oai_handler.collections('KADOC')
+    expect(collections[:entries].map(&:dig.(:metadata, 'metadata', 'oai_dc:dc', 'dc:title')).compact).to deep_include(expected_collections)
+  end
+
+  it 'should get list of identifiers' do
+    ids = oai_handler.identifiers(set: 'test_data', from: '2020-01-01')
+    expect(ids[:entries].map(&:dig.(:identifier)).compact).to deep_include(expected_identifiers)
   end
 
   it 'should get list of records' do
-    status = {}
-    records = oai_handler.records('test_data', status)
-    expect(records).to deep_include(expected_records)
+    records = oai_handler.records(set: 'test_data', from: '2020-01-01')
+    expect(records[:entries]).to deep_include(expected_records)
   end
 
 end

data/spec/rosetta_pds_spec.rb

@@ -10,13 +10,13 @@ require 'libis/services/rosetta/deposit_handler'
 
 describe 'Rosetta PDS Service' do
 
-  let!(:credentials) { Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-test.yml') }
+  let!(:credentials) { Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-prod.yml') }
   let!(:pds_handler) do
     # noinspection RubyResolve
     Libis::Services::Rosetta::PdsHandler.new(credentials.pds_url)
   end
 
-  let(:handle) { pds_handler.login(admin_usr, admin_pwd, admin_ins) }
+  let(:handle) { pds_handler.login(admin_usr, admin_pwd, admin_pds_ins) }
 
   # noinspection RubyResolve
   let(:admin) { credentials.admin }
@@ -26,6 +26,7 @@ describe 'Rosetta PDS Service' do
   let(:admin_pwd) {admin.password}
   # noinspection RubyResolve
   let(:admin_ins) {admin.institute}
+  let(:admin_pds_ins) {admin.institute_pds}
 
   it 'should login and return a handle' do
     expect(handle).to_not be_nil
@@ -62,7 +63,7 @@ describe 'Rosetta PDS Service' do
     bor_info = pds_handler.user_info handle
     expect(bor_info[:bor_info][:id]).to eq admin_usr
     expect(bor_info[:bor_info][:name]).to eq admin_usr
-    expect(bor_info[:bor_info][:institute]).to eq admin_ins
+    expect(bor_info[:bor_info][:institute]).to eq admin_pds_ins
 
   end
 

data/spec/rosetta_producer_spec.rb

@@ -5,7 +5,6 @@ require 'awesome_print'
 
 require 'libis/tools/config_file'
 
-require 'libis/services/rosetta/pds_handler'
 require 'libis/services/rosetta/producer_handler'
 
 describe 'Rosetta Producer Service' do
@@ -22,25 +21,18 @@ describe 'Rosetta Producer Service' do
   # noinspection RubyResolve
   let(:admin_ins) {admin.institute}
 
-  let(:pds_handler) do
-    # noinspection RubyResolve
-    Libis::Services::Rosetta::PdsHandler.new(credentials.pds_url)
-  end
-
-  let(:handle) {pds_handler.login(admin_usr, admin_pwd, admin_ins)}
-
   let(:contact_info) {{user_id: credentials.contact.user_id, name: 'Test User'}}
   # noinspection RubyResolve
   subject(:producer_handler) do
     handler = Libis::Services::Rosetta::ProducerHandler.new credentials.rosetta_url,
                                                             log: credentials.debug,
                                                             log_level: credentials.debug_level
-    handler.pds_handle = handle
     handler
   end
 
   before :each do
-    producer_handler.pds_handle = handle
+    # noinspection RubyResolve
+    producer_handler.authenticate(credentials.admin.user, credentials.admin.password, credentials.admin.institute)
   end
 
   context 'user info' do
@@ -99,7 +91,7 @@ describe 'Rosetta Producer Service' do
     it 'create producer' do
       result = producer_handler.new_producer(new_producer_info)
       expect(result).not_to be_nil
-      expect(result).to match /^\d+$/
+      expect(result).to match(/^\d+$/)
       new_producer_id(result)
     end
 
@@ -164,7 +156,7 @@ describe 'Rosetta Producer Service' do
 
     def new_agent_id(val = nil)
       $new_agent_id = val.to_i if val
-      "#{$new_agent_id}"
+      $new_agent_id
     end
 
     it 'get info' do
@@ -175,41 +167,43 @@ describe 'Rosetta Producer Service' do
       expect(result.to_hash).to match agent_data
     end
 
-    it 'create' do
-      result = producer_handler.new_agent new_agent
-      expect(result).not_to be_nil
-      expect(result).to match /^\d+$/
-      new_agent_id result
-    end
-
-    it 'get info' do
-      result = producer_handler.agent(new_agent_id)
-      expect(result).not_to be_nil
-      expect(result.to_hash).to match new_agent_data
-    end
-
-    it 'update info' do
-      # update data
-      updated_agent = new_agent_data.dup
-      updated_agent[:email_address] = 'other@mail.com'
-      result = producer_handler.agent(new_agent_id, updated_agent)
-      expect(result).not_to be_nil
-      expect(result).to eq new_agent_id
-
-      # retrieve updated data
-      result = producer_handler.agent(new_agent_id)
-      expect(result).not_to be_nil
-      expect(result.to_hash).to match updated_agent
-    end
-
-
-    it 'delete' do
-      result = producer_handler.delete_agent new_agent_id
-      expect(result).not_to be_nil
-      expect(result).to eq new_agent_id
-      result = producer_handler.agent(new_agent_id)
-      expect(result).to be_nil
-    end
+    # DISABLED: Rosetta API does noet work anymore as expected
+    
+    # it 'create' do
+    #   result = producer_handler.new_agent new_agent
+    #   expect(result).not_to be_nil
+    #   expect(result).to match(/^\d+$/)
+    #   new_agent_id result
+    # end
+
+    # it 'get info' do
+    #   result = producer_handler.agent(new_agent_id)
+    #   expect(result).not_to be_nil
+    #   expect(result.to_hash).to match new_agent_data
+    # end
+
+    # it 'update info' do
+    #   # update data
+    #   updated_agent = new_agent_data.dup
+    #   updated_agent[:email_address] = 'other@mail.com'
+    #   result = producer_handler.agent(new_agent_id, updated_agent)
+    #   expect(result).not_to be_nil
+    #   expect(result).to eq new_agent_id
+
+    #   # retrieve updated data
+    #   result = producer_handler.agent(new_agent_id)
+    #   expect(result).not_to be_nil
+    #   expect(result.to_hash).to match updated_agent
+    # end
+
+
+    # it 'delete' do
+    #   result = producer_handler.delete_agent new_agent_id
+    #   expect(result).not_to be_nil
+    #   expect(result).to eq new_agent_id
+    #   result = producer_handler.agent(new_agent_id)
+    #   expect(result).to be_nil
+    # end
 
     it 'get producers' do
       result = producer_handler.agent_producers agent_id, agent_ins
@@ -256,7 +250,7 @@ describe 'Rosetta Producer Service' do
     it 'create' do
       result = producer_handler.new_contact new_contact
       expect(result).not_to be_nil
-      expect(result).to match /^\d+$/
+      expect(result).to match(/^\d+$/)
       new_contact_id result
     end
 

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