libis-services 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1939b9a4c0048b76d3d44dc3a002085ad7f39e28
-  data.tar.gz: 68fa2f7271055a8433dba8f832af917551c249d9
+  metadata.gz: eb98081d6394e2093ac0b8faac32ab71565907a5
+  data.tar.gz: dfa48fcdcf42bc7da12135dad5ef2dcac93e7ee3
 SHA512:
-  metadata.gz: c57e4e644a234e526ffaa316114194df3fc17284e76e52c68e748d2e0d6821b856d12d110a5df40b33ccc711b1a5cc46e7e351d3a1c36bc763e469e5d33ddefd
-  data.tar.gz: 3aa269554726807010b99a8273fd9d02db1b9486acb86ea24cd35034e3fe5bc1782a28033c9b99d9d32230a6a74bbb5b7db9ddbbc19454fc7e54a965aed50ddb
+  metadata.gz: 630bb576af4a70ab7cfe42bb0f2acca199f6912382b859249c90bad41e6c55450afe504e0e116a4132f4c84d037650bfde2a9ff97271240834cd73af96cf2ef3
+  data.tar.gz: b6c80cfadae173fa8ee98a8662c644a843b8e5a09a7267083859396c9711d31c356e7e0d098656491a3d9ef992594badfc1106ccfccb67840e9c82834f97b989

data/lib/libis/services/oai.rb

@@ -0,0 +1,96 @@
+require 'oai'
+require 'libis/tools/extend/hash'
+require 'libis/services/service_error'
+
+module Libis
+  module Services
+    class Oai
+      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
+        end
+
+        def to_hash
+          { from: @from, until: @until, metadata_prefix: @metadata_prefix, set: @set }.cleanup
+        end
+
+      end
+
+      def initialize(url, options = {})
+        options[:debug] = true
+        @oai_client = OAI::Client.new(url, options)
+      end
+
+      def identify
+        do_oai_request(:identify)
+      end
+
+      def sets(token = nil)
+        options = { resumption_token: token }
+        do_oai_request(:list_sets, options)
+      end
+
+      def metdata_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)
+      end
+
+      def records(token = nil, query = Query.new)
+        options = token ? {resumption_token: token} : query.to_hash
+        do_oai_request(:list_records, options)
+      end
+
+      def record(identifier, metadata_prefix)
+        do_oai_request(:get_record, identifier: identifier, metadata_prefix: metadata_prefix)
+      end
+
+      private
+
+      def do_oai_request(method, options = {})
+        response = @oai_client.send(method, options.cleanup)
+        object_to_hash(response)
+      rescue OAI::Exception => e
+        raise Libis::Services::ServiceError, "OAI Error: #{e.code} - #{e.message}"
+      end
+
+      def object_to_hash(obj)
+        case obj
+          when Array
+            obj.map { |x| object_to_hash(x) }
+          when Hash
+            obj.each_with_object({}) do |k,v,h|
+              h[k] = object_to_hash(v)
+            end
+          when REXML::Element
+            obj.to_s
+          when OAI::Response, OAI::Header, OAI::Record, OAI::MetadataFormat
+            result = obj.instance_variables.map do |x|
+              x[1..-1].to_sym
+            end.select do |x|
+              ![:_source, :doc, :resumption_block].include? x
+            end.each_with_object({}) do |x, h|
+              h[x] = object_to_hash obj.send(x)
+            end
+            if obj.methods.include?(:entries)
+              result[:entries] = obj.entries.map do |entry|
+                object_to_hash(entry)
+              end
+            end
+            result
+          else
+            obj
+        end
+      end
+
+    end
+  end
+end

data/lib/libis/services/oracle_client.rb

@@ -1,18 +1,42 @@
+require 'oci8'
+
 module Libis
   module Services
 
     class OracleClient
 
+      attr_reader :oci
+
       def initialize(database, user, password)
         @database = database
         @user = user
         @password = password
+        @oci = OCI8.new(user, password, database)
+        ObjectSpace.define_finalizer( self, self.class.finalize(@oci) )
+      end
+
+      def self.finalize(oci)
+        proc { oci.logoff }
+      end
+
+      # @param [Boolean] value
+      def blocking=(value)
+        oci.non_blocking = !value
+        blocking?
+      end
+
+      def blocking?
+        !oci.non_blocking?
       end
 
       def call(procedure, parameters = [])
         params = ''
         params = "'" + parameters.join("','") + "'" if parameters and parameters.size > 0
-        system "echo \"call #{procedure}(#{params});\" | sqlplus -S #{@user}/#{@password}@#{@database}"
+        oci.exec("call #{procedure}(#{params})")
+      end
+
+      def execute(statement, *bindvars, &block)
+        oci.exec(statement, *bindvars, &block)
       end
 
       def run(script, parameters = [])
@@ -21,10 +45,6 @@ module Libis
         process_result `sqlplus -S #{@user}/#{@password}@#{@database} @#{script} #{params}`
       end
 
-      def execute(sql)
-        process_result `echo \"#{sql}\" | sqlplus -S #{@user}/#{@password}@#{@database}`
-      end
-
       private
 
       def process_result(log)

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

@@ -1,45 +1,17 @@
-# encoding: utf-8
-require 'oai'
-require 'libis/tools/extend/hash'
+require 'libis/services/oai'
 
 module Libis
   module Services
     module Rosetta
-      class OaiPmh
-        include OAI::XPath
+      class OaiPmh < Libis::Services::Oai
 
         def initialize(base_url = 'http://depot.lias.be', options = {})
-          @oai_client = OAI::Client.new(base_url + '/oaiprovider/request', options)
+          super('http://depot.lias.be')
         end
 
-        def sets
-          response = @oai_client.list_sets
-          response.map do |oai_set|
-            {name: oai_set.name, spec: oai_set.spec, description: oai_set.description}.cleanup
-          end
-        end
-
-        def collections(institute, status = {})
-          result = records("#{institute}-collections", status)
-          result.map do |record|
-            record[:title] = xpath_first(record[:metadata], './/dc:title').text
-          end
-        end
-
-        def records(spec, status = {})
-          options = { set: spec }
-          options[:resumption_token] = status[:token] if status[:token]
-          result = []
-          response = @oai_client.list_records(options)
-          response.each do |record|
-            next if record.deleted?
-            result << {
-                id: record.header.identifier,
-                date: record.header.datestamp,
-                metadata: record.metadata,
-            }
-          end
-          result
+        def collections(institute, token = nil, query = Query.new)
+          query.set = "#{institute}-collections"
+          records(token, query)
         end
 
       end

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

@@ -1,5 +1,4 @@
-# coding: utf-8
-
+require 'libis/services/generic_search'
 require 'libis/services/oracle_client'
 require 'libis/tools/xml_document'
 
@@ -10,24 +9,39 @@ module Libis
       class Search
         include ::Libis::Services::GenericSearch
 
+        attr_reader :oracle
+
         def initialize
           @doc = nil
         end
 
+        def connect(name, password)
+          @oracle = OracleClient.new(
+              'libis-db-scope.cc.kuleuven.be:1556/SCOPEP.kuleuven.be',
+              name, password
+          )
+        end
+
         def find(term, options = {})
           super
-          OracleClient.new('SCOPE01', 'APLKN_ARCHV_LIAS', 'archvsc').
-              call('kul_packages.scope_xml_meta_file_ed', [term.upcase])
-          err_file = "/nas/vol03/oracle/scope01/#{term}_err.XML"
+        end
+
+        def query(term, _options = {})
+          @oracle.call('kul_packages.scope_xml_meta_file_ed', [term.upcase])
+          term = term.gsub(/[-\/]/, '_')
+          err_file = "/nas/vol03/oracle/SCOPEP/#{term}_err.XML"
+          md_file = "/nas/vol03/oracle/SCOPEP/#{term}_md.XML"
           if File.exist? err_file
-            doc = XmlDocument.open(err_file)
-            msg = doc.xpath('/error/error_msg').first.content
-            msg_detail = doc.xpath('/error/error_').first.content
-            File.delete(err_file)
+            doc = Libis::Tools::XmlDocument.open(err_file)
+            msg = doc['/error/error_msg']
+            detail = doc['/error/error_']
+            File.delete(err_file) rescue nil
             @doc = nil
-            raise RuntimeError, "Scope search failed: '#{msg}'. Details: '#{msg_detail}'"
+            raise RuntimeError, "Scope search failed: '#{msg}'. Details: '#{detail}'"
+          elsif File.exist? md_file
+            @doc = Libis::Tools::XmlDocument.open(md_file)
           else
-            @doc = XmlDocument.open("/nas/vol03/oracle/scope01/#{term}_md.XML").to_hash
+            raise RuntimeError, 'Scope search did not generate expected result file.'
           end
         end
 

data/lib/libis/services/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Services
-    VERSION = '0.1.5'
+    VERSION = '0.1.7'
   end
 end

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

@@ -0,0 +1,18 @@
+require 'libis/services/oai'
+require 'base64'
+
+module Libis
+  module Services
+    module Viaa
+      class OaiPmh < Libis::Services::Oai
+
+        def initialize(name, password)
+          token = Base64.encode64("#{name}:#{password}").gsub("\n", '')
+          base_url = 'https://archief.viaa.be/mediahaven-oai/oai'
+          super(base_url, headers: {'Authorization' => "Basic #{token}"})
+        end
+
+      end
+    end
+  end
+end

data/libis-services.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'savon', '~> 2.11'
   spec.add_runtime_dependency 'rest-client', '~> 1.8'
   spec.add_runtime_dependency 'oai', '~> 0.4'
+  spec.add_runtime_dependency 'ruby-oci8', '~> 2.2.2'
   spec.add_runtime_dependency 'virtus', '~> 1.0'
   spec.add_runtime_dependency 'write_xlsx', '~> 0.83'
   spec.add_runtime_dependency 'awesome_print', '~> 1.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +249,7 @@ files:
 - lib/libis/services/extend/http_fetch.rb
 - lib/libis/services/generic_search.rb
 - lib/libis/services/http_error.rb
+- lib/libis/services/oai.rb
 - lib/libis/services/oracle_client.rb
 - lib/libis/services/primo.rb
 - lib/libis/services/primo/limo.rb
@@ -266,6 +281,7 @@ files:
 - lib/libis/services/soap_client.rb
 - lib/libis/services/soap_error.rb
 - lib/libis/services/version.rb
+- lib/libis/services/viaa/oai_pmh.rb
 - libis-services.gemspec
 - spec/alma_service_spec.rb
 - spec/ie_data.rb
@@ -299,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: LIBIS Services toolbox.