em_promise.rb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08090445dc90432a6c73b7101f6c361a899b59cb710f0131b272949e2d5f8870'
-  data.tar.gz: bcc073fe296e3616ff82cce4e8060ce3bde64bdaf4f63a01622e8d43e36d492d
+  metadata.gz: 72a70beea8dc08eb215bb38dbc39a2c98f180c8c53367bdf1eb892f1d5fc6c53
+  data.tar.gz: e1bf42f248972e4b5e38bcf9750ffe845020640b6e386da36a5d24bd2b9d0701
 SHA512:
-  metadata.gz: 3569fb2c9967bcc5963a8e592d9d0a87313a0368f00756b1a7469a61fc99ff2770fd42e9b3e3233d190e37a4a4dbb2a1e8c6935816869d714d882c93d7c34902
-  data.tar.gz: 6b788c661ff9fabee37120ef3bf072ef45804552f8db52de595fe5432eeeca7e70402b48ed9127b0078fa144c945fce31800d2b21ab0161fb6e388682cc7400d
+  metadata.gz: 9aedc31b0acf65bd786cdfe364c54f13dbe8ca1f0f952f1ecbf4bdf36278c7c93a70a05df500b2cfa6d1931e80709d027dd3a14a64abc830f9e848cfc86bac3a
+  data.tar.gz: 7d76798c8347bbaa9843c16cea76bfdb21cc63504414b0d93d7c92c65591c0e42ecb382e08bce068c3fbeb6e31b4903ac58425d549aae2eec07f80de52652f4d

data/em_promise.rb.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |spec|
 	spec.homepage      = "https://git.singpolyma.net/em_promise.rb"
 
 	spec.files         =
-		`git ls-files -z`.split("\x00".b).reject do |f|
+		`git ls-files -z`.split("\x00".b).reject { |f|
 			f.start_with?(".", "test/", "scripts/") ||
 				f == "Makefile" || f == "Gemfile"
-		end
+		}
 	spec.require_paths = ["lib"]
 
 	spec.add_dependency "eventmachine"

data/lib/em_promise.rb

@@ -8,28 +8,49 @@ class EMPromise < Promise
 	class Trampoline
 		attr_accessor :ready
 
-		def initialize
+		class SubmittedBlock
+			def initialize(blk)
+				@blk = blk
+			end
+
+			def call(*args, **kwargs, &blk)
+				@blk.call(*args, **kwargs, &blk)
+			end
+		end
+
+		def initialize(&initial_blk)
 			@ready = true
-			@fiber = Fiber.new do |blk|
+			@fiber = Fiber.new { |blk|
 				Thread.current[:_em_promise_trampoline] = self
-				loop do
-					self.ready = false
-					result = blk.call
-					self.ready = true
-					blk = Fiber.yield result
-				end
-			end
+				self.ready = false
+				Trampoline.yield(blk.call)
+			}
+			@fiber.resume(&initial_blk) if initial_blk
 		end
 
 		def submit(&blk)
 			EM.next_tick do
 				if ready
-					@fiber.resume(blk)
+					@fiber.resume(SubmittedBlock.new(blk))
 				else
 					submit(&blk)
 				end
 			end
 		end
+
+		def self.yield(arg=nil)
+			tramp = Thread.current[:_em_promise_trampoline]
+			raise "Trampoline already ready?" if tramp&.ready
+
+			loop do
+				tramp&.ready = true
+				blk = Fiber.yield arg
+				tramp&.ready = false
+				return arg unless blk.is_a?(SubmittedBlock)
+
+				arg = blk.call
+			end
+		end
 	end
 
 	# Make sure that self.class.new inherits the trampoline
@@ -51,9 +72,9 @@ class EMPromise < Promise
 		fulfill(deferrable) if deferrable
 	end
 
-	def fulfill(value, bind_defer=true)
+	def fulfill(value, bind_defer: true)
 		if bind_defer && value.is_a?(EM::Deferrable)
-			value.callback { |x| fulfill(x, false) }
+			value.callback { |x| fulfill(x, bind_defer: false) }
 			value.errback(&method(:reject))
 		else
 			super(value)
@@ -73,17 +94,7 @@ class EMPromise < Promise
 		self.then(resume, resume)
 
 		# We might be in a trampoline, so keep that going
-		tramp = Thread.current[:_em_promise_trampoline]
-		raise "Trampoline already ready?" if tramp&.ready
-
-		result = nil
-		loop do
-			tramp&.ready = true
-			blk = Fiber.yield result
-			tramp&.ready = false
-			result = blk&.call
-			break unless blk
-		end
+		Trampoline.yield
 	end
 
 	def self.reject(e)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em_promise.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stephen Paul Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine