Merge branch 'use-empromise-gem' into 'master'

Stephen Paul Weber created 3 years ago

Use new em_promise.rb gem

See merge request soprani.ca/sgx-bwmsgsv2!2

Change summary

Gemfile       |  2 
em_promise.rb | 77 -----------------------------------------------------
2 files changed, 1 insertion(+), 78 deletions(-)

Detailed changes

Gemfile

@@ -4,10 +4,10 @@ gem 'activesupport', '<5.0.0'
 gem 'blather'
 gem 'em-hiredis'
 gem 'em-http-request'
+gem 'em_promise.rb'
 gem 'eventmachine'
 gem 'goliath'
 gem 'log4r'
-gem 'promise.rb'
 gem 'redis'
 
 group :development do

em_promise.rb

@@ -1,77 +0,0 @@
-# Copyright (C) 2017  Stephen Paul Weber <[e-mail]>
-#
-# This file is part of sgx-bwmsgsv2.
-#
-# sgx-bwmsgsv2 is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# sgx-bwmsgsv2 is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with sgx-bwmsgsv2.  If not, see <http://www.gnu.org/licenses/>.
-
-require "eventmachine"
-require "promise"
-
-class EMPromise < Promise
-	def initialize(deferrable=nil)
-		super()
-		fulfill(deferrable) if deferrable
-	end
-
-	def fulfill(value, bind_defer=true)
-		if bind_defer && value.is_a?(EM::Deferrable)
-			value.callback { |x| fulfill(x, false) }
-			value.errback(&method(:reject))
-		else
-			super(value)
-		end
-	end
-
-	def defer
-		EM.next_tick { yield }
-	end
-
-	def wait
-		fiber = Fiber.current
-		resume = proc do |arg|
-			defer { fiber.resume(arg) }
-		end
-
-		self.then(resume, resume)
-		Fiber.yield
-	end
-
-	def self.reject(e)
-		new.tap { |promise| promise.reject(e) }
-	end
-
-	def self.all(enumerable)
-		super(enumerable.map { |input|
-			if input.respond_to?(:promise)
-				input.promise
-			else
-				input
-			end
-		})
-	end
-end
-
-module EventMachine
-	module Deferrable
-		def promise
-			EMPromise.new(self)
-		end
-
-		[:then, :rescue, :catch].each do |method|
-			define_method(method) do |*args, &block|
-				promise.public_send(method, *args, &block)
-			end
-		end
-	end
-end