configatron 1.2.1 → 1.2.2

data/doc/classes/Configatron/Configuration.html

@@ -92,14 +92,14 @@ The central class for managing the configurations.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000011">configure</a>&nbsp;&nbsp;
-      <a href="#M000012">configure_from_hash</a>&nbsp;&nbsp;
-      <a href="#M000013">configure_from_yaml</a>&nbsp;&nbsp;
-      <a href="#M000014">reload</a>&nbsp;&nbsp;
-      <a href="#M000016">reset</a>&nbsp;&nbsp;
-      <a href="#M000015">reset!</a>&nbsp;&nbsp;
-      <a href="#M000017">revert</a>&nbsp;&nbsp;
-      <a href="#M000018">to_hash</a>&nbsp;&nbsp;
+      <a href="#M000013">configure</a>&nbsp;&nbsp;
+      <a href="#M000014">configure_from_hash</a>&nbsp;&nbsp;
+      <a href="#M000015">configure_from_yaml</a>&nbsp;&nbsp;
+      <a href="#M000016">reload</a>&nbsp;&nbsp;
+      <a href="#M000018">reset</a>&nbsp;&nbsp;
+      <a href="#M000017">reset!</a>&nbsp;&nbsp;
+      <a href="#M000019">revert</a>&nbsp;&nbsp;
+      <a href="#M000020">to_hash</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -147,11 +147,11 @@ NoMethodError exception will be raised.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000011" class="method-detail">
-        <a name="M000011"></a>
+      <div id="method-M000013" class="method-detail">
+        <a name="M000013"></a>
 
         <div class="method-heading">
-          <a href="#M000011" class="method-signature">
+          <a href="#M000013" class="method-signature">
           <span class="method-name">configure</span><span class="method-args">() {|storage| ...}</span>
           </a>
         </div>
@@ -161,8 +161,8 @@ NoMethodError exception will be raised.
 Yields a new <a href="Store.html">Configatron::Store</a> class.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000011-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000011-source">
+            onclick="toggleCode('M000013-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000013-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 18</span>
 18:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure</span>
@@ -178,39 +178,40 @@ Yields a new <a href="Store.html">Configatron::Store</a> class.
         </div>
       </div>
 
-      <div id="method-M000012" class="method-detail">
-        <a name="M000012"></a>
+      <div id="method-M000014" class="method-detail">
+        <a name="M000014"></a>
 
         <div class="method-heading">
-          <a href="#M000012" class="method-signature">
+          <a href="#M000014" class="method-signature">
           <span class="method-name">configure_from_hash</span><span class="method-args">(parameters)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Used to load configuration settings from a Hash.
+Used to load configuration settings from a <a href="../Hash.html">Hash</a>.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000012-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000012-source">
+            onclick="toggleCode('M000014-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000014-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 28</span>
 28:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure_from_hash</span>(<span class="ruby-identifier">parameters</span>)
-29:       <span class="ruby-identifier">storage</span> = <span class="ruby-constant">Configatron</span><span class="ruby-operator">::</span><span class="ruby-constant">Store</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">parameters</span>)
-30:       <span class="ruby-ivar">@_storage_list</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">storage</span>
-31:       <span class="ruby-identifier">load_methods</span>(<span class="ruby-identifier">storage</span>)
-32:     <span class="ruby-keyword kw">end</span>
+29:       <span class="ruby-identifier">parameters</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">to_hash</span>.<span class="ruby-identifier">recursive_merge</span>(<span class="ruby-identifier">parameters</span>)
+30:       <span class="ruby-identifier">storage</span> = <span class="ruby-constant">Configatron</span><span class="ruby-operator">::</span><span class="ruby-constant">Store</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">parameters</span>)
+31:       <span class="ruby-ivar">@_storage_list</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">storage</span>
+32:       <span class="ruby-identifier">load_methods</span>(<span class="ruby-identifier">storage</span>)
+33:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000013" class="method-detail">
-        <a name="M000013"></a>
+      <div id="method-M000015" class="method-detail">
+        <a name="M000015"></a>
 
         <div class="method-heading">
-          <a href="#M000013" class="method-signature">
+          <a href="#M000015" class="method-signature">
           <span class="method-name">configure_from_yaml</span><span class="method-args">(path)</span>
           </a>
         </div>
@@ -220,30 +221,30 @@ Used to load configuration settings from a Hash.
 Used to load configuration settings from a YAML file.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000013-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000013-source">
+            onclick="toggleCode('M000015-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000015-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 35</span>
-35:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure_from_yaml</span>(<span class="ruby-identifier">path</span>)
-36:       <span class="ruby-keyword kw">begin</span>
-37:         <span class="ruby-identifier">storage</span> = <span class="ruby-constant">Configatron</span><span class="ruby-operator">::</span><span class="ruby-constant">YamlStore</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">path</span>)
-38:         <span class="ruby-ivar">@_storage_list</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">storage</span>
-39:         <span class="ruby-identifier">load_methods</span>(<span class="ruby-identifier">storage</span>)
-40:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ENOENT</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-41:         <span class="ruby-identifier">puts</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">message</span>
-42:         <span class="ruby-comment cmt"># file doesn't exist.</span>
-43:       <span class="ruby-keyword kw">end</span>
-44:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 36</span>
+36:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configure_from_yaml</span>(<span class="ruby-identifier">path</span>)
+37:       <span class="ruby-keyword kw">begin</span>
+38:         <span class="ruby-identifier">storage</span> = <span class="ruby-constant">Configatron</span><span class="ruby-operator">::</span><span class="ruby-constant">YamlStore</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">path</span>)
+39:         <span class="ruby-ivar">@_storage_list</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">storage</span>
+40:         <span class="ruby-identifier">load_methods</span>(<span class="ruby-identifier">storage</span>)
+41:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ENOENT</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+42:         <span class="ruby-identifier">puts</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">message</span>
+43:         <span class="ruby-comment cmt"># file doesn't exist.</span>
+44:       <span class="ruby-keyword kw">end</span>
+45:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000014" class="method-detail">
-        <a name="M000014"></a>
+      <div id="method-M000016" class="method-detail">
+        <a name="M000016"></a>
 
         <div class="method-heading">
-          <a href="#M000014" class="method-signature">
+          <a href="#M000016" class="method-signature">
           <span class="method-name">reload</span><span class="method-args">()</span>
           </a>
         </div>
@@ -253,26 +254,26 @@ Used to load configuration settings from a YAML file.
 Replays the history of configurations.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000014-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000014-source">
+            onclick="toggleCode('M000016-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000016-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 47</span>
-47:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reload</span>
-48:       <span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">storage</span><span class="ruby-operator">|</span>
-49:         <span class="ruby-identifier">storage</span>.<span class="ruby-identifier">reload</span>
-50:         <span class="ruby-identifier">load_methods</span>(<span class="ruby-identifier">storage</span>)
-51:       <span class="ruby-keyword kw">end</span>
-52:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 48</span>
+48:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reload</span>
+49:       <span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">storage</span><span class="ruby-operator">|</span>
+50:         <span class="ruby-identifier">storage</span>.<span class="ruby-identifier">reload</span>
+51:         <span class="ruby-identifier">load_methods</span>(<span class="ruby-identifier">storage</span>)
+52:       <span class="ruby-keyword kw">end</span>
+53:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000016" class="method-detail">
-        <a name="M000016"></a>
+      <div id="method-M000018" class="method-detail">
+        <a name="M000018"></a>
 
         <div class="method-heading">
-          <a href="#M000016" class="method-signature">
+          <a href="#M000018" class="method-signature">
           <span class="method-name">reset</span><span class="method-args">()</span>
           </a>
         </div>
@@ -282,64 +283,64 @@ Replays the history of configurations.
 All methods are undefined.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000016-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000016-source">
+            onclick="toggleCode('M000018-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000018-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 64</span>
-64:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset</span>
-65:       <span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">storage</span><span class="ruby-operator">|</span>
-66:         <span class="ruby-identifier">storage</span>.<span class="ruby-identifier">parameters</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
-67:           <span class="ruby-constant">Configatron</span><span class="ruby-operator">::</span><span class="ruby-constant">Configuration</span>.<span class="ruby-identifier">instance_eval</span> <span class="ruby-keyword kw">do</span>
-68:             <span class="ruby-keyword kw">begin</span>
-69:               <span class="ruby-identifier">undef_method</span>(<span class="ruby-identifier">k</span>)
-70:             <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">NameError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-71:             <span class="ruby-keyword kw">end</span>
-72:           <span class="ruby-keyword kw">end</span>
-73:         <span class="ruby-keyword kw">end</span>
-74:       <span class="ruby-keyword kw">end</span>
-75:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 65</span>
+65:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset</span>
+66:       <span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">storage</span><span class="ruby-operator">|</span>
+67:         <span class="ruby-identifier">storage</span>.<span class="ruby-identifier">parameters</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
+68:           <span class="ruby-constant">Configatron</span><span class="ruby-operator">::</span><span class="ruby-constant">Configuration</span>.<span class="ruby-identifier">instance_eval</span> <span class="ruby-keyword kw">do</span>
+69:             <span class="ruby-keyword kw">begin</span>
+70:               <span class="ruby-identifier">undef_method</span>(<span class="ruby-identifier">k</span>)
+71:             <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">NameError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+72:             <span class="ruby-keyword kw">end</span>
+73:           <span class="ruby-keyword kw">end</span>
+74:         <span class="ruby-keyword kw">end</span>
+75:       <span class="ruby-keyword kw">end</span>
+76:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000015" class="method-detail">
-        <a name="M000015"></a>
+      <div id="method-M000017" class="method-detail">
+        <a name="M000017"></a>
 
         <div class="method-heading">
-          <a href="#M000015" class="method-signature">
+          <a href="#M000017" class="method-signature">
           <span class="method-name">reset!</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Does a hard <a href="Configuration.html#M000016">reset</a> of the <a
+Does a hard <a href="Configuration.html#M000018">reset</a> of the <a
 href="Configuration.html">Configatron::Configuration</a> class. All methods
 are undefined, the list of configuration parameters is emptied, and the
-nil_for_missing method gets <a href="Configuration.html#M000016">reset</a>
+nil_for_missing method gets <a href="Configuration.html#M000018">reset</a>
 to false.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000015-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000015-source">
+            onclick="toggleCode('M000017-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000017-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 57</span>
-57:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset!</span>
-58:       <span class="ruby-identifier">reset</span>
-59:       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">nil_for_missing</span> = <span class="ruby-keyword kw">false</span>
-60:       <span class="ruby-ivar">@_storage_list</span> = []
-61:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 58</span>
+58:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset!</span>
+59:       <span class="ruby-identifier">reset</span>
+60:       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">nil_for_missing</span> = <span class="ruby-keyword kw">false</span>
+61:       <span class="ruby-ivar">@_storage_list</span> = []
+62:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000017" class="method-detail">
-        <a name="M000017"></a>
+      <div id="method-M000019" class="method-detail">
+        <a name="M000019"></a>
 
         <div class="method-heading">
-          <a href="#M000017" class="method-signature">
+          <a href="#M000019" class="method-signature">
           <span class="method-name">revert</span><span class="method-args">(step = 1)</span>
           </a>
         </div>
@@ -349,38 +350,38 @@ to false.
 Peels back n number of configuration parameters.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000017-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000017-source">
+            onclick="toggleCode('M000019-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000019-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 78</span>
-78:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">revert</span>(<span class="ruby-identifier">step</span> = <span class="ruby-value">1</span>)
-79:       <span class="ruby-identifier">reset</span>
-80:       <span class="ruby-identifier">step</span>.<span class="ruby-identifier">times</span> {<span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">pop</span>}
-81:       <span class="ruby-identifier">reload</span>
-82:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 79</span>
+79:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">revert</span>(<span class="ruby-identifier">step</span> = <span class="ruby-value">1</span>)
+80:       <span class="ruby-identifier">reset</span>
+81:       <span class="ruby-identifier">step</span>.<span class="ruby-identifier">times</span> {<span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">pop</span>}
+82:       <span class="ruby-identifier">reload</span>
+83:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000018" class="method-detail">
-        <a name="M000018"></a>
+      <div id="method-M000020" class="method-detail">
+        <a name="M000020"></a>
 
         <div class="method-heading">
-          <a href="#M000018" class="method-signature">
+          <a href="#M000020" class="method-signature">
           <span class="method-name">to_hash</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000018-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000018-source">
+            onclick="toggleCode('M000020-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000020-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 88</span>
-88:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_hash</span>
-89:       <span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">inject</span>({}) { <span class="ruby-operator">|</span><span class="ruby-identifier">acc</span>, <span class="ruby-identifier">storage</span><span class="ruby-operator">|</span> <span class="ruby-identifier">acc</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">storage</span>.<span class="ruby-identifier">to_hash</span>) }
-90:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/configatron/configuration.rb, line 89</span>
+89:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_hash</span>
+90:       <span class="ruby-ivar">@_storage_list</span>.<span class="ruby-identifier">inject</span>({}) { <span class="ruby-operator">|</span><span class="ruby-identifier">acc</span>, <span class="ruby-identifier">storage</span><span class="ruby-operator">|</span> <span class="ruby-identifier">acc</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">storage</span>.<span class="ruby-identifier">to_hash</span>) }
+91:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/classes/Configatron/Helpers.html

@@ -80,8 +80,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000001">exists?</a>&nbsp;&nbsp;
-      <a href="#M000002">retrieve</a>&nbsp;&nbsp;
+      <a href="#M000003">exists?</a>&nbsp;&nbsp;
+      <a href="#M000004">retrieve</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -103,11 +103,11 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
 
         <div class="method-heading">
-          <a href="#M000001" class="method-signature">
+          <a href="#M000003" class="method-signature">
           <span class="method-name">exists?</span><span class="method-args">(name)</span>
           </a>
         </div>
@@ -117,8 +117,8 @@
 Checks whether or not configuration parameter exists.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000001-source">
+            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000003-source">
 <pre>
    <span class="ruby-comment cmt"># File lib/configatron/helpers.rb, line 5</span>
 5:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">exists?</span>(<span class="ruby-identifier">name</span>)
@@ -129,11 +129,11 @@ Checks whether or not configuration parameter exists.
         </div>
       </div>
 
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
 
         <div class="method-heading">
-          <a href="#M000002" class="method-signature">
+          <a href="#M000004" class="method-signature">
           <span class="method-name">retrieve</span><span class="method-args">(name, default_value = ArgumentError)</span>
           </a>
         </div>
@@ -145,8 +145,8 @@ be passed that will be returned if the config parameter doesn&#8216;t
 exist.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000002-source">
+            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000004-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/helpers.rb, line 20</span>
 20:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">default_value</span> = <span class="ruby-constant">ArgumentError</span>)

data/doc/classes/Configatron/Store.html

@@ -92,12 +92,12 @@ Used to store each of the ‘sets’ of configuration parameters.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000005">exists?</a>&nbsp;&nbsp;
-      <a href="#M000004">method_missing</a>&nbsp;&nbsp;
-      <a href="#M000006">namespace</a>&nbsp;&nbsp;
-      <a href="#M000003">new</a>&nbsp;&nbsp;
-      <a href="#M000007">reload</a>&nbsp;&nbsp;
-      <a href="#M000008">to_hash</a>&nbsp;&nbsp;
+      <a href="#M000007">exists?</a>&nbsp;&nbsp;
+      <a href="#M000006">method_missing</a>&nbsp;&nbsp;
+      <a href="#M000008">namespace</a>&nbsp;&nbsp;
+      <a href="#M000005">new</a>&nbsp;&nbsp;
+      <a href="#M000009">reload</a>&nbsp;&nbsp;
+      <a href="#M000010">to_hash</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -142,22 +142,22 @@ The actual key/pair parameter values.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000003" class="method-detail">
-        <a name="M000003"></a>
+      <div id="method-M000005" class="method-detail">
+        <a name="M000005"></a>
 
         <div class="method-heading">
-          <a href="#M000003" class="method-signature">
+          <a href="#M000005" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(parameters = {})</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Takes an optional Hash to configure parameters.
+Takes an optional <a href="../Hash.html">Hash</a> to configure parameters.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000003-source">
+            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000005-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/store.rb, line 10</span>
 10:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">parameters</span> = {})
@@ -174,11 +174,11 @@ Takes an optional Hash to configure parameters.
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
+      <div id="method-M000007" class="method-detail">
+        <a name="M000007"></a>
 
         <div class="method-heading">
-          <a href="#M000005" class="method-signature">
+          <a href="#M000007" class="method-signature">
           <span class="method-name">exists?</span><span class="method-args">(name)</span>
           </a>
         </div>
@@ -188,8 +188,8 @@ Takes an optional Hash to configure parameters.
 Checks whether or not configuration parameter exists.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000005-source">
+            onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000007-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/store.rb, line 37</span>
 37:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">exists?</span>(<span class="ruby-identifier">name</span>)
@@ -201,11 +201,11 @@ Checks whether or not configuration parameter exists.
         </div>
       </div>
 
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
+      <div id="method-M000006" class="method-detail">
+        <a name="M000006"></a>
 
         <div class="method-heading">
-          <a href="#M000004" class="method-signature">
+          <a href="#M000006" class="method-signature">
           <span class="method-name">method_missing</span><span class="method-args">(sym, *args)</span>
           </a>
         </div>
@@ -219,8 +219,8 @@ names. If a method is called without an = sign at the end then the value
 from the parameters hash is returned, if it exists.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000004-source">
+            onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000006-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/store.rb, line 23</span>
 23:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">method_missing</span>(<span class="ruby-identifier">sym</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
@@ -240,11 +240,11 @@ from the parameters hash is returned, if it exists.
         </div>
       </div>
 
-      <div id="method-M000006" class="method-detail">
-        <a name="M000006"></a>
+      <div id="method-M000008" class="method-detail">
+        <a name="M000008"></a>
 
         <div class="method-heading">
-          <a href="#M000006" class="method-signature">
+          <a href="#M000008" class="method-signature">
           <span class="method-name">namespace</span><span class="method-args">(name) {|self.send(name.to_sym)| ...}</span>
           </a>
         </div>
@@ -255,8 +255,8 @@ Used to create &#8216;namespaces&#8217; around a set of configuration
 parameters.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000006-source">
+            onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000008-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/store.rb, line 43</span>
 43:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">namespace</span>(<span class="ruby-identifier">name</span>)
@@ -275,24 +275,24 @@ parameters.
         </div>
       </div>
 
-      <div id="method-M000007" class="method-detail">
-        <a name="M000007"></a>
+      <div id="method-M000009" class="method-detail">
+        <a name="M000009"></a>
 
         <div class="method-heading">
-          <a href="#M000007" class="method-signature">
+          <a href="#M000009" class="method-signature">
           <span class="method-name">reload</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Called when a <a href="Store.html#M000007">reload</a> is called on
+Called when a <a href="Store.html#M000009">reload</a> is called on
 configatron. Useful for subclasses that may need to read a file in,
 etc&#8230;
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000007-source">
+            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000009-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/store.rb, line 57</span>
 57:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reload</span>
@@ -302,19 +302,19 @@ etc&#8230;
         </div>
       </div>
 
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
+      <div id="method-M000010" class="method-detail">
+        <a name="M000010"></a>
 
         <div class="method-heading">
-          <a href="#M000008" class="method-signature">
+          <a href="#M000010" class="method-signature">
           <span class="method-name">to_hash</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000008-source">
+            onclick="toggleCode('M000010-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000010-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/store.rb, line 60</span>
 60:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_hash</span>

data/doc/classes/Configatron/YamlStore.html

@@ -95,8 +95,8 @@ that came from a YAML file.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000009">new</a>&nbsp;&nbsp;
-      <a href="#M000010">reload</a>&nbsp;&nbsp;
+      <a href="#M000011">new</a>&nbsp;&nbsp;
+      <a href="#M000012">reload</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -131,11 +131,11 @@ that came from a YAML file.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000009" class="method-detail">
-        <a name="M000009"></a>
+      <div id="method-M000011" class="method-detail">
+        <a name="M000011"></a>
 
         <div class="method-heading">
-          <a href="#M000009" class="method-signature">
+          <a href="#M000011" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(file_location)</span>
           </a>
         </div>
@@ -145,8 +145,8 @@ that came from a YAML file.
 Takes the full path to the YAML file.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000009-source">
+            onclick="toggleCode('M000011-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000011-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/yaml_store.rb, line 9</span>
  9:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">file_location</span>)
@@ -160,11 +160,11 @@ Takes the full path to the YAML file.
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000010" class="method-detail">
-        <a name="M000010"></a>
+      <div id="method-M000012" class="method-detail">
+        <a name="M000012"></a>
 
         <div class="method-heading">
-          <a href="#M000010" class="method-signature">
+          <a href="#M000012" class="method-signature">
           <span class="method-name">reload</span><span class="method-args">()</span>
           </a>
         </div>
@@ -174,8 +174,8 @@ Takes the full path to the YAML file.
 Re-reads the YAML file.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000010-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000010-source">
+            onclick="toggleCode('M000012-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000012-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/yaml_store.rb, line 15</span>
 15:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reload</span>

data/doc/classes/Hash.html

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Class: Hash</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
+  <script type="text/javascript">
+  // <![CDATA[
+
+  function popupCode( url ) {
+    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+  }
+
+  function toggleCode( id ) {
+    if ( document.getElementById )
+      elem = document.getElementById( id );
+    else if ( document.all )
+      elem = eval( "document.all." + id );
+    else
+      return false;
+
+    elemStyle = elem.style;
+    
+    if ( elemStyle.display != "block" ) {
+      elemStyle.display = "block"
+    } else {
+      elemStyle.display = "none"
+    }
+
+    return true;
+  }
+  
+  // Make codeblocks hidden by default
+  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
+  
+  // ]]>
+  </script>
+
+</head>
+<body>
+
+
+
+    <div id="classHeader">
+        <table class="header-table">
+        <tr class="top-aligned-row">
+          <td><strong>Class</strong></td>
+          <td class="class-name-in-header">Hash</td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>In:</strong></td>
+            <td>
+                <a href="../files/lib/configatron_rb.html">
+                lib/configatron.rb
+                </a>
+        <br />
+            </td>
+        </tr>
+
+        <tr class="top-aligned-row">
+            <td><strong>Parent:</strong></td>
+            <td>
+                Object
+            </td>
+        </tr>
+        </table>
+    </div>
+  <!-- banner header -->
+
+  <div id="bodyContent">
+
+
+
+  <div id="contextContent">
+
+
+
+   </div>
+
+    <div id="method-list">
+      <h3 class="section-bar">Methods</h3>
+
+      <div class="name-list">
+      <a href="#M000001">recursive_merge</a>&nbsp;&nbsp;
+      <a href="#M000002">recursive_merge!</a>&nbsp;&nbsp;
+      </div>
+    </div>
+
+  </div>
+
+
+    <!-- if includes -->
+
+    <div id="section">
+
+
+
+
+
+      
+
+
+    <!-- if method_list -->
+    <div id="methods">
+      <h3 class="section-bar">Public Instance methods</h3>
+
+      <div id="method-M000001" class="method-detail">
+        <a name="M000001"></a>
+
+        <div class="method-heading">
+          <a href="#M000001" class="method-signature">
+          <span class="method-name">recursive_merge</span><span class="method-args">(other)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Same as Hash#merge but recursively merges sub-hashes.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000001-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/configatron.rb, line 17</span>
+17:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">recursive_merge</span>(<span class="ruby-identifier">other</span>)
+18:     <span class="ruby-identifier">hash</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">dup</span>
+19:     <span class="ruby-identifier">other</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
+20:       <span class="ruby-identifier">myval</span> = <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">key</span>]
+21:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">value</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Hash</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">myval</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Hash</span>)
+22:         <span class="ruby-identifier">hash</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">myval</span>.<span class="ruby-identifier">recursive_merge</span>(<span class="ruby-identifier">value</span>)
+23:       <span class="ruby-keyword kw">else</span>
+24:         <span class="ruby-identifier">hash</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">value</span>
+25:       <span class="ruby-keyword kw">end</span>
+26:     <span class="ruby-keyword kw">end</span>
+27:     <span class="ruby-identifier">hash</span>
+28:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000002" class="method-detail">
+        <a name="M000002"></a>
+
+        <div class="method-heading">
+          <a href="#M000002" class="method-signature">
+          <span class="method-name">recursive_merge!</span><span class="method-args">(other)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Same as Hash#merge! but recursively merges sub-hashes.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000002-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/configatron.rb, line 32</span>
+32:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">recursive_merge!</span>(<span class="ruby-identifier">other</span>)
+33:     <span class="ruby-identifier">other</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
+34:       <span class="ruby-identifier">myval</span> = <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">key</span>]
+35:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">value</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Hash</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">myval</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Hash</span>)
+36:         <span class="ruby-identifier">myval</span>.<span class="ruby-identifier">recursive_merge!</span>(<span class="ruby-identifier">value</span>)
+37:       <span class="ruby-keyword kw">else</span>
+38:         <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">value</span>
+39:       <span class="ruby-keyword kw">end</span>
+40:     <span class="ruby-keyword kw">end</span>
+41:     <span class="ruby-keyword kw">self</span>
+42:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+
+    </div>
+
+
+  </div>
+
+
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html>

data/doc/classes/Kernel.html

@@ -80,7 +80,7 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000019">configatron</a>&nbsp;&nbsp;
+      <a href="#M000021">configatron</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -102,11 +102,11 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000019" class="method-detail">
-        <a name="M000019"></a>
+      <div id="method-M000021" class="method-detail">
+        <a name="M000021"></a>
 
         <div class="method-heading">
-          <a href="#M000019" class="method-signature">
+          <a href="#M000021" class="method-signature">
           <span class="method-name">configatron</span><span class="method-args">(&amp;block)</span>
           </a>
         </div>
@@ -120,8 +120,8 @@ Configatron::Configatron configure method and yield up a <a
 href="Configatron/Store.html">Configatron::Store</a> object.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000019-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000019-source">
+            onclick="toggleCode('M000021-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000021-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/configatron/kernel.rb, line 6</span>
  6:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configatron</span>(<span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)

data/doc/created.rid

@@ -1 +1 @@
-Wed, 10 Sep 2008 16:12:28 -0400
+Mon, 15 Sep 2008 11:06:30 -0400

data/doc/files/README.html

@@ -120,7 +120,7 @@ becomes:
 Notice how our other configuration parameters haven‘t changed? Cool,
 eh?
 </p>
-<h3>Hash/YAML</h3>
+<h3><a href="../classes/Hash.html">Hash</a>/YAML</h3>
 <p>
 You can configure configatron from a hash as well:
 </p>

data/doc/files/lib/configatron/configuration_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Sep 10 16:09:29 -0400 2008</td>
+      <td>Mon Sep 15 11:06:00 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/configatron/store_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Sep 10 16:09:29 -0400 2008</td>
+      <td>Mon Sep 15 10:59:23 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/configatron_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Sep 05 16:22:37 -0400 2008</td>
+      <td>Mon Sep 15 11:05:40 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/fr_class_index.html

@@ -24,6 +24,7 @@
     <a href="classes/Configatron/Helpers.html">Configatron::Helpers</a><br />
     <a href="classes/Configatron/Store.html">Configatron::Store</a><br />
     <a href="classes/Configatron/YamlStore.html">Configatron::YamlStore</a><br />
+    <a href="classes/Hash.html">Hash</a><br />
     <a href="classes/Kernel.html">Kernel</a><br />
   </div>
 </div>

data/doc/fr_method_index.html

@@ -20,25 +20,27 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Kernel.html#M000019">configatron (Kernel)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000011">configure (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000012">configure_from_hash (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000013">configure_from_yaml (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Store.html#M000005">exists? (Configatron::Store)</a><br />
-    <a href="classes/Configatron/Helpers.html#M000001">exists? (Configatron::Helpers)</a><br />
-    <a href="classes/Configatron/Store.html#M000004">method_missing (Configatron::Store)</a><br />
-    <a href="classes/Configatron/Store.html#M000006">namespace (Configatron::Store)</a><br />
-    <a href="classes/Configatron/YamlStore.html#M000009">new (Configatron::YamlStore)</a><br />
-    <a href="classes/Configatron/Store.html#M000003">new (Configatron::Store)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000014">reload (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Store.html#M000007">reload (Configatron::Store)</a><br />
-    <a href="classes/Configatron/YamlStore.html#M000010">reload (Configatron::YamlStore)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000016">reset (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000015">reset! (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Helpers.html#M000002">retrieve (Configatron::Helpers)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000017">revert (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Configuration.html#M000018">to_hash (Configatron::Configuration)</a><br />
-    <a href="classes/Configatron/Store.html#M000008">to_hash (Configatron::Store)</a><br />
+    <a href="classes/Kernel.html#M000021">configatron (Kernel)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000013">configure (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000014">configure_from_hash (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000015">configure_from_yaml (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Helpers.html#M000003">exists? (Configatron::Helpers)</a><br />
+    <a href="classes/Configatron/Store.html#M000007">exists? (Configatron::Store)</a><br />
+    <a href="classes/Configatron/Store.html#M000006">method_missing (Configatron::Store)</a><br />
+    <a href="classes/Configatron/Store.html#M000008">namespace (Configatron::Store)</a><br />
+    <a href="classes/Configatron/Store.html#M000005">new (Configatron::Store)</a><br />
+    <a href="classes/Configatron/YamlStore.html#M000011">new (Configatron::YamlStore)</a><br />
+    <a href="classes/Hash.html#M000001">recursive_merge (Hash)</a><br />
+    <a href="classes/Hash.html#M000002">recursive_merge! (Hash)</a><br />
+    <a href="classes/Configatron/YamlStore.html#M000012">reload (Configatron::YamlStore)</a><br />
+    <a href="classes/Configatron/Store.html#M000009">reload (Configatron::Store)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000016">reload (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000018">reset (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000017">reset! (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Helpers.html#M000004">retrieve (Configatron::Helpers)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000019">revert (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Configuration.html#M000020">to_hash (Configatron::Configuration)</a><br />
+    <a href="classes/Configatron/Store.html#M000010">to_hash (Configatron::Store)</a><br />
   </div>
 </div>
 </body>

data/lib/configatron/configuration.rb

@@ -26,6 +26,7 @@ module Configatron
     
     # Used to load configuration settings from a Hash.
     def configure_from_hash(parameters)
+      parameters = self.to_hash.recursive_merge(parameters)
       storage = Configatron::Store.new(parameters)
       @_storage_list << storage
       load_methods(storage)

data/lib/configatron.rb

@@ -8,4 +8,38 @@ require File.join(File.dirname(__FILE__), 'configatron', 'store')
 require File.join(File.dirname(__FILE__), 'configatron', 'yaml_store')
 
 module Configatron # :nodoc:
-end
+end
+
+class Hash
+
+  # Same as Hash#merge but recursively merges sub-hashes.
+
+  def recursive_merge(other)
+    hash = self.dup
+    other.each do |key, value|
+      myval = self[key]
+      if value.is_a?(Hash) && myval.is_a?(Hash)
+        hash[key] = myval.recursive_merge(value)
+      else
+        hash[key] = value
+      end
+    end
+    hash
+  end
+
+  # Same as Hash#merge! but recursively merges sub-hashes.
+
+  def recursive_merge!(other)
+    other.each do |key, value|
+      myval = self[key]
+      if value.is_a?(Hash) && myval.is_a?(Hash)
+        myval.recursive_merge!(value)
+      else
+        self[key] = value
+      end
+    end
+    self
+  end
+
+end
+

data/spec/unit/configuration_spec.rb

@@ -28,6 +28,23 @@ describe Configatron::Configuration do
       configatron.homer.should == "Homer Simpson"
     end
     
+    it "doesn't wipe out existing configurations" do
+      configatron do |c|
+        c.namespace(:mack) do |mack|
+          mack.one = 1
+          mack.two = 2
+          mack.three = 3
+        end
+        c.a = 'a'
+        c.b = 'b'
+      end
+      configatron.to_hash.should == {:mack => {:one => 1, :two => 2, :three => 3}, :a => 'a', :b => 'b'}
+      configatron.configure_from_hash(:mack => {:one => 'one'}, :b => 'bee')
+      configatron.to_hash.should == {:mack => {:one => 'one', :two => 2, :three => 3}, :a => 'a', :b => 'bee'}
+      configatron.revert
+      configatron.to_hash.should == {:mack => {:one => 1, :two => 2, :three => 3}, :a => 'a', :b => 'b'}
+    end
+    
   end
   
   describe "hashes to namespace" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: configatron
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -04:00
+date: 2008-09-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - doc/classes/Configatron/Helpers.html
 - doc/classes/Configatron/Store.html
 - doc/classes/Configatron/YamlStore.html
+- doc/classes/Hash.html
 - doc/classes/Kernel.html
 - doc/created.rid
 - doc/files/lib/configatron/configuration_rb.html