libis-tools 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c6c77cfccd6c062ae90c8379432fddc206f414
-  data.tar.gz: 215cea5196e3827cd404b1e4152aeb31ef526e36
+  metadata.gz: fa31aed0ec4adc0f57dcca3d2f816261a0ee956b
+  data.tar.gz: 5d7713ea273850ba3050c6150377d42987a5daea
 SHA512:
-  metadata.gz: 166dbb502d7ddb353711dd3ca89566e054f2c0f10c47295c10bb20a869dd645ad41c7211a1682f2d995492e120b0dfcdf3c0584b77678a0aa1647a6913072db0
-  data.tar.gz: c8ddc3e402ae7b7e4a0671e1619d73da0c276b40ffbd9c1be824f4e6e07e644191b20b85e1379d4213accde18fad2a3f5e9699cb57d5d575bcc15a4e51f772e4
+  metadata.gz: 7e6d7eb3379ca0ba55f5730a8e1b96b7170e206ee10b38dcea7ff6a18861b854b4a534ec7ed7069f553be36b7d86b6d6d2ed5923a8c50518057e3386c6a5ee20
+  data.tar.gz: 8e8d4cb03b0018ed90beb10fe78d538a95aa34455906018b92cfa2b0218296cc8a9d582a1a046f950be818d89ccd36b3caaa59dde30ac6d9a294622b46091c9a

data/lib/libis/tools/deep_struct.rb

@@ -0,0 +1,15 @@
+require 'libis/tools/extend/ostruct'
+require 'recursive-open-struct'
+
+module Libis
+  module Tools
+    class DeepStruct < RecursiveOpenStruct
+
+      def initialize(hash = {}, opts = {})
+        hash = {default: hash} unless hash.is_a? Hash
+        super(hash, {recurse_over_arrays: true}.merge(opts))
+      end
+
+    end
+  end
+end

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

@@ -34,6 +34,10 @@ class Hash
     end
   end unless method_defined? :recursive_merge!
 
+  def key_strings_to_symbols!(opts = {})
+    self.replace self.key_strings_to_symbols opts
+  end unless method_defined? :key_strings_to_symbols!
+
   def key_strings_to_symbols(opts = {})
     opts = {resursive: false, upcase: false, downcase: false}.merge opts
 

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.3'
+    VERSION = '0.9.4'
   end
 end

data/libis-tools.gemspec

@@ -30,10 +30,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'equivalent-xml', '~> 0.5'
 
+
   spec.add_runtime_dependency 'backports', '~> 3.6'
   spec.add_runtime_dependency 'savon', '~> 2.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
   spec.add_runtime_dependency 'gyoku',  '~> 1.2'
   spec.add_runtime_dependency 'nori', '~> 2.4'
+  spec.add_runtime_dependency 'recursive-open-struct', '~>0.6'
 
 end

data/spec/deep_struct_spec.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+require_relative 'spec_helper'
+require 'libis/tools/deep_struct'
+
+describe 'DeepStruct' do
+
+  hash = {a: 1, 'b' => '2', c: 3.0}
+  recursive_hash = {
+      a: {x: 0, y: 0, z: 0},
+      b: {x: 10, y: -5, z: 2.5},
+      c: [
+          [
+              {a: 1},
+              {a: 2}
+          ]
+      ]
+  }
+
+  it 'should initialize' do
+    ds = Libis::Tools::DeepStruct.new
+    expect(ds).not_to eq nil
+  end
+
+  # noinspection RubyResolve
+  it 'should store Hash values' do
+    ds = Libis::Tools::DeepStruct.new hash
+    expect(ds[:a]).to eq 1
+    expect(ds[:b]).to eq '2'
+    expect(ds[:c]).to eq 3.0
+  end
+
+  it 'should allow access through methods' do
+    ds = Libis::Tools::DeepStruct.new hash
+    expect(ds.a).to eq 1
+    expect(ds.b).to eq '2'
+    expect(ds.c).to eq 3.0
+  end
+
+  it 'should allow access through methods, key strings and key symbols' do
+    ds = Libis::Tools::DeepStruct.new hash
+    expect(ds.a).to eq 1
+    expect(ds.b).to eq '2'
+    expect(ds.c).to eq 3.0
+
+    expect(ds['a']).to eq 1
+    expect(ds['b']).to eq '2'
+    expect(ds['c']).to eq 3.0
+
+    expect(ds[:a]).to eq 1
+    expect(ds[:b]).to eq '2'
+    expect(ds[:c]).to eq 3.0
+
+    expect(ds.b).to be ds[:b]
+    expect(ds.b).to be ds['b']
+
+  end
+
+  it 'should store non-hashes with :default key' do
+    ds = Libis::Tools::DeepStruct.new 'abc'
+    expect(ds[:default]).to eq 'abc'
+  end
+
+  it 'should store recursive Hashes as DeepStructs' do
+    ds = Libis::Tools::DeepStruct.new(recursive_hash)
+    expect(ds[:a]).to be_a Libis::Tools::DeepStruct
+    expect(ds.b).to be_a Libis::Tools::DeepStruct
+  end
+
+  it 'should recurse over arrays by default' do
+    ds = Libis::Tools::DeepStruct.new(recursive_hash)
+    expect(ds.c[0][0]).to be_a Libis::Tools::DeepStruct
+    expect(ds.c.first.first.a).to eq 1
+    expect(ds.c.first[1].a).to eq 2
+  end
+
+  it 'should deliver hashes if asked' do
+    ds = Libis::Tools::DeepStruct.new(recursive_hash)
+    expect(ds.to_h).to eq recursive_hash
+    expect(ds.b.to_h).to eq recursive_hash[:b]
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Some tool classes for other LIBIS gems.
 email:
 - kris.dekeyser@libis.be
@@ -172,6 +186,7 @@ files:
 - lib/libis/tools/command.rb
 - lib/libis/tools/config.rb
 - lib/libis/tools/dc_record.rb
+- lib/libis/tools/deep_struct.rb
 - lib/libis/tools/extend/empty.rb
 - lib/libis/tools/extend/hash.rb
 - lib/libis/tools/extend/ostruct.rb
@@ -192,6 +207,7 @@ files:
 - spec/data/test.data
 - spec/data/test.xml
 - spec/data/test.yml
+- spec/deep_struct_spec.rb
 - spec/logger_spec.rb
 - spec/parameter_container_spec.rb
 - spec/parameter_spec.rb
@@ -233,6 +249,7 @@ test_files:
 - spec/data/test.data
 - spec/data/test.xml
 - spec/data/test.yml
+- spec/deep_struct_spec.rb
 - spec/logger_spec.rb
 - spec/parameter_container_spec.rb
 - spec/parameter_spec.rb