rosarium 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d29d25a2dda69339736325662c95e47aa89f72a
-  data.tar.gz: cedaeb3c52e8e7638b089e24570200ef726d4dd5
+  metadata.gz: b929d183760e88db677cb8b244179733aadc3f5e
+  data.tar.gz: 8fd7a19f473d4555108d6317b3b3a75368411d81
 SHA512:
-  metadata.gz: e709529f21c3de794fd607f3c3a28561e0b3369584accdff616b7b35a516a82617c901380a95a40c34668242df4d7b7a49179c7d3932ae24486716a7e95e7803
-  data.tar.gz: 2d1f44d108baa337a810726731277730d8f2b07488358ada586dca0c9a33d268db02d6f263364cad1002086d23134c4cafd56249d56165aafb64f677a45d3588
+  metadata.gz: 566a7cfd9743d343b6c25bb058c079617ad25a7ae82c16f7905cb3679b667b9c21d3881085beb6593863398d84fc7dfd93f409ca1dc3f43ae8e25ee291400e5a
+  data.tar.gz: 395d6da1824396ee9c9ba915054b5c01a2343645d95035edee0d3498407bc907df2a71350379a39f2500911e903fa907492c99ba057b7f45806d04786f6309d5

data/lib/rosarium/promise.rb

@@ -21,16 +21,9 @@ module Rosarium
       deferred.promise
     end
 
+    @@resolved = resolve(nil)
     def self.execute(&block)
-      deferred = defer
-      EXECUTOR.submit do
-        begin
-          deferred.resolve block.call
-        rescue Exception => e
-          deferred.reject e
-        end
-      end
-      deferred.promise
+      @@resolved.then { block.call }
     end
 
     def self.all_settled(promises)
@@ -87,16 +80,20 @@ module Rosarium
       on_rejected ||= DEFAULT_ON_REJECT
 
       on_resolution do
-        begin
-          deferred.resolve(
-            if fulfilled?
-              on_fulfilled.call value
-            else
-              on_rejected.call reason
-            end
-          )
-        rescue Exception => e
-          deferred.reject e
+        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
       end
 

data/lib/rosarium/simple_promise.rb

@@ -69,10 +69,10 @@ module Rosarium
 
     def wait
       on_resolution do
-        @mutex.synchronize { @condition.broadcast }
+        synchronize { @condition.broadcast }
       end
 
-      @mutex.synchronize do
+      synchronize do
         loop do
           return if @state == :fulfilled or @state == :rejected
           @condition.wait @mutex

data/spec/promise_methods_spec.rb

@@ -68,4 +68,11 @@ describe Rosarium::Promise do
     end
   end
 
+  it "uses the executor even if immediately callable" do
+    deferred = Rosarium::Promise.resolve(nil).then { sleep 0.1; 7 }
+    check_pending deferred
+    sleep 0.2
+    check_fulfilled deferred, 7
+  end
+
 end

metadata

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