em_promise.rb 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9252ef4d1a0e87a58dab94d940c0e007daa57bb29aff67607a53ddd9e49eff
-  data.tar.gz: c9deea390a562b41346c6b5c6c067d30bb36e8bd71f90cadf7b78928a56be383
+  metadata.gz: 72a70beea8dc08eb215bb38dbc39a2c98f180c8c53367bdf1eb892f1d5fc6c53
+  data.tar.gz: e1bf42f248972e4b5e38bcf9750ffe845020640b6e386da36a5d24bd2b9d0701
 SHA512:
-  metadata.gz: 1cdccfffad92001ced9be4d66298741a1fdf565ce0e2324f9acf53246901f527a9d36d3b26713dcd6128f07df05d7d4a66f762bff4831948b40dba61b3a571b4
-  data.tar.gz: 0ed5df6e816ae1f221108a5990835e446ac6bc288557131e66baafccf7132ba86881eaa190139e953db5f83e210ceb4d716542b72da4c06ffff89b24a7118647
+  metadata.gz: 9aedc31b0acf65bd786cdfe364c54f13dbe8ca1f0f952f1ecbf4bdf36278c7c93a70a05df500b2cfa6d1931e80709d027dd3a14a64abc830f9e848cfc86bac3a
+  data.tar.gz: 7d76798c8347bbaa9843c16cea76bfdb21cc63504414b0d93d7c92c65591c0e42ecb382e08bce068c3fbeb6e31b4903ac58425d549aae2eec07f80de52652f4d

data/em_promise.rb.gemspec

@@ -12,11 +12,12 @@ 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"
 	spec.add_dependency "promise.rb", "~> 0.7.4"
 end

data/lib/em_promise.rb

@@ -1,15 +1,80 @@
+# frozen_string_literal: true
+
 require "eventmachine"
+require "fiber"
 require "promise"
 
 class EMPromise < Promise
-	def initialize(deferrable=nil)
+	class Trampoline
+		attr_accessor :ready
+
+		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 { |blk|
+				Thread.current[:_em_promise_trampoline] = self
+				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(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
+	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
 
-	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)
@@ -17,17 +82,19 @@ 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
+		Trampoline.yield
 	end
 
 	def self.reject(e)
@@ -61,7 +128,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.5
 platform: ruby
 authors:
 - Stephen Paul Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2022-03-16 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
@@ -54,8 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: promise.rb Promises for EventMachine