libis-tools 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e717837dc7e2b3f0549cf1b6abf6ca1240f1344
-  data.tar.gz: 8310be003731268e303dd930279638d61b6a5edf
+  metadata.gz: f35282647506db8de43d2a9963bd3aabaa944788
+  data.tar.gz: 476b0593171ce67aec1e15a33d75e5e72751b2fa
 SHA512:
-  metadata.gz: 8fce8638e6fc55803704fda53975fedce79a0ed127c2c8e2cf7dd8b989e6d87af001a56205d1091865764c5fa99dc864dd473dd23df637b24e305f29d49d8df0
-  data.tar.gz: 8b8f8b6b0af625240709d68fd48ea75003c7fe8dbf460cdaecd4d67d6f8a2a19a9aad07daae54ab9602237769ec118807eeb6d92107b34c64d48fcb9af15ad48
+  metadata.gz: aa6158973c7ac9f8a1ef9fc1bfa5406bcb0cce7651592488ede57a245c4a3e9e04ec8eb89f14e194d58e00cc3f025896238c98d495ca609d8f17acc6556fe2ac
+  data.tar.gz: e11e56b324b2a3e58e27f8ac5770b383246cec7c09af4800ddb61e6385d95b433bc1608c54a4a83606d701ab272991e3fb421f4032e0a77ebd7b29b7bb7ed0a0

data/lib/libis/tools/config.rb

@@ -73,7 +73,7 @@ module Libis
 
       # Clear all data.
       #
-      # Not only all configuration parameters are deleted, but also the memoirized list of loaded files
+      # Not only all configuration parameters are deleted, but also the memorized list of loaded files
       # and hashes are cleared and the logger configuration is reset to it's default status.
       def clear!
         super

data/lib/libis/tools/config_file.rb

@@ -46,8 +46,8 @@ module Libis
       # derived classes such as ::Libis::Tools::Config.
       #
       # @param [String,Hash] file_or_hash optional String or Hash argument to initialize the data.
-      def <<(file_or_hash)
-        _file_to_hash(file_or_hash).each { |key, value| self[key] = value }
+      def <<(file_or_hash, &block)
+        _file_to_hash(file_or_hash, &block).each { |key, value| self[key] = value }
         self
       end
 

data/lib/libis/tools/parameter.rb

@@ -139,7 +139,9 @@ module Libis
             parameters[name] = Parameter.new(name, default) if parameters[name].nil?
             options.each { |key, value| parameters[name][key] = value if value }
           else
-            parameters[options]
+            param_def = parameters[options]
+            return param_def unless param_def.nil?
+            self.superclass.parameter(options) rescue nil
           end
         end
 

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.7'
+    VERSION = '0.9.9'
   end
 end

data/spec/parameter_container_spec.rb

@@ -4,26 +4,33 @@ require 'libis/tools/parameter'
 
 describe 'ParameterContainer' do
 
-  before :context do
-    class TestContainer
-      include ::Libis::Tools::ParameterContainer
-
-      parameter check: true
-      parameter count: 0
-      parameter price: 1.0
-      parameter name: 'nobody'
-      parameter calendar: Date.new(2014, 01, 01)
-      parameter clock: Time.parse('10:10')
-      parameter timestamp: DateTime.new(2014, 01, 01, 10, 10)
-      parameter with_options: true, options: {a: 1, b: 2}, c: 3
+  class TestContainer
+    include ::Libis::Tools::ParameterContainer
+
+    parameter check: true
+    parameter count: 0
+    parameter price: 1.0
+    parameter name: 'nobody'
+    parameter calendar: Date.new(2014, 01, 01)
+    parameter clock: Time.parse('10:10')
+    parameter timestamp: DateTime.new(2014, 01, 01, 10, 10)
+    parameter with_options: true, options: {a: 1, b: 2}, c: 3
 
-    end
   end
 
-  before :example do
-    @test_container = TestContainer.new
+  class DerivedContainer < TestContainer
+    parameter name: 'somebody'
+    parameter check: 'yes'
   end
 
+  class DerivedDerivedContainer < DerivedContainer; end
+  class DerivedDerivedDerivedContainer < DerivedDerivedContainer; end
+
+  let(:test_container) { TestContainer.new }
+  let(:derived_container) { DerivedContainer.new }
+  let(:derived_derived_container) { DerivedDerivedContainer.new }
+  let(:derived_derived_derived_container) { DerivedDerivedDerivedContainer.new }
+
   it 'class should return parameter if only name is given' do
     [:check, :count, :price, :name, :calendar, :clock, :timestamp].each do |v|
       expect(TestContainer.parameter(v)).to be_a ::Libis::Tools::Parameter
@@ -31,62 +38,75 @@ describe 'ParameterContainer' do
   end
 
   it 'should have default parameters' do
-    expect(@test_container.parameter(:check)).to be_truthy
-    expect(@test_container.parameter(:count)).to eq 0
-    expect(@test_container.parameter(:price)).to eq 1.0
-    expect(@test_container.parameter(:name)).to eq 'nobody'
-    expect(@test_container.parameter(:calendar).year).to eq 2014
-    expect(@test_container.parameter(:calendar).month).to eq 1
-    expect(@test_container.parameter(:calendar).day).to eq 1
-    expect(@test_container.parameter(:clock).hour).to eq 10
-    expect(@test_container.parameter(:clock).min).to eq 10
-    expect(@test_container.parameter(:clock).sec).to eq 0
-    expect(@test_container.parameter(:timestamp).year).to eq 2014
-    expect(@test_container.parameter(:timestamp).month).to eq 1
-    expect(@test_container.parameter(:timestamp).day).to eq 1
-    expect(@test_container.parameter(:timestamp).hour).to eq 10
-    expect(@test_container.parameter(:timestamp).min).to eq 10
-    expect(@test_container.parameter(:timestamp).sec).to eq 0
+    expect(test_container.parameter(:check)).to be_truthy
+    expect(test_container.parameter(:count)).to eq 0
+    expect(test_container.parameter(:price)).to eq 1.0
+    expect(test_container.parameter(:name)).to eq 'nobody'
+    expect(test_container.parameter(:calendar).year).to eq 2014
+    expect(test_container.parameter(:calendar).month).to eq 1
+    expect(test_container.parameter(:calendar).day).to eq 1
+    expect(test_container.parameter(:clock).hour).to eq 10
+    expect(test_container.parameter(:clock).min).to eq 10
+    expect(test_container.parameter(:clock).sec).to eq 0
+    expect(test_container.parameter(:timestamp).year).to eq 2014
+    expect(test_container.parameter(:timestamp).month).to eq 1
+    expect(test_container.parameter(:timestamp).day).to eq 1
+    expect(test_container.parameter(:timestamp).hour).to eq 10
+    expect(test_container.parameter(:timestamp).min).to eq 10
+    expect(test_container.parameter(:timestamp).sec).to eq 0
   end
 
   it 'should allow to set values' do
-    @test_container.parameter(:check, false)
-    expect(@test_container.parameter(:check)).to be_falsey
-
-    @test_container.parameter(:count, 99)
-    expect(@test_container.parameter(:count)).to eq 99
-
-    @test_container.parameter(:price, 99.99)
-    expect(@test_container.parameter(:price)).to eq 99.99
-
-    @test_container.parameter(:name, 'everybody')
-    expect(@test_container.parameter(:name)).to eq 'everybody'
-
-    @test_container.parameter(:calendar, Date.new(2015, 02, 03))
-    expect(@test_container.parameter(:calendar).year).to eq 2015
-    expect(@test_container.parameter(:calendar).month).to eq 2
-    expect(@test_container.parameter(:calendar).day).to eq 3
-
-    @test_container.parameter(:clock, Time.parse('14:40:23'))
-    expect(@test_container.parameter(:clock).hour).to eq 14
-    expect(@test_container.parameter(:clock).min).to eq 40
-    expect(@test_container.parameter(:clock).sec).to eq 23
-
-    @test_container.parameter(:timestamp, DateTime.new(2015, 02, 03, 14, 40, 23))
-    expect(@test_container.parameter(:timestamp).year).to eq 2015
-    expect(@test_container.parameter(:timestamp).month).to eq 2
-    expect(@test_container.parameter(:timestamp).day).to eq 3
-    expect(@test_container.parameter(:timestamp).hour).to eq 14
-    expect(@test_container.parameter(:timestamp).min).to eq 40
-    expect(@test_container.parameter(:timestamp).sec).to eq 23
+    test_container.parameter(:check, false)
+    expect(test_container.parameter(:check)).to be_falsey
+
+    test_container.parameter(:count, 99)
+    expect(test_container.parameter(:count)).to eq 99
+
+    test_container.parameter(:price, 99.99)
+    expect(test_container.parameter(:price)).to eq 99.99
+
+    test_container.parameter(:name, 'everybody')
+    expect(test_container.parameter(:name)).to eq 'everybody'
+
+    test_container.parameter(:calendar, Date.new(2015, 02, 03))
+    expect(test_container.parameter(:calendar).year).to eq 2015
+    expect(test_container.parameter(:calendar).month).to eq 2
+    expect(test_container.parameter(:calendar).day).to eq 3
+
+    test_container.parameter(:clock, Time.parse('14:40:23'))
+    expect(test_container.parameter(:clock).hour).to eq 14
+    expect(test_container.parameter(:clock).min).to eq 40
+    expect(test_container.parameter(:clock).sec).to eq 23
+
+    test_container.parameter(:timestamp, DateTime.new(2015, 02, 03, 14, 40, 23))
+    expect(test_container.parameter(:timestamp).year).to eq 2015
+    expect(test_container.parameter(:timestamp).month).to eq 2
+    expect(test_container.parameter(:timestamp).day).to eq 3
+    expect(test_container.parameter(:timestamp).hour).to eq 14
+    expect(test_container.parameter(:timestamp).min).to eq 40
+    expect(test_container.parameter(:timestamp).sec).to eq 23
   end
 
   it 'should be able to define parameter with options' do
-    expect(@test_container.class.parameter(:with_options)[:options]).to eq a: 1, b: 2, c: 3
-    expect(@test_container.class.parameter(:with_options)[:options][:a]).to be 1
-    expect(@test_container.class.parameter(:with_options)[:a]).to be 1
-    expect(@test_container.class.parameter(:with_options)[:options][:c]).to be 3
-    expect(@test_container.class.parameter(:with_options)[:c]).to be 3
+    expect(test_container.class.parameter(:with_options)[:options]).to eq a: 1, b: 2, c: 3
+    expect(test_container.class.parameter(:with_options)[:options][:a]).to be 1
+    expect(test_container.class.parameter(:with_options)[:a]).to be 1
+    expect(test_container.class.parameter(:with_options)[:options][:c]).to be 3
+    expect(test_container.class.parameter(:with_options)[:c]).to be 3
+  end
+
+  it 'derived class should override parameter values from parent class' do
+    expect(derived_container.parameter(:name)).to eq 'somebody'
+    expect(derived_container.parameter(:check)).to eq 'yes'
+  end
+
+  it 'derived class should be able to access parameters of parent class' do
+    expect(derived_container.parameter(:price)).to eq 1.0
+  end
+
+  it 'derivation should be supported over multiple levels' do
+    expect(derived_derived_derived_container.parameter(:price)).to eq 1.0
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.