cartesian 0.5.3 → 0.6.0

data/History.txt

@@ -1,4 +1,20 @@
-=== 0.5.3 2011-01-04
+=== 0.6.0 2011-01-07
+
+* 1 major enhancement:
+  * Cartesian is now included in Enumerable and in all classes and modules which
+    include it, so that any class or module that ever includes Enumerable will have
+    cartesian methods. New tests were also added to test the novel functionality.
+
+* 7 minor, non-functional, enhancements:
+  * removed replication of VERSION in lib/cartesian.rb and lib/cartesian/version.rb
+  * fixed the "FIXME full name" in the website template
+  * created Rake task :render_website, which also regenerates RDoc documentation, ensuring its up-to-date
+  * documentation is now generated by Darkfish Rdoc and includes README.rdoc, as expected
+  * added Google Analytics tracking to the website
+  * deleted unnecessary test_suite.rb ('rake test' === 'ruby test/test_suite.rb')
+  * moved 'recursive.rb' to 'etc/' (related implementation by Brian Schröäer, not part of the gem)
+
+=== 0.5.3 2011-01-05
 
 * 3 minor enhancements:
   * code comment/documentation update

data/PostInstall.txt

@@ -1,7 +1,4 @@
 
-For more information on cartesian, see http://cartesian.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
+For more information on cartesian, see http://adrianomitre.github.com/cartesian/website/index.html
 
 

data/README.rdoc

@@ -30,19 +30,26 @@ or use the methods provided by the mixin in the Array class
 
 which include the short'n'sweet _x_ method
     v = [] #=> []
-    for a,b in [1,2].x [3,4]
+    for a, b in [1,2].x [3,4]
       v << [a,b]
     end #=> true
     v #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
+    for x, y, z in 0..1
 
 The '**' operator provides a convenient way of iterating multi-dimensionally over the same array or range
-    v = [0,1]**3 #=> #<CartesianIterator:0x7f2fb8e54978 @tot_iter=8, @lists=[[0, 1], [0, 1], [0, 1]]>
-    v.to_a #=> [[0, 0, 0], [0, 0, 1], [0, 1, 0], [0, 1, 1], [1, 0, 0], [1, 0, 1], [1, 1, 0], [1, 1, 1]]
+    u = [0,1]**3 #=> #<CartesianIterator:0x7f2fb8e54978 @tot_iter=8, @lists=[[0, 1], [0, 1], [0, 1]]>
+    u.to_a #=> [[0, 0, 0], [0, 0, 1], [0, 1, 0], [0, 1, 1], [1, 0, 0], [1, 0, 1], [1, 1, 0], [1, 1, 1]]
+
+    v = []
+    for x, y, z in (0...10)**3
+      v << [x, y, z] if x*x + y*y + z*z == 6
+    end
+    v #=> [[1, 1, 2], [1, 2, 1], [2, 1, 1]]
 
 Finally, the grid search methods
-    require 'grid_search'
+    require 'cartesian/grid_search'
     [-1, 0, 1, 2].argmax {|x| x**2 } #=> 2
-    [-1, 0, 1, 2].argmin {|x| x.abs } #=> 0
+    0.argmin {|x| x.abs } #=> 0
 
 == REQUIREMENTS:
 
@@ -56,7 +63,7 @@ Finally, the grid search methods
 
 (The MIT License)
 
-Copyright (c) 2011 Adriano Mitre <adriano.mitre@gmail.com>
+Copyright (c) 2006-2011 Adriano Mitre <adriano.mitre@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -23,4 +23,12 @@ Dir['tasks/**/*.rake'].each { |t| load t }
 
 # TODO - want other tests/tasks run by default? Add them to the list
 # remove_task :default
-# task :default => [:spec, :features]
+# task :default => [:spec, :features]
+
+task :render_website do |t|
+  Dir.chdir File.dirname(File.expand_path(__FILE__))
+  system %q{ script/txt2html website/index.txt website/template.html.erb > website/index.html }
+  system %q{ rdoc README.rdoc lib/*.rb }
+  system %q{ rm -rf website/doc; mv doc website }
+end
+

data/Wishlist.txt

@@ -1,3 +1,13 @@
+= FIXME:
+
+* Include README.rdoc in the website/doc (RDoc)
+
+= SUGGESTIONS:
+
+* Include information regarding the memory usage (vs other cartesian implementations):
+  * "Unfortunately, these methods use too much memory, storing the whole cartesian
+     product Array in memory even its elements are needed only one at a time."
+     src: http://www.ruby-forum.com/topic/95519
+
 * Release GridSearch as a separate, independent gem. Note that 'lib/grid_search.rb' is already independent.
-* Remove replication of VERSION in lib/cartesian.rb and lib/cartesian/version.rb due to parts of newgem 1.5.3 and older (DRY)
-* Fix/automate the FIXME in the website email (currently being fixed manually)
+

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.5.3"
+  VERSION = "0.6.0"
 
   # Produces the cartesian product of self and other.
   # The result is an array of pairs (i.e. two-element arrays).
@@ -156,13 +156,30 @@ module Cartesian
     end
   end
   alias :power! :**
-end
-
-class Array
-  include Cartesian
-end
-
-class Range
-  include Cartesian
+  
+  # Sure, it would be great if +Enumerable.module_eval("include Cartesian")+ did the trick,
+  # but fact is that it would not work because of the [dynamic module include problem][1],
+  # so the following, less straightforward solution has to be applied.
+  #
+  # JRuby (at least up to version 1.5.6) has ObjectSpace disabled by default, so it needs
+  # to be enabled manually ([reference][2]).
+  #
+  # [1]: http://eigenclass.org/hiki/The+double+inclusion+problem                      "Dynamic Module Include Problem"
+  # [2]: http://ola-bini.blogspot.com/2007/07/objectspace-to-have-or-not-to-have.html "ObjectSpace: to have or not to have"
+  # [3]: http://www.ruby-forum.com/topic/160487                                       "problem of feedtools with jruby"
+  #
+  prev_jruby_objectspace_state = nil # only for scope reasons
+  if defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /jruby/i
+    require 'jruby'
+    prev_jruby_objectspace_state = JRuby.objectspace
+    JRuby.objectspace = true
+  end
+  ObjectSpace.each_object(Module) do |m|
+    if m <= Enumerable # equiv. to "if m.include?(Enumerable) || m == Enumerable"
+      m.module_eval("include Cartesian") 
+    end
+  end
+  JRuby.objectspace = prev_jruby_objectspace_state if RUBY_DESCRIPTION =~ /jruby/i
+  
 end
 

data/lib/cartesian_iterator.rb

@@ -52,13 +52,13 @@ 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
+    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.
 
     last_list_index = @lists.size-1
     n = last_list_index
     loop do
       if elems[n] = @lists[n].raw_next
-        if RUBY_VERSION <= '1.9.1'; yield *elems.map {|x| x }; else; yield *elems; end
+        if RUBY_VERSION <= '1.9.1'; yield(*elems.map {|x| x }); else; yield(*elems); end # See previous comment.
         n = last_list_index
         next
       elsif n > 0
@@ -81,7 +81,7 @@ module Iterable
   end
 
   def next
-    restart unless @next_index
+    restart unless defined? @next_index
     raw_next
   end
 

data/script/txt2html

@@ -15,9 +15,9 @@ end
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + "/../lib/#{GEM_NAME}/version.rb"
+require File.dirname(File.expand_path(__FILE__)) + "/../lib/#{GEM_NAME}.rb"
 
-version  = Cartesian::VERSION::STRING
+version  = Cartesian::VERSION
 download = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 
 def rubyforge_project_id
@@ -30,9 +30,9 @@ class Fixnum
     return 'th' if (10..19).include?(self % 100)
     # others
     case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
+    when 1; return 'st'
+    when 2; return 'nd'
+    when 3; return 'rd'
     else    return 'th'
     end
   end

data/test/test_cartesian.rb

@@ -19,6 +19,26 @@ class TestCartesian < Test::Unit::TestCase
                 [2, 6], [3, 4], [3, 5], [3, 6]]
     assert(foo.x(bar).to_a == expected)
     assert(Cartesian.product(foo,bar) == expected)
+  end
+  
+  def test_other_existing_enumerable
+    if RUBY_DESCRIPTION =~ /rubinius/i # Work around a Rubinius bug I found and [reported][1] and whose
+      foo = [0.0, 0.6]                 # [fix][2] has not yet been merged to HEAD (Jan 1st, 2011). 
+    else                               # [1]: https://github.com/evanphx/rubinius/issues/issue/650
+      foo = 0.step(1, 0.6)             # [2]: https://github.com/evanphx/rubinius/commit/9ad78eaaf66dac6615baa06a712594a95b1a7bea
+    end
+    bar = { :x => 42, :y => 43 }
+    expected = foo.to_a.x(bar.to_a).to_a
+    actual = foo.x(bar).to_a
+    assert_equal expected, actual
+  end
+  
+  def test_other_new_enumerable
+    String.class_eval "alias each each_line ; include Enumerable"
+    foo = "foo\nbar"
+    bar = [1, 2]
+    expected = [["foo\n", 1], ["foo\n", 2], ["bar", 1], ["bar", 2]]
+    assert_equal expected, foo.x(bar).to_a
   end
   
   def test_product
@@ -44,9 +64,11 @@ class TestCartesian < Test::Unit::TestCase
     foo = 1..3
     bar = %w{a b c}
     expected = [[1, "a"], [1, "b"], [1, "c"], [2, "a"], [2, "b"],
-                [2, "c"], [3, "a"], [3, "b"], [3, "c"]]
-    assert(foo.x(bar).to_a == expected)
-    assert(Cartesian.product(foo,bar) == expected) ##################
+                [2, "c"], [3, "a"], [3, "b"], [3, "c"]]
+    actual = foo.x(bar).to_a
+    assert_equal expected, actual
+    actual = Cartesian.product(foo,bar)
+    assert_equal expected, actual
   end
   
   def test_power
@@ -56,8 +78,9 @@ class TestCartesian < Test::Unit::TestCase
     assert_equal ary, ary**1
     expected = [[0, 0, 0], [0, 0, 1], [0, 1, 0],\
                 [0, 1, 1], [1, 0, 0], [1, 0, 1],\
-                [1, 1, 0], [1, 1, 1]]
-    assert_equal expected, ([0,1]**3).to_a
+                [1, 1, 0], [1, 1, 1]]
+    actual = ([0,1]**3).to_a
+    assert_equal expected, actual
   end
   
   def test_joined_cartesian

data/test/test_extensions.rb

@@ -1,10 +1,11 @@
-require File.join(File.dirname(__FILE__), 'test_helper.rb')
-require File.join(File.dirname(__FILE__), 'extensions.rb')
-
+%w{test_helper extensions}.each do |req|
+  require File.join(File.dirname(__FILE__), "#{req}.rb")
+end
+
 class TestExtensions < Test::Unit::TestCase
   def test_among?
-    assert 1.among?([1,2,3])
+    assert   1.among? [1,2,3]
     assert ! 7.among?([1,2,3])
-    assert (3.0).among?([1,2,3])
+    assert 3.0.among? [1,2,3]
   end
 end

data/test/test_grid_search.rb

@@ -13,9 +13,9 @@ class TestCartesian < Test::Unit::TestCase
     assert_equal 0, *[-2,-1,0].argmax {|x| x**3 }
     values = []
     -3.step(3, 0.25) {|val| values << val }
-    x, y = (values**2).argmax {|x,y| x**2+y**2 }
-    assert x.among?([-3,3])
-    assert y.among?([-3,3])
+    x2, y2 = (values**2).argmax {|x,y| x**2+y**2 }
+    assert x2.among?([-3,3])
+    assert y2.among?([-3,3])
   end
 
 end

data/website/doc/created.rid

@@ -1 +1,5 @@
-Tue, 04 Jan 2011 07:25:24 -0200
+Fri, 07 Jan 2011 02:32:48 -0200
+README.rdoc	Fri, 07 Jan 2011 02:06:14 -0200
+lib/cartesian.rb	Fri, 07 Jan 2011 01:02:01 -0200
+lib/cartesian_iterator.rb	Thu, 06 Jan 2011 18:18:15 -0200
+lib/grid_search.rb	Wed, 05 Jan 2011 06:07:10 -0200

data/website/doc/index.html

@@ -1,24 +1,124 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
-<!--
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
 
-    RDoc Documentation
+	<title>RDoc Documentation</title>
+
+	<link type="text/css" media="screen" href="rdoc.css" rel="stylesheet" />
+
+	<script src="js/jquery.js" type="text/javascript" charset="utf-8"></script>
+	<script src="js/thickbox-compressed.js" type="text/javascript" charset="utf-8"></script>
+	<script src="js/quicksearch.js" type="text/javascript" charset="utf-8"></script>
+	<script src="js/darkfish.js" type="text/javascript" charset="utf-8"></script>
 
-  -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>RDoc Documentation</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 </head>
-<frameset rows="20%, 80%">
-    <frameset cols="25%,35%,45%">
-        <frame src="fr_file_index.html"   title="Files" name="Files" />
-        <frame src="fr_class_index.html"  name="Classes" />
-        <frame src="fr_method_index.html" name="Methods" />
-    </frameset>
-    <frame src="files/cartesian_rb.html" name="docwin" />
-</frameset>
-</html>
+<body class="indexpage">
+
+	
+	<h1>RDoc Documentation</h1>
+
+	
+	<p>This is the API documentation for 'RDoc Documentation'.</p>
+	
+
+	
+	
+	<h2>Files</h2>
+	<ul>
+		
+			<li class="file"><a href="README_rdoc.html">README.rdoc</a></li>
+		
+	</ul>
+	
+
+	<h2 id="classes">Classes/Modules</h2>
+	<ul>
+		
+		<li class="class"><a href="Array.html">Array</a></li>
+		
+		<li class="module"><a href="Cartesian.html">Cartesian</a></li>
+		
+		<li class="class"><a href="CartesianIterator.html">CartesianIterator</a></li>
+		
+		<li class="module"><a href="Enumerable.html">Enumerable</a></li>
+		
+		<li class="module"><a href="GridSearch.html">GridSearch</a></li>
+		
+		<li class="module"><a href="Iterable.html">Iterable</a></li>
+		
+	</ul>
+
+	<h2 id="methods">Methods</h2>
+	<ul>
+		
+			<li><a href="Cartesian.html#method-c-joined_product">::joined_product &mdash; Cartesian</a></li>
+		
+			<li><a href="CartesianIterator.html#method-c-new">::new &mdash; CartesianIterator</a></li>
+		
+			<li><a href="Cartesian.html#method-c-product">::product &mdash; Cartesian</a></li>
+		
+			<li><a href="Cartesian.html#method-i-%2A%2A">#** &mdash; Cartesian</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-%3D%3D">#== &mdash; CartesianIterator</a></li>
+		
+			<li><a href="GridSearch.html#method-i-argbest">#argbest &mdash; GridSearch</a></li>
+		
+			<li><a href="GridSearch.html#method-i-argmax">#argmax &mdash; GridSearch</a></li>
+		
+			<li><a href="GridSearch.html#method-i-argmin">#argmin &mdash; GridSearch</a></li>
+		
+			<li><a href="Cartesian.html#method-i-cartesian">#cartesian &mdash; Cartesian</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>
+		
+			<li><a href="CartesianIterator.html#method-i-equal">#equal &mdash; CartesianIterator</a></li>
+		
+			<li><a href="Cartesian.html#method-i-joined_cartesian">#joined_cartesian &mdash; Cartesian</a></li>
+		
+			<li><a href="Cartesian.html#method-i-left_product">#left_product &mdash; Cartesian</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-left_product">#left_product &mdash; CartesianIterator</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-left_product%21">#left_product! &mdash; CartesianIterator</a></li>
+		
+			<li><a href="Iterable.html#method-i-next">#next &mdash; Iterable</a></li>
+		
+			<li><a href="Cartesian.html#method-i-power%21">#power! &mdash; Cartesian</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-product">#product &mdash; CartesianIterator</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-product%21">#product! &mdash; CartesianIterator</a></li>
+		
+			<li><a href="Iterable.html#method-i-raw_next">#raw_next &mdash; Iterable</a></li>
+		
+			<li><a href="Iterable.html#method-i-restart">#restart &mdash; Iterable</a></li>
+		
+			<li><a href="Iterable.html#method-i-restart_and_raw_next">#restart_and_raw_next &mdash; Iterable</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-right_product">#right_product &mdash; CartesianIterator</a></li>
+		
+			<li><a href="Cartesian.html#method-i-right_product">#right_product &mdash; Cartesian</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-right_product%21">#right_product! &mdash; CartesianIterator</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-x">#x &mdash; CartesianIterator</a></li>
+		
+			<li><a href="Cartesian.html#method-i-x">#x &mdash; Cartesian</a></li>
+		
+			<li><a href="CartesianIterator.html#method-i-x%21">#x! &mdash; CartesianIterator</a></li>
+		
+	</ul>
+
+	<div id="validator-badges">
+		<p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+		<p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+			Rdoc Generator</a> 1.1.6</small>.</p>
+	</div>
+</body>
+</html>

data/website/index.html

@@ -33,7 +33,7 @@
     <h1></h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/cartesian"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/cartesian" class="numbers">0.5.3</a>
+      <a href="http://rubyforge.org/projects/cartesian" class="numbers">0.6.0</a>
     </div>
     <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script><h1>cartesian</h1>
 <h3>Cartesian products in Ruby</h3>
@@ -60,15 +60,18 @@ It can also be easily and conveniently mixed-in into any enumerable class.</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="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">v</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, @lists=[[0, 1], [0, 1], [0, 1]]&gt;</span>
-<span class="ident">v</span><span class="punct">.</span><span class="ident">to_a</span> <span class="comment">#=&gt; [[0, 0, 0], [0, 0, 1], [0, 1, 0], [0, 1, 1], [1, 0, 0], [1, 0, 1], [1, 1, 0], [1, 1, 1]]</span>
+<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'>
@@ -92,19 +95,34 @@ rake install_gem</pre>
 <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="adriano.mitre@gmail.com">Adriano Mitre</a>, 5th January 2011<br>
+      <a href="adriano.mitre@gmail.com">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>

data/website/index.txt

@@ -39,7 +39,7 @@ which include the short'n'sweet _x_ method
 
 <pre syntax="ruby">
 v = [] #=> []
-for a,b in [1,2].x [3,4]
+for a, b in [1,2].x [3,4]
   v << [a,b]
 end #=> true
 v #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
@@ -48,8 +48,11 @@ v #=> [[1, 3], [1, 4], [2, 3], [2, 4]]
 The '**' operator provides a convenient way of iterating multi-dimensionally over the same array or range
 
 <pre syntax="ruby">
-v = [0,1]**3 #=> #<CartesianIterator:0x7f2fb8e54978 @tot_iter=8, @lists=[[0, 1], [0, 1], [0, 1]]>
-v.to_a #=> [[0, 0, 0], [0, 0, 1], [0, 1, 0], [0, 1, 1], [1, 0, 0], [1, 0, 1], [1, 1, 0], [1, 1, 1]]
+u = [0, 1]**3 #=> #<CartesianIterator:0x7f2fb8e54978 @tot_iter=8, \
+  #                @lists=[[0, 1], [0, 1], [0, 1]]>
+u.to_a #=> [[0, 0, 0], [0, 0, 1], [0, 1, 0], \
+  #        [0, 1, 1], [1, 0, 0], [1, 0, 1], \
+  #        [1, 1, 0], [1, 1, 1]]
 </pre>
 
 Finally, the grid search methods
@@ -87,10 +90,11 @@ h2. Contact
 
 Comments are welcome. Send an email to "Adriano Mitre":mailto:adriano.mitre@gmail.com.
 
+<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!">
 <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 </form>
-
+</div>

data/website/template.html.erb

@@ -37,12 +37,25 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, <%= modified.pretty %><br>
+      <a href="adriano.mitre@gmail.com">Adriano Mitre</a>, <%= modified.pretty %><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,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cartesian
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Adriano Mitre
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -02:00
+date: 2011-01-07 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 2
         - 8
@@ -133,7 +131,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -142,7 +139,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"