libis-tools 1.0.4 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e3d995478c23cf34462e49682a86e2268c059314a3f9b8f1a4d4cb7dca3cfa
-  data.tar.gz: 20138f051ab8337d686aa2f7b226883ea535afc418765a80b19cd135c016b673
+  metadata.gz: 810ac9ed3a3b03f0ae8cc0d1deea5b1c6a0f70b0d34bce8eb752fba9da5583f9
+  data.tar.gz: 5b51eb0c78b0928e1183f53bd270ec148f35b47f42a066432705a657279ccfa9
 SHA512:
-  metadata.gz: d35c8c621b0e07a7817a5671a74f624ab7fc5a1d4a3f781c19f77fc03e61a411edafbb77666c3bab7607b59057a90d58e271cb927cd4156fcd77925ed755da4b
-  data.tar.gz: 1381a075f84a335510b4acff0a6c8ffef7daf8a0efb84d0a30fc49d56dc0250191b6f51bb0fd8d6b75faacc08fc4783d56c5c6915c70c78663c3d2fbd591984e
+  metadata.gz: a0a53c49318401d632db7a3e20a70a1378a50ce101c2e8f26ac0216aee3ffcb28c81287663b6daccb3693d2a962337c472f36254e6ea065aed2135e65cfbf876
+  data.tar.gz: 207d258c97de31f803d71dd0f39c6cc37b00fbcfe0120bf37a36c3669c3ac43d4d1253b2c1cfed0004a24ed8215e03e9990af4853389c40958f6c5300497068f

data/.travis.yml

@@ -1,36 +1,30 @@
+dist: bionic
 language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
-  - jruby-9.0.5.0
-  - jruby-9.1.9.0
+#  - jruby-9.1
+  - jruby-9.2
   - jruby-head
 jdk:
-  - openjdk8
-  - oraclejdk8
+  - openjdk11
 matrix:
-  exclude:
-    - rvm: 2.1.10
-      jdk: oraclejdk8
-    - rvm: 2.2.8
-      jdk: oraclejdk8
-    - rvm: 2.3.5
-      jdk: oraclejdk8
-    - rvm: 2.4.2
-      jdk: oraclejdk8
-    - rvm: ruby-head
-      jdk: oraclejdk8
   allow_failures:
+    - rvm: 3.0
     - rvm: ruby-head
     - rvm: jruby-head
 branches:
   only:
       - master
+#before_install:
+#  - gem update --system
+#  - gem --version
 addons:
   code_climate:
     repo_token: f6978964f55e6543befb82373651365f8195677816af6ff40ad70c82f7f22f09

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

@@ -92,7 +92,7 @@ module Libis
 
         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
+            h[c.name] = c.content if c.name != 'text'
             h
           end
           hash_dmd

data/lib/libis/tools/parameter.rb

@@ -60,7 +60,7 @@ module Libis
       # Merges other parameter data into the current parameter
       # @param [::Libis::Tools::Parameter] other parameter definition to copy properties from
       def merge!(other)
-        other.each do |k,v|
+        other.each do |k, v|
           if k == :options
             self[:options].merge!(v)
           else
@@ -130,55 +130,59 @@ module Libis
         end
         true
       end
+
       private
 
       def guess_datatype
         self[:datatype] || case self[:default]
-                             when TrueClass, FalseClass
-                               'bool'
-                             when NilClass
-                               'string'
-                             when Integer
-                               'int'
-                             when Float
-                               'float'
-                             when DateTime, Date, Time
-                               'datetime'
-                             when Array
-                               'array'
-                             when Hash
-                               'hash'
-                             else
-                               self[:default].class.name.downcase
+                           when TrueClass, FalseClass
+                             'bool'
+                           when NilClass
+                             'string'
+                           when Integer
+                             'int'
+                           when Float
+                             'float'
+                           when DateTime, Date, Time
+                             'datetime'
+                           when Array
+                             'array'
+                           when Hash
+                             'hash'
+                           else
+                             self[:default].class.name.downcase
                            end
       end
 
       def convert(v)
         case self[:datatype].to_s.downcase
-          when 'boolean', 'bool'
-            return true if TRUE_BOOL.include?(v.to_s.downcase)
-            return false if FALSE_BOOL.include?(v.to_s.downcase)
-            raise ParameterValidationError, "No boolean information in '#{v.to_s}'. " +
-                                              "Valid values are: '#{TRUE_BOOL.join('\', \'')}" +
-                                              "' and '#{FALSE_BOOL.join('\', \'')}'."
-          when 'string', 'nil'
-            return v.to_s
-          when 'int'
-            return Integer(v)
-          when 'float'
-            return Float(v)
-          when 'datetime'
-            return v.to_datetime if v.respond_to? :to_datetime
-            return DateTime.parse(v)
-          when 'array'
-            return v if v.is_a?(Array)
-            return v.split(/[,;|\s]+/) if v.is_a?(String)
-            return v.to_a if v.respond_to?(:to_a)
-          when 'hash'
-            return v when v.is_a?(Hash)
-                       return Hash[(0...v.size).zip(v)] when v.is_a?(Array)
-          else
-            raise ParameterValidationError, "Datatype not supported: '#{self[:datatype]}'"
+        when 'boolean', 'bool'
+          return true if TRUE_BOOL.include?(v.to_s.downcase)
+          return false if FALSE_BOOL.include?(v.to_s.downcase)
+          raise ParameterValidationError, "No boolean information in '#{v.to_s}'. " +
+              "Valid values are: '#{TRUE_BOOL.join('\', \'')}" +
+              "' and '#{FALSE_BOOL.join('\', \'')}'."
+        when 'string', 'nil'
+          return v.to_s
+        when 'int', 'integer'
+          return Integer(v)
+        when 'float'
+          return Float(v)
+        when 'datetime'
+          return v.to_datetime if v.respond_to? :to_datetime
+          return DateTime.parse(v)
+        when 'array'
+          return v if v.is_a?(Array)
+          return v.split(/[,;|\s]+/) if v.is_a?(String)
+          # Alternatavely:
+          # return JSON.parse(v) if v.is_a?(String)
+          return v.to_a if v.respond_to?(:to_a)
+        when 'hash'
+          return v if v.is_a?(Hash)
+          return Hash[(0...v.size).zip(v)] if v.is_a?(Array)
+          return JSON.parse(v) if v.is_a?(String)
+        else
+          raise ParameterValidationError, "Datatype not supported: '#{self[:datatype]}'"
         end
         nil
       end
@@ -194,17 +198,17 @@ module Libis
       def constraint_checker(v, constraint)
 
         case constraint
-          when Array
-            constraint.each do |c|
-              return true if (constraint_checker(v, c) rescue false)
-            end
-            return true if constraint.include? v
-          when Range
-            return true if constraint.cover? v
-          when Regexp
-            return true if v =~ constraint
-          else
-            return true if v == constraint
+        when Array
+          constraint.each do |c|
+            return true if (constraint_checker(v, c) rescue false)
+          end
+          return true if constraint.include? v
+        when Range
+          return true if constraint.cover? v
+        when Regexp
+          return true if v =~ constraint
+        else
+          return true if v == constraint
         end
         false
       end
@@ -245,16 +249,16 @@ module Libis
         # @return [Hash] with parameter names as keys and {Parameter} instance as value.
         def parameter_defs
           return @parameters if @parameters
-            @parameters = ::Concurrent::Hash.new
-            begin
-              self.superclass.parameter_defs.
-                  each_with_object(@parameters) do |(name, param), hash|
-                  hash[name] = param.dup
-              end
-            rescue NoMethodError
-              # ignored
+          @parameters = ::Concurrent::Hash.new
+          begin
+            self.superclass.parameter_defs.
+                each_with_object(@parameters) do |(name, param), hash|
+              hash[name] = param.dup
             end
-            @parameters
+          rescue NoMethodError
+            # ignored
+          end
+          @parameters
         end
 
         # DSL method that allows creating parameter definitions on the class level.

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '1.0.4'
+    VERSION = '1.0.12'
   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/command_spec.rb

@@ -19,7 +19,9 @@ describe 'Command' do
 
     result = Libis::Tools::Command.run('ls')
 
-    expect(result[:out].sort).to match entries
+    output = result[:out].map {|x| x.split(/\s+/)}.flatten.compact
+    expect(output.size).to eq entries.size
+    expect(output.sort).to match entries
     expect(result[:err]).to eq []
     expect(result[:status]).to eq 0
 
@@ -30,6 +32,7 @@ describe 'Command' do
     result = Libis::Tools::Command.run('ls', '-1')
 
     output = result[:out]
+    puts output.sort
     expect(output.size).to eq entries.size
     expect(output.sort).to match entries
     expect(result[:err]).to eq []

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.4
+  version: 1.0.12
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 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,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.