rosarium 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7953c9f3adbdebbd4299ddef80c064fe76f32fe74e8bd8abafd160d0f9b6d816
-  data.tar.gz: 80b937b9e1e8750f1bbac9a9913a0e129b5dc80048d97b3ea360774b02eb1e2e
+  metadata.gz: 3789051cf47569f1729bb161433ecb033274b49833e774eec788e5884c490897
+  data.tar.gz: f48ef4f93bc8cadb68d9069d3dd3f8434b45ce43e6f3057918912d97d72f5432
 SHA512:
-  metadata.gz: 22821d81eaccb0357841982eb2095c57e58f786d535834600b5903719c180d91af364b9e8778ac1256236d19db95835262fd77b8c313bedafdf60ae0e04a7579
-  data.tar.gz: 34ac659ece6ea48a111db7dab0ea89f8c0adcf90cfcf0802aaecba89eec49b1e8831fb9d55147691c4b686e51c1e68e38164fcd6dd27b4464fd5363ca802bcc9
+  metadata.gz: 3e108887ddb2cdee8bc0e5abe53915e249028d5f367a7c617874460a4b7b5ec19ca04c364631e3b6235c0da80c2ae2951501e08c6b280dd2609455bdbe9f7858
+  data.tar.gz: 7622eab1b92fcee040b91394422f8b7f1f2c78be004c62988d5e588bf528ab6718da0bc97d3adb8b24022b22498d80843e31c051b5b83ed2f4fed308ff288370

data/lib/rosarium/promise.rb

@@ -3,20 +3,20 @@
 module Rosarium
   class Promise
 
-    DEFAULT_ON_FULFILL = proc { |value| value }
-    DEFAULT_ON_REJECT = proc { |reason| raise reason }
-
     private_class_method :new
 
     def self.defer
       promise = new
 
-      resolver = ->(value) { promise.send(:try_settle, value, nil) }
+      resolver = lambda do |value|
+        promise.send(:try_settle, value, nil)
+        nil # do not leak
+      end
 
       rejecter = lambda do |reason|
         raise "reason must be an Exception" unless reason.is_a?(Exception)
-
         promise.send(:try_settle, nil, reason)
+        nil # do not leak
       end
 
       Deferred.new(promise, resolver, rejecter)
@@ -57,7 +57,7 @@ module Rosarium
       end
 
       promises.each do |promise|
-        promise.then(check, &check)
+        promise.send(:when_settled, &check)
       end
 
       deferred.promise
@@ -72,60 +72,27 @@ module Rosarium
       waiting_for = promises.count
       mutex = Mutex.new
 
-      do_reject = ->(reason) { deferred.reject(reason) }
-      do_fulfill = proc do
-        # Only fulfilled (not rejected), so hits zero iff all promises were fulfilled
-        if mutex.synchronize { (waiting_for -= 1) == 0 }
-          deferred.resolve(promises.map(&:value))
+      check = lambda do |promise|
+        if promise.fulfilled?
+          # Hits zero iff all promises were fulfilled
+          if mutex.synchronize { (waiting_for -= 1) == 0 }
+            deferred.resolve(promises.map(&:value))
+          end
+        else
+          deferred.reject(promise.reason)
         end
       end
 
       promises.each do |promise|
-        promise.then(do_reject, &do_fulfill)
-      end
-
-      deferred.promise
-    end
-
-    def then(on_rejected = nil, &on_fulfilled)
-      deferred = self.class.defer
-
-      on_fulfilled ||= DEFAULT_ON_FULFILL
-      on_rejected ||= DEFAULT_ON_REJECT
-
-      when_settled do
-        EXECUTOR.submit do
-          begin
-            deferred.resolve(
-              if fulfilled?
-                # User-supplied code
-                on_fulfilled.call value
-              else
-                # User-supplied code
-                on_rejected.call reason
-              end
-            )
-          rescue Exception => e
-            deferred.reject e
-          end
-        end
+        promise.send(:when_settled) { check.call(promise) }
       end
 
       deferred.promise
     end
 
-    def rescue(&block)
-      self.then(block)
-    end
-
-    alias catch rescue
-    alias on_error rescue
-
-    public
-
     def initialize
       @state = :pending
-      @resolving = false
+      @settling = false
       @mutex = Mutex.new
       @condition = ConditionVariable.new
       @when_settled = []
@@ -136,15 +103,23 @@ module Rosarium
     end
 
     def value
-      wait
+      wait_until_settled
       synchronize { @value }
     end
 
     def reason
-      wait
+      wait_until_settled
       synchronize { @reason }
     end
 
+    def value!
+      wait_until_settled
+      synchronize do
+        raise @reason if @state == :rejected
+        @value
+      end
+    end
+
     def inspect
       synchronize do
         r = { state: @state }
@@ -162,24 +137,43 @@ module Rosarium
       state == :rejected
     end
 
-    def value!
-      wait
-      synchronize do
-        raise @reason if @state == :rejected
-        @value
+    def then(on_rejected = nil, &on_fulfilled)
+      deferred = self.class.defer
+
+      when_settled do
+        EXECUTOR.submit do
+          begin
+            deferred.resolve(
+              if fulfilled?
+                # User-supplied code
+                on_fulfilled ? on_fulfilled.call(value) : value
+              else
+                # User-supplied code
+                on_rejected ? on_rejected.call(reason) : raise(reason)
+              end
+            )
+          rescue Exception => e
+            deferred.reject e
+          end
+        end
       end
+
+      deferred.promise
     end
 
-    private
+    def rescue(&block)
+      self.then(block)
+    end
 
-    def wait
-      when_settled do
-        synchronize { @condition.broadcast }
-      end
+    alias catch rescue
+    alias on_error rescue
 
+    private
+
+    def wait_until_settled
       synchronize do
         loop do
-          return if @state == :fulfilled || @state == :rejected
+          return if @state != :pending
           @condition.wait @mutex
         end
       end
@@ -189,68 +183,55 @@ module Rosarium
       @mutex.synchronize(&block)
     end
 
+    # Can be called more than once
     def try_settle(value, reason)
-      callbacks = []
-      add_when_settled = false
+      settle_with = nil
 
       synchronize do
-        if @state == :pending && !@resolving
-          if value.is_a? Promise
-            @resolving = true
-            add_when_settled = true
-          elsif reason.nil?
-            @value = value
-            @state = :fulfilled
-            callbacks.concat @when_settled
-            @when_settled.clear
-          else
-            @reason = reason
-            @state = :rejected
-            callbacks.concat @when_settled
-            @when_settled.clear
-          end
+        return if @state != :pending || @settling
+
+        if value.is_a? Promise
+          @settling = true
+        elsif reason.nil?
+          settle_with = [value, nil]
+        else
+          settle_with = [nil, reason]
         end
       end
 
-      # rubocop:disable Style/IfUnlessModifier
-      if add_when_settled
-        value.when_settled { copy_settlement_from value }
+      if settle_with
+        settle(*settle_with)
+      else
+        value.when_settled do
+          if value.fulfilled?
+            settle(value.value, nil)
+          else
+            settle(nil, value.reason)
+          end
+        end
       end
-      # rubocop:enable Style/IfUnlessModifier
-
-      callbacks.each { |c| EXECUTOR.submit(&c) }
     end
 
-    def copy_settlement_from(other)
-      callbacks = []
-
+    # Only called once
+    def settle(value, reason)
       synchronize do
-        @value = other.value
-        @reason = other.reason
-        @state = other.state
-        @resolving = false
-        callbacks.concat @when_settled
-        @when_settled.clear
-      end
-
-      callbacks.each { |c| EXECUTOR.submit(&c) }
+        @state = (reason ? :rejected : :fulfilled)
+        @value = value
+        @reason = reason
+        @condition.broadcast
+        @when_settled.slice!(0, @when_settled.length)
+      end.each(&:call)
     end
 
     protected
 
     def when_settled(&block)
       immediate = synchronize do
-        if @state == :fulfilled || @state == :rejected
-          true
-        else
-          @when_settled << block
-          false
-        end
+        @when_settled << block if @state == :pending
+        @state != :pending
       end
 
       block.call if immediate
-
-      nil
     end
 
     @resolved = resolve(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosarium
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Rachel Evans
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,7 +64,7 @@ homepage: http://rve.org.uk/gems/rosarium
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -79,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Promises, or something like them
 test_files: []