concurrent-ruby 0.1.1.pre.2 → 0.1.1.pre.3

data/spec/concurrent/future_spec.rb

@@ -21,7 +21,7 @@ module Concurrent
     end
 
     before(:each) do
-      $GLOBAL_THREAD_POOL = FixedThreadPool.new(2)
+      Future.thread_pool = FixedThreadPool.new(1)
     end
 
     it_should_behave_like Obligation
@@ -40,17 +40,10 @@ module Concurrent
     context '#initialize' do
 
       it 'spawns a new thread when a block is given' do
-        $GLOBAL_THREAD_POOL.should_receive(:post).once.with(any_args())
+        Future.thread_pool.should_receive(:post).once.with(any_args())
         Future.new{ nil }
       end
 
-      it 'accepts an alternate thread pool as the first argument' do
-        pool = Concurrent::FixedThreadPool.new(2)
-        pool.should_receive(:post).with(no_args())
-        Future.new(pool, 1, 2, 3){ nil }
-        sleep(0.1)
-      end
-
       it 'does not spawns a new thread when no block given' do
         Thread.should_not_receive(:new).with(any_args())
         Future.new
@@ -76,16 +69,6 @@ module Concurrent
         [@a, @b, @c].should eq [1, 2, 3]
       end
 
-      it 'passes all other arguments to the handler when a thread pool is given' do
-        @expected = nil
-        pool = Concurrent::FixedThreadPool.new(2)
-        f = Future.new(pool, 1, 2, 3) do |a, b, c|
-          @a, @b, @c = a, b, c
-        end
-        sleep(0.1)
-        [@a, @b, @c].should eq [1, 2, 3]
-      end
-
       it 'sets the value to the result of the handler' do
         f = Future.new(10){|a| a * 2 }
         sleep(0.1)

data/spec/concurrent/global_thread_pool_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Concurrent
+
+  describe UsesGlobalThreadPool do
+
+    before(:each) do
+      $GLOBAL_THREAD_POOL = FixedThreadPool.new(1)
+    end
+
+    it 'defaults to the global thread pool' do
+      clazz = Class.new{ include UsesGlobalThreadPool }
+      clazz.thread_pool.should eq $GLOBAL_THREAD_POOL
+    end
+
+    it 'sets and gets the thread pool for the class' do
+      pool = NullThreadPool.new
+      clazz = Class.new{ include UsesGlobalThreadPool }
+
+      clazz.thread_pool = pool
+      clazz.thread_pool.should eq pool
+    end
+
+    it 'gives each class its own thread pool' do
+      clazz1 = Class.new{ include UsesGlobalThreadPool }
+      clazz2 = Class.new{ include UsesGlobalThreadPool }
+      clazz3 = Class.new{ include UsesGlobalThreadPool }
+
+      clazz1.thread_pool = FixedThreadPool.new(1)
+      clazz2.thread_pool = CachedThreadPool.new
+      clazz3.thread_pool = NullThreadPool.new
+
+      clazz1.thread_pool.should_not eq clazz2.thread_pool
+      clazz2.thread_pool.should_not eq clazz3.thread_pool
+      clazz3.thread_pool.should_not eq clazz1.thread_pool
+    end
+  end
+end

data/spec/concurrent/null_thread_pool_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+require 'concurrent/goroutine'
+
+module Concurrent
+
+  describe NullThreadPool do
+
+    subject { NullThreadPool.new }
+
+    after(:all) do
+      $GLOBAL_THREAD_POOL = FixedThreadPool.new(1)
+    end
+
+    context '#post' do
+
+      it 'proxies a call without arguments' do
+        Thread.should_receive(:new).with(no_args())
+        $GLOBAL_THREAD_POOL.should_not_receive(:post).with(any_args())
+        subject.post{ nil }
+      end
+
+      it 'proxies a call with arguments' do
+        Thread.should_receive(:new).with(1,2,3)
+        $GLOBAL_THREAD_POOL.should_not_receive(:post).with(any_args())
+        subject.post(1,2,3){ nil }
+      end
+
+      it 'aliases #<<' do
+        Thread.should_receive(:new).with(no_args())
+        $GLOBAL_THREAD_POOL.should_not_receive(:post).with(any_args())
+        subject << proc{ nil }
+      end
+    end
+
+    context 'operation' do
+
+      context 'goroutine' do
+
+        it 'gets a new thread' do
+          $GLOBAL_THREAD_POOL = subject
+
+          t = Thread.new{ nil }
+
+          Thread.should_receive(:new).with(no_args()).and_return(t)
+          go{ nil }
+
+          Thread.should_receive(:new).with(1,2,3).and_return(t)
+          go(1,2,3){ nil }
+        end
+      end
+    end
+  end
+end

data/spec/concurrent/promise_spec.rb

@@ -21,6 +21,10 @@ module Concurrent
         rescue{ nil }.tap(){ sleep(0.1) }
     end
 
+    before(:each) do
+      Promise.thread_pool = FixedThreadPool.new(1)
+    end
+
     it_should_behave_like Obligation
 
     context 'behavior' do
@@ -194,6 +198,8 @@ module Concurrent
       end
 
       it 'searches associated rescue handlers in order' do
+        Promise.thread_pool = CachedThreadPool.new
+
         @expected = nil
         Promise.new{ raise ArgumentError }.
           rescue(ArgumentError){|ex| @expected = 1 }.

data/spec/concurrent/reactor/drb_async_demux_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+module Concurrent
+  class Reactor
+
+    describe DRbAsyncDemux do
+
+      pending
+
+    end
+  end
+end

data/spec/concurrent/reactor/tcp_sync_demux_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+module Concurrent
+  class Reactor
+
+    describe TcpSyncDemux do
+
+      pending
+
+    end
+  end
+end

data/spec/concurrent/reactor_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+module Concurrent
+
+  describe Reactor do
+
+    pending
+
+  end
+end

data/spec/concurrent/thread_pool_shared.rb

@@ -29,8 +29,9 @@ module Concurrent
 
     context '#shutdown?' do
 
-      it 'returns true if #shutdown has been called' do
+      it 'returns true if #shutdown is complete' do
         subject.shutdown
+        sleep(0.1)
         subject.should be_shutdown
       end
 
@@ -139,7 +140,7 @@ module Concurrent
       it 'returns false when shutdown fails to complete before timeout' do
         subject.post{ sleep(1) }
         subject.shutdown
-        subject.wait_for_termination(0.5).should be_true
+        subject.wait_for_termination(0.5).should be_false
       end
     end
 

data/spec/spec_helper.rb

@@ -1,3 +1,12 @@
+require 'simplecov'
+SimpleCov.start do
+  project_name 'concurrent-ruby'
+  add_filter '/md/'
+  add_filter '/pkg/'
+  add_filter '/spec/'
+  add_filter '/tasks/'
+end
+
 require 'eventmachine'
 
 require 'concurrent'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre.2
+  version: 0.1.1.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: functional-ruby
@@ -59,7 +59,6 @@ files:
 - lib/concurrent/agent.rb
 - lib/concurrent/cached_thread_pool.rb
 - lib/concurrent/defer.rb
-- lib/concurrent/drb_async_demux.rb
 - lib/concurrent/event.rb
 - lib/concurrent/event_machine_defer_proxy.rb
 - lib/concurrent/executor.rb
@@ -68,11 +67,13 @@ files:
 - lib/concurrent/future.rb
 - lib/concurrent/global_thread_pool.rb
 - lib/concurrent/goroutine.rb
+- lib/concurrent/null_thread_pool.rb
 - lib/concurrent/obligation.rb
 - lib/concurrent/promise.rb
+- lib/concurrent/reactor/drb_async_demux.rb
+- lib/concurrent/reactor/tcp_sync_demux.rb
 - lib/concurrent/reactor.rb
 - lib/concurrent/smart_mutex.rb
-- lib/concurrent/tcp_sync_demux.rb
 - lib/concurrent/thread_pool.rb
 - lib/concurrent/utilities.rb
 - lib/concurrent/version.rb
@@ -96,9 +97,14 @@ files:
 - spec/concurrent/fixed_thread_pool_spec.rb
 - spec/concurrent/functions_spec.rb
 - spec/concurrent/future_spec.rb
+- spec/concurrent/global_thread_pool_spec.rb
 - spec/concurrent/goroutine_spec.rb
+- spec/concurrent/null_thread_pool_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/promise_spec.rb
+- spec/concurrent/reactor/drb_async_demux_spec.rb
+- spec/concurrent/reactor/tcp_sync_demux_spec.rb
+- spec/concurrent/reactor_spec.rb
 - spec/concurrent/smart_mutex_spec.rb
 - spec/concurrent/thread_pool_shared.rb
 - spec/concurrent/utilities_spec.rb
@@ -138,9 +144,14 @@ test_files:
 - spec/concurrent/fixed_thread_pool_spec.rb
 - spec/concurrent/functions_spec.rb
 - spec/concurrent/future_spec.rb
+- spec/concurrent/global_thread_pool_spec.rb
 - spec/concurrent/goroutine_spec.rb
+- spec/concurrent/null_thread_pool_spec.rb
 - spec/concurrent/obligation_shared.rb
 - spec/concurrent/promise_spec.rb
+- spec/concurrent/reactor/drb_async_demux_spec.rb
+- spec/concurrent/reactor/tcp_sync_demux_spec.rb
+- spec/concurrent/reactor_spec.rb
 - spec/concurrent/smart_mutex_spec.rb
 - spec/concurrent/thread_pool_shared.rb
 - spec/concurrent/utilities_spec.rb

data/lib/concurrent/drb_async_demux.rb

@@ -1,72 +0,0 @@
-require 'drb/drb'
-require 'drb/acl'
-require 'functional'
-require 'concurrent/reactor'
-
-module Concurrent
-
-  class DRbAsyncDemux
-
-    behavior(:async_event_demux)
-
-    DEFAULT_URI = 'druby://localhost:12345'
-    DEFAULT_ACL = %[allow all]
-
-    def initialize(opts = {})
-      @uri = opts[:uri] || DEFAULT_URI
-      @acl = ACL.new(opts[:acl] || DEFAULT_ACL)
-    end
-
-    def set_reactor(reactor)
-      raise ArgumentError.new('invalid reactor') unless reactor.behaves_as?(:demux_reactor)
-      @reactor = reactor
-    end
-
-    def start
-      DRb.install_acl(@acl)
-      @service = DRb.start_service(@uri, Demultiplexer.new(@reactor))
-    end
-
-    def stop
-      @service = DRb.stop_service
-    end
-
-    def stopped?
-      return @service.nil?
-    end
-
-    private
-
-    class Demultiplexer
-
-      def initialize(reactor)
-        @reactor = reactor
-      end
-
-      Concurrent::Reactor::RESERVED_EVENTS.each do |event|
-        define_method(event){|*args| false }
-      end
-
-      def method_missing(method, *args, &block)
-        (class << self; self; end).class_eval do
-          define_method(method) do |*args|
-            result = @reactor.handle(method, *args)
-            case result.first
-            when :ok
-              return result.last
-            when :ex
-              raise result.last
-            when :noop
-              raise NoMethodError.new("undefined method '#{method}' for #{self}")
-            else
-              raise DRb::DRbUnknownError.new("unexpected error when calling method '#{method}'")
-            end
-          end
-        end
-        self.send(method, *args)
-      end
-    end
-  end
-
-  DRbAsyncDemultiplexer = DRbAsyncDemux
-end

data/lib/concurrent/tcp_sync_demux.rb

@@ -1,96 +0,0 @@
-require 'socket'
-require 'drb/acl'
-require 'functional'
-require 'concurrent/reactor'
-
-module Concurrent
-
-  class TcpSyncDemux
-
-    behavior(:sync_event_demux)
-
-    DEFAULT_HOST = '127.0.0.1'
-    DEFAULT_PORT = 12345
-    DEFAULT_ACL = %[allow all]
-
-    def initialize(opts = {})
-      @host = opts[:host] || DEFAULT_HOST
-      @port = opts[:port] || DEFAULT_PORT
-      @acl = ACL.new(opts[:acl] || DEFAULT_ACL)
-    end
-
-    def start
-      @server = TCPServer.new(@host, @port)
-    end
-
-    def stop
-      atomic {
-        @socket.close unless @socket.nil?
-        @server.close unless @server.nil?
-        @server = @socket = nil
-      }
-    end
-
-    def stopped?
-      return @server.nil?
-    end
-
-    def accept
-      @socket = @server.accept if @socket.nil?
-      return nil unless @acl.allow_socket?(@socket)
-      event, args = get_message(@socket)
-      return nil if event.nil?
-      return Reactor::EventContext.new(event, args)
-    end
-
-    def respond(result, message)
-      return nil if @socket.nil?
-      @socket.puts(format_message(result, message))
-    end
-
-    def close
-      @socket.close
-      @socket = nil
-    end
-
-    def self.format_message(event, *args)
-      args = args.reduce('') do |memo, arg|
-        memo << "#{arg}\r\n"
-      end
-      return ":#{event}\r\n#{args}\r\n"
-    end
-    def format_message(*args) self.class.format_message(*args); end
-
-    def self.parse_message(message)
-      return atomic {
-        event = message.first.match /^:?(\w+)/
-        event = event[1].to_s.downcase.to_sym unless event.nil?
-
-        args = message.slice(1, message.length) || []
-
-        [event, args]
-      }
-    end
-    def parse_message(*args) self.class.parse_message(*args); end
-
-    def self.get_message(socket)
-      message = []
-      while line = socket.gets
-        if line.nil? || (line = line.strip).empty?
-          break
-        else
-          message << line
-        end
-      end
-
-      if message.empty?
-        return nil
-      else
-        return parse_message(message)
-      end
-    end
-    def get_message(*args) self.class.get_message(*args); end
-  end
-
-  TcpSyncDemultiplexer = TcpSyncDemux
-end