promise 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/future.rb

@@ -8,8 +8,7 @@ require 'promise'
 #   # do stuff...
 #   y = x * 2     # => 6.  blocks unless 5 seconds has passed.
 #
-class Future < defined?(BasicObject) ? BasicObject : Object
-  instance_methods.each { |m| undef_method m unless m =~ /__/ } unless defined?(BasicObject)
+class Future < Promise
 
   ##
   # Creates a new future.
@@ -17,8 +16,14 @@ class Future < defined?(BasicObject) ? BasicObject : Object
   # @yield  [] The block to evaluate optimistically.
   # @see    Kernel#future
   def initialize(&block)
-    @promise = ::Promise.new(&block)
-    @thread  = ::Thread.new { @promise.__force__ }
+    super
+    # Ruby won't assign the value of @thread until after the thread is off and
+    # running, meaning we can run into an unset @thread when joining off in
+    # __force__, instead of it being Thread.current.  We could leave it as nil
+    # and check for that, but this is a more explicit way to watch for this
+    # easy-to-miss gotcha.
+    @thread = NOT_SET
+    @thread  = ::Thread.new { __force__ }
   end
 
   ##
@@ -26,25 +31,24 @@ class Future < defined?(BasicObject) ? BasicObject : Object
   #
   # @return [Object]
   def __force__
-    @thread.join if @thread
-    @promise
+    @thread.join unless (@thread == ::Thread.current) || @thread.equal?(NOT_SET)
+    super
   end
   alias_method :force, :__force__
 
+  
   ##
-  # Does this future support the given method?
+  # Returns true if klass.equal?(Future), if klass.equal?(Promise), or the
+  # underlying block returns an instance of the given klass
   #
-  # @param  [Symbol]
-  # @return [Boolean]
-  def respond_to?(method)
-    :force.equal?(method) || :__force__.equal?(method) || __force__.respond_to?(method)
+  # @param [Class]
+  # @return [true, false]
+  def is_a?(klass)
+    klass.equal?(::Future) || super
   end
 
   private
 
-  def method_missing(method, *args, &block)
-    __force__.__send__(method, *args, &block)
-  end
 end
 
 module Kernel

data/lib/promise.rb

@@ -43,14 +43,14 @@ class Promise < defined?(BasicObject) ? BasicObject : ::Object
   # @return [Object]
   def __force__
     @mutex.synchronize do
-      if @result.equal?(NOT_SET) && @error.equal?(NOT_SET)
+      if !__forced?
         begin
           @result = @block.call
         rescue ::Exception => e
           @error = e
         end
       end
-    end if @result.equal?(NOT_SET) && @error.equal?(NOT_SET)
+    end unless __forced?
     # BasicObject won't send raise to Kernel
     @error.equal?(NOT_SET) ? @result : ::Kernel.raise(@error)
   end
@@ -60,9 +60,27 @@ class Promise < defined?(BasicObject) ? BasicObject : ::Object
   # Does this promise support the given method?
   #
   # @param  [Symbol]
-  # @return [Boolean]
+  # @return [true, false]
   def respond_to?(method)
-    :force.equal?(method) || :__force__.equal?(method) || __force__.respond_to?(method)
+    :__forced?.equal?(method) || :force.equal?(method) || :__force__.equal?(method) || __force__.respond_to?(method)
+  end
+
+  ##
+  # Returns true if klass.equal?(Promise) or the underlying block returns an
+  # instance of the given klass
+  #
+  # @param [Class]
+  # @return [true, false]
+  def is_a?(klass)
+    klass.equal?(::Promise) || __force__.is_a?(klass)
+  end
+
+  ##
+  # Returns true if this promise has finished executing
+  #
+  # @return [true, false]
+  def __forced?
+    !(@result.equal?(NOT_SET) && @error.equal?(NOT_SET))
   end
 
   private

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Lavender
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -05:00
+date: 2010-07-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency