concurrent-ruby-edge 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483222056a02ba17d68abfa363b9724752bd1afb
-  data.tar.gz: 6aeaffa48b1e72537dfc0cd4d7e2192f9f0a9b7f
+  metadata.gz: 701e26cf927708495af961bdb3d74ecc9d19f674
+  data.tar.gz: f0c8360bfa3bcd0d0ac9ffd6870a039e4f422e94
 SHA512:
-  metadata.gz: bd2568bd3bc5a0475f010707956951699b261d436350031ec07426d724202754d7b4ca24424fd39ef7b9cdfbaf1be15191c32dc810486ef550f3348451f6915a
-  data.tar.gz: 99c27ac66c7e2071ff4d641e5a6ea9c0a9d1a9a57cfc63e7603248ef160461981fcd6127cc29c05a487aee66c5a48110312030955695eb5c4d15829c9c2ce8f2
+  metadata.gz: abe04d158a10d5d137dee2e2ca9b6612b4028ea505296d2e6892af3166443e648bdb0a0a7ca8e8a64a2d3870830e02fc61d471a53b6627ff612da7c13ea508da
+  data.tar.gz: c645a675298541932bec282938cfac60d3b61c562eecd0383fd0224ff3ef794f038109eb064deb4535f70876a6ee40a90651a1a06ac67731f0bb08e149f4466f

data/README.md

@@ -45,9 +45,9 @@
 
 ### Supported Ruby versions
 
-MRI 1.9.3, 2.0, 2.1, 2.2, JRuby (1.9 mode), and Rubinius 2.x are supported.
+MRI 1.9.3, 2.0 and above, JRuby 1.7x in 1.9 mode, JRuby 9000, and Rubinius 2.x are supported.
 This gem should be fully compatible with any interpreter that is compliant with Ruby 1.9.3 or newer.
-Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs will be supported.
+Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.
 
 ## Thread Safety
 
@@ -59,14 +59,10 @@ It is critical to remember, however, that Ruby is a language of mutable referenc
 
 ## Features & Documentation
 
-We have a roadmap guiding our work toward the [v1.0.0 release](https://github.com/ruby-concurrency/concurrent-ruby/issues/257).
-
 The primary site for documentation is the automatically generated [API documentation](http://ruby-concurrency.github.io/concurrent-ruby/frames.html)
 
 We also have a [mailing list](http://groups.google.com/group/concurrent-ruby) and [IRC (gitter)](https://gitter.im/ruby-concurrency/concurrent-ruby).
 
-This library contains a variety of concurrency abstractions at high and low levels. One of the high-level abstractions is likely to meet most common needs.
-
 #### General-purpose Concurrency Abstractions
 
 * [Async](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Async.html): A mixin module that provides simple asynchronous behavior to a class. Loosely based on Erlang's [gen_server](http://www.erlang.org/doc/man/gen_server.html).
@@ -182,7 +178,7 @@ gem install concurrent-ruby
 or add the following line to Gemfile:
 
 ```ruby
-gem 'concurrent-ruby'
+gem 'concurrent-ruby', require: 'concurrent'
 ```
 
 and run `bundle install` from your shell.
@@ -198,7 +194,7 @@ gem install concurrent-ruby-edge
 or add the following line to Gemfile:
 
 ```ruby
-gem 'concurrent-ruby-edge'
+gem 'concurrent-ruby-edge', require: 'concurrent-edge'
 ```
 
 and run `bundle install` from your shell.

data/lib/concurrent/edge/future.rb

@@ -76,12 +76,23 @@ module Concurrent
         ScheduledPromise.new(default_executor, intended_time).future.then(&task)
       end
 
-      # Constructs new {Future} which is completed after all futures are complete. Its value is array
-      # of dependent future values. If there is an error it fails with the first one.
-      # @param [Event] futures
+      # Constructs new {Future} which is completed after all futures_and_or_events are complete. Its value is array
+      # of dependent future values. If there is an error it fails with the first one. Event does not
+      # have a value so it's represented by nil in the array of values.
+      # @param [Event] futures_and_or_events
       # @return [Future]
-      def zip(*futures)
-        ZipPromise.new(futures, :io).future
+      def zip_futures(*futures_and_or_events)
+        ZipFuturesPromise.new(futures_and_or_events, :io).future
+      end
+
+      alias_method :zip, :zip_futures
+
+      # Constructs new {Event} which is completed after all futures_and_or_events are complete
+      # (Future is completed when Success or Failed).
+      # @param [Event] futures_and_or_events
+      # @return [Event]
+      def zip_events(*futures_and_or_events)
+        ZipEventsPromise.new(futures_and_or_events, :io).future
       end
 
       # Constructs new {Future} which is completed after first of the futures is complete.
@@ -95,6 +106,7 @@ module Concurrent
       # @return [Future]
       def select(*channels)
         future do
+          # noinspection RubyArgCount
           Channel.select do |s|
             channels.each do |ch|
               s.take(ch) { |value| [value, ch] }
@@ -503,9 +515,9 @@ module Concurrent
       # @!visibility private
       class PartiallyFailed < CompletedWithResult
         def initialize(value, reason)
+          super()
           @Value  = value
           @Reason = reason
-          super()
         end
 
         def success?
@@ -670,7 +682,7 @@ module Concurrent
       # Zips with selected value form the suplied channels
       # @return [Future]
       def then_select(*channels)
-        ZipPromise.new([self, Concurrent.select(*channels)], @DefaultExecutor).future
+        ZipFuturesPromise.new([self, Concurrent.select(*channels)], @DefaultExecutor).future
       end
 
       # Changes default executor for rest of the chain
@@ -987,12 +999,16 @@ module Concurrent
     # @abstract
     # @!visibility private
     class BlockedPromise < InnerPromise
+      def self.new(*args, &block)
+        promise = super(*args, &block)
+        promise.blocked_by.each { |f| f.add_callback :pr_callback_notify_blocked, promise }
+        promise
+      end
+
       def initialize(future, blocked_by_futures, countdown)
+        super(future)
         initialize_blocked_by(blocked_by_futures)
         @Countdown = AtomicFixnum.new countdown
-
-        super(future)
-        @BlockedBy.each { |f| f.add_callback :pr_callback_notify_blocked, self }
       end
 
       # @api private
@@ -1053,9 +1069,9 @@ module Concurrent
     class BlockedTaskPromise < BlockedPromise
       def initialize(blocked_by_future, default_executor, executor, &task)
         raise ArgumentError, 'no block given' unless block_given?
+        super Future.new(self, default_executor), blocked_by_future, 1
         @Executor = executor
         @Task     = task
-        super Future.new(self, default_executor), blocked_by_future, 1
       end
 
       def executor
@@ -1203,8 +1219,8 @@ module Concurrent
     # @!visibility private
     class ZipFutureEventPromise < BlockedPromise
       def initialize(future, event, default_executor)
-        @FutureResult = future
         super Future.new(self, default_executor), [future, event], 2
+        @FutureResult = future
       end
 
       def on_completable(done_future)
@@ -1215,9 +1231,9 @@ module Concurrent
     # @!visibility private
     class ZipFutureFuturePromise < BlockedPromise
       def initialize(future1, future2, default_executor)
+        super Future.new(self, default_executor), [future1, future2], 2
         @Future1Result = future1
         @Future2Result = future2
-        super Future.new(self, default_executor), [future1, future2], 2
       end
 
       def on_completable(done_future)
@@ -1256,62 +1272,54 @@ module Concurrent
     end
 
     # @!visibility private
-    class ZipPromise < BlockedPromise
+    class ZipFuturesPromise < BlockedPromise
 
       private
 
       def initialize(blocked_by_futures, default_executor)
-        klass = Event
-        blocked_by_futures.each do |f|
-          if f.is_a?(Future)
-            if klass == Event
-              klass = Future
-              break
-            end
-          end
-        end
-
-        # noinspection RubyArgCount
-        super(klass.new(self, default_executor), blocked_by_futures, blocked_by_futures.size)
+        super(Future.new(self, default_executor), blocked_by_futures, blocked_by_futures.size)
 
-        if blocked_by_futures.empty?
-          on_completable nil
-        end
+        on_completable nil if blocked_by_futures.empty?
       end
 
       def on_completable(done_future)
         all_success = true
-        values      = []
-        reasons     = []
-
-        blocked_by.each do |future|
-          next unless future.is_a?(Future)
-          success, value, reason = future.result
+        values      = Array.new(blocked_by.size)
+        reasons     = Array.new(blocked_by.size)
 
-          unless success
-            all_success = false
+        blocked_by.each_with_index do |future, i|
+          if future.is_a?(Future)
+            success, values[i], reasons[i] = future.result
+            all_success                    &&= success
+          else
+            values[i] = reasons[i] = nil
           end
-
-          values << value
-          reasons << reason
         end
 
         if all_success
-          if values.empty?
-            complete_with Event::COMPLETED
-          else
-            if values.size == 1
-              complete_with Future::Success.new(values.first)
-            else
-              complete_with Future::SuccessArray.new(values)
-            end
-          end
+          complete_with Future::SuccessArray.new(values)
         else
           complete_with Future::PartiallyFailed.new(values, reasons)
         end
       end
     end
 
+    # @!visibility private
+    class ZipEventsPromise < BlockedPromise
+
+      private
+
+      def initialize(blocked_by_futures, default_executor)
+        super(Event.new(self, default_executor), blocked_by_futures, blocked_by_futures.size)
+
+        on_completable nil if blocked_by_futures.empty?
+      end
+
+      def on_completable(done_future)
+        complete_with Event::COMPLETED
+      end
+    end
+
     # @!visibility private
     class AnyPromise < BlockedPromise
 
@@ -1354,8 +1362,8 @@ module Concurrent
       private
 
       def initialize(default_executor, value)
-        @Value = value
         super Future.new(self, default_executor)
+        @Value = value
       end
     end
 
@@ -1373,6 +1381,8 @@ module Concurrent
       private
 
       def initialize(default_executor, intended_time)
+        super Event.new(self, default_executor)
+
         @IntendedTime = intended_time
 
         in_seconds = begin
@@ -1385,8 +1395,6 @@ module Concurrent
           [0, schedule_time.to_f - now.to_f].max
         end
 
-        super Event.new(self, default_executor)
-
         Concurrent.global_timer_set.post(in_seconds) do
           @Future.complete_with Event::COMPLETED
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby-edge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jerry D'Antonio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 description: |
   These features are under active development and may change frequently. They are expected not to
   keep backward compatibility (there may also lack tests and documentation). Semantic versions will
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.0
 signing_key: 
 specification_version: 4
 summary: Edge features and additions to the concurrent-ruby gem.