Merge pull request #18 from nedap/master

Future should not marschal when it contains exceptions

lib/futuroscope/future.rb

@@ -46,18 +46,15 @@ def run_future
     #
     # Returns the Future's block execution result.
     def __getobj__
-      resolved = resolved_future_value
-
-      raise resolved[:exception] if resolved[:exception]
-      resolved[:value]
+      resolved_future_value_or_raise[:value]
     end
 
     def __setobj__ obj
       @resolved_future = { value: obj }
     end
 
     def marshal_dump
-      resolved_future_value
+      resolved_future_value_or_raise
     end
 
     def marshal_load value
@@ -70,6 +67,13 @@ def marshal_load value
 
     private
 
+    def resolved_future_value_or_raise
+      resolved = resolved_future_value
+
+      raise resolved[:exception] if resolved[:exception]
+      resolved
+    end
+
     def resolved_future_value
       @resolved_future || @mutex.synchronize do
         @resolved_future ||= @queue.pop

spec/futuroscope/future_spec.rb

@@ -59,6 +59,14 @@ module Futuroscope
       expect(Marshal.load(dumped).future_value).to eq(object)
     end
 
+    it "re-raises captured exception when trying to marshal" do
+      future = Future.new{ raise Exception }
+
+      expect(lambda{
+        Marshal.dump(future)
+      }).to raise_error(Exception)
+    end
+
     it "correctly duplicates a future object" do
       object = [1, 2, 3]
       future = Future.new { object }