libis-tools 1.0.19 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901262cdfc7d422163928efb4db49faa4290bc55369cd3168b78135b17073af6
-  data.tar.gz: 46b7f6db6f546f0a30134d231c1b9310e3efae766e603dd64226a9228db264c1
+  metadata.gz: 9cdf44886fdc0890073e44ad0a507e3dd37db77523defc39f3584192e8bce70a
+  data.tar.gz: 8c0037d5ea9907a99b006c7273e39ef5f3d5b51e81618963bc4a82728c28c13e
 SHA512:
-  metadata.gz: daefd95f9d07e81b2d56125172b162c857b20f9d6bb051455d65f20417fa3c8de05245466ab87cafcb6399b90207c93059a3816ed6f2a895c2192bc8b39526dc
-  data.tar.gz: 8140a9f88ea5dee720cbd623042b61cec46927d4ce5c5a5db5598b2002da629b9b24851c46763b3afd546acea897c28041bc00ed44e8b1c8be463e7662df02ef
+  metadata.gz: a69b2e77fab73af0fadbef38afa6a53f2d462689f82b3299ee8447b4a0d799cb2f2503ce8eea2cb1bbede8686a31e5b5c320526769fb30d6719adfb56839a696
+  data.tar.gz: 749f31e690dfbd7bba4d205005dd157113da3632aa1c445a4a7d62f3a6a79430dcf9793df4b0ba3f8e1e2de5147a785ca0665c2c7446206bbcf926d10e904e98

data/lib/libis/tools/command.rb

@@ -48,9 +48,8 @@ module Libis
       #         * :err (Array<String>)- the stderr output of the command
       #         * :timeout(Boolean) - if true, the command did not return in time
       #         * :pid(Integer) - the command's processID
-      def self.run(*cmd)
+      def self.run(*cmd, **spawn_opts)
 
-        spawn_opts = Hash === cmd.last ? cmd.pop.dup : {}
         opts = {
             :stdin_data => spawn_opts.delete(:stdin_data) || '',
             :binmode => spawn_opts.delete(:binmode) || false,

data/lib/libis/tools/config.rb

@@ -35,16 +35,16 @@ module Libis
 
         # For each configuration parameter, the value can be accessed via the class or the Singleton instance.
         # The class diverts to the instance automatically.
-        def method_missing(name, *args, &block)
-          result = instance.send(name, *args, &block)
+        def method_missing(name, *args, **kwargs, &block)
+          result = instance.send(name, *args, **kwargs, &block)
           self === result ? self : result
         end
 
       end
 
       # Instance method that allows to access the configuration parameters by method.
-      def method_missing(name, *args, &block)
-        result = config.send(name, *args, &block)
+      def method_missing(name, *args, **kwargs, &block)
+        result = config.send(name, *args, **kwargs, &block)
         self === config ? self : result
       end
 

data/lib/libis/tools/csv.rb

@@ -7,7 +7,7 @@ module Libis
       # @param [String] file_name
       # @param [Hash] options
       # @return [CSV] Open CSV object
-      def self.open(file_name, options = {})
+      def self.open(file_name, **options)
         options = {
             mode: 'rb:UTF-8',
             required: %w'',

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

@@ -33,7 +33,7 @@ module Roo
         end
 
         header_line.upto(last_row) do |line|
-          yield(Hash[headers.map { |k, v| [k, cell(line, v)] }])
+          yield(headers.each_with_object({}) { |(k, v), hash| hash[k] = cell(line, v) })
         end
       end
     end
@@ -89,15 +89,4 @@ module Roo
 
   end
 
-  class CSV
-    def each_row(options, &block)
-      if uri?(filename)
-        each_row_using_tempdir(options, &block)
-      elsif is_stream?(filename_or_stream)
-        ::CSV.new(filename_or_stream, **options).each(&block)
-      else
-        ::CSV.foreach(filename, **options, &block)
-      end
-    end
-  end
 end

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

@@ -1,8 +1,8 @@
-# Symbol monkey patch to allow map(&:method) to take arguments. Allows: [2,3].map(&:+.(10)) # => [12,13]
+# Symbol monkey patch to allow map(&:method) to take arguments. Allows: [2,3].map(&:+.with(10)) # => [12,13]
 # See: https://stackoverflow.com/questions/23695653/can-you-supply-arguments-to-the-mapmethod-syntax-in-ruby
 # for more information,
 class Symbol
-  def call(*args, &block)
+  def with(*args, &block)
     ->(caller, *rest) { caller.public_send(self, *rest, *args, &block) }
   end
 end

data/lib/libis/tools/logger.rb

@@ -64,45 +64,46 @@ module Libis
       #
       # @param [String] msg the message.
       # @param [Array] args optional extra arguments.
-      # @!method(debug(msg, *args))
-      def debug(msg, *args)
-        self.message :DEBUG, msg, *args
+      # @param [Hash] kwargs optional keyword arguments
+      # @!method(debug(msg, *args, **kwargs))
+      def debug(msg, *args, **kwargs)
+        self.message :DEBUG, msg, *args, **kwargs
       end
 
       # Send an info message to the logger.
       #
       # (see #debug)
       # @param (see #debug)
-      # @!method(info(msg, *args))
-      def info(msg, *args)
-        self.message :INFO, msg, *args
+      # @!method(info(msg, *args, **kwargs))
+      def info(msg, *args, **kwargs)
+        self.message :INFO, msg, *args, **kwargs
       end
 
       # Send a warning message to the logger.
       #
       # (see #debug)
       # @param (see #debug)
-      # @!method(warn(msg, *args))
-      def warn(msg, *args)
-        self.message :WARN, msg, *args
+      # @!method(warn(msg, *args, **kwargs))
+      def warn(msg, *args, **kwargs)
+        self.message :WARN, msg, *args, **kwargs
       end
 
       # Send an error message to the logger.
       #
       # (see #debug)
       # @param (see #debug)
-      # @!method(error(msg, *args))
-      def error(msg, *args)
-        self.message :ERROR, msg, *args
+      # @!method(error(msg, *args, **kwargs))
+      def error(msg, *args, **kwargs)
+        self.message :ERROR, msg, *args, **kwargs
       end
 
       # Send a fatal message to the logger.
       #
       # (see #debug)
       # @param (see #debug)
-      # @!method(fatal_error(msg, *args))
-      def fatal_error(msg, *args)
-        self.message :FATAL, msg, *args
+      # @!method(fatal_error(msg, *args, **kwargs))
+      def fatal_error(msg, *args, **kwargs)
+        self.message :FATAL, msg, *args, **kwargs
       end
 
       # The method that performs the code logging action.
@@ -117,8 +118,9 @@ module Libis
       # @param [{::Logger::Severity}] severity
       # @param [String] msg message string
       # @param [Object] args optional list of extra arguments
-      # @!method(message(severity, msg, *args))
-      def message(severity, msg, *args)
+      # @oaram [Hash] kwargs optional list of extra keyword arguments
+      # @!method(message(severity, msg, *args, **kwargs))
+      def message(severity, msg, *args, **kwargs)
         message_text = (msg % args rescue "#{msg}#{args.empty? ? '' : " - #{args}"}")
         self.logger.add(::Logging.level_num(severity), message_text)
       end

data/lib/libis/tools/parameter.rb

@@ -42,10 +42,11 @@ module Libis
       #     * constraint - Array, Range, RegEx or single value. Default is nil meaning no constraint.
       #     * frozen - Boolean. Default is false; if true the parameter value cannot be changed from the default value.
       #     * options - Any Hash. It's up to the applcation to interprete and use this info.
-      #    datatype can be omitted if the type can be derived from the
-      def initialize(*args)
+      #    datatype can be omitted if the type can be derived from the default value
+      def initialize(*args, **options)
         super(*args)
         self[:options] ||= {}
+        self[:options].merge!(options)
         self[:datatype] ||= guess_datatype
       end
 
@@ -90,7 +91,9 @@ module Libis
       # Convience method to create a new {Parameter} from a Hash.
       # @param [Hash] h Hash with parameter definition properties
       def self.from_hash(h)
-        h.each { |k, v| self[k.to_s.to_sym] = v }
+        p = new
+        h.each { |k, v| p[k.to_s.to_sym] = v }
+        p
       end
 
       # Dumps the parameter properties into a Hash.
@@ -297,8 +300,8 @@ module Libis
         #   hash is added to the retrievable properties of the parameter. Likewise any property defined, that is not in the list of
         #   known properties is added to the options hash. In this aspect the ::Libis::Tools::Parameter class behaves much like an
         #   OpenStruct even though it is implemented as a Struct.
-        def parameter(options = {})
-          return self.parameter_defs[options] unless options.is_a? Hash
+        def parameter(name = nil, **options)
+          return self.parameter_defs[name.to_s.to_sym] unless name.to_s.empty?
           return nil if options.keys.empty?
           param_def = options.shift
           name = param_def.first.to_s.to_sym

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '1.0.19'
+    VERSION = '1.1.1'
   end
 end

data/lib/libis/tools/xml_document.rb

@@ -71,7 +71,7 @@ module Libis
       # @return [XmlDocument] new instance
       def self.from_hash(hash, options = {})
         doc = XmlDocument.new
-        doc.document = Nokogiri::XML(Gyoku.xml(hash, options))
+        doc.document = Nokogiri::XML(Gyoku.xml(hash, **options))
         doc.document.encoding = 'utf-8'
         doc
       end
@@ -92,7 +92,7 @@ module Libis
       # @return [String] a string
       def to_xml(options = {})
         options = {indent: 2, encoding: 'utf-8', save_with: Nokogiri::XML::Node::SaveOptions::DEFAULT_XML}.merge(options)
-        @document.to_xml(options)
+        @document.to_xml(**options)
       end
 
       # Export the XML Document to a Hash.
@@ -122,7 +122,7 @@ module Libis
       # @param [Hash] options
       # @return [Hash]
       def to_hash(options = {})
-        Nori.new(options).parse(to_xml)
+        Nori.new(**options).parse(to_xml)
       end
 
       # Check if the document validates against a given XML schema file.
@@ -212,7 +212,7 @@ module Libis
       def build(at_node = nil, options = {}, &block)
         options = {encoding: 'utf-8' }.merge options
         if at_node
-            Nokogiri::XML::Builder.new(options,at_node, &block)
+            Nokogiri::XML::Builder.new(options, at_node, &block)
         else
           xml = Nokogiri::XML::Builder.new(options, &block)
           @document = xml.doc
@@ -285,9 +285,7 @@ module Libis
       #     - a Hash containing tag-value pairs for each attribute; the special key ':namespaces'
       #       contains a Hash of namespace definitions as in {#add_namespaces}
       # @return [Nokogiri::XML::Node] the new node
-      def add_node(*args)
-        attributes = {}
-        attributes = args.pop if args.last.is_a? Hash
+      def add_node(*args, **attributes)
         name, value, parent = *args
 
         return nil if name.nil?
@@ -306,9 +304,9 @@ module Libis
         return node if attributes.empty?
 
         namespaces = attributes.delete :namespaces
-        add_namespaces(node, namespaces) if namespaces
+        add_namespaces(node, **namespaces) if namespaces
 
-        add_attributes(node, attributes) if attributes
+        add_attributes(node, **attributes) if attributes
 
         node
 
@@ -332,12 +330,12 @@ module Libis
       # @param [Nokogiri::XML::Node] node node to add the attributes to
       # @param [Hash] attributes a Hash with tag - value pairs for each attribute
       # @return [Nokogiri::XML::Node] the node
-      def add_attributes(node, attributes)
-        XmlDocument.add_attributes node, attributes
+      def add_attributes(node, **attributes)
+        XmlDocument.add_attributes node, **attributes
       end
 
       # (see #add_attributes)
-      def self.add_attributes(node, attributes)
+      def self.add_attributes(node, **attributes)
 
         attributes.each do |name, value|
           node.set_attribute name.to_s, value
@@ -371,12 +369,12 @@ module Libis
       # @param [Hash] namespaces a Hash with prefix - URI pairs for each namespace definition that should be added. The
       #     special key +:node_ns+ is reserved for specifying the prefix for the node itself. To set the default
       #     namespace, use the prefix +nil+
-      def add_namespaces(node, namespaces)
-        XmlDocument.add_namespaces node, namespaces
+      def add_namespaces(node, **namespaces)
+        XmlDocument.add_namespaces node, **namespaces
       end
 
       # (see #add_namespaces)
-      def self.add_namespaces(node, namespaces)
+      def self.add_namespaces(node, **namespaces)
 
         node_ns = namespaces.delete :node_ns
         default_ns = namespaces.delete nil

data/libis-tools.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.authors       = ['Kris Dekeyser']
   spec.email         = ['kris.dekeyser@libis.be']
-  spec.homepage      = 'https://github.com/Kris-LIBIS/LIBIS_Tools'
+  spec.homepage      = 'https://github.com/libis/LIBIS_Tools'
   spec.license       = 'MIT'
 
   spec.platform      = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
@@ -29,18 +29,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   # spec.has_rdoc = 'yard'
 
-  spec.add_development_dependency 'bundler', '> 1.6'
+  spec.add_development_dependency 'bundler', '> 2.2'
   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_development_dependency 'term-ansicolor', '~> 1.7'
+  spec.add_development_dependency 'equivalent-xml', '~> 0.6'
+  spec.add_development_dependency 'awesome_print', '~> 1.9'
 
-  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
-  spec.add_runtime_dependency 'gyoku',  '~> 1.3'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.15'
+  spec.add_runtime_dependency 'gyoku',  '~> 1.4'
   spec.add_runtime_dependency 'nori', '~> 2.6'
   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'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'

data/spec/spreadsheet_spec.rb

@@ -10,9 +10,9 @@ describe 'Libis::Tools::Spreadsheet' do
   let(:ss) {
     Libis::Tools::Spreadsheet.new(
         File.join(path, file_name),
-        { required: required_headers,
-        optional: optional_headers
-        }.merge(options)
+        required: required_headers,
+        optional: optional_headers,
+        **options
     )
   }
 

data/spec/temp_file_spec.rb

@@ -37,7 +37,7 @@ describe 'TempFile' do
 
     it 'created' do
       f = Libis::Tools::TempFile.file
-      expect(File.exists?(f.path)).to be_truthy
+      expect(File.exist?(f.path)).to be_truthy
       f.close
       f.delete
     end
@@ -61,14 +61,14 @@ describe 'TempFile' do
       f = Libis::Tools::TempFile.file
       f.close
       f.unlink
-      expect(File.exists?(f.path)).to be_falsey
+      expect(File.exist?(f.path)).to be_falsey
     end
 
     it 'can be deleted' do
       f = Libis::Tools::TempFile.file
       f.close
       f.delete
-      expect(File.exists?(f.path)).to be_falsey
+      expect(File.exist?(f.path)).to be_falsey
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.1.1
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,70 +58,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: gyoku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: parslet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: simple_xlsx_reader
   requirement: !ruby/object:Gem::Requirement
@@ -367,7 +353,7 @@ files:
 - test/test_helper.rb
 - test/webservices/test_ca_item_info.rb
 - test/webservices/test_ca_search.rb
-homepage: https://github.com/Kris-LIBIS/LIBIS_Tools
+homepage: https://github.com/libis/LIBIS_Tools
 licenses:
 - MIT
 metadata: {}
@@ -386,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.