myna_eventmachine 1.1.0 → 1.1.1

data/README.md

@@ -46,5 +46,4 @@ Rake commands:
 
 ## TODO
 
-- Futures need to handle failures, and need to rigourously trap exceptions and propagate them.
 - Some RDoc or equivalent might be useful

data/lib/myna/future.rb

@@ -27,9 +27,9 @@ require 'thread'
 
 module Future
 
-  def Future.run
+  def Future.run(&block)
     future = Future.new
-    future.run(yield)
+    future.run(block)
     future
   end
 
@@ -68,9 +68,10 @@ module Future
       self.set(value, :failure)
     end
 
-    def run
+    def run(proc)
       begin
-        self.succeed(yield)
+        value = proc.call()
+        self.succeed(value)
       rescue => exn
         self.fail(exn)
       end
@@ -120,9 +121,7 @@ module Future
     def map(&block)
       future = Future.new
       self.on_complete do |value|
-        future.run do
-          block.call(value)
-        end
+        future.run(proc { block.call(value) })
       end
       future
     end

data/lib/myna/version.rb

@@ -23,5 +23,5 @@
 #
 
 module Myna
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/test_future.rb

@@ -54,9 +54,23 @@ describe Future do
 
   describe "Future.fail" do
     it "must cause an exception to be raised on get" do
-      # Not implemented
-      # Also test Future.run and future.run
-      true.must_equal false
+      exn = Exception.new("A test")
+      f = Future::Future.new
+      f.fail(exn)
+
+      proc { f.get }.must_raise Exception
+    end
+  end
+
+  describe "Future.run" do
+    it "must complete the future with the expected value" do
+      f = Future.run do 1 + 1 end
+      f.get.must_equal 2
+    end
+
+    it "must catch exceptions and complete the future in a failed state" do
+      f = Future.run do 1/0 end
+      proc { f.get }.must_raise ZeroDivisionError
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myna_eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: