libis-services 1.0.7 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2598b3601e64cf3b97f27f73c6d1888ba445f657
-  data.tar.gz: 1624104e868fe2947c206ab8851cd7ed22b60408
+SHA256:
+  metadata.gz: 286b07cf808e2a2e50a5cde29b49e6a9f9162a43598a45ed11f5460a69855046
+  data.tar.gz: 2ac35bfbbf62ba56ea718a41297aed33cf2e45bf1123a9938f7a1ba52de24b10
 SHA512:
-  metadata.gz: 38d1b1128b0fc1a3c5f85c62da5a3f3fd478521a9d91929dd64b2e86cf2f9c390c492cf977b054eb2386b1909946388eb9ab80dd6ffae49ce4fb70fc8eb96e96
-  data.tar.gz: d977e8e76c558f9ec342379d5880e6768da64109ab7ffb33e16e2946b5316afcd39b24a7051b393d5afec279c63fd36662d0320ed00fa1f3a5d8db3b9434d53e
+  metadata.gz: 6e00164a2d67021f72ba76e6880291809460604f4db62900b4c7e8c39acc314466129f064c7c6a6c329c2668326fe353a82db1163a1f3beffc51e634e07f9e4d
+  data.tar.gz: 3cadc5af5ed9ca5f07766ba9bebd9bd517c046465d6e32b43e7796d68e5e6ac9fb6d8f3ef6ae7a7196fc836731970794db1fe86ae56eff7c2f18347af9d6f2e9

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/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/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'

data/lib/libis/services/version.rb

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

data/libis-services.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   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 'ruby-oci8', '~> 2.2.2'
+  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'
   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: 1.0.7
+  version: 1.0.10
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: LIBIS Services toolbox.