threadlimiter 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.1.2 (06-10-2008)
+
+* Introduced ThreadLimiter.handle_clusters, which is reused by
+  ForkAndReturn.
+
 0.1.1 (27-07-2008)
 
 * Fixed the clustering of empty enumerables.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/threadlimiter/enumerable.rb

@@ -28,29 +28,7 @@ module Enumerable
     if number_of_clusters <= 0
       threaded_collect(number_of_clusters, &block)
     else
-      clusters	= []	# One cluster per thread.
-      last_pos	= -1
-      res	= []
-
-      self.each do |object|
-        last_pos += 1
-
-        (clusters[last_pos%number_of_clusters] ||= []) << object
-      end
-
-      clusters.threaded_collect(-1) do |cluster|
-        cluster.collect do |object|
-          if block.arity > 1 and object.kind_of?(Enumerable)
-            yield(*object.to_a)
-          else
-            yield(object)
-          end
-        end + (cluster.length == clusters[0].length ? [] : [nil])	# Add padding nil, in order to be able to transpose
-      end.transpose.each do |array|
-        res.concat(array)
-      end
-
-      res[0..last_pos]	# Remove padding nil.
+      ThreadLimiter.handle_clusters(self, number_of_clusters, :threaded_collect, &block)
     end
   end
 

data/lib/threadlimiter/threadlimiter.rb

@@ -49,4 +49,33 @@ class ThreadLimiter
       end
     end
   end
+
+  def self.handle_clusters(enumeration, number_of_clusters, method_name, &block)
+    clusters	= []	# One cluster per fork.
+    last_pos	= -1
+    res	= []
+
+    enumeration.each do |object|
+      last_pos += 1
+
+      (clusters[last_pos%number_of_clusters] ||= []) << object
+    end
+
+    clusters.__send__(method_name, -1) do |cluster|
+      cluster.collect do |object|
+        if block.arity > 1 and object.kind_of?(Enumerable)
+          yield(*object.to_a)
+        else
+          yield(object)
+        end
+      end
+    end.collect do |cluster|
+      cluster + (cluster.length == clusters[0].length ? [] : [nil])	# Add padding nil, in order to be able to transpose
+    end.transpose.each do |array|
+      res.concat(array)
+    end
+
+    res[0..last_pos]	# Remove padding nil.
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: threadlimiter
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Erik Veenstra
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-27 00:00:00 +02:00
+date: 2008-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -39,7 +39,7 @@ rdoc_options:
 - VERSION
 - CHANGELOG
 - --title
-- threadlimiter (0.1.1)
+- threadlimiter (0.1.2)
 - --main
 - README
 require_paths: