dharma 0.9.0 → 0.9.1

data/README.md

@@ -5,7 +5,7 @@ Dharma
 
 A futures and promises library [modeled after Scala].
 
-![Dharma Initiative](http://wallpaperstock.net/lost-dharma-initiative_wallpapers_17255_1920x1440.jpg)
+![Dharma Initiative](http://api.ning.com/files/GO1Rm-PT2poZlNj*ZI2pv2eil*Pfx1whNze5EWTmXuMthXp*vt2O8Zledx7JGilmjCWGHSNs3tK-j0kGQlJNDn0APhMFwXrY/Dharma_Initiative_Wallpaper_by_MisterCrankyGeek.jpg)
 
 
 # License

data/dharma.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'dharma'
-  s.version           = '0.9.0'
-  s.date              = '2013-05-24'
+  s.version           = '0.9.1'
+  s.date              = '2013-05-30'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/lib/dharma.rb

@@ -1,9 +1,10 @@
 module Dharma
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 
   class PromiseFailure < RuntimeError; end
   class IllegalStateException < RuntimeError; end
   class TimeoutException < RuntimeError; end
+  class NoSuchElementException < RuntimeError; end
 
   def self.default_executor
     @default_executor ||= Dharma::ThreadExecutor.new
@@ -31,11 +32,29 @@ module Dharma
     end
   end
 
+  def self.first_completed_of(promises)
+    p = Dharma.promise
+    promises.each do |promies|
+      promise.on_complete do |value, as|
+        p.try_complete(value, as)
+      end
+    end
+    p
+  end
+
   def self.trace_completion(tag, promise, logger = Rails.logger)
     promise.on_complete do |value, as|
       logger.info "#{tag}: #{as}: #{value.inspect}"
     end
   end
+
+  def self.ready(promise, duration = nil)
+    promise.ready(duration)
+  end
+
+  def self.result(promise, duration = nil)
+    promise.result(duration)
+  end
 end
 
 require 'dharma/promise'

data/lib/dharma/promise_actions.rb

@@ -47,7 +47,18 @@ module Dharma
       cb ||= block
       p = Dharma.promise
 
-      on_complete { |value| p.complete(cb.call(value)) }
+      on_complete do |value, as|
+        case as
+        when :failure
+          begin
+            p.complete(cb.call(value))
+          rescue => e
+            p.failure(e)
+          end
+        when :success
+          p.success(value)
+        end
+      end
 
       p
     end
@@ -64,12 +75,74 @@ module Dharma
           rescue => e
             p.failure(e)
           end
-        else
+        when :success
           p.complete(value)
         end
       end
 
       p
     end
+
+    def map(cb = nil, &block)
+      cb ||= block
+      p = Dharma.promise
+
+      on_complete do |value, as|
+        begin
+          case as
+          when :success
+            p.success(cb.call(value))
+          when :failure
+            p.failure(value)
+          end
+        rescue => e
+          p.failure(e)
+        end
+      end
+
+      p
+    end
+
+    def flat_map(cb = nil, &block)
+      cb ||= block
+      p = Dharma.promise
+
+      on_complete do |value, as|
+        begin
+          case as
+          when :success
+            cb.call(value).on_complete do |value2, as2|
+              case as2
+              when :success
+                p.success(value2)
+              when :failure
+                p.failure(value2)
+              end
+            end
+          when :failure
+            p.failure(value)
+          end
+        rescue => e
+          p.failure(e)
+        end
+      end
+
+      p
+    end
+
+    def failed
+      p = Dharma.promise
+
+      on_complete do |value, as|
+        case as
+        when :failure
+          p.success(value)
+        when :success
+          p.failure(NoSuchElementException.new("Future.failed not completed with an exception."))
+        end
+      end
+
+      p
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-24 00:00:00 -07:00
+date: 2013-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: []