Use ns_wait_until

Author: pitr-ch

lib/concurrent/edge/future.rb

@@ -91,7 +91,7 @@ def completed?
       # @param [Numeric] timeout the maximum time in second to wait.
       # @return [Obligation] self
       def wait(timeout = nil)
-        synchronize { ns_wait(timeout) }
+        synchronize { ns_wait_until_complete(timeout) }
       end
 
       def touch
@@ -184,7 +184,7 @@ def with_default_executor(executor = default_executor)
         AllPromise.new([self], executor).future
       end
 
-      protected
+      private
 
       def ns_initialize(promise, default_executor = :fast)
         @promise          = promise
@@ -194,9 +194,9 @@ def ns_initialize(promise, default_executor = :fast)
         @touched          = false
       end
 
-      def ns_wait(timeout = nil)
+      def ns_wait_until_complete(timeout = nil)
         ns_touch
-        super timeout if ns_incomplete?
+        ns_wait_until(timeout) { ns_completed? }
         self
       end
 
@@ -234,11 +234,11 @@ def pr_chain(default_executor, executor = nil, &callback)
       end
 
       def pr_delay(default_executor)
-        self.pr_join(default_executor, Delay.new(default_executor).future)
+        pr_join(default_executor, Delay.new(default_executor).future)
       end
 
       def pr_schedule(default_executor, intended_time)
-        self.pr_chain(default_executor) { ScheduledPromise.new(intended_time).future.join(self) }.flat
+        pr_chain(default_executor) { ScheduledPromise.new(intended_time).future.join(self) }.flat
       end
 
       def pr_join(default_executor, *futures)
@@ -279,8 +279,6 @@ def ns_add_callback(method, *args)
         self
       end
 
-      private
-
       def ns_complete_state
         @state = :completed
       end
@@ -350,7 +348,7 @@ def reason(timeout = nil)
       # @return [Obligation] self
       # @raise [Exception] when #failed? it raises #reason
       def wait!(timeout = nil)
-        synchronize { ns_wait! timeout }
+        synchronize { ns_wait_until_complete! timeout }
       end
 
       # @raise [Exception] when #failed? it raises #reason
@@ -427,7 +425,7 @@ def ns_add_callback(method, *args)
         self
       end
 
-      protected
+      private
 
       def ns_initialize(promise, default_executor = :fast)
         super(promise, default_executor)
@@ -448,23 +446,23 @@ def ns_completed?
       end
 
       def ns_value(timeout = nil)
-        ns_wait timeout
+        ns_wait_until_complete timeout
         @value
       end
 
       def ns_reason(timeout = nil)
-        ns_wait timeout
+        ns_wait_until_complete timeout
         @reason
       end
 
-      def ns_wait!(timeout = nil)
-        ns_wait(timeout)
+      def ns_wait_until_complete!(timeout = nil)
+        ns_wait_until_complete(timeout)
         raise self if ns_failed?
         self
       end
 
       def ns_value!(timeout = nil)
-        ns_wait!(timeout)
+        ns_wait_until_complete!(timeout)
         @value
       end