recursive configuration merge

Author: gfowley

.yardoc/checksums

@@ -1,2 +1,2 @@
-lib/iqeo/configuration.rb df8997f10c38ea8ba74a6ccef3341c9126de3521
-lib/iqeo/configuration/version.rb ad9da77d4fb2220b3374e15340f7e014e0d7ee80
+lib/iqeo/configuration.rb fb776784916e7a38f6424d31f66a5da06b446532
+lib/iqeo/configuration/version.rb c2a9c241b633aea27196848bec6b5e9069315361

.yardoc/objects/root.dat

@@ -119,7 +119,7 @@ conf.collect { |key,value| value }  # => [ 1, 2.0, :three, 'four' ]
 * read from string, at creation, or after - merged & nested
 * load from filename, at creation, or after - merged & nested
 * defaults
-* merge configurations
+* merge configurations recursively
 * blank slate for DSL
 
 ## Fancy usage

README.md

@@ -115,7 +115,7 @@ <h2>Constant Summary</h2>
         <dt id="CONFIGURATION_VERSION-constant" class="">CONFIGURATION_VERSION =
 
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.13</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>1.0.1</span><span class='tstring_end'>&quot;</span></span></pre></dd>
 
     </dl>
 
@@ -131,7 +131,7 @@ <h2>Constant Summary</h2>
 </div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:18 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/Iqeo.html

@@ -115,7 +115,7 @@ <h2>Direct Known Subclasses</h2>
 </div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:18 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/Iqeo/BlankSlate.html

@@ -454,27 +454,19 @@ <h3 class="signature first" id="initialize-instance_method">
 98
 99
 100
-101
-102
-103
-104
-105</pre>
+101</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 87</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span> <span class='id identifier rubyid_default'>default</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span>
-  <span class='comment'># todo: default immediate child Configurations should have _parent updated
-</span>  <span class='ivar'>@_items</span> <span class='op'>=</span> <span class='kw'>case</span>
-              <span class='kw'>when</span> <span class='id identifier rubyid_default'>default</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>HashWithIndifferentAccess</span> <span class='rparen'>)</span> <span class='kw'>then</span> <span class='id identifier rubyid_default'>default</span>
-              <span class='kw'>when</span> <span class='id identifier rubyid_default'>default</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>Configuration</span> <span class='rparen'>)</span> <span class='kw'>then</span> <span class='id identifier rubyid_default'>default</span><span class='period'>.</span><span class='id identifier rubyid__items'>_items</span>
-              <span class='kw'>else</span> <span class='const'>HashWithIndifferentAccess</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
-            <span class='kw'>end</span>
+  <span class='ivar'>@_items</span> <span class='op'>=</span> <span class='const'>HashWithIndifferentAccess</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
   <span class='ivar'>@_parent</span> <span class='op'>=</span> <span class='kw'>nil</span>
+  <span class='id identifier rubyid__merge!'>_merge!</span> <span class='id identifier rubyid_default'>default</span> <span class='kw'>if</span> <span class='id identifier rubyid_default'>default</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>Configuration</span> <span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='id identifier rubyid_block_given?'>block_given?</span>
-    <span class='kw'>if</span> <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_arity'>arity</span> <span class='op'>&gt;</span> <span class='int'>0</span>                                           <span class='comment'># cannot set parent for yield blocks here as self is wrong !?
-</span>      <span class='kw'>yield</span> <span class='kw'>self</span>
-    <span class='kw'>else</span>
+    <span class='kw'>if</span> <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_arity'>arity</span> <span class='op'>&gt;</span> <span class='int'>0</span>                                            <span class='comment'># cannot set parent for yield block here as context is unknowable
+</span>      <span class='kw'>yield</span> <span class='kw'>self</span>                                                  <span class='comment'># parent is being set in new_defer_block_for_parent
+</span>    <span class='kw'>else</span>
       <span class='kw'>if</span> <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_binding'>binding</span><span class='period'>.</span><span class='id identifier rubyid_eval'>eval</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>self</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>Configuration</span> <span class='rparen'>)</span>     <span class='comment'># for eval block if nested configuration
 </span>        <span class='ivar'>@_parent</span> <span class='op'>=</span> <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_binding'>binding</span><span class='period'>.</span><span class='id identifier rubyid_eval'>eval</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>self</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span>                     <span class='comment'># set parent to make inherited values available
 </span>      <span class='kw'>end</span>                                                         <span class='comment'># during block execution
@@ -510,6 +502,10 @@ <h3 class="signature first" id="method_missing-instance_method">
       <pre class="lines">
 
 
+103
+104
+105
+106
 107
 108
 109
@@ -522,14 +518,10 @@ <h3 class="signature first" id="method_missing-instance_method">
 116
 117
 118
-119
-120
-121
-122
-123</pre>
+119</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 107</span>
+      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 103</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_method_missing'>method_missing</span> <span class='id identifier rubyid_name'>name</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_values'>values</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span>
   <span class='kw'>return</span> <span class='ivar'>@_items</span><span class='period'>.</span><span class='id identifier rubyid_send'>send</span><span class='lparen'>(</span> <span class='id identifier rubyid_name'>name</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_values'>values</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span> <span class='rparen'>)</span> <span class='kw'>if</span> <span class='ivar'>@_items</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span> <span class='id identifier rubyid_name'>name</span>     <span class='comment'># @_items methods are highest priority
@@ -821,12 +813,12 @@ <h3 class="signature first" id="_load-instance_method">
       <pre class="lines">
 
 
-152
-153
-154</pre>
+144
+145
+146</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 152</span>
+      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 144</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid__load'>_load</span> <span class='id identifier rubyid_file'>file</span>
   <span class='id identifier rubyid__read'>_read</span> <span class='id identifier rubyid_file'>file</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:read</span><span class='rparen'>)</span> <span class='op'>?</span> <span class='id identifier rubyid_file'>file</span><span class='period'>.</span><span class='id identifier rubyid_read'>read</span> <span class='op'>:</span> <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_read'>read</span><span class='lparen'>(</span><span class='id identifier rubyid_file'>file</span><span class='rparen'>)</span>
@@ -851,17 +843,15 @@ <h3 class="signature " id="_merge-instance_method">
       <pre class="lines">
 
 
-162
-163
-164
-165</pre>
+160
+161
+162</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 162</span>
+      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 160</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid__merge'>_merge</span> <span class='id identifier rubyid_other'>other</span>
-  <span class='comment'># todo: merges should update _parent of any immediate child Configurations
-</span>  <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_dup'>dup</span><span class='period'>.</span><span class='id identifier rubyid__merge!'>_merge!</span> <span class='id identifier rubyid_other'>other</span>
+  <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_dup'>dup</span><span class='period'>.</span><span class='id identifier rubyid__merge!'>_merge!</span> <span class='id identifier rubyid_other'>other</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -883,18 +873,30 @@ <h3 class="signature " id="_merge!-instance_method">
       <pre class="lines">
 
 
+148
+149
+150
+151
+152
+153
+154
+155
 156
 157
-158
-159
-160</pre>
+158</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 156</span>
+      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 148</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid__merge!'>_merge!</span> <span class='id identifier rubyid_other'>other</span>
-  <span class='comment'># todo: merges should update _parent of any immediate child Configurations
-</span>  <span class='ivar'>@_items</span><span class='period'>.</span><span class='id identifier rubyid_merge!'>merge!</span> <span class='id identifier rubyid_other'>other</span><span class='period'>.</span><span class='id identifier rubyid__items'>_items</span>
+  <span class='ivar'>@_items</span><span class='period'>.</span><span class='id identifier rubyid_merge!'>merge!</span><span class='lparen'>(</span><span class='id identifier rubyid_other'>other</span><span class='period'>.</span><span class='id identifier rubyid__items'>_items</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span><span class='id identifier rubyid_this'>this</span><span class='comma'>,</span><span class='id identifier rubyid_other'>other</span><span class='op'>|</span>
+    <span class='kw'>if</span> <span class='id identifier rubyid_this'>this</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>Configuration</span> <span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_other'>other</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>Configuration</span> <span class='rparen'>)</span>
+      <span class='id identifier rubyid_this'>this</span><span class='period'>.</span><span class='id identifier rubyid__merge!'>_merge!</span> <span class='id identifier rubyid_other'>other</span>
+    <span class='kw'>else</span>
+      <span class='id identifier rubyid_other'>other</span>
+    <span class='kw'>end</span>
+  <span class='kw'>end</span>
+  <span class='ivar'>@_items</span><span class='period'>.</span><span class='id identifier rubyid_values'>values</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_value'>value</span><span class='op'>|</span> <span class='id identifier rubyid_value'>value</span><span class='period'>.</span><span class='id identifier rubyid__parent'>_parent</span> <span class='op'>=</span> <span class='kw'>self</span> <span class='kw'>if</span> <span class='id identifier rubyid_value'>value</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span><span class='lparen'>(</span> <span class='const'>Configuration</span> <span class='rparen'>)</span> <span class='rbrace'>}</span>
   <span class='kw'>self</span>
 <span class='kw'>end</span></pre>
     </td>
@@ -917,12 +919,12 @@ <h3 class="signature " id="_read-instance_method">
       <pre class="lines">
 
 
-148
-149
-150</pre>
+140
+141
+142</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 148</span>
+      <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 140</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid__read'>_read</span> <span class='id identifier rubyid_string'>string</span>
   <span class='id identifier rubyid_instance_eval'>instance_eval</span> <span class='id identifier rubyid_string'>string</span>
@@ -937,7 +939,7 @@ <h3 class="signature " id="_read-instance_method">
 </div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:18 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/Iqeo/Configuration.html

@@ -131,7 +131,7 @@ <h2>Namespace Listing A-Z</h2>
 </div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:17 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/_index.html

@@ -176,7 +176,7 @@ <h2>Features</h2>
 <li>read from string, at creation, or after - merged &amp; nested</li>
 <li>load from filename, at creation, or after - merged &amp; nested</li>
 <li>defaults</li>
-<li>merge configurations</li>
+<li>merge configurations recursively</li>
 <li>blank slate for DSL</li>
 </ul>
 
@@ -197,7 +197,7 @@ <h2>License</h2>
 </div></div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:17 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/file.README.html

@@ -176,7 +176,7 @@ <h2>Features</h2>
 <li>read from string, at creation, or after - merged &amp; nested</li>
 <li>load from filename, at creation, or after - merged &amp; nested</li>
 <li>defaults</li>
-<li>merge configurations</li>
+<li>merge configurations recursively</li>
 <li>blank slate for DSL</li>
 </ul>
 
@@ -197,7 +197,7 @@ <h2>License</h2>
 </div></div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:17 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/index.html

@@ -103,7 +103,7 @@ <h2>Defined Under Namespace</h2>
 </div>
 
     <div id="footer">
-  Generated on Tue May 15 23:15:18 2012 by
+  Generated on Mon May 21 15:18:24 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.1 (ruby-1.9.3).
 </div>

doc/top-level-namespace.html

@@ -146,10 +146,14 @@ def _load file
     end
 
     def _merge! other
-      @_items.merge! other._items
-      @_items.values.each do |value|
-        value._parent = self if value.kind_of?( Configuration )
+      @_items.merge!(other._items) do |key,this,other|
+        if this.kind_of?( Configuration ) && other.kind_of?( Configuration )
+          this._merge! other
+        else
+          other
+        end
       end
+      @_items.values.each { |value| value._parent = self if value.kind_of?( Configuration ) }
       self
     end
 

lib/iqeo/configuration.rb

@@ -1,3 +1,3 @@
 module Iqeo
-  CONFIGURATION_VERSION = "1.1.0"
+  CONFIGURATION_VERSION = "1.0.1"
 end