libis-services 1.0.10 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286b07cf808e2a2e50a5cde29b49e6a9f9162a43598a45ed11f5460a69855046
-  data.tar.gz: 2ac35bfbbf62ba56ea718a41297aed33cf2e45bf1123a9938f7a1ba52de24b10
+  metadata.gz: 0cb4a19cf2e21d0a98cc25d510e0c3509b2a9a8ac64de25f42ae2db62066295b
+  data.tar.gz: 9b60e51ed5881010fcde0ff7918368d9db43e7bbf26172bdde1674a44a250176
 SHA512:
-  metadata.gz: 6e00164a2d67021f72ba76e6880291809460604f4db62900b4c7e8c39acc314466129f064c7c6a6c329c2668326fe353a82db1163a1f3beffc51e634e07f9e4d
-  data.tar.gz: 3cadc5af5ed9ca5f07766ba9bebd9bd517c046465d6e32b43e7796d68e5e6ac9fb6d8f3ef6ae7a7196fc836731970794db1fe86ae56eff7c2f18347af9d6f2e9
+  metadata.gz: cce6bcd91d6f976253d6539b9e114409f14316757e6f06b06c9b3a08fcdb0200f1e3211f508650b9c435216fb29260e7e3ece0455491ea631ffd9be1ebe131ee
+  data.tar.gz: 0dec285395763bf5497f3da62a8ff769bc8f7edb0bee055d28e0971bb25eed697ef72421731d4cada038cd923cf6f046c15efeeb1eb7b5de014234e373769d19

data/lib/libis/services/oai.rb

@@ -1,5 +1,6 @@
 require 'oai'
 require 'libis/tools/extend/hash'
+require 'libis/tools/xml_document'
 require 'libis/services/service_error'
 
 module Libis
@@ -8,15 +9,24 @@ module Libis
       include OAI::XPath
 
       class Query
-        attr_accessor :from, :until, :set, :metadata_prefix
 
-        def intialize(metadata_prefix = 'oai_dc')
-          @from = @until = @set = nil
-          @metadata_prefix = metadata_prefix
+        def initialize(options = {})
+          @options = options
+          @options[:metadata_prefix] ||= 'oai_dc'
+        end
+
+        def [](key, value)
+          @options[key] = value
         end
 
         def to_hash
-          { from: @from, until: @until, metadata_prefix: @metadata_prefix, set: @set }.cleanup
+          { 
+            from: @options[:from],
+            until: @options[:until],
+            metadata_prefix: @options[:metadata_prefix],
+            set: @options[:set],
+            resumption_token: @options[:token] || @options[:resumption_token]
+          }.cleanup
         end
 
       end
@@ -35,28 +45,41 @@ module Libis
         do_oai_request(:list_sets, options)
       end
 
-      def metdata_formats(identifier = nil)
+      def metadata_formats(identifier = nil)
         do_oai_request(:list_metadata_formats, {identifier: identifier})
       end
 
-      def identifiers(token = nil, query = Query.new)
-        options = token ? {resumption_token: token} : query.to_hash
-        do_oai_request(:list_identifiers, options)
+      def identifiers(token_or_query = nil)
+        do_oai_request(:list_identifiers, token_or_query_to_hash(token_or_query))
       end
 
-      def records(token = nil, query = Query.new)
-        options = token ? {resumption_token: token} : query.to_hash
-        do_oai_request(:list_records, options)
+      def records(token_or_query = nil)
+        do_oai_request(:list_records, token_or_query_to_hash(token_or_query))
       end
 
-      def record(identifier, metadata_prefix)
+      def record(identifier, metadata_prefix = 'oai_dc')
         do_oai_request(:get_record, identifier: identifier, metadata_prefix: metadata_prefix)
       end
 
-      private
+      protected
+
+      def token_or_query_to_hash(token_or_query)
+        case token_or_query
+        when Hash
+          Query.new(token_or_query).to_hash
+        when Query
+          token_or_query.to_hash
+        when String
+          { resumption_token: token_or_query }
+        else
+          {}
+        end
+      end
 
+      private
+      
       def do_oai_request(method, options = {})
-        response = @oai_client.send(method, options.cleanup)
+        response = options.cleanup.empty? ? @oai_client.send(method): @oai_client.send(method, options.cleanup)
         object_to_hash(response)
       rescue OAI::Exception => e
         raise Libis::Services::ServiceError, "OAI Error: #{e.code} - #{e.message}"
@@ -71,7 +94,7 @@ module Libis
               h[k] = object_to_hash(v)
             end
           when REXML::Element
-            obj.to_s
+            Libis::Tools::XmlDocument.parse(obj.to_s).to_hash
           when OAI::Response, OAI::Header, OAI::Record, OAI::MetadataFormat, OAI::Set
             result = obj.instance_variables.map do |x|
               x[1..-1].to_sym

data/lib/libis/services/oracle_client.rb

@@ -60,6 +60,15 @@ module Libis
         oci.exec(statement, *bindvars, &block)
       end
 
+      def parse(statement)
+        oci.parse(statement)
+      end
+
+      def cursor_exec(cursor, **binvars)
+        bindvars.each { |k, v| cursor.bind_param(k, v) }
+        cursor.exec
+      end
+
       def table(name)
         metadata = oci.describe_table(name)
         {

data/lib/libis/services/rosetta/client.rb

@@ -28,7 +28,7 @@ module Libis
             ]
           end
           opts = {strip_namespaces: true, logger: ::Libis::Tools::Config.logger}.merge options
-          base_url = opts.delete(:url) || 'http://depot.lias.be'
+          base_url = opts.delete(:url) || 'https://repository.teneo.libis.be'
           configure "#{base_url}/dpsws/#{section}/#{service}?wsdl", opts
         end
 

data/lib/libis/services/rosetta/collection_handler.rb

@@ -12,7 +12,7 @@ module Libis
       class CollectionHandler < Libis::Services::Rosetta::Client
 
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super 'repository', 'CollectionWebServices', {url: base_url}.merge(options)
         end
 

data/lib/libis/services/rosetta/deposit_handler.rb

@@ -9,7 +9,7 @@ module Libis
 
       class DepositHandler < ::Libis::Services::Rosetta::Client
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super 'deposit', 'DepositWebServices', {url: base_url}.merge(options)
         end
 

data/lib/libis/services/rosetta/ie_handler.rb

@@ -10,18 +10,18 @@ module Libis
 
       class IeHandler < Libis::Services::Rosetta::Client
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super 'repository', 'IEWebServices', {url: base_url}.merge(options)
         end
 
         def get_mets(ie, flags = 0)
           result = call_raw :get_ie, pds_handle: @pds_handle, ie_pid: ie, flags: flags
-          Libis::Tools::MetsFile.parse(result[:get_ie])
+          Libis::Tools::MetsFile.parse(result)
         end
 
         def get_metadata(ie)
           result = call_raw :get_md, pds_handle: @pds_handle, 'PID' => ie
-          Libis::Tools::MetsFile.parse(result[:get_md])
+          Libis::Tools::MetsFile.parse(result)
         end
 
       end

data/lib/libis/services/rosetta/oai_pmh.rb

@@ -1,17 +1,17 @@
 require 'libis/services/oai'
+require 'libis/tools/xml_document'
 
 module Libis
   module Services
     module Rosetta
       class OaiPmh < Libis::Services::Oai
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super(base_url + '/oaiprovider/request')
         end
 
-        def collections(institute, token = nil, query = Query.new)
-          query.set = "#{institute}-collections"
-          records(token, query)
+        def collections(institute, token_or_query = nil)
+          records(token_or_query_to_hash(token_or_query).merge(set: "#{institute}-collections"))
         end
 
       end

data/lib/libis/services/rosetta/producer_handler.rb

@@ -13,7 +13,7 @@ module Libis
       class ProducerHandler < Libis::Services::Rosetta::Client
 
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super 'backoffice', 'ProducerWebServices', {url: base_url}.merge(options)
         end
 

data/lib/libis/services/rosetta/service.rb

@@ -26,7 +26,7 @@ module Libis
         attr_reader :pds_service, :producer_service, :deposit_service, :sip_service, :ie_service, :collection_service
 
         # @param [String] base_url
-        def initialize(base_url = 'http://depot.lias.be', pds_url = 'https://pds.libis.be', opts = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', pds_url = 'https://pds.libis.be', opts = {})
           @pds_service = Libis::Services::Rosetta::PdsHandler.new pds_url
           @producer_service = Libis::Services::Rosetta::ProducerHandler.new base_url, opts
           @deposit_service = Libis::Services::Rosetta::DepositHandler.new base_url, opts

data/lib/libis/services/rosetta/sip_handler.rb

@@ -11,7 +11,7 @@ module Libis
 
       class SipHandler < Libis::Services::Rosetta::Client
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super 'repository', 'SipWebServices', {url: base_url}.merge(options)
         end
 

data/lib/libis/services/rosetta/user_manager.rb

@@ -10,7 +10,7 @@ module Libis
 
       class UserManager < Libis::Services::Rosetta::Client
 
-        def initialize(base_url = 'http://depot.lias.be', options = {})
+        def initialize(base_url = 'https://repository.teneo.libis.be', options = {})
           super 'infra', 'UserManagerWS', {url: base_url}.merge(options)
         end
 

data/lib/libis/services/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Services
-    VERSION = '1.0.10'
+    VERSION = '1.0.12'
   end
 end

data/libis-services.gemspec

@@ -27,12 +27,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'coveralls', '~> 0.7'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6'
+  spec.add_development_dependency 'rexml'
 
   spec.add_runtime_dependency 'libis-tools', '~> 1.0'
-  spec.add_runtime_dependency 'highline', '~> 1.7'
+  spec.add_runtime_dependency 'highline', '~> 2.0'
   spec.add_runtime_dependency 'savon', '~> 2.11'
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
-  spec.add_runtime_dependency 'oai', '~> 0.4'
+  spec.add_runtime_dependency 'oai', '~> 1.0'
   spec.add_runtime_dependency 'ruby-oci8', '~> 2.2.2' unless RUBY_PLATFORM == 'java'
   spec.add_runtime_dependency 'virtus', '~> 1.0'
   spec.add_runtime_dependency 'write_xlsx', '~> 0.83'

data/spec/alma_service_spec.rb

@@ -6,146 +6,17 @@ require 'libis/services/alma/sru_service'
 
 describe 'Alma' do
 
-  # noinspection RubyLiteralArrayInspection
-  let(:record) {
-    {
-        leader: '01960nas a2200553u  4500',
-        controlfield: ['9930800070101471', '20170602113306.0', '881205c19679999be  r|p||     0|||a|dut c'],
-        datafield: [
-            {
-                subfield: '(BeLVLBS)003080007LBS01-Aleph',
-                :@tag => '035', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: 'Kerk en leven. Bisdom Antwerpen (0991)',
-                :@tag => '245', :@ind1 => '0', :@ind2 => '0'
-            }, {
-                subfield: 'K & L',
-                :@tag => '246', :@ind1 => '3', :@ind2 => '3'
-            }, {
-                subfield: ['Antwerpen', 'Kerk en leven,', '1967-.'],
-                :@tag => '260', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: 'Weekly',
-                :@tag => '310', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: %w(text rdacontent),
-                :@tag => '336', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: %w(computer rdamedia),
-                :@tag => '337', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['online resource', 'rdacarrier'],
-                :@tag => '338', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: 'Online',
-                :@tag => '340', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: 'Digitale kopie van de gedrukte uitgave',
-                :@tag => '500', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['KADOC', 'C1', 'Kerken en religie', '(ODIS-HT)'],
-                :@tag => '650', :@ind1 => ' ', :@ind2 => '7'
-            }, {
-                subfield: ['KADOC', 'Antwerpen [deelgemeente in gemeente Antwerpen - BE]', '(ODIS-GEO)10560000006504'],
-                :@tag => '650', :@ind1 => ' ', :@ind2 => '7'
-            }, {
-                subfield: ['KADOC', 'Bisdom Antwerpen (1961-heden)', '(ODIS-ORG)9284'],
-                :@tag => '650', :@ind1 => ' ', :@ind2 => '7'
-            }, {
-                subfield: ['KADOC', 'Studiecentrum voor Zielzorg en Predicatie', '(ODIS-ORG)24894'],
-                :@tag => '650', :@ind1 => ' ', :@ind2 => '7'
-            }, {
-                subfield: 'E-journals',
-                :@tag => '653', :@ind1 => ' ', :@ind2 => '6'
-            }, {
-                subfield: 'Collectie Kerk en Leven',
-                :@tag => '699', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: 'KYE000486',
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1967)7-35, 37-52'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1968)1-14, 17-49'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1969)1-10, 12-37, 39-49'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1970)1-50 volledig'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1971)1-28, 30-31, 33-37, 41-49'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1972)22, 30-32, 34-36, 38-50'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1973)1-50 volledig'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1974)1-25, 27-50'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1975)-(1992)volledig'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1993)1-10, 12-50'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1994)-(1996)volledig'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1997)volledig'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(1998)1-53'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2000)1-16, 18-52'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2001)-(2003)volledig'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2004)1-53'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2005)1-8, 10-52'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2006)1-26, 29, 32-52'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2007)39-42, 44, 46-49, 51-52'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2008)1-28, 32-53'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2009)1-34, 36-38'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', '(2011)1-13, 15-36, 45-52'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', 'KADOC elektronische tijdschriften'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }, {
-                subfield: ['EKAD', 'KADOC lopende periodiek'],
-                :@tag => '983', :@ind1 => ' ', :@ind2 => ' '
-            }
-        ],
-    }
-  }
-
   context 'API service' do
     let(:subject) { Libis::Services::Alma::WebService.new }
+    let(:record) { Hash.new }
 
     context 'marc' do
 
       before {
+        data = Libis::Services::Alma::SruService.new.search('alma.local_field_983', 'KYE000486')
+        data = data.first.to_hash(:convert_tags_to => lambda { |tag| tag.snakecase.to_sym })
+
+        record = data[:record]
         record[:controlfield][0] = '9930800070101480'
         record[:datafield].insert(1, {
             subfield: '(EXLNZ-32KUL_LIBIS_NETWORK)9930800070101471',
@@ -170,9 +41,16 @@ describe 'Alma' do
 
   context 'SRU service' do
     let(:subject) { Libis::Services::Alma::SruService.new }
+    let(:record) { Hash.new }
 
     context 'marc' do
 
+      before {
+        data = Libis::Services::Alma::WebService.new.get_marc('9930800070101480', 'l7xx8879c82a7d7b453a887a6e6dca8300fd').
+            to_hash(:convert_tags_to => lambda { |tag| tag.snakecase.to_sym })
+        record = data[:bib][:record]
+        record.cleanup!
+      }
 
       it 'search' do
         result = subject.search('alma.local_field_983', 'KYE000486')