rosarium 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c296247c0162ee53783379115ff4a8aaa6a33e
-  data.tar.gz: fcfdc65d25c8610894b0c00087b4a12762c53056
+  metadata.gz: 0caf50a0435f2f9bd47f702eb22de12e5ad672d2
+  data.tar.gz: dd71f5aa5e34a2b6302dcf6d65d5aecd41825f2f
 SHA512:
-  metadata.gz: 36bc6091d46684b63bb142db5b4b638785ea69552f8e00f2377c7dfdbe88be38abcc9d60fe827bca648308c30071f272b58ff7aca87e86679f888527897e4ae9
-  data.tar.gz: 6a6a19090556dfba2defc71ff3c2ac44e884682003df62439148c39b1c546e49f7b4a074276c83362552fc66b1e47984ccac758c7ab0e9116f447fd2fab88e2c
+  metadata.gz: 3075ef2b1dcd8cdf1911e00fafb55c211d940420a18bafe356b703236e2ce888fe299898dfbc37d99f99374a56eb2fc91f60bdddc5a92d6df6e56fe0129ce25b
+  data.tar.gz: d6575b8a7f78e44848d26e98b536e9bc08aec5db580af6523b04e10e541842256fe98b9ace1cf152adb17c64feddfd15e3e361aea1c92b33570a71242fd4a9ff

data/README.md

@@ -77,6 +77,10 @@ then later, use the "deferred" to fulfill or reject the promise:
   # or nil (if fulfilled).
   promise.reason
 
+  # A hash describing the state of the promise.  Always includes :state key;
+  # may include :value or :reason.
+  promise.inspect
+
   # true iff state == :fulfilled
   promise.fulfilled?
 

data/lib/rosarium/promise.rb

@@ -5,28 +5,24 @@ module Rosarium
     DEFAULT_ON_FULFILL = Proc.new {|value| value}
     DEFAULT_ON_REJECT = Proc.new {|reason| raise reason}
 
-    def self.defer
-      new_deferred
-    end
-
     def self.resolve(value)
       if value.kind_of? Promise
         return value
       end
 
-      deferred = new_deferred
+      deferred = defer
       deferred.resolve(value)
       deferred.promise
     end
 
     def self.reject(reason)
-      deferred = new_deferred
+      deferred = defer
       deferred.reject(reason)
       deferred.promise
     end
 
     def self.execute(&block)
-      deferred = new_deferred
+      deferred = defer
       EXECUTOR.submit do
         begin
           deferred.resolve block.call
@@ -40,11 +36,15 @@ module Rosarium
     def self.all_settled(promises)
       return resolve([]) if promises.empty?
 
-      deferred = new_deferred
+      deferred = defer
       promises = promises.dup
 
+      waiting_for = promises.count
+      mutex = Mutex.new
+
       check = Proc.new do
-        if promises.all? {|promise| promise.fulfilled? or promise.rejected?}
+        # Includes both fulfilled and rejected, so always hits zero eventually
+        if mutex.synchronize { (waiting_for -= 1) == 0 }
           deferred.resolve promises
         end
       end
@@ -59,12 +59,16 @@ module Rosarium
     def self.all(promises)
       return resolve([]) if promises.empty?
 
-      deferred = new_deferred
+      deferred = defer
       promises = promises.dup
 
+      waiting_for = promises.count
+      mutex = Mutex.new
+
       do_reject = Proc.new {|reason| deferred.reject reason}
       do_fulfill = Proc.new do
-        if promises.all?(&:fulfilled?)
+        # Only fulfilled (not rejected), so hits zero iff all promises were fulfilled
+        if mutex.synchronize { (waiting_for -= 1) == 0 }
           deferred.resolve(promises.map &:value)
         end
       end
@@ -77,20 +81,20 @@ module Rosarium
     end
 
     def then(on_rejected = nil, &on_fulfilled)
-      deferred = self.class.new_deferred
+      deferred = self.class.defer
 
       on_fulfilled ||= DEFAULT_ON_FULFILL
       on_rejected ||= DEFAULT_ON_REJECT
 
       on_resolution do
-        callback, arg = if fulfilled?
-                          [ on_fulfilled, value ]
-                        else
-                          [ on_rejected, reason ]
-                        end
-
         begin
-          deferred.resolve(callback.call arg)
+          deferred.resolve(
+            if fulfilled?
+              on_fulfilled.call value
+            else
+              on_rejected.call reason
+            end
+          )
         rescue Exception => e
           deferred.reject e
         end

data/lib/rosarium/simple_promise.rb

@@ -2,7 +2,7 @@ module Rosarium
 
   class SimplePromise
 
-    def self.new_deferred
+    def self.defer
       promise = new
       resolver = promise.method :resolve
       rejecter = promise.method :reject
@@ -17,23 +17,33 @@ module Rosarium
 
     def initialize
       @state = :pending
+      @resolving = false
       @mutex = Mutex.new
       @condition = ConditionVariable.new
       @on_resolution = []
     end
 
     def state
-      synchronized { @state }
+      synchronize { @state }
     end
 
     def value
       wait
-      synchronized { @value }
+      synchronize { @value }
     end
 
     def reason
       wait
-      synchronized { @reason }
+      synchronize { @reason }
+    end
+
+    def inspect
+      synchronize do
+        r = { state: @state }
+        r[:value] = @value if @state == :fulfilled
+        r[:reason] = @reason if @state == :rejected
+        r
+      end
     end
 
     def fulfilled?
@@ -46,7 +56,7 @@ module Rosarium
 
     def value!
       wait
-      synchronized do
+      synchronize do
         if @state == :rejected
           raise @reason
         else
@@ -70,7 +80,7 @@ module Rosarium
 
     private
 
-    def synchronized
+    def synchronize
       @mutex.synchronize { yield }
     end
 
@@ -91,10 +101,10 @@ module Rosarium
       callbacks = []
       add_on_resolution = false
 
-      synchronized do
-        if @state == :pending
+      synchronize do
+        if @state == :pending and not @resolving
           if value.kind_of? SimplePromise
-            @state = :resolving
+            @resolving = true
             add_on_resolution = true
           elsif reason.nil?
             @value = value
@@ -120,14 +130,13 @@ module Rosarium
     def copy_resolution_from(other)
       callbacks = []
 
-      synchronized do
-        if @state == :resolving
-          @value = other.value
-          @reason = other.reason
-          @state = other.state
-          callbacks.concat @on_resolution
-          @on_resolution.clear
-        end
+      synchronize do
+        @value = other.value
+        @reason = other.reason
+        @state = other.state
+        @resolving = false
+        callbacks.concat @on_resolution
+        @on_resolution.clear
       end
 
       callbacks.each {|c| EXECUTOR.submit { c.call } }
@@ -136,7 +145,7 @@ module Rosarium
     protected
 
     def on_resolution(&block)
-      immediate = synchronized do
+      immediate = synchronize do
         if @state == :fulfilled or @state == :rejected
           true
         else

data/spec/deferred_spec.rb

@@ -61,7 +61,7 @@ describe "deferred promises" do
     d1 = Rosarium::Promise.defer
     d2 = Rosarium::Promise.defer
     d1.resolve(d2.promise)
-    check_resolving d1.promise
+    check_pending d1.promise
     d2.resolve 7
     d1.promise.wait
     check_fulfilled d1.promise, 7
@@ -71,7 +71,7 @@ describe "deferred promises" do
     d1 = Rosarium::Promise.defer
     d2 = Rosarium::Promise.defer
     d1.resolve(d2.promise)
-    check_resolving d1.promise
+    check_pending d1.promise
     e = an_error
     d2.reject e
     d1.promise.wait

data/spec/promise_test_helper.rb

@@ -6,14 +6,7 @@ module PromiseTestHelper
     expect(promise).not_to be_rejected
     # expect(promise.value).to be_nil # should block
     # expect(promise.reason).to be_nil # should block
-  end
-
-  def check_resolving(promise)
-    expect(promise.state).to eq(:resolving)
-    expect(promise).not_to be_fulfilled
-    expect(promise).not_to be_rejected
-    # expect(promise.value).to be_nil # should block
-    # expect(promise.reason).to be_nil # should block
+    expect(promise.inspect).to eq(state: :pending)
   end
 
   def check_fulfilled(promise, value)
@@ -22,6 +15,7 @@ module PromiseTestHelper
     expect(promise).not_to be_rejected
     expect(promise.value).to eq(value)
     expect(promise.reason).to be_nil
+    expect(promise.inspect).to eq(state: :fulfilled, value: value)
   end
 
   def check_rejected(promise, e)
@@ -30,6 +24,7 @@ module PromiseTestHelper
     expect(promise).to be_rejected
     expect(promise.value).to eq(nil)
     expect(promise.reason).to eq(e)
+    expect(promise.inspect).to eq(state: :rejected, reason: e)
   end
 
   def an_error(message = "bang")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosarium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rachel Evans