iqeo-conf 0.0.13 → 1.0.0

data/Gemfile.lock

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

data/lib/iqeo/configuration/version.rb

@@ -1,3 +1,3 @@
 module Iqeo
-  CONFIGURATION_VERSION = "0.0.13"
+  CONFIGURATION_VERSION = "1.0.0"
 end

data/lib/iqeo/configuration.rb

@@ -85,16 +85,12 @@ module Iqeo
     attr_accessor :_parent, :_items
 
     def initialize default = nil, &block
-      # todo: default immediate child Configurations should have _parent updated
-      @_items = case
-                  when default.kind_of?( HashWithIndifferentAccess ) then default
-                  when default.kind_of?( Configuration ) then default._items
-                  else HashWithIndifferentAccess.new
-                end
+      @_items = HashWithIndifferentAccess.new
       @_parent = nil
+      _merge! default if default.kind_of?( Configuration )
       if block_given?
-        if block.arity > 0                                           # cannot set parent for yield blocks here as self is wrong !?
-          yield self
+        if block.arity > 0                                            # cannot set parent for yield block here as context is unknowable
+          yield self                                                  # parent is being set in new_defer_block_for_parent
         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
@@ -123,11 +119,7 @@ module Iqeo
     end
 
     def _set key, value
-      # todo: extend parenting for enumerable with configurations at arbitrary depth
-      case
-      when value.kind_of?( Configuration ) then value._parent = self
-      when value.kind_of?( Enumerable )    then value.each { |v| v._parent = self if v.kind_of? Configuration }
-      end
+      value._parent = self if value.kind_of?( Configuration )
       @_items[key] = value
     end
     alias []= _set
@@ -140,8 +132,8 @@ module Iqeo
 
     def _get key
       return @_items[key] unless @_items[key].nil?
-      return @_items[key] if _parent.nil?
-      _parent._get key
+      return @_items[key] if @_parent.nil?
+      @_parent._get key
     end
     alias [] _get
 
@@ -154,17 +146,18 @@ module Iqeo
     end
 
     def _merge! other
-      # todo: merges should update _parent of any immediate child Configurations
       @_items.merge! other._items
+      @_items.values.each do |value|
+        value._parent = self if value.kind_of?( Configuration )
+      end
       self
     end
 
     def _merge other
-      # todo: merges should update _parent of any immediate child Configurations
       self.dup._merge! other
     end
 
-    # todo: can :_parent= be protected ?
+    # todo: why can't :_parent= be protected ?
 
     protected :_parent, :_items, :_items=, :_get, :[], :_set, :[]=
 

data/spec/configuration_spec.rb

@@ -262,18 +262,7 @@ describe Configuration do
       conf.should_not be_nil
       conf.alpha.bravo.__send__(:_parent).should be conf.alpha
       conf.alpha.__send__(:_parent).should be conf
-      conf._parent.should be_nil
-    end
-
-    it 'knows its parent when contained in an enumerable' do
-      conf = nil
-      expect do
-        conf = Configuration.new
-        conf.alpha Configuration.new, Configuration.new, Configuration.new
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.each { |child| child.__send__(:_parent).should be conf }
-      conf._parent.should be_nil
+      conf.__send__(:_parent).should be_nil
     end
 
     it 'inherits settings' do
@@ -813,6 +802,7 @@ describe Configuration do
       conf.echo.should be :original1
       conf.hotel.should be :new
       conf.foxtrot.should be :overridden
+      conf.__send__(:_parent).should be nil
       conf.should be orig
     end
 
@@ -829,6 +819,63 @@ describe Configuration do
       conf.echo.should be :original1
       conf.hotel.should be :new
       conf.foxtrot.should be :overridden
+      conf.__send__(:_parent).should be nil
+      conf.should_not be orig
+    end
+
+    it 'can update with a nested configuration' do
+      orig = simple_explicit_configuration
+      orig.echo    :original1
+      orig.foxtrot :original2
+      other = Configuration.new do
+                foxtrot :overridden
+                hotel   :new
+                nested do
+                  golf  :also_new
+                  hotel :overridden
+                  echo  :overridden
+                end
+              end
+      conf = orig._merge! other
+      simple_configuration_example conf
+      conf.echo.should be :original1
+      conf.hotel.should be :new
+      conf.foxtrot.should be :overridden
+      conf.nested.alpha.should be 1
+      conf.nested.echo.should be :overridden
+      conf.nested.foxtrot.should be :overridden
+      conf.nested.golf.should be :also_new
+      conf.nested.hotel.should be :overridden
+      conf.nested.__send__(:_parent).should be conf
+      conf.__send__(:_parent).should be nil
+      conf.should be orig
+    end
+
+    it 'can create with a nested configuration' do
+      orig = simple_explicit_configuration
+      orig.echo    :original1
+      orig.foxtrot :original2
+      other = Configuration.new do
+                foxtrot :overridden
+                hotel   :new
+                nested do
+                  golf  :also_new
+                  hotel :overridden
+                  echo  :overridden
+                end
+              end
+      conf = orig._merge other
+      simple_configuration_example conf
+      conf.echo.should be :original1
+      conf.hotel.should be :new
+      conf.foxtrot.should be :overridden
+      conf.nested.alpha.should be 1
+      conf.nested.echo.should be :overridden
+      conf.nested.foxtrot.should be :overridden
+      conf.nested.golf.should be :also_new
+      conf.nested.hotel.should be :overridden
+      conf.nested.__send__(:_parent).should be conf
+      conf.__send__(:_parent).should be nil
       conf.should_not be orig
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqeo-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake