libis-services 0.0.2 → 0.0.3

data/spec/primo_search_spec.rb

@@ -11,7 +11,7 @@ describe 'Primo search service' do
     it 'default return result' do
       result = subject.query 'foo'
       expect(result.keys).to eq [:count, :from, :to, :step, :data]
-      expect(result[:data].size).to eq [result[:count], result[:step]].min
+      expect(result[:data].size).to eq [result[:count], result[:step] - 1].min
     end
 
   end

data/spec/rosetta_collection_spec.rb

@@ -89,8 +89,8 @@ describe 'Rosetta Collection Service' do
         },
         md_source: [],
         navigate: true,
-        publish: false,
-        external_id: '9999',
+        publish: true,
+        external_id: '5555',
         external_system: 'CollectiveAccess'
     } }
 
@@ -151,7 +151,7 @@ describe 'Rosetta Collection Service' do
 
 
     it 'create new collection' do
-       new_collection_id = collection_service.create(collection_data)
+      new_collection_id = collection_service.create(collection_data)
       expect(new_collection_id).not_to be_nil
       expect(new_collection_id).to be_a String
       expect(new_collection_id).to eq new_collection.id

data/spec/rosetta_ie_spec.rb

@@ -8,6 +8,7 @@ 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') }
@@ -36,310 +37,18 @@ describe 'Rosetta IE Service' do
     ie_handler.pds_handle = handle
   end
 
-  let(:expected_mets) {
-    {
-        amd: {
-            tech: {
-                'internalIdentifier' => [
-                    {'internalIdentifierType' => 'SIPID', 'internalIdentifierValue' => '55010'},
-                    {'internalIdentifierType' => 'PID', 'internalIdentifierValue' => 'IE403595'},
-                    {'internalIdentifierType' => 'DepositSetID', 'internalIdentifierValue' => '55662'}],
-                'objectCharacteristics' => [
-                    {'objectType' => 'INTELLECTUAL_ENTITY',
-                     'creationDate' => '2015-10-13 14:41:56',
-                     'createdBy' => 'testadmin',
-                     'modificationDate' => '2015-10-13 14:46:23',
-                     'modifiedBy' => 'testadmin',
-                     'owner' => 'CRS00.TESTINS.TESTDEP'}],
-                'generalIECharacteristics' => [{'status' => 'ACTIVE'}],
-                'retentionPolicy' => [
-                    {'policyId' => 'NO_RETENTION',
-                     'policyDescription' => 'No Retention Policy'}]
-            },
-            rights: {
-                'accessRightsPolicy' => [
-                    {'policyId' => '50740',
-                     'policyParameters' => '',
-                     'policyDescription' => 'AR_IP_RANGE_KUL'}]
-            },
-            source: {
-                'metaData' => [
-                    {'MID' => 'DNX_IE403595',
-                     'UUID' => '23107258',
-                     'creationDate' => '2015-10-13 14:41:56',
-                     'createdBy' => 'testadmin',
-                     'modificationDate' => '2015-10-13 14:46:23',
-                     'modifiedBy' => 'testadmin',
-                     'metadataType' => '21',
-                     'description' => '',
-                     'externalSystem' => '',
-                     'externalRecordId' => '',
-                     'application' => 'Test Metadata Profile'}]
-            },
-            digiprov: {
-                'producer' => [
-                    {'userName' => '',
-                     'address1' => 'Willem de Croylaan 54',
-                     'address2' => '',
-                     'address3' => 'Heverlee',
-                     'address4' => 'Belgium',
-                     'address5' => '',
-                     'defaultLanguage' => 'en',
-                     'emailAddress' => 'lias.test.user@gmail.com',
-                     'firstName' => 'Test',
-                     'jobTitle' => '',
-                     'lastName' => 'Deposit',
-                     'middleName' => '',
-                     'telephone1' => '0032 16 32 22 66',
-                     'telephone2' => '',
-                     'authorativeName' => 'test_producer_group',
-                     'producerId' => '23106349',
-                     'userIdAppId' => '23106348',
-                     'webSiteUrl' => '',
-                     'zip' => '3001'}],
-                'producerAgent' => [
-                    {'firstName' => 'Test', 'lastName' => 'Administrator', 'middleName' => ''}],
-                'event' => [
-                    {'eventDateTime' => '2015-10-13 14:46:23',
-                     'eventType' => 'PROCESSING',
-                     'eventIdentifierType' => 'DPS',
-                     'eventIdentifierValue' => '130',
-                     'eventOutcome1' => 'SUCCESS',
-                     'eventDescription' => "Object's Metadata Record Modified",
-                     'linkingAgentIdentifierType1' => 'USER',
-                     'linkingAgentIdentifierValue1' => 'testadmin'}]
-            }
-        },
-        dmd: {
-            'text' => "\n        ",
-            'title' => 'Nachtzicht strand Ærøskøbing'
-        },
-        'Preservation Master' => {
-            id: 'REP403596',
-            amd: {
-                tech: {
-                    'generalRepCharacteristics' => [
-                        {'preservationType' => 'PRESERVATION_MASTER',
-                         'usageType' => 'VIEW',
-                         'RevisionNumber' => '1',
-                         'DigitalOriginal' => 'false'}],
-                    'internalIdentifier' => [
-                        {'internalIdentifierType' => 'SIPID', 'internalIdentifierValue' => '55010'},
-                        {'internalIdentifierType' => 'PID', 'internalIdentifierValue' => 'REP403596'},
-                        {'internalIdentifierType' => 'DepositSetID', 'internalIdentifierValue' => '55662'}],
-                    'objectCharacteristics' => [
-                        {'objectType' => 'REPRESENTATION',
-                         'creationDate' => '2015-10-13 14:41:56',
-                         'createdBy' => 'testadmin',
-                         'modificationDate' => '2015-10-13 14:41:56',
-                         'modifiedBy' => 'testadmin',
-                         'owner' => 'CRS00.TESTINS.TESTDEP'}]
-                },
-                rights: {},
-                source: {'metaData' =>
-                             [
-                                 {'MID' => 'DNX_REP403596',
-                                  'UUID' => '23107254',
-                                  'creationDate' => '2015-10-13 14:41:56',
-                                  'createdBy' => 'testadmin',
-                                  'modificationDate' => '2015-10-13 14:41:56',
-                                  'modifiedBy' => '',
-                                  'metadataType' => '21',
-                                  'description' => '',
-                                  'externalSystem' => '',
-                                  'externalRecordId' => ''},
-                                 {'MID' => 'REP403596-1',
-                                  'UUID' => '23107257',
-                                  'creationDate' => '2015-10-13 14:41:56',
-                                  'createdBy' => 'testadmin',
-                                  'modificationDate' => '2015-10-13 14:41:56',
-                                  'modifiedBy' => '',
-                                  'metadataType' => '32',
-                                  'description' => '',
-                                  'externalSystem' => '',
-                                  'externalRecordId' => ''} ]
-                },
-                digiprov: {}
-            },
-            nil => {},
-            'Table of Contents' =>
-                {nil => {},
-                 'Nachtzicht strand Ærøskøbing' => {
-                     id: 'FL403597',
-                     amd: {
-                         tech: {
-                             'fileFixity' => [
-                                 {'fixityType' => 'MD5',
-                                  'fixityValue' => '22d8897eeb3adfa70794fcfac04e8602'}],
-                             'objectCharacteristics' => [
-                                 {'groupID' => '',
-                                  'objectType' => 'FILE',
-                                  'creationDate' => '2015-10-13 14:41:56',
-                                  'createdBy' => 'testadmin',
-                                  'modificationDate' => '2015-10-13 14:41:56',
-                                  'modifiedBy' => 'testadmin',
-                                  'owner' => 'CRS00.TESTINS.TESTDEP'}],
-                             'internalIdentifier' => [
-                                 {'internalIdentifierType' => 'SIPID',
-                                  'internalIdentifierValue' => '55010'},
-                                 {'internalIdentifierType' => 'PID',
-                                  'internalIdentifierValue' => 'FL403597'},
-                                 {'internalIdentifierType' => 'DepositSetID',
-                                  'internalIdentifierValue' => '55662'}],
-                             'vsOutcome' => [
-                                 {'checkDate' => 'Tue Oct 13 14:42:02 CEST 2015',
-                                  'type' => 'FILE_FORMAT',
-                                  'vsAgent' =>
-                                      'REG_SA_DROID , Version 6.01 , Signature version Binary SF v.52/ Container SF v.1',
-                                  'result' => 'PASSED',
-                                  'resultDetails' => '',
-                                  'vsEvaluation' => 'PASSED',
-                                  'vsEvaluationDetails' => ''}],
-                             'fileFormat' => [
-                                 {'agent' => 'REG_SA_DROID',
-                                  'formatRegistry' => 'PRONOM',
-                                  'formatRegistryId' => 'fmt/43',
-                                  'formatRegistryRole' => '',
-                                  'formatName' => 'fmt/43',
-                                  'formatVersion' => '1.01',
-                                  'formatDescription' => 'JPEG File Interchange Format',
-                                  'formatNote' => '',
-                                  'exactFormatIdentification' => 'true',
-                                  'mimeType' => 'image/jpeg',
-                                  'agentVersion' => '6.01',
-                                  'agentSignatureVersion' => 'Binary SF v.52/ Container SF v.1',
-                                  'formatLibraryVersion' => '3.007'}],
-                             'generalFileCharacteristics' => [
-                                 {'label' => 'Nachtzicht strand Ærøskøbing',
-                                  'note' => '',
-                                  'fileCreationDate' => '',
-                                  'fileModificationDate' => '',
-                                  'FileEntityType' => '',
-                                  'compositionLevel' => '',
-                                  'fileLocationType' => 'FILE',
-                                  'fileLocation' => '',
-                                  'fileOriginalName' => 'DSC03176.jpg',
-                                  'fileOriginalPath' => 'DSC03176.jpg',
-                                  'fileOriginalID' => '/deposit_storage/55001-56000/dep_55662/deposit/content/streams/DSC03176.jpg',
-                                  'fileExtension' => 'jpg',
-                                  'fileMIMEType' => 'image/jpeg',
-                                  'fileSizeBytes' => '7694075',
-                                  'formatLibraryId' => 'fmt/43',
-                                  'riskLibraryIdentifiers' => ''}]
-                         },
-                         rights: {},
-                         source: {
-                             'metaData' => [
-                                 {'MID' => 'DNX_FL403597',
-                                  'UUID' => '23107256',
-                                  'creationDate' => '2015-10-13 14:41:56',
-                                  'createdBy' => 'testadmin',
-                                  'modificationDate' => '2015-10-13 14:41:56',
-                                  'modifiedBy' => '',
-                                  'metadataType' => '21',
-                                  'description' => '',
-                                  'externalSystem' => '',
-                                  'externalRecordId' => ''}]
-                         },
-                         digiprov: {
-                             'event' => [
-                                 {'eventDateTime' => '2015-10-13 14:42:01',
-                                  'eventType' => 'VALIDATION',
-                                  'eventIdentifierType' => 'DPS',
-                                  'eventIdentifierValue' => '25',
-                                  'eventOutcome1' => 'SUCCESS',
-                                  'eventOutcomeDetail1' => 'PROCESS_ID=;PID=FL403597;FILE_EXTENSION=jpg;SIP_ID=55010;DEPOSIT_ACTIVITY_ID=55662;MF_ID=23106594;TASK_ID=48;IDENTIFICATION_METHOD=SIGNATURE;PRODUCER_ID=23106349;FORMAT_ID=fmt/43;',
-                                  'eventDescription' => 'Format Identification performed on file',
-                                  'linkingAgentIdentifierType1' => 'SOFTWARE',
-                                  'linkingAgentIdentifierValue1' => 'REG_SA_DROID , Version 6.01 , Signature version Binary SF v.52/ Container SF v.1'}]
-                         }
-                     }
-                 }
-                }
-        }
-    }
-  }
-
-  let(:expected_ies) {
-    {amd: {
-        tech: {'internalIdentifier' =>
-                   [{'internalIdentifierType' => 'SIPID', 'internalIdentifierValue' => '55010'},
-                    {'internalIdentifierType' => 'PID',
-                     'internalIdentifierValue' => 'IE403595'},
-                    {'internalIdentifierType' => 'DepositSetID',
-                     'internalIdentifierValue' => '55662'}],
-               'objectCharacteristics' =>
-                   [{'objectType' => 'INTELLECTUAL_ENTITY',
-                     'creationDate' => '2015-10-13 14:41:56',
-                     'createdBy' => 'testadmin',
-                     'modificationDate' => '2015-10-13 14:46:23',
-                     'modifiedBy' => 'testadmin',
-                     'owner' => 'CRS00.TESTINS.TESTDEP'}],
-               'generalIECharacteristics' => [{'status' => 'ACTIVE'}],
-               'retentionPolicy' =>
-                   [{'policyId' => 'NO_RETENTION',
-                     'policyDescription' => 'No Retention Policy'}]},
-        rights: {'accessRightsPolicy' =>
-                     [{'policyId' => '50740',
-                       'policyParameters' => '',
-                       'policyDescription' => 'AR_IP_RANGE_KUL'}]},
-        source: {'metaData' =>
-                     [{'MID' => 'DNX_IE403595',
-                       'UUID' => '23107258',
-                       'creationDate' => '2015-10-13 14:41:56',
-                       'createdBy' => 'testadmin',
-                       'modificationDate' => '2015-10-13 14:46:23',
-                       'modifiedBy' => 'testadmin',
-                       'metadataType' => '21',
-                       'description' => '',
-                       'externalSystem' => '',
-                       'externalRecordId' => '',
-                       'application' => 'Test Metadata Profile'}]},
-        digiprov: {'producer' =>
-                       [{'userName' => '',
-                         'address1' => 'Willem de Croylaan 54',
-                         'address2' => '',
-                         'address3' => 'Heverlee',
-                         'address4' => 'Belgium',
-                         'address5' => '',
-                         'defaultLanguage' => 'en',
-                         'emailAddress' => 'lias.test.user@gmail.com',
-                         'firstName' => 'Test',
-                         'jobTitle' => '',
-                         'lastName' => 'Deposit',
-                         'middleName' => '',
-                         'telephone1' => '0032 16 32 22 66',
-                         'telephone2' => '',
-                         'authorativeName' => 'test_producer_group',
-                         'producerId' => '23106349',
-                         'userIdAppId' => '23106348',
-                         'webSiteUrl' => '',
-                         'zip' => '3001'}],
-                   'producerAgent' =>
-                       [{'firstName' => 'Test', 'lastName' => 'Administrator', 'middleName' => ''}],
-                   'event' =>
-                       [{'eventDateTime' => '2015-10-13 14:46:23',
-                         'eventType' => 'PROCESSING',
-                         'eventIdentifierType' => 'DPS',
-                         'eventIdentifierValue' => '130',
-                         'eventOutcome1' => 'SUCCESS',
-                         'eventDescription' => "Object's Metadata Record Modified",
-                         'linkingAgentIdentifierType1' => 'USER',
-                         'linkingAgentIdentifierValue1' => 'testadmin'}]}},
-     dmd: {'text' => "\n        ", 'title' => 'Nachtzicht strand Ærøskøbing'}} }
-
   it 'should get IE info' do
 
     mets = ie_handler.get_mets('IE403595')
     expect(mets).not_to be_nil
-    expect(mets).to match expected_mets
+    check_container expected_mets, mets
   end
 
   it 'should get IE metadata' do
 
     metadata = ie_handler.get_metadata('IE403595')
     expect(metadata).not_to be_nil
-    expect(metadata).to match expected_ies
+    check_container(expected_ies, metadata)
   end
 
 end

data/spec/rosetta_oai_spec.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+require_relative 'spec_helper'
+
+require 'libis/tools/config_file'
+require 'libis/services/rosetta/oai_pmh'
+
+describe 'Rosetta OAI-PMH Service' do
+
+  let(:credentials) { Libis::Tools::ConfigFile.new File.join(File.dirname(__FILE__), 'credentials-test.yml'), debug: true }
+
+  subject(:oai_handler) do
+    # noinspection RubyResolve
+    Libis::Services::Rosetta::OaiPmh.new credentials.rosetta_url
+  end
+
+  let(:expected_sets) {
+    {name:'TESTINS-collections', spec: 'TESTINS-collections'}
+  }
+
+  let(:expected_collections) {
+    [
+        'My pictures',
+        'Test Collection',
+    ]
+  }
+
+  let(:expected_records) {
+    [
+        {
+            id: 'oai:d4I1-pubam:IE403595',
+        }
+    ]
+  }
+
+  it 'should get set list' do
+    sets = oai_handler.sets
+    expect(sets).to include(expected_sets)
+  end
+
+  it 'should get list of collections' do
+    status = {}
+    collections = oai_handler.collections('TESTINS', status)
+    check_container expected_collections, collections
+  end
+
+  it 'should get list of records' do
+    status = {}
+    records = oai_handler.records('test_data', status)
+    check_container(expected_records, records)
+  end
+
+end

data/spec/rosetta_sip_spec.rb

@@ -20,7 +20,7 @@ describe 'Rosetta SIP Service' do
     { module: 'PER', stage: 'Finished', status: 'FINISHED' }
   }
 
-  let(:expected_ies) { ['IE403595'] }
+  let(:expected_ies) { [{pid: 'IE403595'}] }
 
   it 'should get SIP info' do
 
@@ -33,7 +33,7 @@ describe 'Rosetta SIP Service' do
 
     ies = sip_handler.get_ies(55010)
     expect(ies).not_to be_nil
-    expect(ies).to match_array expected_ies
+    expect(ies.map(&:to_h)).to match_array expected_ies
   end
 
 end

data/spec/spec_helper.rb

@@ -10,3 +10,19 @@ Bundler.setup
 require 'rspec'
 require 'libis-services'
 
+def check_container(expected, result)
+  case expected
+    when Array
+      expect(result).to be_a Array
+      expected.each_with_index { |value, i| check_container(value, result[i]) }
+    when Hash
+      expect(result).to be_a Hash
+      expected.each_key do |key|
+        expect(result[key]).not_to be_nil
+        check_container(expected[key], result[key])
+      end
+    else
+      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.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: oai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +235,7 @@ files:
 - lib/libis-services.rb
 - lib/libis/services.rb
 - lib/libis/services/aleph/search.rb
+- lib/libis/services/alma/web_service.rb
 - lib/libis/services/collective_access.rb
 - lib/libis/services/collective_access/cataloguing.rb
 - lib/libis/services/collective_access/connector.rb
@@ -246,6 +261,8 @@ files:
 - lib/libis/services/rosetta/deposit_handler.rb
 - lib/libis/services/rosetta/ie.rb
 - lib/libis/services/rosetta/ie_handler.rb
+- lib/libis/services/rosetta/oai_pmh.rb
+- 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_handler.rb
@@ -256,17 +273,21 @@ files:
 - lib/libis/services/rosetta/user_manager.rb
 - lib/libis/services/scope/search.rb
 - lib/libis/services/search_factory.rb
+- lib/libis/services/service_error.rb
 - lib/libis/services/sharepoint/connector.rb
 - lib/libis/services/sharepoint/search.rb
 - lib/libis/services/soap_client.rb
 - lib/libis/services/soap_error.rb
 - lib/libis/services/version.rb
 - libis-services.gemspec
+- spec/alma_service_spec.rb
+- spec/ie_data.rb
 - spec/primo_limo_spec.rb
 - spec/primo_search_spec.rb
 - spec/rosetta_collection_spec.rb
 - spec/rosetta_deposit_spec.rb
 - spec/rosetta_ie_spec.rb
+- spec/rosetta_oai_spec.rb
 - spec/rosetta_pds_spec.rb
 - spec/rosetta_producer_spec.rb
 - spec/rosetta_sip_spec.rb
@@ -296,11 +317,14 @@ signing_key:
 specification_version: 4
 summary: LIBIS Services toolbox.
 test_files:
+- spec/alma_service_spec.rb
+- spec/ie_data.rb
 - spec/primo_limo_spec.rb
 - spec/primo_search_spec.rb
 - spec/rosetta_collection_spec.rb
 - spec/rosetta_deposit_spec.rb
 - spec/rosetta_ie_spec.rb
+- spec/rosetta_oai_spec.rb
 - spec/rosetta_pds_spec.rb
 - spec/rosetta_producer_spec.rb
 - spec/rosetta_sip_spec.rb