libis-services 1.0.5 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2ce00b4bcc3a7510bba4c67012c0a1552952d952
-  data.tar.gz: 96428f5da531d60378045967800aeeab05091a5d
+SHA256:
+  metadata.gz: d769686dc6aacfd5c2284f26e692fe0bb9b2dddcaf7493d39363395b043846c6
+  data.tar.gz: 327783e9345a9f65aee921dda2f834c6610acc9df6658fa3586dc449b01781bc
 SHA512:
-  metadata.gz: a2540a1835aace4888073336db20174a2a06e8073db83e7a6c58f623045d6b102f712f923416bc18e8b23c8e07a3a366322439d92dfd72c9ca720f6a9a441d5a
-  data.tar.gz: 95eb2d53eca5febf20098eaf1f917ec1133f00f4a08589e40bd1052a545bfb7d765a2558fe99d8e93eb3144fb4e5f74b49b7c527d8944d51c8b4b7a8f9c5b515
+  metadata.gz: 84ec4e272d57865eeca0454d5f7348bc4065a6a34202e3e9982e63c761b4c408125595608429209f02a0788f7b51024da9318e095c1a99e30fb74eadcfbc2fc6
+  data.tar.gz: 9ecfd46c5bf0ee6f60c204d556ce4590023d1a76e074781ecb2cf055527ca8de7693c78f49d1254e4c750db891c01b521bea9cfda8f8c1cc3e4cbc62d557e1b5

data/lib/libis/services/aleph/search.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'backports/rails/hash'
+require 'libis/tools/extend/hash'
 require 'libis/tools/xml_document'
 
 require 'libis/services/generic_search'

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

@@ -1,4 +1,12 @@
-require 'oci8'
+# frozen_string_literal: true
+if RUBY_PLATFORM == 'java'
+  require 'java'
+  require 'ojdbc8.jar'
+  require 'orai18n.jar'
+  java_import 'oracle.jdbc.pool.OracleDataSource'
+else
+  require 'oci8'
+end
 
 module Libis
   module Services
@@ -9,12 +17,27 @@ module Libis
 
       def initialize(url)
         @url = url
-        @oci = OCI8.new(url)
+        @oci = if RUBY_PLATFORM == 'java'
+          raise RuntimeError, 'Malformed database URL' unless url =~ /^(.*)\/(.*)@(.*)$/
+          user, pass, db = $1, $2, $3
+          uri = "jdbc:oracle:thin:@#{db}"
+          ods = OracleDataSource.new
+          ods.set_url(uri)
+          ods.set_user(user)
+          ods.set_password(pass)
+          ods.get_connection
+        else
+          OCI8.new(url)
+        end
         ObjectSpace.define_finalizer(self, self.class.finalize(@oci))
       end
 
       def self.finalize(oci)
-        proc { oci.logoff }
+        if RUBY_PLATFORM == 'java'
+          proc { oci.close }
+        else
+          proc { oci.logoff }
+        end
       end
 
       # @param [Boolean] value
@@ -60,7 +83,7 @@ module Libis
 
       def run(script, parameters = [])
         params = ''
-        params = "\"" + parameters.join("\" \"") + "\"" if parameters and parameters.size > 0
+        params = "\"" + parameters.join("\" \"") + "\"" if parameters&.size.to_i > 0
         process_result `sqlplus -S #{url} @#{script} #{params}`
       end
 

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

@@ -19,6 +19,7 @@ module Libis
         include ::Libis::Tools::Logger
 
         def initialize(section, service, options = {})
+          @clear_soap_action = true
           basic_auth = options.delete(:basic_auth)
           if basic_auth
             options[:basic_auth] = [
@@ -27,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
 
@@ -46,16 +47,18 @@ module Libis
 
         protected
 
+        attr_reader :clear_soap_action
+
         def call_raw(operation, args = {})
-          data = if @auth
-                   request operation.to_s.to_sym, args, headers: {'Authorization' => @auth}
-                 else
-                   request operation.to_s.to_sym, args
-                 end
+          opts = {}
+          opts[:soap_action] = nil if clear_soap_action
+          opts[:headers] = {:Authorization => @auth} if @auth
+          data = request operation.to_s.to_sym, args, opts
 
           # remove wrapper
           data = data["#{operation}_response".to_sym]
-          data.delete(:'@xmlns:ns1')
+          data.delete_if {|key, _value| key.to_s =~ /^@/}
+          # data.delete(:'@xmlns:ns1')
 
           # drill down the returned Hash
           data = data.first.last while data.is_a?(Hash) && 1 == data.size

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'libis/tools/xml_document'
+require 'libis/tools/mets_file'
 require_relative 'client'
 
 module Libis
@@ -9,7 +10,7 @@ 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
 

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.rb

@@ -61,8 +61,9 @@ module Libis
               strip_namespaces: true,
               delete_namespace_attributes: true,
               empty_tag_value: nil,
-              convert_tags_to: lambda { |tag| tag.to_sym }
+              convert_tags_to: lambda(&:to_sym)
           )
+          # noinspection RubyArgCount
           self.new(hash[:producer_info])
         end
       end

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

@@ -0,0 +1,56 @@
+require 'virtus'
+
+module Libis
+  module Services
+    module Rosetta
+      class ProducerAgent
+        # noinspection RubyResolve
+        include Virtus.model(nullify_blank: true)
+
+        attribute :first_name, String
+        attribute :last_name, String
+        attribute :user_name, String
+        attribute :job_title, String
+        attribute :street, String
+        attribute :suburb, String
+        attribute :city, String
+        attribute :country, String
+        attribute :address_5, String
+        attribute :zip, String
+        attribute :email_address, String
+        attribute :web_site_url, String
+        attribute :telephone_1, String
+        attribute :telephone_2, String
+        attribute :user_group, String
+
+        def to_hash
+          attributes.cleanup
+        end
+
+        def to_xml
+          Libis::Tools::XmlDocument.build do |xml|
+            # noinspection RubyResolve
+            xml.user_info {
+              xml.parent.default_namespace = 'http://www.exlibrisgroup.com/xsd/dps/backoffice/service'
+              self.attributes.each do |name, value|
+                xml.send(name, xmlns: '').text(value) if value
+              end
+            }
+          end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::DEFAULT_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION)
+        end
+
+        def self.from_xml(xml)
+          xml_doc = Libis::Tools::XmlDocument.parse(xml)
+          hash = xml_doc.to_hash(
+              strip_namespaces: true,
+              delete_namespace_attributes: true,
+              empty_tag_value: nil,
+              convert_tags_to: lambda(&:to_sym)
+          )
+          # noinspection RubyArgCount
+          self.new(hash[:producer_info])
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 require 'libis/tools/extend/hash'
 require 'libis/tools/xml_document'
 require_relative 'producer'
+require_relative 'producer_agent'
 require_relative 'user'
 
 require_relative 'client'
@@ -12,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
 
@@ -39,6 +40,7 @@ module Libis
         end
 
         def new_producer(producer_info)
+          # noinspection RubyArgCount
           producer_info = Rosetta::Producer.new(producer_info) unless producer_info.is_a?(Rosetta::Producer)
           call :create_producer, arg0: @pds_handle, arg1: producer_info.to_xml
         end
@@ -51,17 +53,18 @@ module Libis
           if agent_info
             info = agent(agent_id)
             return nil if info.nil?
-            (agent_info.is_a?(Rosetta::User) ? agent_info.attributes : agent_info).each do |name, value|
+            (agent_info.is_a?(Rosetta::ProducerAgent) ? agent_info.attributes : agent_info).each do |name, value|
               info[name] = value
             end
             call :update_producer_agent, arg0: @pds_handle, arg1: agent_id, arg2: info.to_xml
           else
-            request_object :get_producer_agent, Rosetta::User, arg0: @pds_handle, arg1: agent_id
+            request_object :get_producer_agent, Rosetta::ProducerAgent, arg0: @pds_handle, arg1: agent_id
           end
         end
 
         def new_agent(agent_info)
-          agent_info = Rosetta::User.new(agent_info) unless agent_info.is_a?(Rosetta::User)
+          # noinspection RubyArgCount
+          agent_info = Rosetta::ProducerAgent.new(agent_info) unless agent_info.is_a?(Rosetta::ProducerAgent)
           call :create_producer_agent, arg0: @pds_handle, arg1: agent_info.to_xml
         end
 
@@ -99,6 +102,7 @@ module Libis
         end
 
         def new_contact(contact_info)
+          # noinspection RubyArgCount
           contact_info = Rosetta::User.new(contact_info) unless contact_info.is_a?(Rosetta::User)
           call :create_contact, arg0: @pds_handle, arg1: contact_info.to_xml
         end
@@ -108,6 +112,7 @@ module Libis
         end
 
         def link_contact(contact_id, producer_id, primary = true)
+          # noinspection RubySimplifyBooleanInspection
           call :link_contact_to_producer, arg0: @pds_handle, arg1: producer_id, arg2: contact_id, arg3: (!!primary).to_s.upcase
         end
 

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

@@ -10,7 +10,8 @@ require 'libis/tools/mets_file'
 
 require 'csv'
 require 'write_xlsx'
-require 'backports'
+require 'libis/tools/extend/hash'
+require 'libis/tools/extend/string'
 require 'awesome_print'
 
 require_relative '../service_error'
@@ -25,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.rb

@@ -60,8 +60,9 @@ module Libis
               strip_namespaces: true,
               delete_namespace_attributes: true,
               empty_tag_value: nil,
-              convert_tags_to: lambda { |tag| tag.to_sym }
+              convert_tags_to: lambda(&:to_sym)
           )
+          # noinspection RubyArgCount
           self.new(hash[:producer_info])
         end
       end