iqeo-conf 0.0.11 → 0.0.12

Sign up to get free protection for your applications and to get access to all the features.
data/.yardoc/checksums CHANGED
@@ -1,2 +1,2 @@
1
- lib/iqeo/configuration.rb 0790c6ed002a1b1e69afc4f38e218756c5ac480f
2
- lib/iqeo/configuration/version.rb dad9c52c1d00b3028d333907df8e3ad45d475d93
1
+ lib/iqeo/configuration.rb 9891a492d5fef7d00d417e5483c1e910340fb368
2
+ lib/iqeo/configuration/version.rb 04bf2bd5ca1cd510f086ae4da43fc3008de6516c
data/.yardoc/object_types CHANGED
Binary file
Binary file
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- iqeo-conf (0.0.11)
4
+ iqeo-conf (0.0.12)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -12,14 +12,14 @@ GEM
12
12
  rdoc (3.12)
13
13
  json (~> 1.4)
14
14
  redcarpet (2.1.1)
15
- rspec (2.9.0)
16
- rspec-core (~> 2.9.0)
17
- rspec-expectations (~> 2.9.0)
18
- rspec-mocks (~> 2.9.0)
19
- rspec-core (2.9.0)
20
- rspec-expectations (2.9.1)
15
+ rspec (2.10.0)
16
+ rspec-core (~> 2.10.0)
17
+ rspec-expectations (~> 2.10.0)
18
+ rspec-mocks (~> 2.10.0)
19
+ rspec-core (2.10.0)
20
+ rspec-expectations (2.10.0)
21
21
  diff-lcs (~> 1.1.3)
22
- rspec-mocks (2.9.0)
22
+ rspec-mocks (2.10.1)
23
23
  yard (0.8.1)
24
24
 
25
25
  PLATFORMS
@@ -30,5 +30,5 @@ DEPENDENCIES
30
30
  rake (~> 0.9.2)
31
31
  rdoc (~> 3.12.0)
32
32
  redcarpet (~> 2.1.1)
33
- rspec (~> 2.9.0)
33
+ rspec (~> 2.10.0)
34
34
  yard (~> 0.8.1)
data/README.md CHANGED
@@ -118,8 +118,8 @@ conf.collect { |key,value| value } # => [ 1, 2.0, :three, 'four' ]
118
118
  * inheritance & override
119
119
  * read from string, at creation, or after - merged & nested
120
120
  * load from filename, at creation, or after - merged & nested
121
- * todo: merge configurations
122
- * todo: defaults
121
+ * defaults
122
+ * merge configurations
123
123
  * todo: blank slate
124
124
 
125
125
  ## Fancy usage
@@ -133,7 +133,7 @@
133
133
 
134
134
  </div>
135
135
  </dt>
136
- <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.11</span><span class='tstring_end'>&quot;</span></span></pre></dd>
136
+ <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.12</span><span class='tstring_end'>&quot;</span></span></pre></dd>
137
137
 
138
138
  </dl>
139
139
 
@@ -144,6 +144,33 @@
144
144
  <h2>Instance Attribute Summary <small>(<a href="#" class="summary_toggle">collapse</a>)</small></h2>
145
145
  <ul class="summary">
146
146
 
147
+ <li class="public ">
148
+ <span class="summary_signature">
149
+
150
+ <a href="#_items-instance_method" title="#_items (instance method)">- (Object) <strong>_items</strong> </a>
151
+
152
+
153
+
154
+ </span>
155
+
156
+
157
+
158
+
159
+
160
+
161
+
162
+
163
+
164
+
165
+
166
+
167
+ <span class="summary_desc"><div class='inline'>
168
+ <p>Returns the value of attribute _items.</p>
169
+ </div></span>
170
+
171
+ </li>
172
+
173
+
147
174
  <li class="public ">
148
175
  <span class="summary_signature">
149
176
 
@@ -331,6 +358,50 @@ symbol.</p>
331
358
 
332
359
 
333
360
 
361
+ <span class="summary_desc"><div class='inline'></div></span>
362
+
363
+ </li>
364
+
365
+
366
+ <li class="public ">
367
+ <span class="summary_signature">
368
+
369
+ <a href="#_merge-instance_method" title="#_merge (instance method)">- (Object) <strong>_merge</strong>(other) </a>
370
+
371
+
372
+
373
+ </span>
374
+
375
+
376
+
377
+
378
+
379
+
380
+
381
+
382
+
383
+ <span class="summary_desc"><div class='inline'></div></span>
384
+
385
+ </li>
386
+
387
+
388
+ <li class="public ">
389
+ <span class="summary_signature">
390
+
391
+ <a href="#_merge%21-instance_method" title="#_merge! (instance method)">- (Object) <strong>_merge!</strong>(other) </a>
392
+
393
+
394
+
395
+ </span>
396
+
397
+
398
+
399
+
400
+
401
+
402
+
403
+
404
+
334
405
  <span class="summary_desc"><div class='inline'></div></span>
335
406
 
336
407
  </li>
@@ -385,7 +456,7 @@ symbol.</p>
385
456
  <li class="public ">
386
457
  <span class="summary_signature">
387
458
 
388
- <a href="#initialize-instance_method" title="#initialize (instance method)">- (Configuration) <strong>initialize</strong>(&amp;block) </a>
459
+ <a href="#initialize-instance_method" title="#initialize (instance method)">- (Configuration) <strong>initialize</strong>(default = nil, &amp;block) </a>
389
460
 
390
461
 
391
462
 
@@ -439,7 +510,7 @@ symbol.</p>
439
510
  <div class="method_details first">
440
511
  <h3 class="signature first" id="initialize-instance_method">
441
512
 
442
- - (<tt><span class='object_link'><a href="" title="Iqeo::Configuration (class)">Configuration</a></span></tt>) <strong>initialize</strong>(&amp;block)
513
+ - (<tt><span class='object_link'><a href="" title="Iqeo::Configuration (class)">Configuration</a></span></tt>) <strong>initialize</strong>(default = nil, &amp;block)
443
514
 
444
515
 
445
516
 
@@ -462,6 +533,9 @@ symbol.</p>
462
533
  <pre class="lines">
463
534
 
464
535
 
536
+ 52
537
+ 53
538
+ 54
465
539
  55
466
540
  56
467
541
  57
@@ -475,13 +549,18 @@ symbol.</p>
475
549
  65
476
550
  66
477
551
  67
478
- 68</pre>
552
+ 68
553
+ 69</pre>
479
554
  </td>
480
555
  <td>
481
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 55</span>
482
-
483
- <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span>
484
- <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>
556
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 52</span>
557
+
558
+ <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>
559
+ <span class='ivar'>@_items</span> <span class='op'>=</span> <span class='kw'>case</span>
560
+ <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>
561
+ <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>
562
+ <span class='kw'>else</span> <span class='const'>HashWithIndifferentAccess</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
563
+ <span class='kw'>end</span>
485
564
  <span class='ivar'>@_parent</span> <span class='op'>=</span> <span class='kw'>nil</span>
486
565
  <span class='kw'>if</span> <span class='id identifier rubyid_block_given?'>block_given?</span>
487
566
  <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'>==</span> <span class='int'>1</span> <span class='comment'># cannot set parent for yield blocks here as self is wrong !?
@@ -522,7 +601,6 @@ symbol.</p>
522
601
  <pre class="lines">
523
602
 
524
603
 
525
- 70
526
604
  71
527
605
  72
528
606
  73
@@ -538,13 +616,14 @@ symbol.</p>
538
616
  83
539
617
  84
540
618
  85
541
- 86</pre>
619
+ 86
620
+ 87</pre>
542
621
  </td>
543
622
  <td>
544
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 70</span>
623
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 71</span>
545
624
 
546
625
  <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>
547
- <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
626
+ <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
548
627
  </span>
549
628
  <span class='id identifier rubyid_name'>name</span> <span class='op'>=</span> <span class='id identifier rubyid_name'>name</span><span class='period'>.</span><span class='id identifier rubyid_to_s'>to_s</span><span class='period'>.</span><span class='id identifier rubyid_chomp'>chomp</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>=</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span>
550
629
 
@@ -571,10 +650,54 @@ symbol.</p>
571
650
  <h2>Instance Attribute Details</h2>
572
651
 
573
652
 
653
+ <span id="_items=-instance_method"></span>
654
+ <span id="_items-instance_method"></span>
655
+ <div class="method_details first">
656
+ <h3 class="signature first" id="_items-instance_method">
657
+
658
+ - (<tt>Object</tt>) <strong>_items</strong>
659
+
660
+
661
+
662
+
663
+
664
+ </h3><div class="docstring">
665
+ <div class="discussion">
666
+
667
+ <p>Returns the value of attribute _items</p>
668
+
669
+
670
+ </div>
671
+ </div>
672
+ <div class="tags">
673
+
674
+
675
+ </div><table class="source_code">
676
+ <tr>
677
+ <td>
678
+ <pre class="lines">
679
+
680
+
681
+ 89
682
+ 90
683
+ 91</pre>
684
+ </td>
685
+ <td>
686
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 89</span>
687
+
688
+ <span class='kw'>def</span> <span class='id identifier rubyid__items'>_items</span>
689
+ <span class='ivar'>@_items</span>
690
+ <span class='kw'>end</span></pre>
691
+ </td>
692
+ </tr>
693
+ </table>
694
+ </div>
695
+
696
+
574
697
  <span id="_parent=-instance_method"></span>
575
698
  <span id="_parent-instance_method"></span>
576
- <div class="method_details first">
577
- <h3 class="signature first" id="_parent-instance_method">
699
+ <div class="method_details ">
700
+ <h3 class="signature " id="_parent-instance_method">
578
701
 
579
702
  - (<tt>Object</tt>) <strong>_parent</strong>
580
703
 
@@ -599,12 +722,12 @@ symbol.</p>
599
722
  <pre class="lines">
600
723
 
601
724
 
602
- 88
603
725
  89
604
- 90</pre>
726
+ 90
727
+ 91</pre>
605
728
  </td>
606
729
  <td>
607
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 88</span>
730
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 89</span>
608
731
 
609
732
  <span class='kw'>def</span> <span class='id identifier rubyid__parent'>_parent</span>
610
733
  <span class='ivar'>@_parent</span>
@@ -649,12 +772,12 @@ symbol.</p>
649
772
  <pre class="lines">
650
773
 
651
774
 
652
- 40
653
- 41
654
- 42</pre>
775
+ 37
776
+ 38
777
+ 39</pre>
655
778
  </td>
656
779
  <td>
657
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 40</span>
780
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 37</span>
658
781
 
659
782
  <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_load'>load</span> <span class='id identifier rubyid_file'>file</span>
660
783
  <span class='kw'>return</span> <span class='kw'>self</span><span class='period'>.</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>
@@ -679,19 +802,19 @@ symbol.</p>
679
802
  <pre class="lines">
680
803
 
681
804
 
805
+ 41
806
+ 42
807
+ 43
682
808
  44
683
809
  45
684
810
  46
685
811
  47
686
812
  48
687
813
  49
688
- 50
689
- 51
690
- 52
691
- 53</pre>
814
+ 50</pre>
692
815
  </td>
693
816
  <td>
694
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 44</span>
817
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 41</span>
695
818
 
696
819
  <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_new_defer_block_for_parent'>new_defer_block_for_parent</span> <span class='id identifier rubyid_parent'>parent</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span>
697
820
  <span class='id identifier rubyid_conf'>conf</span> <span class='op'>=</span> <span class='const'>Configuration</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
@@ -736,14 +859,14 @@ symbol.</p>
736
859
  <pre class="lines">
737
860
 
738
861
 
862
+ 27
863
+ 28
864
+ 29
739
865
  30
740
- 31
741
- 32
742
- 33
743
- 34</pre>
866
+ 31</pre>
744
867
  </td>
745
868
  <td>
746
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 30</span>
869
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 27</span>
747
870
 
748
871
  <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_read'>read</span> <span class='id identifier rubyid_string'>string</span>
749
872
  <span class='id identifier rubyid_conf'>conf</span> <span class='op'>=</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
@@ -781,12 +904,12 @@ symbol.</p>
781
904
  <pre class="lines">
782
905
 
783
906
 
784
- 22
785
- 23
786
- 24</pre>
907
+ 19
908
+ 20
909
+ 21</pre>
787
910
  </td>
788
911
  <td>
789
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 22</span>
912
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 19</span>
790
913
 
791
914
  <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_version'>version</span>
792
915
  <span class='const'>VERSION</span>
@@ -837,18 +960,18 @@ symbol.</p>
837
960
  <pre class="lines">
838
961
 
839
962
 
840
- 106
841
963
  107
842
964
  108
843
965
  109
844
- 110</pre>
966
+ 110
967
+ 111</pre>
845
968
  </td>
846
969
  <td>
847
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 106</span>
970
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 107</span>
848
971
 
849
972
  <span class='kw'>def</span> <span class='id identifier rubyid__get'>_get</span> <span class='id identifier rubyid_key'>key</span>
850
- <span class='kw'>return</span> <span class='ivar'>@items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span> <span class='kw'>unless</span> <span class='ivar'>@items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
851
- <span class='kw'>return</span> <span class='ivar'>@items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span> <span class='kw'>if</span> <span class='id identifier rubyid__parent'>_parent</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
973
+ <span class='kw'>return</span> <span class='ivar'>@_items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span> <span class='kw'>unless</span> <span class='ivar'>@_items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
974
+ <span class='kw'>return</span> <span class='ivar'>@_items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span> <span class='kw'>if</span> <span class='id identifier rubyid__parent'>_parent</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
852
975
  <span class='id identifier rubyid__parent'>_parent</span><span class='period'>.</span><span class='id identifier rubyid__get'>_get</span> <span class='id identifier rubyid_key'>key</span>
853
976
  <span class='kw'>end</span></pre>
854
977
  </td>
@@ -871,12 +994,12 @@ symbol.</p>
871
994
  <pre class="lines">
872
995
 
873
996
 
874
- 117
875
997
  118
876
- 119</pre>
998
+ 119
999
+ 120</pre>
877
1000
  </td>
878
1001
  <td>
879
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 117</span>
1002
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 118</span>
880
1003
 
881
1004
  <span class='kw'>def</span> <span class='id identifier rubyid__load'>_load</span> <span class='id identifier rubyid_file'>file</span>
882
1005
  <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>
@@ -884,6 +1007,68 @@ symbol.</p>
884
1007
  </td>
885
1008
  </tr>
886
1009
  </table>
1010
+ </div>
1011
+
1012
+ <div class="method_details ">
1013
+ <h3 class="signature " id="_merge-instance_method">
1014
+
1015
+ - (<tt>Object</tt>) <strong>_merge</strong>(other)
1016
+
1017
+
1018
+
1019
+
1020
+
1021
+ </h3><table class="source_code">
1022
+ <tr>
1023
+ <td>
1024
+ <pre class="lines">
1025
+
1026
+
1027
+ 127
1028
+ 128
1029
+ 129</pre>
1030
+ </td>
1031
+ <td>
1032
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 127</span>
1033
+
1034
+ <span class='kw'>def</span> <span class='id identifier rubyid__merge'>_merge</span> <span class='id identifier rubyid_other'>other</span>
1035
+ <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>
1036
+ <span class='kw'>end</span></pre>
1037
+ </td>
1038
+ </tr>
1039
+ </table>
1040
+ </div>
1041
+
1042
+ <div class="method_details ">
1043
+ <h3 class="signature " id="_merge!-instance_method">
1044
+
1045
+ - (<tt>Object</tt>) <strong>_merge!</strong>(other)
1046
+
1047
+
1048
+
1049
+
1050
+
1051
+ </h3><table class="source_code">
1052
+ <tr>
1053
+ <td>
1054
+ <pre class="lines">
1055
+
1056
+
1057
+ 122
1058
+ 123
1059
+ 124
1060
+ 125</pre>
1061
+ </td>
1062
+ <td>
1063
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 122</span>
1064
+
1065
+ <span class='kw'>def</span> <span class='id identifier rubyid__merge!'>_merge!</span> <span class='id identifier rubyid_other'>other</span>
1066
+ <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>
1067
+ <span class='kw'>self</span>
1068
+ <span class='kw'>end</span></pre>
1069
+ </td>
1070
+ </tr>
1071
+ </table>
887
1072
  </div>
888
1073
 
889
1074
  <div class="method_details ">
@@ -901,12 +1086,12 @@ symbol.</p>
901
1086
  <pre class="lines">
902
1087
 
903
1088
 
904
- 113
905
1089
  114
906
- 115</pre>
1090
+ 115
1091
+ 116</pre>
907
1092
  </td>
908
1093
  <td>
909
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 113</span>
1094
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 114</span>
910
1095
 
911
1096
  <span class='kw'>def</span> <span class='id identifier rubyid__read'>_read</span> <span class='id identifier rubyid_string'>string</span>
912
1097
  <span class='id identifier rubyid_instance_eval'>instance_eval</span> <span class='id identifier rubyid_string'>string</span>
@@ -935,17 +1120,17 @@ symbol.</p>
935
1120
  <pre class="lines">
936
1121
 
937
1122
 
938
- 90
939
1123
  91
940
1124
  92
941
1125
  93
942
1126
  94
943
1127
  95
944
1128
  96
945
- 97</pre>
1129
+ 97
1130
+ 98</pre>
946
1131
  </td>
947
1132
  <td>
948
- <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 90</span>
1133
+ <pre class="code"><span class="info file"># File 'lib/iqeo/configuration.rb', line 91</span>
949
1134
 
950
1135
  <span class='kw'>def</span> <span class='id identifier rubyid__set'>_set</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_value'>value</span>
951
1136
  <span class='comment'># fix: extend parenting for enumerable with configurations at arbitrary depth
@@ -953,7 +1138,7 @@ symbol.</p>
953
1138
  <span class='kw'>when</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='kw'>then</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>
954
1139
  <span class='kw'>when</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'>Enumerable</span> <span class='rparen'>)</span> <span class='kw'>then</span> <span class='id identifier rubyid_value'>value</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_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</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_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_kind_of?'>kind_of?</span> <span class='const'>Configuration</span> <span class='rbrace'>}</span>
955
1140
  <span class='kw'>end</span>
956
- <span class='ivar'>@items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_value'>value</span>
1141
+ <span class='ivar'>@_items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_value'>value</span>
957
1142
  <span class='kw'>end</span></pre>
958
1143
  </td>
959
1144
  </tr>
@@ -965,7 +1150,7 @@ symbol.</p>
965
1150
  </div>
966
1151
 
967
1152
  <div id="footer">
968
- Generated on Fri May 11 14:53:17 2012 by
1153
+ Generated on Mon May 14 20:37:48 2012 by
969
1154
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
970
1155
  0.8.1 (ruby-1.9.3).
971
1156
  </div>
data/doc/Iqeo.html CHANGED
@@ -89,7 +89,7 @@
89
89
  <h2>Overview</h2><div class="docstring">
90
90
  <div class="discussion">
91
91
 
92
- <p>Iqeo namespace module.</p>
92
+ <p>Iqeo namespace</p>
93
93
 
94
94
 
95
95
  </div>
@@ -119,7 +119,7 @@
119
119
  </div>
120
120
 
121
121
  <div id="footer">
122
- Generated on Fri May 11 14:53:17 2012 by
122
+ Generated on Mon May 14 20:37:48 2012 by
123
123
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
124
124
  0.8.1 (ruby-1.9.3).
125
125
  </div>
data/doc/_index.html CHANGED
@@ -116,7 +116,7 @@
116
116
  </div>
117
117
 
118
118
  <div id="footer">
119
- Generated on Fri May 11 14:53:17 2012 by
119
+ Generated on Mon May 14 20:37:48 2012 by
120
120
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
121
121
  0.8.1 (ruby-1.9.3).
122
122
  </div>
data/doc/file.README.html CHANGED
@@ -175,8 +175,8 @@ Configuration settings can be retrieved directly or indirectly.</p>
175
175
  <li>inheritance &amp; override</li>
176
176
  <li>read from string, at creation, or after - merged &amp; nested</li>
177
177
  <li>load from filename, at creation, or after - merged &amp; nested</li>
178
- <li>todo: merge configurations</li>
179
- <li>todo: defaults</li>
178
+ <li>defaults</li>
179
+ <li>merge configurations</li>
180
180
  <li>todo: blank slate</li>
181
181
  </ul>
182
182
 
@@ -197,7 +197,7 @@ See LICENSE file.</p>
197
197
  </div></div>
198
198
 
199
199
  <div id="footer">
200
- Generated on Fri May 11 14:53:17 2012 by
200
+ Generated on Mon May 14 20:37:48 2012 by
201
201
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
202
202
  0.8.1 (ruby-1.9.3).
203
203
  </div>
data/doc/index.html CHANGED
@@ -175,8 +175,8 @@ Configuration settings can be retrieved directly or indirectly.</p>
175
175
  <li>inheritance &amp; override</li>
176
176
  <li>read from string, at creation, or after - merged &amp; nested</li>
177
177
  <li>load from filename, at creation, or after - merged &amp; nested</li>
178
- <li>todo: merge configurations</li>
179
- <li>todo: defaults</li>
178
+ <li>defaults</li>
179
+ <li>merge configurations</li>
180
180
  <li>todo: blank slate</li>
181
181
  </ul>
182
182
 
@@ -197,7 +197,7 @@ See LICENSE file.</p>
197
197
  </div></div>
198
198
 
199
199
  <div id="footer">
200
- Generated on Fri May 11 14:53:17 2012 by
200
+ Generated on Mon May 14 20:37:48 2012 by
201
201
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
202
202
  0.8.1 (ruby-1.9.3).
203
203
  </div>