mr_darcy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 200c16f28a04c2608e104d084400e44c55f84e78
-  data.tar.gz: 2c4132617b62c2713cedcc37d560c55a180e6251
+  metadata.gz: 76e4be46dc9cdd1c3940172e1fd429cb9ca06d1e
+  data.tar.gz: c8f1944c3cf626b51599edf3337a66bc146969c6
 SHA512:
-  metadata.gz: baa8c75ad0f00c458e6610b389a52b29d345b705d02f71ca845a8df4297deb31c3c7c5b6b556ef3338b179a807f8e5f53121308d30eb0111f045bdbf6f1bd044
-  data.tar.gz: c73abc19ded59554f375cbf4e34a74fa946e114d2a34d90711e568f0b47179b5535675fb6448614706024108b33ef27cc41f701347a086d9943bf4476a0970e6
+  metadata.gz: 37ea3db8c56a22d1f78ab6f004c06e4b4f96e98f5fb95a8824fd2adc7491c40fa957546008c8d98bfdd7899739b9d2df29e2cd48e4d51da966305dc756dc95aa
+  data.tar.gz: 3fdde3baecf7aa7fcb3a1b925084b09be2b742a405326344c83b644b9b4c21812b557ae17a3a3a0dfbdf4f8db1656dfb4ecd6016cf10c939667ad7da71dadf7e

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
   - 2.1.1
-  - 2.1.0
   - 2.0.0
-  - jruby-20mode
+  - jruby
   - rbx
 

data/lib/mr_darcy.rb

@@ -17,10 +17,16 @@ module MrDarcy
   end
 
   def all_drivers
-    %w| synchronous thread celluloid em |.map(&:to_sym)
+    drivers = %w| synchronous thread celluloid em |.map(&:to_sym)
+
+    drivers.delete :em if RUBY_ENGINE=='jruby'
+
+    drivers
   end
 
-  def promise driver: driver, &block
+  def promise opts={}, &block
+    driver = opts[:driver] || self.driver
     MrDarcy::Promise.new driver: driver, &block
   end
+
 end

data/lib/mr_darcy/context.rb

@@ -28,7 +28,7 @@ module MrDarcy
       roles = self.class.roles
       roles.each do |role_name, role|
         player = role_players[role_name]
-        raise ArgumentError, "No role player for #{role_name} supplied" unless player
+        Kernel::raise ArgumentError, "No role player for #{role_name} supplied" unless player
 
         role.pollute(player)
 

data/lib/mr_darcy/deferred.rb

@@ -5,7 +5,7 @@ module MrDarcy
 
     %w| resolved? rejected? unresolved? resolve reject final result |.map(&:to_sym).each do |method|
       define_method method do |*args|
-        promise.public_send method, *args
+        last_promise.public_send method, *args
       end
     end
 
@@ -17,7 +17,8 @@ module MrDarcy
       self.last_promise = last_promise.fail(&block)
     end
 
-    def initialize driver: MrDarcy.driver
+    def initialize opts={}
+      driver = opts[:driver] || MrDarcy.driver
       self.promise = MrDarcy::Promise.new(driver: driver) {}
       self.last_promise = promise
     end

data/lib/mr_darcy/promise.rb

@@ -12,7 +12,8 @@ module MrDarcy
 
     module_function
 
-    def new driver: ::MrDarcy.driver, &block
+    def new opts={}, &block
+      driver = opts[:driver] || ::MrDarcy.driver
       case driver
       when :thread, :Thread
         ::MrDarcy::Promise::Thread.new block

data/lib/mr_darcy/promise/base.rb

@@ -7,21 +7,20 @@ module MrDarcy
         schedule_promise do
           evaluate_promise &block
         end
+        did_initialize
       end
 
       def then &block
-        @child_promise ||= generate_child_promise
+        ensure_child_promise
         child_promise.resolve_block = block
-        resolve_child_promise if resolved?
-        reject_child_promise  if rejected?
+        resolve_or_reject_child_as_needed
         child_promise.promise
       end
 
       def fail &block
-        @child_promise ||= generate_child_promise
+        ensure_child_promise
         child_promise.reject_block = block
-        resolve_child_promise if resolved?
-        reject_child_promise  if rejected?
+        resolve_or_reject_child_as_needed
         child_promise.promise
       end
 
@@ -35,7 +34,13 @@ module MrDarcy
 
       def raise
         r = result
-        Kernel::raise r if rejected?
+        if rejected?
+          if r.is_a? Exception
+            super r
+          else
+            super RuntimeError, r
+          end
+        end
       end
 
       %w| resolved? unresolved? rejected? |.map(&:to_sym).each do |method|
@@ -45,20 +50,40 @@ module MrDarcy
       end
 
       def resolve value
+        do_resolve value
+        self
+      end
+
+      def reject exception
+        do_reject exception
+        self
+      end
+
+      private
+
+      attr_accessor :value, :state
+
+      def do_resolve value
+        will_resolve value
         set_value_to value
         state_machine_resolve
         resolve_child_promise
+        did_resolve value
       end
 
-      def reject exception
+      def do_reject exception
+        will_reject value
         set_value_to exception
         state_machine_reject
         reject_child_promise
+        did_reject value
       end
 
-      private
-
-      attr_accessor :value, :child_promise, :state
+      def will_resolve value; end
+      def will_reject value; end
+      def did_resolve value; end
+      def did_reject value; end
+      def did_initialize; end
 
       def state
         @state ||= :unresolved
@@ -85,15 +110,16 @@ module MrDarcy
       end
 
       def resolve_child_promise
-        schedule_promise do
-          child_promise.parent_resolved(value) if has_child_promise?
-        end
+        child_promise.parent_resolved(value) if has_child_promise?
       end
 
       def reject_child_promise
-        schedule_promise do
-          child_promise.parent_rejected(value) if has_child_promise?
-        end
+        child_promise.parent_rejected(value) if has_child_promise?
+      end
+
+      def resolve_or_reject_child_as_needed
+        resolve_child_promise if resolved?
+        reject_child_promise  if rejected?
       end
 
       def schedule_promise
@@ -102,7 +128,9 @@ module MrDarcy
 
       def evaluate_promise &block
         begin
-          block.call DSL.new(self)
+          dsl = DSL.new(self)
+          dsl.instance_exec dsl, &block
+          # block.call DSL.new(self)
         rescue Exception => e
           reject e
         end
@@ -112,6 +140,14 @@ module MrDarcy
         Kernel::raise "Subclasses must implement me"
       end
 
+      def ensure_child_promise
+        @child_promise ||= generate_child_promise
+      end
+
+      def child_promise
+        @child_promise
+      end
+
     end
   end
 end

data/lib/mr_darcy/promise/celluloid.rb

@@ -3,50 +3,110 @@ require 'celluloid/autostart'
 module MrDarcy
   module Promise
     class Celluloid < Base
+      class Actor
+        include ::Celluloid
+
+        def initialize
+          @complete = false
+        end
+
+        def schedule block
+          ::Celluloid::Future.new &block
+        end
+
+        def set_status status, value
+          case status
+          when :success
+            @success.call value
+          when :failure
+            @failure.call value
+          end
+          signal :complete
+          @complete = true
+        end
+
+        def on_success block
+          @success = block
+        end
+
+        def on_failure block
+          @failure = block
+        end
+
+        def await_completion
+          return if @complete
+          wait :complete
+        end
+      end
 
       def initialize *args
-        @waiting = false
+        @complete = false
+        ensure_actor
+        actor.on_success proc { |v| do_resolve v }
+        actor.on_failure proc { |v| do_reject v }
         super
       end
 
       def resolve value
-        super
-        condition.signal if @waiting
+        actor.async.set_status :success, value
+        self
       end
 
-      def reject exception
-        super
-        condition.signal if @waiting
+      def reject value
+        actor.async.set_status :failure, value
+        self
       end
 
       def result
-        wait_until_not_unresolved
+        wait_until_complete
         value
       end
 
       def final
-        wait_until_not_unresolved
+        wait_until_complete
         self
       end
 
       private
 
-      def schedule_promise &block
-        ::Celluloid::Future.new &block
+      def wait_until_complete
+        return if @complete
+        actor.alive? && actor.await_completion
+        @complete = true
       end
 
-      def condition
-        @condition ||= ::Celluloid::Condition.new
+      def will_resolve value
+        @complete = true
       end
 
-      def wait_until_not_unresolved
-        @waiting = true
-        condition.wait if unresolved?
+      def will_reject value
+        @complete = true
+      end
+
+      def did_reject value
+        actor.async.terminate
+      end
+
+      def did_resolve value
+        actor.async.terminate
       end
 
       def generate_child_promise
-        ChildPromise.new driver: :thread
+        ChildPromise.new driver: :celluloid
+      end
+
+      def ensure_actor
+        @actor ||= Actor.new
       end
+
+      def actor
+        @actor
+      end
+
+      def schedule_promise &block
+        actor.async.schedule block
+      end
+
     end
   end
 end

data/lib/mr_darcy/promise/child_promise.rb

@@ -1,44 +1,49 @@
 module MrDarcy
   module Promise
-    class ChildPromise < MrDarcy::Deferred
+    class ChildPromise
 
-      attr_accessor :resolve_block, :reject_block
+      attr_accessor :resolve_block, :reject_block, :promise
 
       def initialize opts={}
-        @driver = opts[:driver] if opts.has_key? :driver
-        super
+        self.promise = MrDarcy.promise(opts) {}
       end
 
       def parent_resolved value
         begin
           return resolve_with value unless handles_resolve?
+
           new_value = result_for :resolve, value
-          if thenable? new_value
-            defer_resolution_via new_value
-          else
-            resolve_with new_value
-          end
+          return defer_resolution_via new_value if thenable? new_value
+          resolve_with new_value
         rescue Exception => e
-          reject_with e
+          handle_exception e
         end
       end
 
       def parent_rejected value
         begin
           return reject_with value unless handles_reject?
+
           new_value = result_for :reject, value
-          if thenable? new_value
-            defer_resolution_via new_value
-          else
-            resolve_with new_value
-          end
+          return defer_resolution_via new_value if thenable? new_value
+          resolve_with new_value
         rescue Exception => e
-          reject_with e
+          handle_exception e
         end
       end
 
       private
 
+      def handle_exception e
+        if promise.unresolved?
+          return reject_with e
+        elsif promise.resolved?
+          promise.then { raise e }
+        elsif promise.rejected?
+          promise.fail { raise e }
+        end
+      end
+
       def result_for which, value
         block = public_send("#{which}_block")
         if block
@@ -60,12 +65,12 @@ module MrDarcy
         object.respond_to?(:then) && object.respond_to?(:fail)
       end
 
-      def defer_resolution_via child_promise
-        child_promise.then do |value|
+      def defer_resolution_via new_promise
+        new_promise.then do |value|
           resolve_with value
           value
         end
-        child_promise.fail do |exception|
+        new_promise.fail do |exception|
           reject_with exception
           exception
         end

data/lib/mr_darcy/promise/em.rb

@@ -2,28 +2,79 @@ require 'eventmachine'
 
 module MrDarcy
   module Promise
-    class EM < Thread
+    class EM < Base
+      class DeferrableAdapter
+        include EventMachine::Deferrable
+      end
 
       def initialize *args
+        Kernel::raise "EventMachine driver is unsupported on JRuby, sorry" if RUBY_ENGINE=='jruby'
         unless EventMachine.reactor_running?
           ::Thread.new { EventMachine.run }
           ::Thread.pass until EventMachine.reactor_running?
         end
+        @wait_lock = Mutex.new
+        @wait_cond = ConditionVariable.new
+        @wait_lock.lock
+        deferrable_adapter.callback &method(:do_resolve)
+        deferrable_adapter.errback &method(:do_reject)
         super
       end
 
+      def resolve value
+        deferrable_adapter.set_deferred_status :succeeded, value
+        self
+      end
+
+      def reject value
+        deferrable_adapter.set_deferred_status :failed, value
+        self
+      end
+
+      def result
+        wait_if_unresolved
+        value
+      end
+
+      def final
+        wait_if_unresolved
+        self
+      end
+
       private
 
-      def schedule_promise
-        EventMachine.schedule proc do
-          yield
-        end
+      def wait_if_unresolved
+        @wait_cond.wait @wait_lock if unresolved?
+      end
+
+      def deferrable_adapter
+        @deferrable_adapter ||= DeferrableAdapter.new
+      end
+
+      def schedule_promise &block
+        EventMachine.defer block
+      end
+
+      def resolve_or_reject_child_as_needed
+        EventMachine.defer { super }
       end
 
       def generate_child_promise
         ChildPromise.new driver: :em
       end
 
+      def did_resolve value
+        notify_waiting
+      end
+
+      def did_reject value
+        notify_waiting
+      end
+
+      def notify_waiting
+        EventMachine.defer { @wait_cond.signal }
+      end
+
     end
   end
 end