Fixed bug in observer sets when block returns complex data types.

Author: jdantonio

lib/concurrent/copy_on_notify_observer_set.rb

@@ -72,11 +72,8 @@ def duplicate_and_clear_observers
     def notify_to(observers, *args)
       raise ArgumentError.new('cannot give arguments and a block') if block_given? && ! args.empty?
       observers.each do |observer, function|
-        if block_given?
-          observer.send(function, *[yield].flatten)
-        else
-          observer.send(function, *args)
-        end
+        args = yield if block_given?
+        observer.send(function, *args)
       end
     end
   end

lib/concurrent/copy_on_write_observer_set.rb

@@ -70,11 +70,8 @@ def notify_and_delete_observers(*args, &block)
     def notify_to(observers, *args)
       raise ArgumentError.new('cannot give arguments and a block') if block_given? && ! args.empty?
       observers.each do |observer, function|
-        if block_given?
-          observer.send(function, *[yield].flatten)
-        else
-          observer.send(function, *args)
-        end
+        args = yield if block_given?
+        observer.send(function, *args)
       end
     end
 

lib/concurrent/dataflow.rb

@@ -43,11 +43,11 @@ def update(time, value, reason)
   #       Concurrent::dataflow(n1, n2) { |v1, v2| v1 + v2 }
   #     end
   #   end
-  #
+  #   
   #   f = fib(14) #=> #<Concurrent::Future:0x000001019a26d8 ...
-  #   sleep(0.5)
-  #
-  #   f.value #=> 377
+  #   
+  #   # wait up to 1 second for the answer...
+  #   f.value(1) #=> 377
   #
   # @param [Future] inputs zero or more +Future+ operations that this dataflow depends upon
   #

spec/concurrent/observer_set_shared.rb

@@ -110,6 +110,20 @@
         observer_set.notify_observers{ [1, 2, 3, 4] }
       end
 
+      it 'accepts blocks returning a single value' do
+
+        expect(observer).to receive(:update).with(:foo)
+        observer_set.add_observer(observer)
+        observer_set.notify_observers{ :foo }
+      end
+
+      it 'accepts block return values that include arrays' do
+
+        expect(observer).to receive(:update).with(1, [2, 3], 4)
+        observer_set.add_observer(observer)
+        observer_set.notify_observers{ [1, [2, 3], 4] }
+      end
+
       it 'raises an exception if given both arguments and a block' do
 
         observer_set.add_observer(observer)