libis-tools 1.0.6 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 614880562757e58d8f1e86db7f507411a873c7920efcc3b932dd446b65eb7a70
-  data.tar.gz: c8aa877ea6b7fcc8daec5f2c1e49d5680afd857e900c6b8e6f5a309e884858e9
+  metadata.gz: d1beb34bf6d3caa983e0909913526c51fede24c5a10eb612a54c3deca274c11a
+  data.tar.gz: 5ec72ceeffaa443b21599036ffa1a647e3a645fb00009647b3929868f734826b
 SHA512:
-  metadata.gz: 8907c8cdb69831d8bfcf432d47d2abf06bb010e8aa6aac8a20e125cbfa1487df3a3b1db2fb3e4da7c77533f34b78377bfec929c4d3c5f5d79e747f11a54c0c8b
-  data.tar.gz: e7536a051acb0cfe862cca95799c1b9b8653f06cc550ffc30cde1a9c5a21a044bb4c5a4d9183a0099cd31b27f0615f8c4fb72e53f03b451c30ef0b3e83e7d124
+  metadata.gz: 67f28b6fa1c208137f3730ca2d2854bf3d86358434bf6f3770846ea008f6be96a193f0b3f7c6e49bdfa1866158f958bb8234df7dc28ae58631811222350922be
+  data.tar.gz: 3d12bb2aa8360009a45ba6e34734c20a219bd7b165778a07de7889886a030ae6db83a014cca433057ccb8dcec89fdf9a6fa153337f4c7acc3d7f022bc7cb8eca

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_RE = /\A[[:space:]]^\z/.freeze
+  def blank?
+    empty? || BLANK_RE.match?(self)
+  end
+end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end

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

@@ -1,5 +1,3 @@
-require 'backports/rails/hash'
-
 # Extension class for Hash
 class Hash
 
@@ -56,6 +54,14 @@ class Hash
     self.merge!(other_hash) {|_,v, w| v.blank? ? w : v}
   end unless method_defined? :apply_defaults!
 
+  def symbolize_keys
+    self.transform_keys {|k| k.to_sym}
+  end unless method_defined? :symbolize_keys
+
+  def symbolize_keys!
+    self.transform_keys! {|k| k.to_sym}
+  end unless method_defined? :symbolize_keys!
+
   # Convert all keys to symbols. In-place operation.
   # @param (see #key_strings_to_symbols)
   def key_strings_to_symbols!(options = {})
@@ -101,6 +107,14 @@ class Hash
     r
   end unless method_defined? :key_strings_to_symbols
 
+  def stringify_keys
+    self.transform_keys {|k| k.to_s}
+  end unless method_defined? :stringify_keys
+
+  def stringify_keys!
+    self.transform_keys! {|k| k.to_s}
+  end unless method_defined? :stringify_keys!
+
   # Convert all keys to strings. In-place operation.
   # (@see #key_symbols_to_strings)
   # @param (see #key_symbols_to_strings)
@@ -144,4 +158,36 @@ class Hash
     r
   end unless method_defined? :key_symbols_to_strings
 
+  def transform_keys
+    result = {}
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end unless method_defined? :transform_keys
+
+  def transform_keys!
+    keys.each do |key|
+      self[yield(key)] = delete(key)
+    end
+    self
+  end unless method_defined? :transform_keys!
+
+  def transform_values
+    return enum_for(:transform_values) { size } unless block_given?
+    return {} if empty?
+    result = self.class.new
+    each do |key, value|
+      result[key] = yield(value)
+    end
+    result
+  end unless method_defined? :transform_values
+
+  def transform_values!
+    return enum_for(:transform_values!) { size } unless block_given?
+    each do |key, value|
+      self[key] = yield(value)
+    end
+  end unless method_defined? :transform_values!
+
 end

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

@@ -1,3 +1,2 @@
 # encoding: utf-8
-require 'ostruct'
-require 'backports/2.0.0/stdlib/ostruct'
+require 'ostruct'

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

@@ -1,12 +1,42 @@
-require 'backports/rails/string'
-
 # Extension class
 class String
 
-  # Check if string is empty
-  def blank?
-    self == ''
-  end unless method_defined? :blank?
+  # from activesupport
+  def camelize(first_letter = :upper)
+    if first_letter == :upper
+      gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    else
+      self[0..0].downcase + camelize[1..-1]
+    end
+  end unless method_defined? :camelize
+
+  def constantize
+    names = split('::')
+    names.shift if names.empty? || names.first.empty?
+
+    constant = Object
+    names.each do |name|
+      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+    end
+    constant
+  end unless method_defined? :constantize
+
+  def dasherize
+    gsub(/_/, '-')
+  end unless method_defined? :dasherize
+
+  def demodulize
+    gsub(/^.*::/, '')
+  end unless method_defined? :demodulize
+
+  def underscore
+    gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+  end unless method_defined? :underscore
+
 
   # Create sortable object from string. Supports better natural sorting.
   def sort_form
@@ -84,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/extend/struct.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require 'json'
-require 'backports/rails/hash'
-require 'backports/2.0.0/struct'
+require_relative 'hash'
 
 class Struct
   # def to_hash

data/lib/libis/tools/logger.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'backports'
 require 'libis/tools/config'
 require 'libis/tools/extend/string'
 

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

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '1.0.6'
+    VERSION = '1.0.13'
   end
 end

data/libis-tools.gemspec

@@ -27,20 +27,19 @@ 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', '~> 10.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'term-ansicolor', '~> 1.6'
   spec.add_development_dependency 'equivalent-xml', '~> 0.5'
   spec.add_development_dependency 'awesome_print', '~> 1.6'
 
-  spec.add_runtime_dependency 'backports', '~> 3.6'
   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.6
+  version: 1.0.13
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -154,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
@@ -400,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.