Merge pull request #572 from lucasallan/promises-then-with-executor

Allows Promise#then to receive an executor

Author: jdantonio

lib/concurrent/promise.rb

@@ -79,7 +79,7 @@ module Concurrent
   # ```
   #
   # Promises can be chained using the `then` method. The `then` method accepts a
-  # block, to be executed on fulfillment, and a callable argument to be executed
+  # block and an executor, to be executed on fulfillment, and a callable argument to be executed
   # on rejection. The result of the each promise is passed as the block argument
   # to chained promises.
   #
@@ -93,7 +93,7 @@ module Concurrent
   # p = Concurrent::Promise.fulfill(20).
   #     then{|result| result - 10 }.
   #     then{|result| result * 3 }.
-  #     then{|result| result % 5 }.execute
+  #     then(executor: different_executor){|result| result % 5 }.execute
   # ```
   #
   # The initial state of a newly created Promise depends on the state of its parent:
@@ -301,15 +301,18 @@ def self.execute(opts = {}, &block)
     # @param [Proc] rescuer An optional rescue block to be executed if the
     #   promise is rejected.
     #
+    # @param [ThreadPool] executor An optional thread pool executor to be used
+    # in the new Promise
+    #
     # @yield The block operation to be performed asynchronously.
     #
     # @return [Promise] the new promise
-    def then(rescuer = nil, &block)
+    def then(rescuer = nil, executor = @executor, &block)
       raise ArgumentError.new('rescuers and block are both missing') if rescuer.nil? && !block_given?
       block = Proc.new { |result| result } unless block_given?
       child = Promise.new(
         parent: self,
-        executor: @executor,
+        executor: executor,
         on_fulfill: block,
         on_reject: rescuer
       )

spec/concurrent/promise_spec.rb

@@ -218,6 +218,13 @@ def get_ivar_from_args(opts)
         expect(child).not_to be empty_root
       end
 
+      it 'returns a new promise when a block, rescuer and executor are passed' do
+        new_executor = Concurrent::SingleThreadExecutor.new
+        child = empty_root.then(Proc.new{}, new_executor) { nil }
+        expect(child).to be_a Promise
+        expect(child).not_to be empty_root
+        expect(child.instance_variable_get(:@executor)).to be(new_executor)
+      end
       it 'should have block or rescuers' do
         expect { empty_root.then }.to raise_error(ArgumentError)
       end