em_promise.rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9252ef4d1a0e87a58dab94d940c0e007daa57bb29aff67607a53ddd9e49eff
-  data.tar.gz: c9deea390a562b41346c6b5c6c067d30bb36e8bd71f90cadf7b78928a56be383
+  metadata.gz: 7197eaa859e861cb7a0e0d4ba684a8e8095bfcedd1350abe3464d87b845bdf33
+  data.tar.gz: df5ee24ccbfca15d4d87978dba61a178e6776ba6233cdbfa497ed55f666b988c
 SHA512:
-  metadata.gz: 1cdccfffad92001ced9be4d66298741a1fdf565ce0e2324f9acf53246901f527a9d36d3b26713dcd6128f07df05d7d4a66f762bff4831948b40dba61b3a571b4
-  data.tar.gz: 0ed5df6e816ae1f221108a5990835e446ac6bc288557131e66baafccf7132ba86881eaa190139e953db5f83e210ceb4d716542b72da4c06ffff89b24a7118647
+  metadata.gz: 3eda1c045cbcf0dde66282e473f8b577049c09c97ddcaeb8838ff6275b6e772b02495d6b2b0cbe56bcbfe310c73756784765e5d4e1c16ead1c8f59401d29a7d1
+  data.tar.gz: 1e4f2a1110ea4ec82324c0b9096e2cf808141f83d413cc9ee721260be08b681e7f2e452ee050fbbeb5ee9c39e3e25d93ed704579cfc926e0e9268e7c12178ebd

data/em_promise.rb.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |spec|
 		end
 	spec.require_paths = ["lib"]
 
+	spec.add_dependency "eventmachine"
 	spec.add_dependency "promise.rb", "~> 0.7.4"
 end

data/lib/em_promise.rb

@@ -1,9 +1,53 @@
+# frozen_string_literal: true
+
 require "eventmachine"
+require "fiber"
 require "promise"
 
 class EMPromise < Promise
-	def initialize(deferrable=nil)
+	class Trampoline
+		attr_accessor :ready
+
+		def initialize
+			@ready = true
+			@fiber = Fiber.new do |blk|
+				Thread.current[:_em_promise_trampoline] = self
+				loop do
+					result = blk.call
+					self.ready = true
+					blk = Fiber.yield result
+					self.ready = false
+				end
+			end
+		end
+
+		def submit(&blk)
+			EM.next_tick do
+				if ready
+					@fiber.resume(blk)
+				else
+					submit(&blk)
+				end
+			end
+		end
+	end
+
+	# Make sure that self.class.new inherits the trampoline
+	def class
+		tramp = @trampoline
+		klass = super.dup
+		klass.define_singleton_method(:new) do |*args|
+			super(*args, trampoline: tramp)
+		end
+		klass
+	end
+
+	def initialize(deferrable=nil, trampoline: nil)
 		super()
+		@trampoline =
+			trampoline ||
+			Thread.current[:_em_promise_trampoline] ||
+			Trampoline.new
 		fulfill(deferrable) if deferrable
 	end
 
@@ -17,17 +61,29 @@ class EMPromise < Promise
 	end
 
 	def defer
-		EM.next_tick { yield }
+		@trampoline.submit { yield }
 	end
 
 	def wait
 		fiber = Fiber.current
-		resume = proc do |arg|
-			defer { fiber.resume(arg) }
+		resume = proc do
+			EM.next_tick { fiber.resume }
 		end
 
 		self.then(resume, resume)
-		Fiber.yield
+
+		# 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
 	end
 
 	def self.reject(e)
@@ -61,7 +117,7 @@ module EventMachine
 			EMPromise.new(self)
 		end
 
-		[:then, :rescue, :catch].each do |method|
+		[:then, :rescue, :catch, :sync].each do |method|
 			define_method(method) do |*args, &block|
 				promise.public_send(method, *args, &block)
 			end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: em_promise.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephen Paul Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: promise.rb
   requirement: !ruby/object:Gem::Requirement