iqeo-conf 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iqeo-conf (0.0.6)
+    iqeo-conf (0.0.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/iqeo/configuration/version.rb

@@ -1,5 +1,5 @@
 module Iqeo
   class Configuration
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/iqeo/configuration.rb

@@ -30,31 +30,48 @@ module Iqeo
       return self.read file.respond_to?(:read) ? file.read : File.read(file)
     end
 
+    def self.new_defer_block_for_parent parent, &block
+      conf = Configuration.new
+      conf._parent = parent
+      if block_given? && block.arity == 1
+        block.call(conf)                                              # this is 'yield self' from the outside
+      else
+        raise "WTF! expected a block with a single parameter"
+      end
+      conf
+    end
+
     def initialize &block
       @items = HashWithIndifferentAccess.new
       @_parent = nil
       if block_given?
-       if block.arity == 1
-         yield self
-       else
-         instance_eval &block
-       end
+        if block.arity == 1                                           # cannot set parent for yield blocks here as self is wrong !?
+          yield self
+        else
+          if block.binding.eval('self').kind_of?( Configuration )     # for eval block if nested configuration
+            @_parent = block.binding.eval('self')                     # set parent to make inherited values available
+          end                                                         # during block execution
+          instance_eval &block
+        end
       end
     end
 
     def method_missing name, *values, &block
-      return @items.send name, *values if @items.respond_to? name    # @items methods are highest priority
-      # this is unreachable since these methods are delegated to @items hash
-      # but keep it around for when we make selective delegation an option
-      #case name
-      #when :[]= then return _set values.shift, values.size > 1 ? values : values.first
-      #when :[]  then return _get values.shift
-      #end
+      return @items.send name, *values if @items.respond_to? name     # @items methods are highest priority
+
       name = name.to_s.chomp('=')        # todo: write a test case for a non-string object as key being converted by .to_s
-      return _set name, Configuration.new( &block ) if block_given?  # block is a nested configuration
-      return _get name if values.empty?                              # just get item
-      return _set name, values if values.size > 1                    # set item to multiple values
-      return _set name, values.first                                 # set item to single value
+
+      if block_given?                                                 # block is a nested configuration
+        if block.arity == 1                                           # yield DSL needs deferred block to set parent without binding
+          return _set name, Configuration.new_defer_block_for_parent( self, &block )
+        else
+          return _set name, Configuration.new( &block )               # eval DSL can set parent from block binding in initialize
+        end
+      end
+
+      return _get name if values.empty?                               # just get item
+      return _set name, values if values.size > 1                     # set item to multiple values
+      return _set name, values.first                                  # set item to single value
     end
 
     attr_accessor :_parent  # todo: should attr_writer be protected ?

data/spec/configuration_spec.rb

@@ -373,6 +373,36 @@ describe Configuration do
         conf.bravo.delta.echo.should be_true
       end
 
+      it 'nested configuration can refer to an inherited setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new do |c1|
+            c1.alpha true
+            c1.hotel c1.alpha
+            c1.bravo do |c2|
+              c2.charlie true
+              c2.foxtrot c2.alpha
+              c2.delta do |c3|
+                c3.echo true
+                c3.golf c3.alpha
+              end
+            end
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+        conf.bravo.delta.golf.should be_true
+        conf.bravo.foxtrot.should be_true
+        conf.hotel.should be_true
+      end
+
     end # yield DSL
 
     context 'instance_eval DSL' do
@@ -470,6 +500,36 @@ describe Configuration do
         conf.bravo.delta.echo.should be_true
       end
 
+      it 'nested configuration can refer to an inherited setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new do
+            alpha true
+            hotel alpha
+            bravo do
+              charlie true
+              foxtrot alpha
+              delta do
+                echo true
+                golf alpha
+              end
+            end
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+        conf.bravo.delta.golf.should be_true
+        conf.bravo.foxtrot.should be_true
+        conf.hotel.should be_true
+      end
+
     end # instance_eval DSL
 
   end # mode of usage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqeo-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -68,6 +68,7 @@ files:
 - pkg/iqeo-conf-0.0.3.gem
 - pkg/iqeo-conf-0.0.4.gem
 - pkg/iqeo-conf-0.0.5.gem
+- pkg/iqeo-conf-0.0.6.gem
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
 homepage: http://iqeo.github.com/iqeo-conf