csv_decision 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91948b110f220bb5a54cc74494d51b189bf5af51
-  data.tar.gz: 23cd2d5e7aa16a301f09186ccc00b57260d3b275
+  metadata.gz: 40af539bd889c1b4bba0b9cced1c517121dd331d
+  data.tar.gz: 60e3f727ad24252bd78ccfc3f6b69be77d2c7b4b
 SHA512:
-  metadata.gz: '0149f4aa493e08f157e859a79ab09a03f3a980523d1affe16ad1179c6a2ee58e94906daefc1e5bf0456b8d507c8e2fb82e710939ac8ca84648beabb564b045b0'
-  data.tar.gz: 8adce55f750392d0478b0e985ff6a400d4a755e8385684ce29f586220669aa3ddc1ce9fb85efe3a9b108282a89e92a83e2eb4036e9736b1f0b2ed73461f6aa61
+  metadata.gz: 22aae99d06ad663ebc6bed44d19c54a3e55b059f58e8dab1a9b1cb72114a104297d8513911afde5cec738dd3237034e8a55e8097f85e67991d79d647b78ea434
+  data.tar.gz: e869bc5eaccbe556cd9e76b3ef5c0bc3d10daa2cc7f47ec4e8ec2151d0c8c4dbf2166dc4eed34357875ca2335aca3fe74957e1a16f6ff1ddefc474baf50505c8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.3.1, 21 January 2018.
+*changes*
+- Optimize code.
+
 ## v0.3.0, 20 January 2018.
 *Additions*
 - Index one or more text-only input columns for faster lookup performance.

data/benchmarks/rufus_decision.rb

@@ -87,7 +87,7 @@ puts ""
 
       GC.start
       x.report("Rufus decision (first_match: #{first_match}) - #{name}: ") do |count|
-        count.times { rufus_table.transform(input) }
+        count.times { rufus_table.transform!(input) }
       end
 
       x.compare!

data/csv_decision.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'csv_decision'
-  spec.version       = '0.3.0'
+  spec.version       = '0.3.1'
   spec.authors       = ['Brett Vickers']
   spec.email         = ['brett@phillips-vickers.com']
   spec.description   = 'CSV based Ruby decision tables.'

data/doc/CSVDecision.html

@@ -606,7 +606,7 @@ table.decide(topic: 'finance', region: 'Europe') #=> team_mem
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/CellValidationError.html

@@ -133,7 +133,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Columns.html

@@ -1167,7 +1167,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Columns/Dictionary.html

@@ -697,7 +697,7 @@ of :outs.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Data.html

@@ -469,7 +469,7 @@ array of arrays. Strips out empty columns/rows and comment cells.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Decision.html

@@ -308,6 +308,7 @@
       <pre class="lines">
 
 
+34
 35
 36
 37
@@ -317,24 +318,21 @@
 41
 42
 43
-44
-45
-46</pre>
+44</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 35</span>
+      <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 34</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='label'>table:</span><span class='comma'>,</span> <span class='label'>input:</span><span class='rparen'>)</span>
   <span class='comment'># The result object is a hash of values, and each value will be an array if this is
 </span>  <span class='comment'># a multi-row result for the +first_match: false+ option.
 </span>  <span class='ivar'>@result</span> <span class='op'>=</span> <span class='const'><span class='object_link'><a href="Result.html" title="CSVDecision::Result (class)">Result</a></span></span><span class='period'>.</span><span class='id identifier rubyid_new'><span class='object_link'><a href="Result.html#initialize-instance_method" title="CSVDecision::Result#initialize (method)">new</a></span></span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>input:</span> <span class='id identifier rubyid_input'>input</span><span class='rparen'>)</span>
 
-  <span class='comment'># All rows picked by the matching process. An array if +first_match: false+, otherwise
-</span>  <span class='comment'># a single row.
+  <span class='comment'># All rows picked by the matching process. An array if +first_match: false+,
+</span>  <span class='comment'># otherwise a single row.
 </span>  <span class='ivar'>@rows_picked</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
 
-  <span class='comment'># Relevant table attributes
-</span>  <span class='ivar'>@first_match</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:first_match</span><span class='rbracket'>]</span>
+  <span class='ivar'>@first_match</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:first_match</span><span class='rbracket'>]</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -461,8 +459,7 @@ hash. Otherwise a copy of the input hash is symbolized.</p>
 27
 28
 29
-30
-31</pre>
+30</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 18</span>
@@ -475,11 +472,10 @@ hash. Otherwise a copy of the input hash is symbolized.</p>
 </span>  <span class='comment'># calculates the final result
 </span>  <span class='id identifier rubyid_decision'>decision</span> <span class='op'>=</span> <span class='const'><span class='object_link'><a href="" title="CSVDecision::Decision (class)">Decision</a></span></span><span class='period'>.</span><span class='id identifier rubyid_new'><span class='object_link'><a href="#initialize-instance_method" title="CSVDecision::Decision#initialize (method)">new</a></span></span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>input:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='rparen'>)</span>
 
-  <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span>
-    <span class='id identifier rubyid_decision'>decision</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>input:</span> <span class='id identifier rubyid_input'>input</span><span class='rparen'>)</span>
-  <span class='kw'>else</span>
-    <span class='id identifier rubyid_decision'>decision</span><span class='period'>.</span><span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='label'>scan_cols:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:scan_cols</span><span class='rbracket'>]</span><span class='rparen'>)</span>
-  <span class='kw'>end</span>
+  <span class='comment'># Use the table&#39;s index if present
+</span>  <span class='kw'>return</span> <span class='id identifier rubyid_decision'>decision</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>input:</span> <span class='id identifier rubyid_input'>input</span><span class='rparen'>)</span> <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span>
+
+  <span class='id identifier rubyid_decision'>decision</span><span class='period'>.</span><span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='label'>scan_cols:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:scan_cols</span><span class='rbracket'>]</span><span class='rparen'>)</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -592,21 +588,41 @@ hash. Otherwise a copy of the input hash is symbolized.</p>
       <pre class="lines">
 
 
+62
+63
+64
+65
+66
+67
 68
 69
 70
 71
 72
-73</pre>
+73
+74
+75
+76
+77</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 68</span>
+      <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 62</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_index'>index</span><span class='lparen'>(</span><span class='label'>table:</span><span class='comma'>,</span> <span class='label'>input:</span><span class='rparen'>)</span>
   <span class='comment'># If the index lookup fails, there&#39;s no match
-</span>  <span class='kw'>return</span> <span class='lbrace'>{</span><span class='rbrace'>}</span> <span class='kw'>unless</span> <span class='lparen'>(</span><span class='id identifier rubyid_rows'>rows</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span><span class='period'>.</span><span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:key</span><span class='rbracket'>]</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+</span>  <span class='kw'>return</span> <span class='lbrace'>{</span><span class='rbrace'>}</span> <span class='kw'>unless</span> <span class='lparen'>(</span><span class='id identifier rubyid_index_rows'>index_rows</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span><span class='period'>.</span><span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:key</span><span class='rbracket'>]</span><span class='rbracket'>]</span><span class='rparen'>)</span>
 
-  <span class='id identifier rubyid_index_scan'>index_scan</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>scan_cols:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:scan_cols</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='label'>rows:</span> <span class='id identifier rubyid_rows'>rows</span><span class='rparen'>)</span>
+  <span class='kw'>if</span> <span class='ivar'>@first_match</span>
+    <span class='id identifier rubyid_index_scan_first_match'>index_scan_first_match</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span>
+                           <span class='label'>scan_cols:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:scan_cols</span><span class='rbracket'>]</span><span class='comma'>,</span>
+                           <span class='label'>hash:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='comma'>,</span>
+                           <span class='label'>index_rows:</span> <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_index_rows'>index_rows</span><span class='rparen'>)</span><span class='rparen'>)</span>
+  <span class='kw'>else</span>
+    <span class='id identifier rubyid_index_scan_accumulate'>index_scan_accumulate</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span>
+                          <span class='label'>scan_cols:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:scan_cols</span><span class='rbracket'>]</span><span class='comma'>,</span>
+                          <span class='label'>hash:</span> <span class='id identifier rubyid_input'>input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='comma'>,</span>
+                          <span class='label'>index_rows:</span> <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_index_rows'>index_rows</span><span class='rparen'>)</span><span class='rparen'>)</span>
+  <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -713,25 +729,17 @@ hash. Otherwise a copy of the input hash is symbolized.</p>
       <pre class="lines">
 
 
+52
+53
 54
-55
-56
-57
-58
-59
-60
-61</pre>
+55</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 54</span>
+      <pre class="code"><span class="info file"># File 'lib/csv_decision/decision.rb', line 52</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='label'>table:</span><span class='comma'>,</span> <span class='label'>hash:</span><span class='comma'>,</span> <span class='label'>scan_cols:</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_row'>row</span><span class='comma'>,</span> <span class='id identifier rubyid_index'>index</span><span class='op'>|</span>
-    <span class='kw'>next</span> <span class='kw'>unless</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_scan_rows'>scan_rows</span><span class='lbracket'>[</span><span class='id identifier rubyid_index'>index</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_match?'>match?</span><span class='lparen'>(</span><span class='label'>row:</span> <span class='id identifier rubyid_row'>row</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_hash'>hash</span><span class='comma'>,</span> <span class='label'>scan_cols:</span> <span class='id identifier rubyid_scan_cols'>scan_cols</span><span class='rparen'>)</span>
-    <span class='kw'>return</span> <span class='ivar'>@result</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span> <span class='kw'>if</span> <span class='id identifier rubyid_add'>add</span><span class='lparen'>(</span><span class='id identifier rubyid_row'>row</span><span class='rparen'>)</span>
-  <span class='kw'>end</span>
-
-  <span class='ivar'>@rows_picked</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span> <span class='op'>?</span> <span class='lbrace'>{</span><span class='rbrace'>}</span> <span class='op'>:</span> <span class='id identifier rubyid_accumulated_result'>accumulated_result</span>
+  <span class='kw'>return</span> <span class='id identifier rubyid_scan_first_match'>scan_first_match</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_hash'>hash</span><span class='comma'>,</span> <span class='label'>scan_cols:</span> <span class='id identifier rubyid_scan_cols'>scan_cols</span><span class='rparen'>)</span> <span class='kw'>if</span> <span class='ivar'>@first_match</span>
+  <span class='id identifier rubyid_scan_accumulate'>scan_accumulate</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_hash'>hash</span><span class='comma'>,</span> <span class='label'>scan_cols:</span> <span class='id identifier rubyid_scan_cols'>scan_cols</span><span class='rparen'>)</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -743,7 +751,7 @@ hash. Otherwise a copy of the input hash is symbolized.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Defaults.html

@@ -281,7 +281,7 @@ We have already determined that this row must be present.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Dictionary.html

@@ -416,7 +416,7 @@ the header row.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Dictionary/Entry.html

@@ -1137,7 +1137,7 @@ type, which is looked up in the above table.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Error.html

@@ -129,7 +129,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/FileError.html

@@ -133,7 +133,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Header.html

@@ -637,7 +637,7 @@ method name - note any spaces will have been replaced with underscores.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Index.html

@@ -731,7 +731,7 @@ indexes.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Input.html

@@ -116,7 +116,7 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#parse-class_method" title="parse (class method)">.<strong>parse</strong>(table:, input:, symbolize_keys:)  &#x21d2; Hash{Symbol =&gt; Hash{Symbol=&gt;Object}, Hash{Integer=&gt;Object}} </a>
+      <a href="#parse-class_method" title="parse (class method)">.<strong>parse</strong>(table:, input:, symbolize_keys:)  &#x21d2; Hash{Symbol=&gt;Object} </a>
     
 
     
@@ -130,11 +130,7 @@
   <span class="private note title">private</span>
 
   
-    <span class="summary_desc"><div class='inline'>
-<p>Returns  a hash of two hashes: * hash: either a copy with keys symbolized
-or the original input object * scan_cols: Picks out the value in the input
-hash for each table input column.</p>
-</div></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
@@ -151,7 +147,7 @@ hash for each table input column.</p>
       <div class="method_details first">
   <h3 class="signature first" id="parse-class_method">
   
-    .<strong>parse</strong>(table:, input:, symbolize_keys:)  &#x21d2; <tt>Hash{Symbol =&gt; Hash{Symbol=&gt;Object}, Hash{Integer=&gt;Object}}</tt> 
+    .<strong>parse</strong>(table:, input:, symbolize_keys:)  &#x21d2; <tt>Hash{Symbol=&gt;Object}</tt> 
   
 
   
@@ -164,81 +160,103 @@ hash for each table input column.</p>
   You should avoid using this method if possible, as it may be removed or be changed in the future.
 </p>
 
-<p>Returns  a hash of two hashes:</p>
-<ul><li>
-<p>hash: either a copy with keys symbolized or the original input object</p>
-</li><li>
-<p>scan_cols: Picks out the value in the input hash for each table input
-column. Defaults to nil if the key is missing in the input hash.</p>
-</li></ul>
-
 
   </div>
 </div>
 <div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
   
-<p class="tag_title">Returns:</p>
-<ul class="return">
+    <li>
+      
+        <span class='name'>table</span>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Table.html" title="CSVDecision::Table (class)">CSVDecision::Table</a></span></tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Decision table.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>input</span>
+      
+      
+        <span class='type'>(<tt>Hash</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Input hash (keys may or may not be symbolized)</p>
+</div>
+      
+    </li>
   
     <li>
       
+        <span class='name'>symbolize_keys</span>
+      
       
-        <span class='type'>(<tt>Hash{Symbol =&gt; Hash{Symbol=&gt;Object}, Hash{Integer=&gt;Object}}</tt>)</span>
+        <span class='type'>(<tt>true</tt>, <tt>false</tt>)</span>
       
       
       
         &mdash;
         <div class='inline'>
-<p>Returns  a hash of two hashes:</p>
-<ul><li>
-<p>hash: either a copy with keys symbolized or the original input object</p>
-</li><li>
-<p>scan_cols: Picks out the value in the input hash for each table input
-column. Defaults to nil if the key is missing in the input hash.</p>
-</li></ul>
+<p>Set to false if keys are symbolized and it&#39;s OK to mutate the input
+hash. Otherwise a copy of the input hash is symbolized.</p>
 </div>
       
     </li>
   
 </ul>
 
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>Hash{Symbol=&gt;Object}</tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
 </div><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
 
 
+13
+14
+15
+16
 17
 18
 19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30</pre>
+20</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/csv_decision/input.rb', line 17</span>
+      <pre class="code"><span class="info file"># File 'lib/csv_decision/input.rb', line 13</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_parse'>parse</span><span class='lparen'>(</span><span class='label'>table:</span><span class='comma'>,</span> <span class='label'>input:</span><span class='comma'>,</span> <span class='label'>symbolize_keys:</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_validate'>validate</span><span class='lparen'>(</span><span class='id identifier rubyid_input'>input</span><span class='rparen'>)</span>
 
-  <span class='id identifier rubyid_hash'>hash</span><span class='comma'>,</span> <span class='id identifier rubyid_scan_cols'>scan_cols</span> <span class='op'>=</span>
-    <span class='id identifier rubyid_parse_input'>parse_input</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>input:</span> <span class='id identifier rubyid_symbolize_keys'>symbolize_keys</span> <span class='op'>?</span> <span class='id identifier rubyid_input'>input</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys'>symbolize_keys</span> <span class='op'>:</span> <span class='id identifier rubyid_input'>input</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_parsed_input'>parsed_input</span> <span class='op'>=</span> <span class='id identifier rubyid_parse_input'>parse_input</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>input:</span> <span class='id identifier rubyid_symbolize_keys'>symbolize_keys</span> <span class='op'>?</span> <span class='id identifier rubyid_input'>input</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys'>symbolize_keys</span> <span class='op'>:</span> <span class='id identifier rubyid_input'>input</span><span class='rparen'>)</span>
 
-  <span class='lbrace'>{</span>
-    <span class='comment'># We can freeze the input hash for safety if we made our own copy.
-</span>    <span class='label'>hash:</span> <span class='id identifier rubyid_symbolize_keys'>symbolize_keys</span> <span class='op'>?</span> <span class='id identifier rubyid_hash'>hash</span><span class='period'>.</span><span class='id identifier rubyid_freeze'>freeze</span> <span class='op'>:</span> <span class='id identifier rubyid_hash'>hash</span><span class='comma'>,</span>
-    <span class='label'>scan_cols:</span>  <span class='id identifier rubyid_scan_cols'>scan_cols</span><span class='period'>.</span><span class='id identifier rubyid_freeze'>freeze</span><span class='comma'>,</span>
-    <span class='comment'># Build the index key if this table is indexed.
-</span>    <span class='label'>key:</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span> <span class='op'>?</span> <span class='id identifier rubyid_parse_key'>parse_key</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_hash'>hash</span><span class='rparen'>)</span> <span class='op'>:</span> <span class='kw'>nil</span>
-  <span class='rbrace'>}</span>
+  <span class='id identifier rubyid_parsed_input'>parsed_input</span><span class='lbracket'>[</span><span class='symbol'>:key</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_parse_key'>parse_key</span><span class='lparen'>(</span><span class='label'>table:</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='label'>hash:</span> <span class='id identifier rubyid_parsed_input'>parsed_input</span><span class='lbracket'>[</span><span class='symbol'>:hash</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_index'>index</span>
+  <span class='id identifier rubyid_parsed_input'>parsed_input</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -250,7 +268,7 @@ column. Defaults to nil if the key is missing in the input hash.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Load.html

@@ -281,7 +281,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers.html

@@ -1350,7 +1350,7 @@ nil.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Constant.html

@@ -474,7 +474,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Function.html

@@ -501,7 +501,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Guard.html

@@ -493,7 +493,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Matcher.html

@@ -497,7 +497,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Numeric.html

@@ -411,7 +411,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Pattern.html

@@ -481,7 +481,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Proc.html

@@ -694,7 +694,7 @@ hash keys (which are always symbolized).</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Range.html

@@ -369,7 +369,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Matchers/Symbol.html

@@ -415,7 +415,7 @@ some type of function.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:36 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Options.html

@@ -433,7 +433,7 @@ set.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Parse.html

@@ -272,7 +272,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Result.html

@@ -483,6 +483,9 @@ result, along with the partial result required to evaluate functions.</p>
       <pre class="code"><span class="info file"># File 'lib/csv_decision/result.rb', line 25</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='label'>table:</span><span class='comma'>,</span> <span class='label'>input:</span><span class='rparen'>)</span>
+  <span class='comment'># Attributes hash contains the output decision key value pairs
+</span>  <span class='ivar'>@attributes</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
+
   <span class='ivar'>@outs</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_columns'>columns</span><span class='period'>.</span><span class='id identifier rubyid_outs'>outs</span>
   <span class='ivar'>@outs_functions</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_outs_functions'>outs_functions</span>
   <span class='ivar'>@if_columns</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_columns'>columns</span><span class='period'>.</span><span class='id identifier rubyid_ifs'>ifs</span>
@@ -492,10 +495,7 @@ result, along with the partial result required to evaluate functions.</p>
 </span>  <span class='comment'># have the same symbol as an input hash key.
 </span>  <span class='comment'># However, the rest of this hash is mutated as output column evaluation results
 </span>  <span class='comment'># are accumulated.
-</span>  <span class='ivar'>@partial_result</span> <span class='op'>=</span> <span class='id identifier rubyid_input'>input</span><span class='op'>&amp;.</span><span class='id identifier rubyid_slice'>slice</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_columns'>columns</span><span class='period'>.</span><span class='id identifier rubyid_input_keys'>input_keys</span><span class='rparen'>)</span> <span class='kw'>if</span> <span class='ivar'>@outs_functions</span>
-
-  <span class='comment'># Attributes hash contains the output decision key value pairs
-</span>  <span class='ivar'>@attributes</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
+</span>  <span class='ivar'>@partial_result</span> <span class='op'>=</span> <span class='id identifier rubyid_input'>input</span><span class='period'>.</span><span class='id identifier rubyid_slice'>slice</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_columns'>columns</span><span class='period'>.</span><span class='id identifier rubyid_input_keys'>input_keys</span><span class='rparen'>)</span> <span class='kw'>if</span> <span class='ivar'>@outs_functions</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1134,7 +1134,7 @@ result, along with the partial result required to evaluate functions.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/ScanRow.html

@@ -858,7 +858,7 @@ non-string constant.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Table.html

@@ -514,22 +514,12 @@ and last row index given.</p>
 81
 82
 83
-84
-85
-86
-87
-88
-89</pre>
+84</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/csv_decision/table.rb', line 79</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span>
-  <span class='ivar'>@columns</span> <span class='op'>=</span> <span class='kw'>nil</span>
-  <span class='ivar'>@file</span> <span class='op'>=</span> <span class='kw'>nil</span>
-  <span class='ivar'>@index</span> <span class='op'>=</span> <span class='kw'>nil</span>
-  <span class='ivar'>@options</span> <span class='op'>=</span> <span class='kw'>nil</span>
-  <span class='ivar'>@outs_functions</span> <span class='op'>=</span> <span class='kw'>nil</span>
   <span class='ivar'>@outs_rows</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
   <span class='ivar'>@if_rows</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
   <span class='ivar'>@rows</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
@@ -1380,7 +1370,7 @@ and last row index given.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/TableValidationError.html

@@ -133,7 +133,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:35 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/CSVDecision/Validate.html

@@ -412,7 +412,7 @@ only required at table load time.</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/_index.html

@@ -440,7 +440,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:33 2018 by
+  Generated on Sun Jan 21 08:56:44 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/file.README.html

@@ -385,7 +385,7 @@ href="./LICENSE">LICENSE</a> document for more information.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/index.html

@@ -385,7 +385,7 @@ href="./LICENSE">LICENSE</a> document for more information.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:45 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/doc/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 20 15:44:34 2018 by
+  Generated on Sun Jan 21 08:56:46 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.0).
 </div>

data/lib/csv_decision/decision.rb

@@ -23,11 +23,10 @@ module CSVDecision
       # calculates the final result
       decision = Decision.new(table: table, input: input[:hash])
 
-      if table.index
-        decision.index(table: table, input: input)
-      else
-        decision.scan(table: table, hash: input[:hash], scan_cols: input[:scan_cols])
-      end
+      # Use the table's index if present
+      return decision.index(table: table, input: input) if table.index
+
+      decision.scan(table: table, hash: input[:hash], scan_cols: input[:scan_cols])
     end
 
     # @param table [CSVDecision::Table] Decision table being processed.
@@ -37,11 +36,10 @@ module CSVDecision
       # a multi-row result for the +first_match: false+ option.
       @result = Result.new(table: table, input: input)
 
-      # All rows picked by the matching process. An array if +first_match: false+, otherwise
-      # a single row.
+      # All rows picked by the matching process. An array if +first_match: false+,
+      # otherwise a single row.
       @rows_picked = []
 
-      # Relevant table attributes
       @first_match = table.options[:first_match]
     end
 
@@ -52,12 +50,8 @@ module CSVDecision
     # @param scan_cols [Hash{Index=>Object}] Input column values to scan.
     # @return [Hash{Symbol=>Object}] Decision result.
     def scan(table:, hash:, scan_cols:)
-      table.each do |row, index|
-        next unless table.scan_rows[index].match?(row: row, hash: hash, scan_cols: scan_cols)
-        return @result.attributes if add(row)
-      end
-
-      @rows_picked.empty? ? {} : accumulated_result
+      return scan_first_match(table: table, hash: hash, scan_cols: scan_cols) if @first_match
+      scan_accumulate(table: table, hash: hash, scan_cols: scan_cols)
     end
 
     # Use an index to scan the decision table up against the input hash.
@@ -67,37 +61,66 @@ module CSVDecision
     # @return [{Symbol=>Object}] Decision result.
     def index(table:, input:)
       # If the index lookup fails, there's no match
-      return {} unless (rows = table.index.hash[input[:key]])
+      return {} unless (index_rows = table.index.hash[input[:key]])
 
-      index_scan(table: table, scan_cols: input[:scan_cols], hash: input[:hash], rows: Array(rows))
+      if @first_match
+        index_scan_first_match(table: table,
+                               scan_cols: input[:scan_cols],
+                               hash: input[:hash],
+                               index_rows: Array(index_rows))
+      else
+        index_scan_accumulate(table: table,
+                              scan_cols: input[:scan_cols],
+                              hash: input[:hash],
+                              index_rows: Array(index_rows))
+      end
     end
 
     private
 
-    def index_scan(table:, scan_cols:, hash:, rows:)
-      rows.each do |start_row, end_row|
+    def scan_first_match(table:, hash:, scan_cols:)
+      table.each do |row, index|
+        next unless table.scan_rows[index].match?(row: row, hash: hash, scan_cols: scan_cols)
+
+        return @result.attributes if first_match(row)
+      end
+
+      {}
+    end
+
+    def scan_accumulate(table:, hash:, scan_cols:)
+      table.each do |row, index|
+        next unless table.scan_rows[index].match?(row: row, hash: hash, scan_cols: scan_cols)
+        # Accumulate output rows
+        @rows_picked << row
+        @result.accumulate_outs(row)
+      end
+
+      @rows_picked.empty? ? {} : accumulated_result
+    end
+
+    def index_scan_first_match(table:, scan_cols:, hash:, index_rows:)
+      index_rows.each do |start_row, end_row|
         table.each(start_row, end_row || start_row) do |row, index|
           next unless table.scan_rows[index].match?(row: row, hash: hash, scan_cols: scan_cols)
-          return @result.attributes if add(row)
+          return @result.attributes if first_match(row)
         end
       end
 
-      @rows_picked.empty? ? {} : accumulated_result
+      {}
     end
 
-    # Add a matched row to the decision object being built.
-    #
-    # @param row [Array] Data row.
-    # @return [false, Hash]
-    def add(row)
-      return add_first_match(row) if @first_match
-
-      # Accumulate output rows
-      @rows_picked << row
-      @result.accumulate_outs(row)
+    def index_scan_accumulate(table:, scan_cols:, hash:, index_rows:)
+      index_rows.each do |start_row, end_row|
+        table.each(start_row, end_row || start_row) do |row, index|
+          next unless table.scan_rows[index].match?(row: row, hash: hash, scan_cols: scan_cols)
+          # Accumulate output rows
+          @rows_picked << row
+          @result.accumulate_outs(row)
+        end
+      end
 
-      # Not done
-      false
+      @rows_picked.empty? ? {} : accumulated_result
     end
 
     def accumulated_result
@@ -124,7 +147,7 @@ module CSVDecision
       end
     end
 
-    def add_first_match(row)
+    def first_match(row)
       # This decision row may contain procs, which if present will need to be evaluated.
       # If this row contains if: columns then this row may be filtered out, in which case
       # this method call will return false.

data/lib/csv_decision/input.rb

@@ -8,33 +8,16 @@ module CSVDecision
   # Parse the input hash.
   # @api private
   module Input
-    # @param (see Decide.decide)
-    # @return [Hash{Symbol => Hash{Symbol=>Object}, Hash{Integer=>Object}}]
-    #   Returns  a hash of two hashes:
-    #   * hash: either a copy with keys symbolized or the original input object
-    #   * scan_cols: Picks out the value in the input hash for each table input column.
-    #     Defaults to nil if the key is missing in the input hash.
+    # @param (see Decision.make)
+    # @return [Hash{Symbol=>Object}]
     def self.parse(table:, input:, symbolize_keys:)
       validate(input)
 
       parsed_input = parse_input(table: table, input: symbolize_keys ? input.symbolize_keys : input)
 
-      key = table.index ? parse_key(table: table, hash: parsed_input[:hash]) : nil
-
-      result(symbolize_keys: symbolize_keys, input: parsed_input, key: key)
-    end
-
-    def self.result(symbolize_keys:, input:, key:)
-      hash = input[:hash]
-      {
-        # We can freeze the input hash for safety if we made our own copy.
-        hash: symbolize_keys ? hash.freeze : hash,
-        scan_cols:  input[:scan_cols].freeze,
-        # Build the index key if this table is indexed.
-        key: key
-      }
+      parsed_input[:key] = parse_key(table: table, hash: parsed_input[:hash]) if table.index
+      parsed_input
     end
-    private_class_method :result
 
     def self.parse_key(table:, hash:)
       return scan_key(table: table, hash: hash) if table.index.columns.count == 1
@@ -74,7 +57,6 @@ module CSVDecision
 
       parse_defaulted(table: table, input: input, defaulted_columns: defaulted_columns)
     end
-
     private_class_method :parse_input
 
     def self.parse_cells(table:, input:)
@@ -87,7 +69,6 @@ module CSVDecision
 
       { hash: input, scan_cols: scan_cols }
     end
-
     private_class_method :parse_cells
 
     def self.parse_defaulted(table:, input:, defaulted_columns:)
@@ -105,7 +86,6 @@ module CSVDecision
 
       { hash: input, scan_cols: scan_cols }
     end
-
     private_class_method :parse_defaulted
 
     def self.default_value(default:, input:, column:)
@@ -121,13 +101,11 @@ module CSVDecision
       # or else a constant.
       eval_default(default.function, input)
     end
-
     private_class_method :default_value
 
     def self.default_if?(set_if, value)
       set_if == true || (value.respond_to?(set_if) && value.send(set_if))
     end
-
     private_class_method :default_if?
 
     # Expression may be a Proc that needs evaluating against the input hash,
@@ -135,7 +113,6 @@ module CSVDecision
     def self.eval_default(expression, input)
       expression.is_a?(::Proc) ? expression[input] : expression
     end
-
     private_class_method :eval_default
   end
 end

data/lib/csv_decision/result.rb

@@ -23,6 +23,9 @@ module CSVDecision
 
     # (see Decision.initialize)
     def initialize(table:, input:)
+      # Attributes hash contains the output decision key value pairs
+      @attributes = {}
+
       @outs = table.columns.outs
       @outs_functions = table.outs_functions
       @if_columns = table.columns.ifs
@@ -32,10 +35,7 @@ module CSVDecision
       # have the same symbol as an input hash key.
       # However, the rest of this hash is mutated as output column evaluation results
       # are accumulated.
-      @partial_result = input&.slice(*table.columns.input_keys) if @outs_functions
-
-      # Attributes hash contains the output decision key value pairs
-      @attributes = {}
+      @partial_result = input.slice(*table.columns.input_keys) if @outs_functions
     end
 
     # Common case for building a single row result is just copying output column values to the
@@ -92,7 +92,7 @@ module CSVDecision
     # or filtered by the if: column conditions.
     def single_row_result
       @if_columns.each_key do |col|
-        return nil unless @attributes[col]
+        return false unless @attributes[col]
 
         # Remove the if: column from the final result hash.
         @attributes.delete(col)

data/lib/csv_decision/table.rb

@@ -77,11 +77,6 @@ module CSVDecision
 
     # @api private
     def initialize
-      @columns = nil
-      @file = nil
-      @index = nil
-      @options = nil
-      @outs_functions = nil
       @outs_rows = []
       @if_rows = []
       @rows = []

data/spec/csv_decision/input_spec.rb

@@ -30,7 +30,6 @@ describe CSVDecision::Input do
 
     expect(result).to eql expected
     expect(result[:hash]).not_to equal expected[:hash]
-    expect(result[:hash].frozen?).to eq true
   end
 
   it 'processes input hash with symbolize_keys: false' do
@@ -52,6 +51,5 @@ describe CSVDecision::Input do
 
     expect(result).to eql expected
     expect(result[:hash]).to equal expected[:hash]
-    expect(result[:hash].frozen?).to eq false
   end
 end

data/spec/csv_decision/table_spec.rb

@@ -522,6 +522,8 @@ describe CSVDecision::Table do
 
             expect(table.send(method, topic: 'politics', region: 'Arctic'))
               .to eq(team_member: %w[Henry Zach])
+            expect(table.send(method, topic: 'culture', region: 'America'))
+              .to eq({})
           end
         end
       end
@@ -556,6 +558,7 @@ describe CSVDecision::Table do
             expect(table.send(method, number: 1,   type: 'integer', input: 'none')).to eq(output: 0)
             expect(table.send(method, number: nil, type: 'string', input: 'one')).to eq(output: nil)
             expect(table.send(method, string: '1', type: 'string', input: 'one')).to eq(output: '1')
+            expect(table.send(method, number: '1', type: 'string', input: 'one')).to eq({})
           end
         end
       end

data/spec/data/valid/index_example.csv

@@ -1,12 +1,12 @@
-in:topic,in:region,out:team_member
-sports,Europe,Alice
-sports,,Bob
-finance,America,Charlie
-finance,Europe,Donald
-finance,,Ernest
-politics,Asia,Fujio
-politics,America,Gilbert
-politics,,Henry
-sports,,Zach
-finance,,Zach
+in:topic,in:region,out:team_member
+sports,Europe,Alice
+sports,,Bob
+finance,America,Charlie
+finance,Europe,Donald
+finance,,Ernest
+politics,Asia,Fujio
+politics,America,Gilbert
+politics,,Henry
+sports,,Zach
+finance,,Zach
 politics,,Zach

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_decision
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brett Vickers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport