celluloid-promise 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRkODIzNWFkZDAwNWQyZjlmZDI5ZjI1NGI4MDZjOTgzNWQ4ZDMxYQ==
+    Y2NhOWI2MjI1NTU4ZWZhZDQ2ZTgwOTdmNWRjNzUxMDUwODgyY2ExNQ==
   data.tar.gz: !binary |-
-    MjM0N2I0YzUxNzViMDY2YTc4MjIwMjRlNmQ2YzhmZGYwMzMzYmVjOA==
+    YmJiYjA3MTY3ZGY3MDNmNjJiOTQ5NjNlMjIyMTcwYjg5N2QzN2NkZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmFiN2ZmNjM5YzQzYThkOWRhMTJkNjgzNDI0NzVlNTllMjJjOWE1YjY2YTdm
-    ZjM3NWI0MTY2ZDZkOTRhMTgyYWY3YzdjOWQyYzE4NjJlNzMzYTRmMmZkOWYz
-    N2YxNTI1MjgwYTI4NGY5NDRhYTRmM2U3YmIyYTU5MGE2NWZhOGI=
+    ODFmYzJhOTg1M2Y5ZTViNjhlNTExYTQ5YjhmNmM4ZWFmNTU5YTNhNDA0ZmYz
+    ZDQzOTMwMWQ1NzJhOTIyYmRlMzQ2NjAxMzQyMDc5Njc2ODk1N2ZjMWJkZDc2
+    N2Y5MjI4ODkzOTkwZDY3YmNiN2ZhOTFhYzc1OTYxOGU2M2ZiMDg=
   data.tar.gz: !binary |-
-    ZDUwNzllYzMxNzRhOWZiZjBkODUwYmE0NjI0ZjQ3MmQ4ZGQ5YjBkNTQ1YTk1
-    NjU4MGRjNDg0ZjEwMzRhYmY1YjExMjk3ZTM5YTkzYmMyMzZhMGMyZWMwZjFj
-    NDY0OWU5Y2E4NzdkNzMyZjk3NmRkYjNlMGI0YTMwNWNhNDA2MmQ=
+    N2Q4NDFmYTcwMWUxZjAwZTgzMjJiMDhmOWExYTg3YzkwMmJiY2ZhYWExZWVh
+    MWIxOTBmZmI5MGZkNGM4ZGI1NjU0MWNjOGFlOWI2NWU0NTUyMzE2ZDk5YTgy
+    NTQzZTUyMDEyM2ExZmVlZWUwNTgwYjFhYjhmYzZmNjNkNzhmZGQ=

data/lib/celluloid-promise/q.rb

@@ -8,7 +8,7 @@ module Celluloid
 		class Reactor
 			include ::Celluloid
 			
-			def task
+			def perform
 				yield if block_given?
 			end
 		end
@@ -44,7 +44,7 @@ module Celluloid
 			# @param [Proc, Proc, &blk] callbacks success, error, success_block
 			# @return [Promise] Returns an unresolved promise for chaining
 			def then(callback = nil, errback = nil, &blk)
-				result = Q.defer
+				result = ::Celluloid::Actor[:Q].defer(@reactor)
 				
 				callback ||= blk
 				
@@ -78,7 +78,7 @@ module Celluloid
 				# Schedule as we are touching shared state
 				#	Everything else is locally scoped
 				#
-				@reactor.async.task do
+				@reactor.async.perform do
 					pending_array = pending
 					
 					if pending_array.nil?
@@ -118,11 +118,11 @@ module Celluloid
 			end
 			
 			def then(callback = nil, errback = nil, &blk)
-				result = Q.defer
+				result = ::Celluloid::Actor[:Q].defer(@reactor)
 				
 				callback ||= blk
 				
-				@reactor.async.task do
+				@reactor.async.perform do
 					if @error
 						if errback.nil?
 							result.resolve(ResolvedPromise.new(@reactor, @response, true))
@@ -164,7 +164,7 @@ module Celluloid
 			#
 			# @param [Object] val constant, message or an object representing the result.
 			def resolve(val = nil)
-				@reactor.async.task do
+				@reactor.async.perform do
 					if not @pending.nil?
 						callbacks = @pending
 						@pending = nil
@@ -223,8 +223,8 @@ module Celluloid
 			# Creates a Deferred object which represents a task which will finish in the future.
 			#
 			# @return [Deferred] Returns a new instance of Deferred
-			def defer
-				return Deferred.new(next_reactor)
+			def defer(reactor = nil)
+				return Deferred.new(next_reactor(reactor))
 			end
 			
 
@@ -316,13 +316,13 @@ module Celluloid
 			
 			#
 			# Promises are placed on reactor threads in a round robin
-			# I would have used pool however Celluloid::IO allows us to run
-			# multiple concurrent promise chains on each reactor, pool can't.
+			# I would have used pool however pool blocks to completion and doesn't
+			# allows us to run multiple concurrent promise chains on each reactor.
 			#
-			def next_reactor
+			def next_reactor(current = nil)
 				@current = @current >= (@reactors.length - 1) ? 0 : @current + 1
 				selected = @reactors[@current]
-				selected != Celluloid::Actor.current ? selected : next_reactor
+				selected != current ? selected : next_reactor(current)
 			end
 		end
 	end
@@ -334,15 +334,15 @@ module Celluloid
 	Promise::Coordinator.supervise_as :Q
 	module Q
 		def self.defer
-			Actor[:Q].defer
+			::Celluloid::Actor[:Q].defer
 		end
 		
 		def self.reject(reason = nil)
-			Actor[:Q].reject(reason)
+			::Celluloid::Actor[:Q].reject(reason)
 		end
 
 		def self.all(*promises)
-			Actor[:Q].all(*promises)
+			::Celluloid::Actor[:Q].all(*promises)
 		end
 	end
 end

data/lib/celluloid-promise/version.rb

@@ -1,6 +1,6 @@
 module Celluloid
 	module Promise
-		VERSION = "1.0.2"
+		VERSION = "1.0.3"
 	end
 end
 

data/spec/promise_spec.rb

@@ -17,10 +17,9 @@ describe Celluloid::Q do
 		@promise = @deferred.promise
 		@log = []
 		@finish = proc {
-			while(@mutex.locked?); end
-			@mutex.synchronize {
-				@resource.signal
-			}
+			while(!@mutex.try_lock); end
+			@resource.signal
+			@mutex.unlock
 		}
 		@default_fail = proc { |reason|
 			fail(reason)
@@ -127,7 +126,7 @@ describe Celluloid::Q do
 			it "can modify the result of a promise before returning" do
 				@mutex.synchronize {
 					proc { |name|
-						@defer.async.task {
+						@defer.async.perform {
 							@deferred.resolve("Hello #{name}")
 						}
 						@promise.then(proc {|result|
@@ -262,9 +261,9 @@ describe Celluloid::Q do
 						@finish.call
 					}, @default_fail)
 					
-					@defer.async.task { @deferred.resolve(:foo) }
-					@defer.async.task { deferred2.resolve(:baz) }
-					@defer.async.task { deferred1.resolve(:bar) }
+					@defer.async.perform { @deferred.resolve(:foo) }
+					@defer.async.perform { deferred2.resolve(:baz) }
+					@defer.async.perform { deferred1.resolve(:bar) }
 
 					@resource.wait(@mutex)
 				}
@@ -281,8 +280,8 @@ describe Celluloid::Q do
 						@finish.call
 					})
 					
-					@defer.async.task { @deferred.resolve(:foo) }
-					@defer.async.task { deferred2.reject(:baz) }
+					@defer.async.perform { @deferred.resolve(:foo) }
+					@defer.async.perform { deferred2.reject(:baz) }
 
 					@resource.wait(@mutex)
 				}
@@ -369,19 +368,19 @@ describe Celluloid::Q do
 				@mutex.synchronize {
 					@promise.then(proc {|result|
 						@log << result
-						:alt1
+						:alt
 					}, @default_fail)
 					@promise.then(proc {|result|
 						@log << result
-						'ERROR'
+						nil
 					}, @default_fail)
 					@promise.then(proc {|result|
 						@log << result
-						EM::Q.reject('some reason')
+						Celluloid::Q.reject('some reason')
 					}, @default_fail)
 					@promise.then(proc {|result|
 						@log << result
-						:alt2
+						raise 'some error'
 					}, @default_fail)
 					@promise.then(proc {
 						@finish.call
@@ -399,19 +398,19 @@ describe Celluloid::Q do
 				@mutex.synchronize {
 					@promise.then(@default_fail, proc {|result|
 						@log << result
-						:alt1
+						:alt
 					})
 					@promise.then(@default_fail, proc {|result|
 						@log << result
-						'ERROR'
+						nil
 					})
 					@promise.then(@default_fail, proc {|result|
 						@log << result
-						EM::Q.reject('some reason')
+						Celluloid::Q.reject('some reason')
 					})
 					@promise.then(@default_fail, proc {|result|
 						@log << result
-						:alt2
+						raise 'some error'
 					})
 					@promise.then(@default_fail, proc {|result|
 						@finish.call
@@ -470,8 +469,8 @@ describe Celluloid::Q do
 			class BlockingActor
 				include ::Celluloid
 				
-				def wait
-					sleep (10..20).to_a.sample
+				def delayed_response
+					sleep (5..10).to_a.sample
 				end
 			end
 			
@@ -486,7 +485,7 @@ describe Celluloid::Q do
 					deferred_store = []
 					
 					args = [proc {|val|
-						actor.wait
+						actor.delayed_response
 						count.update {|v| v + 1}
 					}, @default_fail]
 					
@@ -506,6 +505,9 @@ describe Celluloid::Q do
 					
 					@deferred.resolve()
 					@resource.wait(@mutex)
+					
+					actor.terminate
+					::Celluloid::Actor.kill(actor)
 				}
 			end
 			

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-promise
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Stephen von Takach