modalsupport 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/modalsupport/enumerable.rb

@@ -42,107 +42,70 @@ module Enumerable
     end
   end
 
-  if_ruby_version(:<, '1.8.7') do
-    require 'generator'
-    
-    # Paralell iteration through multiple enumerable objects
-    #   (1..3).paralell_each([:a,:b,:c],(10..12)).to_a
-    #    => [[1, :a, 10], [2, :b, 11], [3, :c, 12]]    
-    def paralell_each(*enums)
-      if block_given?
-        iterators = ([self]+enums).map{|e| Generator.new(e)}
-        loop {
-          begin
-            yield iterators.map{|e| e.next}
-          rescue EOFError
-            break
-          end
-        }
-      else
-        enum_for(:paralell_each, *enums)
-      end
+  # Paralell iteration through multiple enumerable objects
+  #   (1..3).paralell_each([:a,:b,:c],(10..12)).to_a
+  #    => [[1, :a, 10], [2, :b, 11], [3, :c, 12]]   
+  # 
+  #   e.paralell_each(*enums) = e.zip(*enums).each
+  def paralell_each(*enums, &blk)
+    # Note that to implement a lazy iterator we'd need
+    # external iterators which don't work in Rubinius, are
+    # implemented differently  in Ruby < 1.8.7 and are slow.
+    # So, for the time being we generate an array and then
+    # iterate it.    
+    if block_given?
+      zip(*enums).each(&blk)
+    else
+      enum_for(:paralell_each, *enums)
     end
-    
-    # Cross-product iteration through multiple enumerable objects
-    #   (1..4).cross_each([:a,:b,:c],(11..12)).to_a
-    #   => [[1, :a, 11], [1, :a, 12], [1, :b, 11], [1, :b, 12], [1, :c, 11], [1, :c, 12],
-    #       [2, :a, 11], [2, :a, 12], [2, :b, 11], [2, :b, 12], [2, :c, 11], [2, :c, 12],
-    #       [3, :a, 11], [3, :a, 12], [3, :b, 11], [3, :b, 12], [3, :c, 11], [3, :c, 12],
-    #       [4, :a, 11], [4, :a, 12], [4, :b, 11], [4, :b, 12], [4, :c, 11], [4, :c, 12]]
-    def cross_each(*enumerables)
-      if block_given?
-        enumerators = ([self]+enumerables).map{|e| Generator.new(e)}
-        values = enumerators.map{|e| e.next rescue nil}
-        yield values.dup
-        i = values.size - 1
-        loop do
-          if enumerators[i].next?
-            values[i] = enumerators[i].next
-            yield values.dup # we could leave dupping up to the user, but .to_a would fail  
-            i = values.size - 1
-          else
-            enumerators[i].rewind
-            values[i] = enumerators[i].next
-            i -= 1
-            if i<0
-              break
-            end
+  end
+  
+  # Equivalent to paralell_each(*enums).to_a, but more efficient
+  def paralell_array(*enums)
+    zip(*enums)
+  end
+  
+  # Cross-product iteration through multiple enumerable objects
+  #   (1..4).cross_each([:a,:b,:c],(11..12)).to_a
+  #   => [[1, :a, 11], [1, :a, 12], [1, :b, 11], [1, :b, 12], [1, :c, 11], [1, :c, 12],
+  #       [2, :a, 11], [2, :a, 12], [2, :b, 11], [2, :b, 12], [2, :c, 11], [2, :c, 12],
+  #       [3, :a, 11], [3, :a, 12], [3, :b, 11], [3, :b, 12], [3, :c, 11], [3, :c, 12],
+  #       [4, :a, 11], [4, :a, 12], [4, :b, 11], [4, :b, 12], [4, :c, 11], [4, :c, 12]]
+  #
+  #  e.cross_each(*enums) = e.to_a.product(*enums.map{|enum| enum.to_a}).each
+  def cross_each(*enumerables)
+    if block_given?
+      enumerable, *rest = enumerables
+      self.each do |e|
+        if enumerables.empty?
+          yield [e]
+        else
+          enumerable.cross_each(*rest) do |rest_e|
+            yield [e]+rest_e
           end
         end
-      else
-        enum_for(:cross_each, *enumerables)
       end
+    else
+      enum_for(:cross_each, *enumerables)
     end
-  
   end
-
-  if_ruby_version(:>=, '1.8.7') do
-    # Paralell iteration through multiple enumerable objects
-    #   (1..3).paralell_each([:a,:b,:c],(10..12)).to_a
-    #    => [[1, :a, 10], [2, :b, 11], [3, :c, 12]]    
-    def paralell_each(*enums)
-      if block_given?
-        iterators = ([self]+enums).map{|e| e.to_enum}
-        loop {
-          yield iterators.map{|e| e.next}
-        }
-      else
-        enum_for(:paralell_each, *enums)
-      end
-    end
-
-    # Cross-product iteration through multiple enumerable objects
-    #   (1..4).cross_each([:a,:b,:c],(11..12)).to_a
-    #   => [[1, :a, 11], [1, :a, 12], [1, :b, 11], [1, :b, 12], [1, :c, 11], [1, :c, 12],
-    #       [2, :a, 11], [2, :a, 12], [2, :b, 11], [2, :b, 12], [2, :c, 11], [2, :c, 12],
-    #       [3, :a, 11], [3, :a, 12], [3, :b, 11], [3, :b, 12], [3, :c, 11], [3, :c, 12],
-    #       [4, :a, 11], [4, :a, 12], [4, :b, 11], [4, :b, 12], [4, :c, 11], [4, :c, 12]]
-    def cross_each(*enumerables)
-      if block_given?
-        enumerators = ([self]+enumerables).map{|e| e.to_enum}
-        values = enumerators.map{|e| e.next rescue nil}
-        yield values.dup
-        i = values.size - 1
-        loop do
-          begin 
-            values[i] = enumerators[i].next
-          rescue StopIteration
-            enumerators[i].rewind
-            values[i] = enumerators[i].next
-            i -= 1
-            if i<0
-              break
-            end
-          else
-            yield values.dup # we could leave dupping up to the user, but .to_a would fail  
-            i = values.size - 1
-          end
+  
+  # equivalent to cross_each(*enumerables).to_a, but more efficient
+  def cross_array(*enumerables) 
+    # return to_a.product(*enumerables.map{|e| e.to_a})
+    enumerables.unshift self
+    result = [[]]
+    while !enumerables.empty?
+      t, result = result, []
+      b, *enumerables = enumerables
+      t.each do |a|
+        b.each do |n|
+          result << a + [n]
         end
-      else
-        enum_for(:cross_each, *enumerables)
       end
     end
+    result
   end
-
+  
 
 end

data/modalsupport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = %q{2010-06-09}
+  s.date = %q{2010-06-10}
   s.description = %q{additional support extensions to ActiveSupport and HoboSupport}
   s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jgoizueta/modalsupport}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{simple extensions to core classes}
   s.test_files = [
     "test/helper.rb",
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])

data/test/test_cross_each.rb

@@ -12,6 +12,15 @@ class TestCrossEach < Test::Unit::TestCase
                     (1..4).cross_each([:a,:b,:c],(11..12)).to_a
     end
     
+
+    should "have a multiple cross-product" do
+      assert_equal [[1, :a, 11], [1, :a, 12], [1, :b, 11], [1, :b, 12], [1, :c, 11], [1, :c, 12],
+                    [2, :a, 11], [2, :a, 12], [2, :b, 11], [2, :b, 12], [2, :c, 11], [2, :c, 12],
+                    [3, :a, 11], [3, :a, 12], [3, :b, 11], [3, :b, 12], [3, :c, 11], [3, :c, 12],
+                    [4, :a, 11], [4, :a, 12], [4, :b, 11], [4, :b, 12], [4, :c, 11], [4, :c, 12]],
+                    (1..4).cross_array([:a,:b,:c],(11..12))
+    end
   end
 
+
 end

data/test/test_paralell_each.rb

@@ -8,6 +8,18 @@ class TestParalellEach < Test::Unit::TestCase
       assert_equal [[1, :a, 10], [2, :b, 11], [3, :c, 12]],
                    (1..3).paralell_each([:a,:b,:c],(10..12)).to_a 
     end
+
+    should "have a multiple paralell combination" do
+      assert_equal [[1, :a, 10], [2, :b, 11], [3, :c, 12]],
+                   (1..3).paralell_array([:a,:b,:c],(10..12))
+    end
+    
+    should "enumerate in parallel getting nils when an iterator runs out sooner that others" do
+      assert_equal [[1, :a, 10], [2, :b, 11], [3, nil, 12]],
+                   (1..3).paralell_array([:a,:b],(10..12))
+      assert_equal [[1, :a, 10], [2, :b, 11], [3, nil, nil]],
+                   (1..3).paralell_array([:a,:b],(10..11))
+    end
     
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: simple extensions to core classes