cartesian 0.6.4 → 0.6.5

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.6.5 2012-04-13
+
+*  1 bug fix:
+  * Iterable now properly handles nil and false elements.
+    Thanks for ryanberckmans for pointing out the wrong behaviour
+    (https://github.com/adrianomitre/cartesian/issues/4)
+
 === 0.6.4 2011-01-07
 
 *  1 minor enhancements:

data/Rakefile

@@ -14,39 +14,39 @@ $hoe = Hoe.spec 'cartesian' do
   self.developer 'Adriano Mitre', 'adriano.mitre@gmail.com'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
+  # self.extra_deps         = [['activesupport','>= 2.0.2']]
 
 end
 
-require 'newgem/tasks'
+require 'rubygems/package_task'
 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 :chdir do
-  Dir.chdir File.dirname(File.expand_path(__FILE__))
-end
-
-task :render_docs => [:chdir] do
-  system %q{ rm -rf doc/ }
-  system %q{ rdoc README.rdoc lib/*.rb }
-end
-
-task :render_website => [:chdir, :render_docs] do |t|
-  system %q{ script/txt2html website/index.txt website/template.html.erb > website/index.html }
-  system %q{ rm -rf website/doc; cp -R doc website }
-end
-
-task :pre_release => [:manifest, :render_website] do
-  unless `git diff Manifest.txt`.empty?
-    puts
-    puts "  Manifest.txt was re-generated and there were changes."
-    puts "  Use 'git diff Manifest.txt' to inspect them."
-  end
-  puts
-  puts "  Do NOT forget to update History.txt (VERSION should have already be updated)."
-  puts
-end
-
+# task :default => [:spec, :features]
+
+task :chdir do
+  Dir.chdir File.dirname(File.expand_path(__FILE__))
+end
+
+task :render_docs => [:chdir] do
+  system %q{ rm -rf doc/ }
+  system %q{ rdoc README.rdoc lib/*.rb }
+end
+
+task :render_website => [:chdir, :render_docs] do |t|
+  system %q{ script/txt2html website/index.txt website/template.html.erb > website/index.html }
+  system %q{ rm -rf website/doc; cp -R doc website }
+end
+
+task :pre_release => [:manifest, :render_website] do
+  unless `git diff Manifest.txt`.empty?
+    puts
+    puts "  Manifest.txt was re-generated and there were changes."
+    puts "  Use 'git diff Manifest.txt' to inspect them."
+  end
+  puts
+  puts "  Do NOT forget to update History.txt (VERSION should have already be updated)."
+  puts
+end
+

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.4"
+  VERSION = "0.6.5"
 
   # Produces the cartesian product of self and other.
   # The result is an array of pairs (i.e. two-element arrays).
@@ -179,7 +179,7 @@ module Cartesian
       m.module_eval("include Cartesian") 
     end
   end
-  JRuby.objectspace = prev_jruby_objectspace_state if RUBY_DESCRIPTION =~ /jruby/i
+  JRuby.objectspace = prev_jruby_objectspace_state if defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /jruby/i
   
 end
 

data/lib/cartesian_iterator.rb

@@ -1,3 +1,9 @@
+require 'iterable'
+
+class Array
+  include Iterable
+end
+
 class CartesianIterator
 
   def initialize(foo, bar)
@@ -20,7 +26,7 @@ class CartesianIterator
   alias == equal
 
   def product!(other)
-    @lists << other.to_a.dup
+    @lists << Array(other).dup
     @tot_iter *= @lists[-1].size
     self
   end
@@ -28,7 +34,7 @@ class CartesianIterator
   alias x! product!
   
   def left_product!(other)
-    @lists.unshift other.to_a.dup
+    @lists.unshift Array(other).dup
     @tot_iter *= @lists[-1].size
     self
   end
@@ -57,7 +63,8 @@ class CartesianIterator
     last_list_index = @lists.size-1
     n = last_list_index
     loop do
-      if elems[n] = @lists[n].raw_next
+      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.
         n = last_list_index
         next
@@ -73,27 +80,3 @@ class CartesianIterator
   include Enumerable
 
 end
-
-module Iterable
-  def restart
-    @next_index = -1
-    true
-  end
-
-  def next
-    restart unless defined? @next_index
-    raw_next
-  end
-
-  def raw_next
-    self[@next_index += 1]
-  end
-
-  def restart_and_raw_next
-    self[@next_index = 0]
-  end
-end
-
-class Array
-  include Iterable
-end

data/test/test_cartesian_iterator.rb

@@ -1,29 +1,19 @@
 require File.join(File.dirname(__FILE__), 'test_helper.rb')
 require 'cartesian'
-
-class TestCartesianIterator < Test::Unit::TestCase
-  
-  def test_equal
-    assert_equal [1].x([2]), [1].x([2])
-    assert_not_equal [1].x([2]), [1].x([3])
-  end
-  
-  
-  def test_dup
-    c = [1,2].x([3,4])
-    d = c.dup
-    e = d.x([5,6])
-    assert_not_equal(e, c)
-    assert_equal(c, d)
-  end
-  
-  def test_iterator_next_and_restart
-    foo = [1,2]
-    assert_equal 1, foo.next
-    assert_equal 2, foo.next
-    assert_equal nil, foo.next
-    foo.restart
-    assert_equal 1, foo.next
-  end
-
-end
+
+class TestCartesianIterator < Test::Unit::TestCase
+  
+  def test_equal
+    assert_equal [1].x([2]), [1].x([2])
+    assert_not_equal [1].x([2]), [1].x([3])
+  end
+    
+  def test_dup
+    c = [1,2].x([3,4])
+    d = c.dup
+    e = d.x([5,6])
+    assert_not_equal(e, c)
+    assert_equal(c, d)
+  end
+
+end

data/test/test_iterable.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), 'test_helper.rb')
+require 'iterable'
+
+class TestIterable < Test::Unit::TestCase
+  def setup
+    @foo = [1, 2].extend Iterable
+    @bar = [nil, "a", :b].extend Iterable
+    @baz = Array.new(rand(100)) {|n| n % 2 == 0 ? n : (rand >= 0.5 ? nil : false) }
+    @baz.extend Iterable
+  end
+
+  def test_next
+    [@foo, @bar, @baz].each do  |ary|
+      ary.each do |item|
+        assert_equal item, ary.next
+      end
+    end
+  end
+
+  def test_done
+    [@foo, @bar, @baz].each do  |ary|
+      ary.size.times do
+        assert !ary.done?
+        assert_nothing_raised { ary.next }
+      end
+      assert ary.done?
+      assert_raise(RangeError) { ary.next }
+    end
+  end
+
+  def test_restart
+    [@foo, @bar, @baz].each do  |ary|
+      assert_equal ary.first, ary.next
+      rand(ary.size-1).times { ary.next }
+      assert_equal ary.first, ary.restart.next
+    end
+  end
+
+  def test_extending_objects_from_other_classes
+    baz = 'baz'.extend Iterable
+    baz.size.times do |n|
+      assert_equal baz[n], baz.next
+    end
+    assert_raise(RangeError) { baz.next }
+  end
+end

metadata

@@ -1,54 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartesian
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 4
-  version: 0.6.4
+version: !ruby/object:Gem::Version
+  version: 0.6.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Adriano Mitre
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-07 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+date: 2012-04-13 00:00:00.000000000 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
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id001
-description: |-
-  Provides methods for the calculation of the cartesian producted between two
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+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
@@ -94,43 +106,40 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.html.erb
-has_rdoc: true
+- test/test_iterable.rb
+- .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 
-      segments: 
-      - 0
-      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 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cartesian
-rubygems_version: 1.3.7
+rubygems_version: 1.8.21
 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_helper.rb
-- test/test_extensions.rb
+summary: Provides methods for the calculation of the cartesian producted between two
+  or more enumerable objects
+test_files:
 - test/test_suite.rb
-- test/test_cartesian_iterator.rb
-- test/test_cartesian.rb
+- test/test_iterable.rb
 - test/test_grid_search.rb
+- test/test_cartesian.rb
+- test/test_extensions.rb
+- test/test_helper.rb
+- test/test_cartesian_iterator.rb