lib/quack_concurrency/future.rb in quack_concurrency-0.2.0 vs lib/quack_concurrency/future.rb in quack_concurrency-0.3.0

@@ -1,44 +1,43 @@
 module QuackConcurrency
-  class Future
-  
-    class Canceled < StandardError
-    end
+  class Future < ConcurrencyTool
     
-    def initialize(duck_types: {})
-      condition_variable_class = duck_types[:condition_variable] || ConditionVariable
-      mutex_class = duck_types[:mutex] || Mutex
-      @condition_variable = condition_variable_class.new
-      @mutex = mutex_class.new
+    def initialize(duck_types: nil)
+      classes = setup_duck_types(duck_types)
+      @condition_variable = classes[:condition_variable].new
+      @mutex = classes[:mutex].new
       @value = nil
       @value_set = false
       @complete = false
     end
     
     def set(new_value = nil)
       @mutex.synchronize do
-        raise if @complete
+        raise Complete if @complete
         @value_set = true
         @complete = true
         @value = new_value
         @condition_variable.broadcast
       end
+      nil
     end
     
     def get
       @mutex.synchronize do
         @condition_variable.wait(@mutex) unless complete?
-        raise 'should not get here' unless complete?
+        raise 'internal error, invalid state' unless complete?
         raise Canceled unless @value_set
         @value
       end
     end
     
     def cancel
       @mutex.synchronize do
-        raise if @complete
+        raise Complete if @complete
         @complete = true
+        @condition_variable.broadcast
       end
+      nil
     end
     
     def complete?
       @complete
     end