jruby_threach 0.3.0-java → 0.4.0-java

data/README.markdown

@@ -59,9 +59,10 @@ You can also use Threach::MultiEnum, the class behind `#mthreach`, by itself, fo
 
     me = Threach::MultiEnum.new(
        [1..10, 'a'..'z', File.open('myfile.txt')], # array of enumerables
+       3,     # number of threads. nil => one per enum
        :each, # enumerator method to use
-       10,    # size of the internal queue
-       3)     # number of threads. nil => one per enum
+       10     # size of the internal queue
+      )
     me.each {|item| process_item(item)}
 
 
@@ -71,6 +72,9 @@ You can also use Threach::MultiEnum, the class behind `#mthreach`, by itself, fo
 
 **Spurious warning**  As of this writing, breaking out of a `threach` loop (by calling `break` in the passed block) causes JRuby to print a warning of the form, 'Exception in thread "RubyThread-44: samples.rb:1"org.JRuby.exceptions.JumpException$BreakJump'. Hopefully this can be tracked down and eliminated by the JRuby team.
 
+## CHANGES
+
+* 0.4.0 Changed signature of Threach::MultiEnum.new to put no. threads up front.
 
 ## Contributing to JRuby_threach
  

data/lib/jruby_threach.rb

@@ -60,13 +60,13 @@ module Threach
     
     # Create a new MultiEnum
     # @param [Enumerable] enumerators A list of enumerators that you wish to act as a single enum
+    # @param [Integer, nil] numthreads The number of threads to dedicate to pulling items 
     # @param [Symbol] iterator Which iterator to call against each enum
     # @param [Integer] size The size of the underlying queue
-    # @param [Integer, nil] numthreads The number of threads to dedicate to pulling items 
     #   off the enumerators and pushing them onto the shared queue. nil or zero implies one for
     #   each enumerator
     # @return [Threach::MultiEnum] the new multi-enumerator
-    def initialize enumerators, iterator = :each, size = 5, numthreads=nil
+    def initialize enumerators, numthreads=nil, iterator = :each, size = 5
       @enum = enumerators
       @iter = iterator
       @size = size
@@ -139,7 +139,7 @@ module Enumerable
   #   [1..10, 'a'..'z'].mthreach(2,2) {|i| process_item(i)}
   # 
   def mthreach(pthreads=nil, threads = 0, iterator = :each,  &blk)
-    me = Threach::MultiEnum.new(self, iterator, threads * 3, pthreads)
+    me = Threach::MultiEnum.new(self, pthreads, iterator, threads*3)
     me.send(:threach, threads, iterator, &blk)
   end
   
@@ -274,7 +274,6 @@ module Enumerable
   end
 end
 
-__END__
 
 class DelayedEnum
   include Enumerable

metadata

@@ -2,7 +2,7 @@
 name: jruby_threach
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: java
 authors: 
 - BillDueber
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -07:00
+date: 2011-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1042269137
+      hash: -424975983
       segments: 
       - 0
       version: "0"