OptionsParser::get_executor_from is now a module function.

Author: jdantonio

lib/concurrent/agent.rb

@@ -35,7 +35,6 @@ module Concurrent
   class Agent
     include Dereferenceable
     include Concurrent::Observable
-    include OptionsParser
 
     # The default timeout value (in seconds); used when no timeout option
     # is given at initialization
@@ -66,7 +65,7 @@ def initialize(initial, opts = {})
       @validator = Proc.new { |result| true }
       @timeout = opts.fetch(:timeout, TIMEOUT).freeze
       self.observers = CopyOnWriteObserverSet.new
-      @executor = get_executor_from(opts)
+      @executor = OptionsParser::get_executor_from(opts)
       init_mutex
       set_deref_options(opts)
     end

lib/concurrent/executor/timer_set.rb

@@ -12,7 +12,6 @@ module Concurrent
   # time. Tasks are run on the global task pool or on the supplied executor.
   class TimerSet
     include Executor
-    include OptionsParser
 
     # Create a new set of timed tasks.
     #
@@ -24,7 +23,7 @@ class TimerSet
     #   this executor rather than the global thread pool (overrides :operation)
     def initialize(opts = {})
       @queue = PriorityQueue.new(order: :min)
-      @task_executor = get_executor_from(opts)
+      @task_executor = OptionsParser::get_executor_from(opts)
       @timer_executor = SingleThreadExecutor.new
       @condition = Condition.new
       init_executor

lib/concurrent/future.rb

@@ -41,7 +41,6 @@ module Concurrent
   # @see http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Future.html java.util.concurrent.Future
   class Future < IVar
     include Obligation
-    include OptionsParser
 
     # Create a new `Future` in the `:unscheduled` state.
     #
@@ -64,7 +63,7 @@ def initialize(opts = {}, &block)
       super(IVar::NO_VALUE, opts)
       @state = :unscheduled
       @task = block
-      @executor = get_executor_from(opts)
+      @executor = OptionsParser::get_executor_from(opts)
     end
 
     # Execute an `:unscheduled` `Future`. Immediately sets the state to `:pending` and

lib/concurrent/options_parser.rb

@@ -20,5 +20,6 @@ def get_executor_from(opts = {})
         Concurrent.configuration.global_task_pool
       end
     end
+    module_function :get_executor_from
   end
 end

lib/concurrent/promise.rb

@@ -7,7 +7,6 @@ module Concurrent
 
   class Promise
     include Obligation
-    include OptionsParser
 
     # Initialize a new Promise with the provided options.
     #
@@ -33,7 +32,7 @@ class Promise
     def initialize(opts = {}, &block)
       opts.delete_if {|k, v| v.nil?}
 
-      @executor = get_executor_from(opts)
+      @executor = OptionsParser::get_executor_from(opts)
       @parent = opts.fetch(:parent) { nil }
       @on_fulfill = opts.fetch(:on_fulfill) { Proc.new{ |result| result } }
       @on_reject = opts.fetch(:on_reject) { Proc.new{ |reason| raise reason } }

spec/concurrent/options_parser_spec.rb

@@ -4,10 +4,6 @@ module Concurrent
 
   describe OptionsParser do
 
-    subject do
-      Class.new{ include OptionsParser }.new
-    end
-
     let(:executor){ ImmediateExecutor.new }
 
     let(:task_pool){ ImmediateExecutor.new }
@@ -16,59 +12,59 @@ module Concurrent
     context '#get_executor_from' do
 
       it 'returns the given :executor' do
-        subject.get_executor_from(executor: executor).should eq executor
+        OptionsParser::get_executor_from(executor: executor).should eq executor
       end
 
       it 'returns the global operation pool when :operation is true' do
         Concurrent.configuration.should_receive(:global_operation_pool).
           and_return(:operation_pool)
-        subject.get_executor_from(operation: true)
+        OptionsParser::get_executor_from(operation: true)
       end
 
       it 'returns the global task pool when :operation is false' do
         Concurrent.configuration.should_receive(:global_task_pool).
           and_return(:task_pool)
-        subject.get_executor_from(operation: false)
+        OptionsParser::get_executor_from(operation: false)
       end
 
       it 'returns the global operation pool when :task is false' do
         Concurrent.configuration.should_receive(:global_operation_pool).
           and_return(:operation_pool)
-        subject.get_executor_from(task: false)
+        OptionsParser::get_executor_from(task: false)
       end
 
       it 'returns the global task pool when :task is true' do
         Concurrent.configuration.should_receive(:global_task_pool).
           and_return(:task_pool)
-        subject.get_executor_from(task: true)
+        OptionsParser::get_executor_from(task: true)
       end
 
       it 'returns the global task pool when :executor is nil' do
         Concurrent.configuration.should_receive(:global_task_pool).
           and_return(:task_pool)
-        subject.get_executor_from(executor: nil)
+        OptionsParser::get_executor_from(executor: nil)
       end
 
       it 'returns the global task pool when no option is given' do
         Concurrent.configuration.should_receive(:global_task_pool).
           and_return(:task_pool)
-        subject.get_executor_from
+        OptionsParser::get_executor_from
       end
 
       specify ':executor overrides :operation' do
-        subject.get_executor_from(executor: executor, operation: true).
+        OptionsParser::get_executor_from(executor: executor, operation: true).
           should eq executor
       end
 
       specify ':executor overrides :task' do
-        subject.get_executor_from(executor: executor, task: true).
+        OptionsParser::get_executor_from(executor: executor, task: true).
           should eq executor
       end
 
       specify ':operation overrides :task' do
         Concurrent.configuration.should_receive(:global_operation_pool).
           and_return(:operation_pool)
-        subject.get_executor_from(operation: true, task: true)
+        OptionsParser::get_executor_from(operation: true, task: true)
       end
     end
   end