IVar now uses ns_initialize.

Author: jdantonio

lib/concurrent/future.rb

@@ -24,7 +24,7 @@ class Future < IVar
     # @raise [ArgumentError] if no block is given
     def initialize(opts = {}, &block)
       raise ArgumentError.new('no block given') unless block_given?
-      super(IVar::NO_VALUE, opts)
+      super(IVar::NO_VALUE, opts, &nil)
       @state = :unscheduled
       @task = block
       @executor = Executor.executor_from_options(opts) || Concurrent.global_io_executor

lib/concurrent/ivar.rb

@@ -57,18 +57,13 @@ class IVar < Synchronization::Object
     # @option opts [String] :copy_on_deref (nil) call the given `Proc` passing
     #   the internal value and returning the value returned from the proc
     def initialize(value = NO_VALUE, opts = {})
-      #FIXME use ns_initialize
-      super(&:nil)
-      init_obligation(self)
-      self.observers = CopyOnWriteObserverSet.new
-      set_deref_options(opts)
-      @state = :pending
-
-      set(value) unless value == NO_VALUE
+      if value != NO_VALUE && block_given?
+        raise ArgumentError.new('provide only a value or a block')
+      end
+      value = yield if block_given?
+      super
     end
 
-    protected :synchronize
-
     # Add an observer on this object that will receive notification on update.
     #
     # Upon completion the `IVar` will notify all observers in a thread-safe way.
@@ -118,10 +113,13 @@ def set(value = NO_VALUE)
 
       begin
         value = yield if block_given?
-        complete(true, value, nil)
+        complete_without_notification(true, value, nil)
       rescue => ex
-        complete(false, nil, ex)
+        complete_without_notification(false, nil, ex)
       end
+
+      notify_observers(self.value, reason)
+      self
     end
 
     # @!macro [attach] ivar_fail_method
@@ -150,19 +148,39 @@ def try_set(value = NO_VALUE, &block)
 
     protected
 
-    # @!visibility private
-    def complete(success, value, reason) # :nodoc:
-      synchronize do
-        raise MultipleAssignmentError if [:fulfilled, :rejected].include? @state
-        set_state(success, value, reason)
-        event.set
+    def ns_initialize(value, opts)
+      init_obligation(self)
+      self.observers = CopyOnWriteObserverSet.new
+      set_deref_options(opts)
+
+      if value == NO_VALUE
+        @state = :pending
+      else
+        ns_complete_without_notification(true, value, nil)
       end
+    end
 
-      time = Time.now
-      observers.notify_and_delete_observers{ [time, self.value, reason] }
+    def complete(success, value, reason)
+      complete_without_notification(success, value, reason)
+      notify_observers(self.value, reason)
       self
     end
 
+    def complete_without_notification(success, value, reason)
+      synchronize { ns_complete_without_notification(success, value, reason) }
+      self
+    end
+
+    def notify_observers(value, reason)
+      observers.notify_and_delete_observers{ [Time.now, value, reason] }
+    end
+
+    def ns_complete_without_notification(success, value, reason)
+      raise MultipleAssignmentError if [:fulfilled, :rejected].include? @state
+      set_state(success, value, reason)
+      event.set
+    end
+
     # @!visibility private
     def check_for_block_or_value!(block_given, value) # :nodoc:
       if (block_given && value != NO_VALUE) || (! block_given && value == NO_VALUE)

lib/concurrent/promise.rb

@@ -203,7 +203,7 @@ class Promise < IVar
     # @see http://promises-aplus.github.io/promises-spec/
     def initialize(opts = {}, &block)
       opts.delete_if { |k, v| v.nil? }
-      super(IVar::NO_VALUE, opts)
+      super(IVar::NO_VALUE, opts, &nil)
 
       @executor = Executor.executor_from_options(opts) || Concurrent.global_io_executor
       @args = get_arguments_from(opts)

lib/concurrent/scheduled_task.rb

@@ -159,7 +159,7 @@ def initialize(delay, opts = {}, &block)
       raise ArgumentError.new('no block given') unless block_given?
       @delay = TimerSet.calculate_delay!(delay)
 
-      super(NO_VALUE, opts)
+      super(IVar::NO_VALUE, opts, &nil)
 
       self.observers = CopyOnNotifyObserverSet.new
       @state         = :unscheduled

spec/concurrent/ivar_spec.rb

@@ -63,6 +63,19 @@ def trigger_observable(observable)
       it 'can set an initial value' do
         i = IVar.new(14)
         expect(i).to be_complete
+        expect(i.value).to eq 14
+      end
+
+      it 'can set an initial value with a block' do
+        i = IVar.new{ 42 }
+        expect(i).to be_complete
+        expect(i.value).to eq 42
+      end
+
+      it 'raises an exception if given both a value and a block' do
+        expect {
+          IVar.new(42){ 42 }
+        }.to raise_error(ArgumentError)
       end
     end