libis-tools 0.9.48 → 0.9.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216f400d1d4418bb8ca3398c7f7f6a4d009a3d9f
-  data.tar.gz: 1e390dc571ff5337eae238dc4b36d4864d7588e8
+  metadata.gz: 126e8ab6d9702232cdc3d787424f3a6a87825fec
+  data.tar.gz: d90fd1aed354e349be0a0fdd7aa9266af714d150
 SHA512:
-  metadata.gz: 7d9a343d90a548d12962fae171f04bc6e398898dda748839de47958927cfb6f4403c3806cc4b6bf2680a242eb4ef47abb4de00176070c59a546d9845c8405ee1
-  data.tar.gz: 3ad5cf76ff3f996cba3eb65244ad06b0fc79ea606ceeccf380d4c93aa6aaf0b78c8852a3ef38cc0b6e2f577369a20a2e83580f29e7f01b6d8a77e006dd96a716
+  metadata.gz: 2fbdeb3e52a27f3607867c328822e982bd2f307440c3dabc3da21a79fb60d4e7ac09e566c35ecebb2ec0eda85b2e4145d5e1beac8bd09dc8e1fcc34549dc5dfd
+  data.tar.gz: a6349ba0aa99aebab5d56af9ff63eeb8ddbf7ad8cc69a4c50c0bfbee73e787f5d6c0f4ca7ec775ce416436e6278ec7f04e26ff77b7de110005b428214bcd42c6

data/lib/libis/tools/config_file.rb

@@ -46,8 +46,7 @@ module Libis
       #
       # @param [String,Hash] file_or_hash optional String or Hash argument to initialize the data.
       def <<(file_or_hash, &block)
-        _file_to_hash(file_or_hash, &block).each { |key, value| self[key] = value }
-        self
+        self.merge!(_file_to_hash(file_or_hash, &block))
       end
 
       # Save configuration parameters in a YAML file.

data/lib/libis/tools/deep_struct.rb

@@ -26,12 +26,25 @@ module Libis
 
       def merge(hash)
         return self unless hash.respond_to?(:to_hash)
-        hash.to_hash.inject(self.dup) { |ds, (key, value)| ds[key] = value; ds }
+        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
+          ).call(value)
+          ds
+        end
       end
 
       def merge!(hash)
         return self unless hash.respond_to?(:to_hash)
-        hash.to_hash.inject(self) { |ds, (key, value)| ds[key] = value; ds }
+        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
+          ).call(value)
+          ds
+        end
+        self
       end
 
       def key?(key)

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

@@ -1,6 +1,5 @@
 require 'roo'
 require 'roo-xls'
-require 'roo-google'
 require 'libis/tools/extend/hash'
 
 module Roo
@@ -9,9 +8,8 @@ module Roo
   class Base
 
     # changes:
-    # - added option :skip_header to prevent #each and #parse to return the header row
     # - added option :partial_match to allow to use headers that only partially match the query
-    # - added option :required to force the result to have at least these columns
+    # - added option :required_headers to force the result to have at least these columns
     # - allow option :headers to contain an array with header labels that will be forced when no header row is found
     # - improved proper range scanning (first_row->last_row and first_column->last_column)
 
@@ -20,13 +18,11 @@ module Roo
     def each(options = {})
       return to_enum(:each, options) unless block_given?
 
-      skip_headers = options.delete(:skip_headers)
       @partial_match = options.delete(:partial_match) if options.has_key?(:partial_match)
       required_headers = options.delete(:required_headers) if options.has_key?(:required_headers)
 
       if options.empty?
         first_row.upto(last_row) do |line|
-          next if skip_headers && line == header_line
           yield row(line)
         end
       else
@@ -36,9 +32,7 @@ module Roo
           raise Roo::HeaderRowIncompleteError unless headers.keys & required_headers == required_headers
         end
 
-        start_line = header_line
-        start_line += 1 if skip_headers
-        start_line.upto(last_row) do |line|
+        header_line.upto(last_row) do |line|
           yield(Hash[headers.map { |k, v| [k, cell(line, v)] }])
         end
       end

data/lib/libis/tools/spreadsheet.rb

@@ -184,7 +184,7 @@ module Libis
           end
 
           @current_row = @ss.header_line
-          @header_options = ss_options.merge(skip_headers: true)
+          @header_options = ss_options
         end
 
         @header_options.dup

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.48'
+    VERSION = '0.9.49'
   end
 end

data/spec/config_file_spec.rb

@@ -39,7 +39,7 @@ describe ::Libis::Tools::ConfigFile do
       subject << hash
       # noinspection RubyResolve
       subject.b.v = 1
-      hash[:b]['v'] = 1
+      hash[:b][:v] = 1
       expect(subject.to_hash).to eq hash
     end
 
@@ -47,7 +47,7 @@ describe ::Libis::Tools::ConfigFile do
       subject << hash
       # noinspection RubyResolve
       subject.c[0][0].a[0].v = 1
-      hash[:c][0][0][:a][0]['v'] = 1
+      hash[:c][0][0][:a][0][:v] = 1
       expect(subject.to_hash).to eq hash
     end
 

data/spec/spreadsheet_spec.rb

@@ -809,7 +809,6 @@ describe 'Libis::Tools::Spreadsheet' do
         it '#shift returns Hash object' do
           row = ss.shift
           expect(row).to be_a Hash
-          puts row
           expect(row['Date']).to eq Date.new(2016, 05, 10)
           expect(row['Amount']).to eq 1270.0
           expect(row['Code']).to eq 1
@@ -857,7 +856,6 @@ describe 'Libis::Tools::Spreadsheet' do
         it '#shift returns Hash object' do
           row = ss.shift
           expect(row).to be_a Hash
-          puts row
           expect(row['Date']).to eq Date.new(2016, 05, 10)
           expect(row['Amount']).to eq 1270.0
           expect(row['Code']).to eq 1
@@ -1080,7 +1078,6 @@ describe 'Libis::Tools::Spreadsheet' do
         it '#shift returns Hash object' do
           row = ss.shift
           expect(row).to be_a Hash
-          puts row
           expect(row['Date']).to eq Date.new(2016, 05, 10)
           expect(row['Amount']).to eq 1270.0
           expect(row['Code']).to eq 1
@@ -1128,7 +1125,6 @@ describe 'Libis::Tools::Spreadsheet' do
         it '#shift returns Hash object' do
           row = ss.shift
           expect(row).to be_a Hash
-          puts row
           expect(row['Date']).to eq Date.new(2016, 05, 10)
           expect(row['Amount']).to eq 1270.0
           expect(row['Code']).to eq 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.48
+  version: 0.9.49
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler