modalsupport 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/modalsupport/enumerable.rb

@@ -42,5 +42,107 @@ 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
+    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
+        end
+      else
+        enum_for(:cross_each, *enumerables)
+      end
+    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
+        end
+      else
+        enum_for(:cross_each, *enumerables)
+      end
+    end
+  end
+
 
 end

data/modalsupport.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
@@ -37,9 +37,11 @@ Gem::Specification.new do |s|
      "modalsupport.gemspec",
      "test/helper.rb",
      "test/test_bracket_constructor.rb",
+     "test/test_cross_each.rb",
      "test/test_grep.rb",
      "test/test_gsub.rb",
      "test/test_match.rb",
+     "test/test_paralell_each.rb",
      "test/test_product.rb",
      "test/test_relative_path.rb",
      "test/test_slice.rb",
@@ -54,9 +56,11 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
      "test/test_bracket_constructor.rb",
+     "test/test_cross_each.rb",
      "test/test_grep.rb",
      "test/test_gsub.rb",
      "test/test_match.rb",
+     "test/test_paralell_each.rb",
      "test/test_product.rb",
      "test/test_relative_path.rb",
      "test/test_slice.rb",

data/test/test_cross_each.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class TestCrossEach < Test::Unit::TestCase
+
+  context "Enumerable objects" do
+
+    should "have a multiple cross-product iterator" 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_each([:a,:b,:c],(11..12)).to_a
+    end
+    
+  end
+
+end

data/test/test_paralell_each.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+class TestParalellEach < Test::Unit::TestCase
+
+  context "Enumerable objects" do
+
+    should "have a multiple paralell iterator" do
+      assert_equal [[1, :a, 10], [2, :b, 11], [3, :c, 12]],
+                   (1..3).paralell_each([:a,:b,:c],(10..12)).to_a 
+    end
+    
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -62,9 +62,11 @@ files:
 - modalsupport.gemspec
 - test/helper.rb
 - test/test_bracket_constructor.rb
+- test/test_cross_each.rb
 - test/test_grep.rb
 - test/test_gsub.rb
 - test/test_match.rb
+- test/test_paralell_each.rb
 - test/test_product.rb
 - test/test_relative_path.rb
 - test/test_slice.rb
@@ -107,9 +109,11 @@ summary: simple extensions to core classes
 test_files: 
 - test/helper.rb
 - test/test_bracket_constructor.rb
+- test/test_cross_each.rb
 - test/test_grep.rb
 - test/test_gsub.rb
 - test/test_match.rb
+- test/test_paralell_each.rb
 - test/test_product.rb
 - test/test_relative_path.rb
 - test/test_slice.rb