libis-tools 1.0.9 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c057b018c6fd9fa648ba532ebbf0919d7f04c399057aa2a73b61b346076dece9
-  data.tar.gz: 9ae7380f4b60de143a6949990a69cb7249f4d81ea06912194c329c5df1b5bcf6
+  metadata.gz: f007ed770338a6d5f537e3388cc72409e4e35deab2c337f8f4a80a76db200371
+  data.tar.gz: c57cd7d2cb65c0cf6cc03a2e7973ee2d24e279f5e975da5580b4569f50c833b3
 SHA512:
-  metadata.gz: c00fa670055c8cc156b3a7b5810f4e927c8386dba41ae4dd5b55bb602124fd962df415a4b0f1c640941685d2d1d3a7bb8222978f199bb55856ba095287015865
-  data.tar.gz: 60d16f403a7473bea8f0de32793a53f72779db587ba82911628ff974b9f62d5fed2eacf3532dad4ff177383e2f47d1c7e9aae8714a66aa1c5b82f011d3142cb4
+  metadata.gz: a4a87f3ffdb3319e748fa9d60f47971f250fb2ff841ea63f0c7795afbacbee452943958b366b1462f866a406f07a39b5556258778b7913db236e8889a2f2a7ea
+  data.tar.gz: 1058f448308c579de12b41183d185846278ec9c798cf97cece7f5a324039fcd7886f12960a8023e833eadac073f33245d0fbb3e022d00267f5eaa7f633f34c5d

data/.travis.yml

@@ -3,30 +3,20 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
 #  - jruby-9.1
   - jruby-9.2
   - jruby-head
 jdk:
-  - openjdk10
   - openjdk11
 matrix:
-  exclude:
-    - rvm: 2.3
-      jdk: openjdk10
-    - rvm: 2.4
-      jdk: openjdk10
-    - rvm: 2.5
-      jdk: openjdk10
-    - rvm: 2.6
-      jdk: openjdk10
-    - rvm: ruby-head
-      jdk: openjdk10
   allow_failures:
+    - rvm: 3.0
     - rvm: ruby-head
     - rvm: jruby-head
 branches:

data/lib/libis/tools/csv.rb

@@ -20,7 +20,7 @@ module Libis
         optional_headers = options.delete(:optional)
         options[:headers] = true
         options[:return_headers] = true
-        csv = CSV.open(file_name, mode, options)
+        csv = ::CSV.open(file_name, mode, **options)
         line = csv.shift
         found_headers = required_headers & line.headers
         return csv if found_headers.size == required_headers.size
@@ -29,7 +29,7 @@ module Libis
         options[:headers] = (required_headers + optional_headers)[0...line.size]
         raise RuntimeError, 'CSV does not contain enough columns' if required_headers.size > line.size
         options[:return_headers] = true
-        csv = CSV.open(file_name, mode, options)
+        csv = ::CSV.open(file_name, mode, **options)
         csv.shift
         csv
       end

data/lib/libis/tools/deep_struct.rb

@@ -28,8 +28,8 @@ module Libis
         return self unless hash.respond_to?(:to_hash)
         hash.to_hash.inject(self.dup) do |ds, (key, value)|
           ds[key] = DeepDup.new(
-              recurse_over_arrays: @recurse_over_arrays,
-              preserve_original_keys: @preserve_original_keys
+              recurse_over_arrays: @options[:recurse_over_arrays],
+              preserve_original_keys: @options[:preserve_original_keys]
           ).call(value)
           ds
         end
@@ -39,8 +39,8 @@ module Libis
         return self unless hash.respond_to?(:to_hash)
         hash.to_hash.inject(self) do |ds, (key, value)|
           ds[key] = DeepDup.new(
-              recurse_over_arrays: @recurse_over_arrays,
-              preserve_original_keys: @preserve_original_keys
+              recurse_over_arrays: @options[:recurse_over_arrays],
+              preserve_original_keys: @options[:preserve_original_keys]
           ).call(value)
           ds
         end

data/lib/libis/tools/extend/empty.rb

@@ -1,7 +1,32 @@
-# Extension for NilClass
+# frozen_string_literal: true
+
 class NilClass
-  # Allows nil.empty?
   def empty?
     true
   end
-end
+end
+
+class TrueClass
+  def empty?
+    false
+  end
+end
+
+class FalseClass
+  def empty?
+    false
+  end
+end
+
+class String
+  BLANK_REGEX = /\A[[:space:]]^\z/.freeze
+  def blank?
+    empty? || BLANK_REGEX.match?(self)
+  end unless method_defined? :blank?
+end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end

data/lib/libis/tools/extend/string.rb

@@ -37,10 +37,6 @@ class String
         downcase
   end unless method_defined? :underscore
 
-  # Check if string is empty
-  def blank?
-    self == ''
-  end unless method_defined? :blank?
 
   # Create sortable object from string. Supports better natural sorting.
   def sort_form
@@ -118,11 +114,4 @@ class String
 
 end
 
-# Extension class
-class NilClass
-
-  # Allow nil.blank? so that blank? can be applied without errors.
-  def blank?
-    true
-  end
-end
+require_relative 'empty'

data/lib/libis/tools/mets_file.rb

@@ -91,14 +91,18 @@ module Libis
                   end
 
         dmd_sec = xml_doc.root.xpath('mets:dmdSec', NS).inject({}) do |hash_dmd, dmd|
-          hash_dmd[dmd[:ID]] = dmd.xpath('.//dc:record', NS).first.children.inject({}) do |h, c|
-            h[c.name] = c.content
+          id = dmd[:ID]
+          id = id.slice(0..(id.index('-dmd') + 3))
+          hash_dmd[id] = dmd.xpath('.//dc:record', NS).first.children.inject({}) do |h, c|
+            h[c.name] = c.content if c.name != 'text'
             h
           end
           hash_dmd
         end
         amd_sec = xml_doc.root.xpath('mets:amdSec', NS).inject({}) do |hash_amd, amd|
-          hash_amd[amd[:ID]] = [:tech, :rights, :source, :digiprov].inject({}) do |hash_sec, sec|
+          id = amd[:ID]
+          id = id.slice(0..(id.index('-amd') + 3))
+          hash_amd[id] = [:tech, :rights, :source, :digiprov].inject({}) do |hash_sec, sec|
             md = amd.xpath("mets:#{sec}MD", NS).first
             return hash_sec unless md
             # hash_sec[sec] = md.xpath('mets:mdWrap/dnx:dnx/dnx:section', NS).inject({}) do |hash_md, dnx_sec|

data/lib/libis/tools/mets_objects.rb

@@ -289,7 +289,7 @@ module Libis
               compositionLevel: composition_level,
               # fileLocationType: 'FILE',
               fileLocation: location,
-              fileOriginalName: CGI.escape(original || target_name).gsub('+', '%20'),
+              fileOriginalName: original || target_names,
               fileOriginalPath: target_path,
               # fileOriginalID: URI.encode(location),
               # fileExtension: ::File.extname(orig_name),

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '1.0.9'
+    VERSION = '1.0.15'
   end
 end

data/libis-tools.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.require_paths = ['lib']
-  spec.has_rdoc = 'yard'
+  # spec.has_rdoc = 'yard'
 
   spec.add_development_dependency 'bundler', '> 1.6'
   spec.add_development_dependency 'rake', '~> 13.0'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
   spec.add_runtime_dependency 'gyoku',  '~> 1.3'
   spec.add_runtime_dependency 'nori', '~> 2.6'
-  spec.add_runtime_dependency 'recursive-open-struct', '~> 1.0'
+  spec.add_runtime_dependency 'recursive-open-struct', '>= 1.1.3'
   spec.add_runtime_dependency 'parslet', '~> 1.7'
   spec.add_runtime_dependency 'simple_xlsx_reader', '~> 1.0'
   spec.add_runtime_dependency 'logging', '~> 2.0'

data/spec/config_file_spec.rb

@@ -45,6 +45,7 @@ describe ::Libis::Tools::ConfigFile do
 
     it 'allows to change hash in array' do
       subject << hash
+      # subject = ::Libis::Tools::ConfigFile.new(hash)
       # noinspection RubyResolve
       subject.c[0][0].a[0].v = 1
       hash[:c][0][0][:a][0][:v] = 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.15
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -386,8 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.