promise 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ae5a36893d54edf8775e75177c2f8c7e269c2d7
+  data.tar.gz: 995b75b7423afc3ffa444067569eb6a1b688947b
+SHA512:
+  metadata.gz: 2daaaff146b272eb18a9c87eb5bddb190c77ffeff5345bec3f6755aee71fdcec73c0b6df0d20c6ced5440cc0d788e7ce51f877e1b13cadf6d94db15838dedc24
+  data.tar.gz: 3891a5a381c112659a52baaa0da4bda7f42c4873e27bf8564d7cf789c1a7d4ccb1f9ef7b3c22a178f3da467e1fd051989ab45d0a2949e9ddab9655e0f93d9d08

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/future.rb

@@ -8,7 +8,8 @@ require 'promise'
 #   # do stuff...
 #   y = x * 2     # => 6.  blocks unless 5 seconds has passed.
 #
-class Future < Promise
+class Future < defined?(BasicObject) ? BasicObject : Object
+  instance_methods.each { |m| undef_method m unless m =~ /^(__.*|object_id)$/ }
 
   ##
   # Creates a new future.
@@ -16,14 +17,8 @@ class Future < Promise
   # @yield  [] The block to evaluate optimistically.
   # @see    Kernel#future
   def initialize(&block)
-    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__ }
+    @promise = ::Promise.new(&block)
+    @thread  = ::Thread.new { @promise.__force__ }
   end
 
   ##
@@ -31,24 +26,25 @@ class Future < Promise
   #
   # @return [Object]
   def __force__
-    @thread.join unless (@thread == ::Thread.current) || @thread.equal?(NOT_SET)
-    super
+    @thread.join if @thread
+    @promise
   end
   alias_method :force, :__force__
 
-  
   ##
-  # Returns true if klass.equal?(Future), if klass.equal?(Promise), or the
-  # underlying block returns an instance of the given klass
+  # Does this future support the given method?
   #
-  # @param [Class]
-  # @return [true, false]
-  def is_a?(klass)
-    klass.equal?(::Future) || super
+  # @param  [Symbol]
+  # @return [Boolean]
+  def respond_to?(method, include_all=false)
+    :force.equal?(method) || :__force__.equal?(method) || __force__.respond_to?(method, include_all)
   end
 
   private
 
+  def method_missing(method, *args, &block)
+    __force__.__send__(method, *args, &block)
+  end
 end
 
 module Kernel

data/lib/promise.rb

@@ -17,7 +17,7 @@
 class Promise < defined?(BasicObject) ? BasicObject : ::Object
   NOT_SET = ::Object.new.freeze
 
-  instance_methods.each { |m| undef_method m unless m.to_s =~ /__/ }
+  instance_methods.each { |m| undef_method m unless m =~ /^(__.*|object_id)$/ }
 
   ##
   # Creates a new promise.
@@ -29,7 +29,7 @@ class Promise < defined?(BasicObject) ? BasicObject : ::Object
   # @see    Kernel#promise
   def initialize(&block)
     if block.arity > 0
-      raise ArgumentError, "Cannot store a promise that requires an argument"
+      ::Kernel.raise ::ArgumentError, "Cannot store a promise that requires an argument"
     end
     @block  = block
     @mutex  = ::Mutex.new
@@ -43,14 +43,14 @@ class Promise < defined?(BasicObject) ? BasicObject : ::Object
   # @return [Object]
   def __force__
     @mutex.synchronize do
-      if !__forced?
+      if @result.equal?(NOT_SET) && @error.equal?(NOT_SET)
         begin
           @result = @block.call
         rescue ::Exception => e
           @error = e
         end
       end
-    end unless __forced?
+    end if @result.equal?(NOT_SET) && @error.equal?(NOT_SET)
     # BasicObject won't send raise to Kernel
     @error.equal?(NOT_SET) ? @result : ::Kernel.raise(@error)
   end
@@ -59,28 +59,35 @@ class Promise < defined?(BasicObject) ? BasicObject : ::Object
   ##
   # Does this promise support the given method?
   #
-  # @param  [Symbol]
-  # @return [true, false]
-  def respond_to?(method)
-    :__forced?.equal?(method) || :force.equal?(method) || :__force__.equal?(method) || __force__.respond_to?(method)
+  # @param  [Symbol, Boolean]
+  # @return [Boolean]
+  def respond_to?(method, include_all=false)
+    # If the promised object implements marshal_dump, Marshal will use it in
+    # preference to our _dump, so make sure that doesn't happen.
+    return false if :marshal_dump.equal?(method)
+
+    :_dump.equal?(method) ||  # for Marshal
+      :force.equal?(method) ||
+      :__force__.equal?(method) ||
+      __force__.respond_to?(method, include_all)
   end
 
   ##
-  # Returns true if klass.equal?(Promise) or the underlying block returns an
-  # instance of the given klass
+  # Method used by Marshal to serialize the object.  Forces evaluation.
   #
-  # @param [Class]
-  # @return [true, false]
-  def is_a?(klass)
-    klass.equal?(::Promise) || __force__.is_a?(klass)
+  # @param  [Integer] limit -- refer to Marshal doc
+  # @return [Object]
+  def _dump(limit)
+    ::Marshal.dump(__force__, limit)
   end
 
   ##
-  # Returns true if this promise has finished executing
+  # Method used by Marshal to deserialize the object.
   #
-  # @return [true, false]
-  def __forced?
-    !(@result.equal?(NOT_SET) && @error.equal?(NOT_SET))
+  # @param  [Object]
+  # @return [Promise]
+  def self._load(obj)
+    ::Marshal.load(obj)
   end
 
   private

metadata

@@ -1,96 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: promise
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Ben Lavender
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-05 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :development
-  version_requirements: *id002
-description: "    A glimpse of a promising future in which Ruby supports delayed execution.\n    Provides global 'promise' and 'future' methods.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.8
+description: |2
+      A glimpse of a promising future in which Ruby supports delayed execution.
+      Provides global 'promise' and 'future' methods.
 email: blavender@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - README
 - UNLICENSE
 - VERSION
 - lib/future.rb
 - lib/promise.rb
-has_rdoc: false
 homepage: http://promise.rubyforge.org/
-licenses: 
+licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 2
+    - !ruby/object:Gem::Version
       version: 1.8.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: promising-future
-rubygems_version: 1.3.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Promises and futures for Ruby
 test_files: []
-
+has_rdoc: false