cartesian 0.6.6 → 0.6.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.6.7 2012-04-15
+
+* 1 bug fix:
+  * Thanks to bclennox for "Fixing a problem with JRuby 1.7 and yielding in CartesianIterator#each."
+
 === 0.6.6 2012-04-15
 
 * 2 minor documentation fixes:

data/lib/cartesian.rb

@@ -39,7 +39,7 @@ module Cartesian
   # Unfortunately, as of now, the version data must be replicated in ../cartesian.rb,
   # due to a mix of newgem versions, each requiring a different one. Not DRY :P
   #
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 
   # Produces the cartesian product of self and other.
   # The result is an array of pairs (i.e. two-element arrays).

data/lib/cartesian/version.rb

@@ -5,8 +5,8 @@ module Cartesian #:nodoc:
   #
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 5
-    TINY  = 3
+    MINOR = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/cartesian_iterator.rb

@@ -58,14 +58,14 @@ class CartesianIterator
     for list in @lists
       elems << list.restart_and_raw_next
     end
-    if RUBY_VERSION <= '1.9.1'; yield(*elems.map {|x| x }); else; yield(*elems); end # Yeah, v.map{|x|x} should be equal to v, but strangely it is NOT in Ruby versions prior to 1.9.2.
+    yield(*elems.dup)
 
     last_list_index = @lists.size-1
     n = last_list_index
     loop do
       if !@lists[n].done?
         elems[n] = @lists[n].raw_next
-        if RUBY_VERSION <= '1.9.1'; yield(*elems.map {|x| x }); else; yield(*elems); end # See previous comment.
+        yield(*elems.dup)
         n = last_list_index
         next
       elsif n > 0

data/website/doc/CartesianIterator.html

@@ -201,13 +201,13 @@
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 9</span>
- 9:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">foo</span>, <span class="ruby-identifier">bar</span>)
-10:     <span class="ruby-ivar">@lists</span> = []
-11:     <span class="ruby-ivar">@tot_iter</span> = <span class="ruby-value">1</span>
-12:     <span class="ruby-identifier">product!</span>(<span class="ruby-identifier">foo</span>)
-13:     <span class="ruby-identifier">product!</span>(<span class="ruby-identifier">bar</span>)
-14:   <span class="ruby-keyword kw">end</span></pre>
+   <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 3</span>
+3:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">foo</span>, <span class="ruby-identifier">bar</span>)
+4:     <span class="ruby-ivar">@lists</span> = []
+5:     <span class="ruby-ivar">@tot_iter</span> = <span class="ruby-value">1</span>
+6:     <span class="ruby-identifier">product!</span>(<span class="ruby-identifier">foo</span>)
+7:     <span class="ruby-identifier">product!</span>(<span class="ruby-identifier">bar</span>)
+8:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -273,10 +273,10 @@
 					<div class="method-source-code"
 						id="dup-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 16</span>
-16:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dup</span>
-17:     <span class="ruby-constant">Marshal</span>.<span class="ruby-identifier">load</span>(<span class="ruby-constant">Marshal</span>.<span class="ruby-identifier">dump</span>(<span class="ruby-keyword kw">self</span>))
-18:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 10</span>
+10:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dup</span>
+11:     <span class="ruby-constant">Marshal</span>.<span class="ruby-identifier">load</span>(<span class="ruby-constant">Marshal</span>.<span class="ruby-identifier">dump</span>(<span class="ruby-keyword kw">self</span>))
+12:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -307,32 +307,31 @@
 					<div class="method-source-code"
 						id="each-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 54</span>
-54:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">each</span>
-55:     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@tot_iter</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">1</span>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 48</span>
+48:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">each</span>
+49:     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@tot_iter</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">1</span>
+50: 
+51:     <span class="ruby-identifier">elems</span> = []
+52:     <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">list</span> <span class="ruby-keyword kw">in</span> <span class="ruby-ivar">@lists</span>
+53:       <span class="ruby-identifier">elems</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">list</span>.<span class="ruby-identifier">restart_and_raw_next</span>
+54:     <span class="ruby-keyword kw">end</span>
+55:     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value str">'1.9.1'</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span> }); <span class="ruby-keyword kw">else</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>); <span class="ruby-keyword kw">end</span> <span class="ruby-comment cmt"># Yeah, v.map{|x|x} should be equal to v, but strangely it is NOT in Ruby versions prior to 1.9.2.</span>
 56: 
-57:     <span class="ruby-identifier">elems</span> = []
-58:     <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">list</span> <span class="ruby-keyword kw">in</span> <span class="ruby-ivar">@lists</span>
-59:       <span class="ruby-identifier">elems</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">list</span>.<span class="ruby-identifier">restart_and_raw_next</span>
-60:     <span class="ruby-keyword kw">end</span>
-61:     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value str">'1.9.1'</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span> }); <span class="ruby-keyword kw">else</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>); <span class="ruby-keyword kw">end</span> <span class="ruby-comment cmt"># Yeah, v.map{|x|x} should be equal to v, but strangely it is NOT in Ruby versions prior to 1.9.2.</span>
-62: 
-63:     <span class="ruby-identifier">last_list_index</span> = <span class="ruby-ivar">@lists</span>.<span class="ruby-identifier">size</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>
-64:     <span class="ruby-identifier">n</span> = <span class="ruby-identifier">last_list_index</span>
-65:     <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-66:       <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@lists</span>[<span class="ruby-identifier">n</span>].<span class="ruby-identifier">done?</span>
-67:         <span class="ruby-identifier">elems</span>[<span class="ruby-identifier">n</span>] = <span class="ruby-ivar">@lists</span>[<span class="ruby-identifier">n</span>].<span class="ruby-identifier">raw_next</span>
-68:         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value str">'1.9.1'</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span> }); <span class="ruby-keyword kw">else</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>); <span class="ruby-keyword kw">end</span> <span class="ruby-comment cmt"># See previous comment.</span>
-69:         <span class="ruby-identifier">n</span> = <span class="ruby-identifier">last_list_index</span>
-70:         <span class="ruby-keyword kw">next</span>
-71:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">n</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-72:         <span class="ruby-identifier">elems</span>[<span class="ruby-identifier">n</span>] = <span class="ruby-ivar">@lists</span>[<span class="ruby-identifier">n</span>].<span class="ruby-identifier">restart_and_raw_next</span>
-73:         <span class="ruby-identifier">n</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span>
-74:       <span class="ruby-keyword kw">else</span>
-75:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
-76:       <span class="ruby-keyword kw">end</span>
-77:     <span class="ruby-keyword kw">end</span>
-78:   <span class="ruby-keyword kw">end</span></pre>
+57:     <span class="ruby-identifier">last_list_index</span> = <span class="ruby-ivar">@lists</span>.<span class="ruby-identifier">size</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>
+58:     <span class="ruby-identifier">n</span> = <span class="ruby-identifier">last_list_index</span>
+59:     <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
+60:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">elems</span>[<span class="ruby-identifier">n</span>] = <span class="ruby-ivar">@lists</span>[<span class="ruby-identifier">n</span>].<span class="ruby-identifier">raw_next</span>
+61:         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&lt;=</span> <span class="ruby-value str">'1.9.1'</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span> }); <span class="ruby-keyword kw">else</span>; <span class="ruby-keyword kw">yield</span>(*<span class="ruby-identifier">elems</span>); <span class="ruby-keyword kw">end</span> <span class="ruby-comment cmt"># See previous comment.</span>
+62:         <span class="ruby-identifier">n</span> = <span class="ruby-identifier">last_list_index</span>
+63:         <span class="ruby-keyword kw">next</span>
+64:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">n</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+65:         <span class="ruby-identifier">elems</span>[<span class="ruby-identifier">n</span>] = <span class="ruby-ivar">@lists</span>[<span class="ruby-identifier">n</span>].<span class="ruby-identifier">restart_and_raw_next</span>
+66:         <span class="ruby-identifier">n</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span>
+67:       <span class="ruby-keyword kw">else</span>
+68:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
+69:       <span class="ruby-keyword kw">end</span>
+70:     <span class="ruby-keyword kw">end</span>
+71:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -363,13 +362,13 @@
 					<div class="method-source-code"
 						id="equal-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 20</span>
-20:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">equal</span>(<span class="ruby-identifier">other</span>)
-21:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">instance_variables</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">var_name</span><span class="ruby-operator">|</span>
-22:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-identifier">var_name</span>) <span class="ruby-operator">!=</span> <span class="ruby-identifier">other</span>.<span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-identifier">var_name</span>)
-23:     <span class="ruby-keyword kw">end</span>
-24:     <span class="ruby-keyword kw">true</span>
-25:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 14</span>
+14:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">equal</span>(<span class="ruby-identifier">other</span>)
+15:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">instance_variables</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">var_name</span><span class="ruby-operator">|</span>
+16:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-identifier">var_name</span>) <span class="ruby-operator">!=</span> <span class="ruby-identifier">other</span>.<span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-identifier">var_name</span>)
+17:     <span class="ruby-keyword kw">end</span>
+18:     <span class="ruby-keyword kw">true</span>
+19:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -404,11 +403,11 @@
 					<div class="method-source-code"
 						id="left-product-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 49</span>
-49:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">left_product</span>(<span class="ruby-identifier">other</span>)
-50:     (<span class="ruby-identifier">result</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">dup</span>).<span class="ruby-identifier">left_product!</span>(<span class="ruby-identifier">other</span>)
-51:     <span class="ruby-identifier">result</span>
-52:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 43</span>
+43:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">left_product</span>(<span class="ruby-identifier">other</span>)
+44:     (<span class="ruby-identifier">result</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">dup</span>).<span class="ruby-identifier">left_product!</span>(<span class="ruby-identifier">other</span>)
+45:     <span class="ruby-identifier">result</span>
+46:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -439,12 +438,12 @@
 					<div class="method-source-code"
 						id="left-product--source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 36</span>
-36:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">left_product!</span>(<span class="ruby-identifier">other</span>)
-37:     <span class="ruby-ivar">@lists</span>.<span class="ruby-identifier">unshift</span> <span class="ruby-constant">Array</span>(<span class="ruby-identifier">other</span>).<span class="ruby-identifier">dup</span>
-38:     <span class="ruby-ivar">@tot_iter</span> <span class="ruby-operator">*=</span> <span class="ruby-ivar">@lists</span>[<span class="ruby-value">1</span>].<span class="ruby-identifier">size</span>
-39:     <span class="ruby-keyword kw">self</span>
-40:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 30</span>
+30:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">left_product!</span>(<span class="ruby-identifier">other</span>)
+31:     <span class="ruby-ivar">@lists</span>.<span class="ruby-identifier">unshift</span> <span class="ruby-identifier">other</span>.<span class="ruby-identifier">to_a</span>.<span class="ruby-identifier">dup</span>
+32:     <span class="ruby-ivar">@tot_iter</span> <span class="ruby-operator">*=</span> <span class="ruby-ivar">@lists</span>[<span class="ruby-value">1</span>].<span class="ruby-identifier">size</span>
+33:     <span class="ruby-keyword kw">self</span>
+34:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -475,11 +474,11 @@
 					<div class="method-source-code"
 						id="product-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 42</span>
-42:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">product</span>(<span class="ruby-identifier">other</span>)
-43:     (<span class="ruby-identifier">result</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">dup</span>).<span class="ruby-identifier">product!</span>(<span class="ruby-identifier">other</span>)
-44:     <span class="ruby-identifier">result</span>
-45:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 36</span>
+36:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">product</span>(<span class="ruby-identifier">other</span>)
+37:     (<span class="ruby-identifier">result</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">dup</span>).<span class="ruby-identifier">product!</span>(<span class="ruby-identifier">other</span>)
+38:     <span class="ruby-identifier">result</span>
+39:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -514,12 +513,12 @@
 					<div class="method-source-code"
 						id="product--source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 28</span>
-28:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">product!</span>(<span class="ruby-identifier">other</span>)
-29:     <span class="ruby-ivar">@lists</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">Array</span>(<span class="ruby-identifier">other</span>).<span class="ruby-identifier">dup</span>
-30:     <span class="ruby-ivar">@tot_iter</span> <span class="ruby-operator">*=</span> <span class="ruby-ivar">@lists</span>[<span class="ruby-value">1</span>].<span class="ruby-identifier">size</span>
-31:     <span class="ruby-keyword kw">self</span>
-32:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 22</span>
+22:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">product!</span>(<span class="ruby-identifier">other</span>)
+23:     <span class="ruby-ivar">@lists</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">other</span>.<span class="ruby-identifier">to_a</span>.<span class="ruby-identifier">dup</span>
+24:     <span class="ruby-ivar">@tot_iter</span> <span class="ruby-operator">*=</span> <span class="ruby-ivar">@lists</span>[<span class="ruby-value">1</span>].<span class="ruby-identifier">size</span>
+25:     <span class="ruby-keyword kw">self</span>
+26:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/website/doc/Iterable.html

@@ -38,8 +38,8 @@
 				<div class="section-body">
 					<ul>
 					
-						<li><a href="./lib/iterable_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
-							class="thickbox" title="lib/iterable.rb">lib/iterable.rb</a></li>
+						<li><a href="./lib/cartesian_iterator_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
+							class="thickbox" title="lib/cartesian_iterator.rb">lib/cartesian_iterator.rb</a></li>
 					
 					</ul>
 				</div>
@@ -62,8 +62,6 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#method-i-done%3F">#done?</a></li>
-					
 					<li><a href="#method-i-next">#next</a></li>
 					
 					<li><a href="#method-i-raw_next">#raw_next</a></li>
@@ -147,43 +145,6 @@
 			<h3 class="section-header">Public Instance Methods</h3>
 
 		
-			<div id="done--method" class="method-detail ">
-				<a name="method-i-done%3F"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">done?</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					<p>
-TODO: consider a module inclusion time solution to &#8220;count rescue
-size&#8221;, for performance sake
-</p>
-					
-
-					
-					<div class="method-source-code"
-						id="done--source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/iterable.rb, line 22</span>
-22:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">done?</span>
-23:     <span class="ruby-ivar">@next_index</span> <span class="ruby-operator">&amp;&amp;</span> (<span class="ruby-ivar">@next_index</span> <span class="ruby-operator">==</span> (<span class="ruby-identifier">count</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-identifier">size</span>)<span class="ruby-operator">-</span><span class="ruby-value">1</span>)
-24:   <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
 			<div id="next-method" class="method-detail ">
 				<a name="method-i-next"></a>
 
@@ -204,11 +165,11 @@ size&#8221;, for performance sake
 					<div class="method-source-code"
 						id="next-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/iterable.rb, line 7</span>
- 7:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">next</span>
- 8:     <span class="ruby-identifier">restart</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-keyword kw">defined?</span> <span class="ruby-ivar">@next_index</span>
- 9:     <span class="ruby-identifier">raw_next</span>
-10:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 83</span>
+83:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">next</span>
+84:     <span class="ruby-identifier">restart</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-keyword kw">defined?</span> <span class="ruby-ivar">@next_index</span>
+85:     <span class="ruby-identifier">raw_next</span>
+86:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -239,11 +200,10 @@ size&#8221;, for performance sake
 					<div class="method-source-code"
 						id="raw-next-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/iterable.rb, line 12</span>
-12:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">raw_next</span>
-13:     <span class="ruby-identifier">raise</span> <span class="ruby-constant">RangeError</span>, <span class="ruby-value str">'there is no next element, please restart'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">done?</span>
-14:     <span class="ruby-keyword kw">self</span>[<span class="ruby-ivar">@next_index</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>]
-15:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 88</span>
+88:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">raw_next</span>
+89:     <span class="ruby-keyword kw">self</span>[<span class="ruby-ivar">@next_index</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>]
+90:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -274,11 +234,11 @@ size&#8221;, for performance sake
 					<div class="method-source-code"
 						id="restart-source">
 <pre>
-   <span class="ruby-comment cmt"># File lib/iterable.rb, line 2</span>
-2:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restart</span>
-3:     <span class="ruby-ivar">@next_index</span> = <span class="ruby-value">1</span>
-4:     <span class="ruby-keyword kw">self</span>
-5:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 78</span>
+78:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restart</span>
+79:     <span class="ruby-ivar">@next_index</span> = <span class="ruby-value">1</span>
+80:     <span class="ruby-keyword kw">true</span>
+81:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -309,10 +269,10 @@ size&#8221;, for performance sake
 					<div class="method-source-code"
 						id="restart-and-raw-next-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/iterable.rb, line 17</span>
-17:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restart_and_raw_next</span>
-18:     <span class="ruby-keyword kw">self</span>[<span class="ruby-ivar">@next_index</span> = <span class="ruby-value">0</span>]
-19:   <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/cartesian_iterator.rb, line 92</span>
+92:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restart_and_raw_next</span>
+93:     <span class="ruby-keyword kw">self</span>[<span class="ruby-ivar">@next_index</span> = <span class="ruby-value">0</span>]
+94:   <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/website/doc/README_rdoc.html

@@ -183,7 +183,7 @@ sudo gem install cartesian
 (The MIT License)
 </p>
 <p>
-Copyright &#169; 2006-2012 Adriano Mitre <adriano.mitre@gmail.com>
+Copyright &#169; 2006-2011 Adriano Mitre <adriano.mitre@gmail.com>
 </p>
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a

data/website/doc/created.rid

@@ -1,6 +1,5 @@
-Sun, 15 Apr 2012 03:34:04 -0300
-README.rdoc	Sun, 15 Apr 2012 03:31:27 -0300
-lib/cartesian.rb	Sun, 15 Apr 2012 03:31:27 -0300
-lib/cartesian_iterator.rb	Sun, 15 Apr 2012 03:31:27 -0300
-lib/grid_search.rb	Sun, 15 Apr 2012 03:31:27 -0300
-lib/iterable.rb	Sun, 15 Apr 2012 03:31:27 -0300
+Fri, 07 Jan 2011 13:53:06 -0200
+README.rdoc	Fri, 07 Jan 2011 02:46:43 -0200
+lib/cartesian.rb	Fri, 07 Jan 2011 13:53:03 -0200
+lib/cartesian_iterator.rb	Fri, 07 Jan 2011 02:46:43 -0200
+lib/grid_search.rb	Wed, 05 Jan 2011 06:07:10 -0200

data/website/doc/index.html

@@ -73,8 +73,6 @@
 		
 			<li><a href="Cartesian.html#method-i-cartesian">#cartesian &mdash; Cartesian</a></li>
 		
-			<li><a href="Iterable.html#method-i-done%3F">#done? &mdash; Iterable</a></li>
-		
 			<li><a href="CartesianIterator.html#method-i-dup">#dup &mdash; CartesianIterator</a></li>
 		
 			<li><a href="CartesianIterator.html#method-i-each">#each &mdash; CartesianIterator</a></li>

data/website/doc/lib/cartesian_iterator_rb.html

@@ -24,15 +24,13 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2012-04-15 03:31:27 -0300</dd>
+			<dd class="modified-date">2011-01-07 02:46:43 -0200</dd>
 
 			
 			<dt class="requires">Requires</dt>
 			<dd class="requires">
 				<ul>
 				
-					<li>iterable</li>
-				
 				</ul>
 			</dd>
 			

data/website/doc/lib/cartesian_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2012-04-15 03:31:27 -0300</dd>
+			<dd class="modified-date">2011-01-07 13:53:03 -0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/website/doc/lib/grid_search_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2012-04-15 03:31:27 -0300</dd>
+			<dd class="modified-date">2011-01-05 06:07:10 -0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/website/index.html

@@ -1,5 +1,128 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>
+      
+  </title>
+  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
+<style>
 
+</style>
+  <script type="text/javascript">
+    window.onload = function() {
+      settings = {
+          tl: { radius: 10 },
+          tr: { radius: 10 },
+          bl: { radius: 10 },
+          br: { radius: 10 },
+          antiAlias: true,
+          autoPad: true,
+          validTags: ["div"]
+      }
+      var versionBox = new curvyCorners(settings, document.getElementById("version"));
+      versionBox.applyCornersToAll();
+    }
+  </script>
+</head>
+<body>
+<div id="main">
 
-Generating the website requires the newgem RubyGem
-Install: gem install newgem
+    <h1></h1>
+    <div id="version" class="clickable" onclick='document.location = "http://github.com/adrianomitre/cartesian"; return false'>
+      <p>Get Version</p>
+      <a href="http://github.com/adrianomitre/cartesian" class="numbers">0.6.4</a>
+    </div>
+    <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script><h1>cartesian</h1>
+<h3>Cartesian products in Ruby</h3>
+<h2>What</h2>
+<p>Provides methods for the calculation of the cartesian producted between<br />
+two or more enumerable objects. Includes grid search optimization methods.<br />
+It can also be easily and conveniently mixed-in into any enumerable class.</p>
+<h2>Installing</h2>
+<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">cartesian</span></pre></p>
+<h2>The basics</h2>
+<p><pre class='syntax'><span class="constant">Cartesian</span><span class="punct">::</span><span class="ident">product</span> <span class="punct">[</span><span class="number">1</span><span class="punct">,</span><span class="number">2</span><span class="punct">],[</span><span class="number">3</span><span class="punct">,</span><span class="number">4</span><span class="punct">]</span> <span class="comment">#=&gt; [[1, 3], [1, 4], [2, 3], [2, 4]]</span></pre></p>
+<h2>Demonstration of usage</h2>
+<p>One can use the Cartesian module directly<br />
+<pre class='syntax'>
+<span class="ident">require</span> <span class="punct">'</span><span class="string">cartesian</span><span class="punct">'</span>
+<span class="ident">foo</span> <span class="punct">=</span> <span class="punct">[</span><span class="number">1</span><span class="punct">,</span> <span class="number">2</span><span class="punct">]</span>
+<span class="ident">bar</span> <span class="punct">=</span> <span class="punct">[&quot;</span><span class="string">a</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">b</span><span class="punct">&quot;]</span>
+<span class="constant">Cartesian</span><span class="punct">::</span><span class="ident">product</span><span class="punct">(</span><span class="ident">foo</span><span class="punct">,</span> <span class="ident">bar</span><span class="punct">)</span> <span class="comment">#=&gt; [[1, &quot;a&quot;], [1, &quot;b&quot;], [2, &quot;a&quot;], [2, &quot;b&quot;]]</span>
+</pre></p>
+<p>or use the methods provided by the mixin in the Array class</p>
+<p><pre class='syntax'>
+<span class="ident">foo</span><span class="punct">.</span><span class="ident">cartesian</span><span class="punct">(</span><span class="ident">bar</span><span class="punct">)</span>  <span class="comment">#=&gt; [[1, &quot;a&quot;], [1, &quot;b&quot;], [2, &quot;a&quot;], [2, &quot;b&quot;]]</span>
+</pre></p>
+<p>which include the short&#8217;n&#8217;sweet <em>x</em> method</p>
+<p><pre class='syntax'>
+<span class="ident">v</span> <span class="punct">=</span> <span class="punct">[]</span> <span class="comment">#=&gt; []</span>
+<span class="keyword">for</span> <span class="ident">a</span><span class="punct">,</span> <span class="ident">b</span> <span class="keyword">in</span> <span class="punct">[</span><span class="number">1</span><span class="punct">,</span><span class="number">2</span><span class="punct">].</span><span class="ident">x</span> <span class="punct">[</span><span class="number">3</span><span class="punct">,</span><span class="number">4</span><span class="punct">]</span>
+  <span class="ident">v</span> <span class="punct">&lt;&lt;</span> <span class="punct">[</span><span class="ident">a</span><span class="punct">,</span><span class="ident">b</span><span class="punct">]</span>
+<span class="keyword">end</span> <span class="comment">#=&gt; true</span>
+<span class="ident">v</span> <span class="comment">#=&gt; [[1, 3], [1, 4], [2, 3], [2, 4]]</span>
+</pre></p>
+<p>The &#8216;**&#8217; operator provides a convenient way of iterating multi-dimensionally over the same array or range</p>
+<p><pre class='syntax'>
+<span class="ident">u</span> <span class="punct">=</span> <span class="punct">[</span><span class="number">0</span><span class="punct">,</span> <span class="number">1</span><span class="punct">]**</span><span class="number">3</span> <span class="comment">#=&gt; #&lt;CartesianIterator:0x7f2fb8e54978 @tot_iter=8, \</span>
+  <span class="comment">#                @lists=[[0, 1], [0, 1], [0, 1]]&gt;</span>
+<span class="ident">u</span><span class="punct">.</span><span class="ident">to_a</span> <span class="comment">#=&gt; [[0, 0, 0], [0, 0, 1], [0, 1, 0], \</span>
+  <span class="comment">#        [0, 1, 1], [1, 0, 0], [1, 0, 1], \</span>
+  <span class="comment">#        [1, 1, 0], [1, 1, 1]]</span>
+</pre></p>
+<p>Finally, the grid search methods</p>
+<p><pre class='syntax'>
+<span class="ident">require</span> <span class="punct">'</span><span class="string">grid_search</span><span class="punct">'</span>
+<span class="punct">[-</span><span class="number">1</span><span class="punct">,</span> <span class="number">0</span><span class="punct">,</span> <span class="number">1</span><span class="punct">,</span> <span class="number">2</span><span class="punct">].</span><span class="ident">argmax</span> <span class="punct">{|</span><span class="ident">x</span><span class="punct">|</span> <span class="ident">x</span><span class="punct">**</span><span class="number">2</span> <span class="punct">}</span> <span class="comment">#=&gt; 2</span>
+<span class="punct">[-</span><span class="number">1</span><span class="punct">,</span> <span class="number">0</span><span class="punct">,</span> <span class="number">1</span><span class="punct">,</span> <span class="number">2</span><span class="punct">].</span><span class="ident">argmin</span> <span class="punct">{|</span><span class="ident">x</span><span class="punct">|</span> <span class="ident">x</span><span class="punct">.</span><span class="ident">abs</span> <span class="punct">}</span> <span class="comment">#=&gt; 0</span></pre><br />
+</pre></p>
+<p>For more examples and details, see the RDoc-generated documentation <a href="doc/index.html">here</a>.</p>
+<h2>How to submit patches</h2>
+<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
+<p>You can fetch the source from:</p>
+<ul>
+	<li>github: <a href="http://github.com/adrianomitre/cartesian/tree/master">http://github.com/adrianomitre/cartesian/tree/master</a></li>
+</ul>
+<pre>git clone git@github.com:adrianomitre/cartesian.git</pre>
+<h3>Build and test instructions</h3>
+<pre>cd cartesian
+rake test
+rake install_gem</pre>
+<h2>License</h2>
+<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
+<h2>Contact</h2>
+<p>Comments are welcome. Send an email to <a href="mailto:adriano.mitre@gmail.com">Adriano Mitre</a>.</p>
+<div align=right>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="hosted_button_id" value="9ABWULT73Y7AC">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<p><img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"></p>
+</form>
+</div>
+    <p class="coda">
+      <a href="http://github.com/adrianomitre">Adriano Mitre</a>, 7th January 2011<br>
+      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
+    </p>
+</div>
 
+<!-- insert site tracking codes here, like Google Urchin -->
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-20605454-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+
+</body>
+</html>

metadata

@@ -1,82 +1,68 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cartesian
-version: !ruby/object:Gem::Version
-  version: 0.6.6
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.6.7
 platform: ruby
-authors:
+authors: 
 - Adriano Mitre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: newgem
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
+      - !ruby/object:Gem::Version 
+        version: "3.10"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: newgem
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: ! 'Provides methods for the calculation of the cartesian producted between
-  two
-
+      - !ruby/object:Gem::Version 
+        version: "3.4"
+  type: :development
+  version_requirements: *id003
+description: |-
+  Provides methods for the calculation of the cartesian producted between two
   or more enumerable objects. Includes grid search optimization methods.
-
-  It can also be easily and conveniently mixed in into any enumerable class.'
-email:
+  It can also be easily and conveniently mixed in into any enumerable class.
+email: 
 - adriano.mitre@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - PostInstall.txt
 - README.rdoc
 - Wishlist.txt
 - website/index.txt
-files:
+files: 
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -127,36 +113,37 @@ files:
 - .gemtest
 homepage: http://adrianomitre.github.com/cartesian/website/index.html
 licenses: []
+
 post_install_message: PostInstall.txt
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: cartesian
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Provides methods for the calculation of the cartesian producted between two
-  or more enumerable objects
-test_files:
-- test/test_suite.rb
+summary: Provides methods for the calculation of the cartesian producted between two or more enumerable objects
+test_files: 
 - test/test_iterable.rb
+- test/test_suite.rb
 - test/test_grid_search.rb
-- test/test_cartesian.rb
-- test/test_extensions.rb
 - test/test_helper.rb
+- test/test_extensions.rb
+- test/test_cartesian.rb
 - test/test_cartesian_iterator.rb