in_threads 1.1.1 → 1.1.2

data/.gitignore

@@ -1,10 +1,12 @@
 /pkg/
+/*.gem
 
 /doc/
 /rdoc/
 /.yardoc/
 /coverage/
 
+Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+script: "bundle exec rspec"

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Ivan Kuchin
+Copyright (c) 2010-2013 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -32,4 +32,4 @@ You can use any Enumerable method, but some of them can not use threads (`inject
 
 ## Copyright
 
-Copyright (c) 2010-2011 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2013 Ivan Kuchin. See LICENSE.txt for details.

data/in_threads.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'in_threads'
-  s.version     = '1.1.1'
+  s.version     = '1.1.2'
   s.summary     = %q{Execute ruby code in parallel}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/in_threads.rb

@@ -30,7 +30,7 @@ class InThreads
     instance_methods.map(&:to_s) -
     %w[__id__ __send__ class inspect instance_of? is_a? kind_of? nil? object_id respond_to? send]
   ).each{ |name| undef_method name }
-  (private_instance_methods.map(&:to_s) - %w[initialize raise]).each{ |name| undef_method name }
+  (private_instance_methods.map(&:to_s) - %w[initialize raise method_missing]).each{ |name| undef_method name }
 
   attr_reader :enumerable, :thread_count
   def initialize(enumerable, thread_count = 10, &block)
@@ -92,7 +92,7 @@ class InThreads
   use :run_without_threads, :for => %w[
     inject reduce
     max min minmax sort
-    entries to_a
+    entries to_a to_set
     drop take
     first
     include? member?

data/lib/in_threads/filler.rb

@@ -34,7 +34,6 @@ class InThreads
       @mutex = Mutex.new
       @filler = Thread.new do
         enum.each do |o|
-          Thread.stop
           synchronize do
             @extractors.each do |extractor|
               extractor.push(o)

data/spec/in_threads_spec.rb

@@ -1,22 +1,23 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 class Item
-  attr_reader :rand
   def initialize(i)
-    @i = i
-    @rand = Kernel.rand
-    @sleep = Kernel.rand
+    @i, @value = i, Kernel.rand
   end
 
-  class MiddleMatcher
+  def ==(other)
+    self.id == other.id
+  end
+
+  class HalfMatcher
     def ===(item)
       raise "#{item.inspect} is not an Item" unless item.is_a?(Item)
-      (0.25..0.75) === item.rand
+      (0.25..0.75) === item.instance_variable_get(:@value)
     end
   end
 
   def value
-    sleep; rand
+    sleep; @value
   end
 
   def check?
@@ -31,17 +32,22 @@ class Item
     touch(*args); check?
   end
 
+protected
+
+  def id
+    [self.class, @i, @value]
+  end
+
 private
 
   def sleep
-    Kernel.sleep @sleep * 0.01
+    Kernel.sleep 0.01
   end
 end
 
 class ValueItem < Item
   def initialize(i, value)
-    super(i)
-    @value = value
+    @i, @value = i, value
   end
 
   def value
@@ -59,7 +65,7 @@ def describe_enum_method(method, &block)
     describe(method, &block)
   else
     it "should not be defined" do
-      exception_regexp = /^undefined method `#{Regexp.escape(method)}' for #<InThreads:0x[0-9a-f]+>$/
+      exception_regexp = /^undefined method `#{Regexp.escape(method)}' .*\bInThreads\b/
       proc{ enum.in_threads.send(method) }.should raise_error(NoMethodError, exception_regexp)
     end
   end
@@ -121,7 +127,7 @@ describe "in_threads" do
           @thread_count = 0
           @max_thread_count = 0
           @mutex = Mutex.new
-          enum.in_threads(13).send(method) do |o|
+          enum.in_threads(4).send(method) do |o|
             @mutex.synchronize do
               @thread_count += 1
               @max_thread_count = [@max_thread_count, @thread_count].max
@@ -133,7 +139,7 @@ describe "in_threads" do
             res
           end
           @thread_count.should == 0
-          @max_thread_count.should == 13
+          @max_thread_count.should == 4
         end
       end
     end
@@ -217,7 +223,7 @@ describe "in_threads" do
       end
 
       it "should fire same objects in reverse order" do
-        @order = mock('order', :notify => nil)
+        @order = double('order', :notify => nil)
         @order.should_receive(:notify).with(enum.last).ordered
         @order.should_receive(:notify).with(enum[enum.length / 2]).ordered
         @order.should_receive(:notify).with(enum.first).ordered
@@ -366,7 +372,7 @@ describe "in_threads" do
     end
 
     describe "grep" do
-      let(:matcher){ Item::MiddleMatcher.new }
+      let(:matcher){ Item::HalfMatcher.new }
 
       it "should fire same objects" do
         enum.each{ |o| o.should_receive(:touch).exactly(matcher === o ? 1 : 0).times }
@@ -392,7 +398,7 @@ describe "in_threads" do
         def each
           10.times{ yield 1 }
           10.times{ yield 2, 3 }
-          10.times{ yield }
+          10.times{ yield 4, 5, 6 }
         end
       end
 
@@ -404,10 +410,10 @@ describe "in_threads" do
       end
 
       it "should execute block for each element" do
-        @order = mock('order')
+        @order = double('order')
         @order.should_receive(:notify).with(1).exactly(10).times.ordered
         @order.should_receive(:notify).with([2, 3]).exactly(10).times.ordered
-        @order.should_receive(:notify).with(nil).exactly(10).times.ordered
+        @order.should_receive(:notify).with([4, 5, 6]).exactly(10).times.ordered
         @mutex = Mutex.new
         enum.in_threads.each_entry do |o|
           @mutex.synchronize{ @order.notify(o) }

metadata

@@ -1,46 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: in_threads
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
+- Gemfile
 - LICENSE.txt
 - README.markdown
 - in_threads.gemspec
@@ -50,39 +45,30 @@ files:
 - spec/in_threads_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/toy/in_threads
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-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 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: in_threads
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Execute ruby code in parallel
-test_files: 
+test_files:
 - spec/in_threads_spec.rb
 - spec/spec_helper.rb
-has_rdoc: