async_enum 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWU0MWNjY2UwYTE3OTI5Njc1OThiZTAyMDNjMjliNmQ3MWMzZmZjMg==
+    ZDFhMWYwZjQ0ZWE1Njc1NzJiZGU3ZTEwMDAyMzIzN2M4ZmZhZDM4ZA==
   data.tar.gz: !binary |-
-    NGM5ZDA0NjA5NTI3M2YyNjVjZTA1N2UxOTVmYzI5MGQ2OGQ5YzhlNg==
+    ZDAzNTI1ZjczYzU4NjQ0YTNhNTVmMTkzMzdjNzEyMzk4Y2Q4ZjUwMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjQ0Nzc5NmVlNTQzMzMzZmEyNzBmOTU4ZThkYWZmOWYwYmFmYTUxMDkxMTU5
-    NTFhNzI0MTUxNDQ2NGIyZjU3OTAyMTFiZTFiZjdmZjNlYWNhMGVlYjdkNTY2
-    OGFmZWM4OTk4MzUyNGUwYTQ3YWQ1N2Q3YjZjYWU2NjFkMmNlNTc=
+    YmQ0MjFmMTU3NGQyMWEzZTQ4MWY5NjM2NGZhMWVhN2Q0OTU4ZGY3ZTBhNDI3
+    NWUyNmQ1YzZlMWVkNjA0YmIwNWE5OTZhNTdhNzg1ZjUxZTdkZDkxZjUzMzM4
+    MDA5NmFhZGU3NzE5MTQyMGMzOTU3N2IzNTUxYzczMzgwMzcwNTE=
   data.tar.gz: !binary |-
-    MWQyYWM1ZWQ1ODc1YjQ0M2M2Y2VhMjQzM2I5ODhiODU0MjEzOTdmNzM0ZTY2
-    ZDcwMTE5YjhlYTEwZmUwMDBlMmE5MTI0MWY4MGU3ZWNlOTMxMzlhN2ZhOWIy
-    M2ExYjE1ZWI2MjM0MjBkMGM3ZTY1YWFiNDhjNmIwNmNmZWYzOTk=
+    ZjdiNzk0OWI1MGI0YzE1MzE5NjExYzI4OTNjNGYzNmM1YzQ0ZmViODk0NTA0
+    OWMyZWUyNjQwOTY5MzdlYzEzZjc2OThjNWVhZGExYWE1MzI2MmQ4NTM4M2Zj
+    YmZlMmFhMjljNTk1ODVhYWIxZTY2MTIwOWUyNDQ3MmQ1ZjRkZDc=

data/README.md

@@ -105,7 +105,7 @@ To install it, add it to your gemfile:
 ```
 # Gemfile
 
-gem 'async_enum', github: 'aj0strow/async_enum'
+gem 'async_enum'
 ```
 
 To run the demos, clone the project and run with the library included in the load path:

data/async_enum.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'async_enum'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.authors     = %w(aj0strow)
   s.email       = 'alexander.ostrow@gmail.com'
   s.description = 'iterate over enumerable objects concurrently'

data/lib/enumerator/async.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 class Enumerator
   class Async < Enumerator
     
@@ -15,7 +17,18 @@ class Enumerator
       alias_method :evaluate, :instance_exec
     end
     
+    EOQ = Object.new
+    private_constant :EOQ
+    
     def initialize(enum, pool_size = nil)
+      if pool_size
+        unless pool_size >= 1
+          message = "Thread pool size is invalid! Expected a positive integer but got: #{pool_size}"
+          raise ArgumentError, message
+        end
+        pool_size = pool_size.to_i
+      end
+
       @enum = enum
       @pool_size = pool_size
       @lockset = Lockset.new
@@ -39,13 +52,24 @@ class Enumerator
       raise_error('each') unless block_given?
       
       if @pool_size
+        queue = SizedQueue.new @pool_size
+        
         threads = @pool_size.times.map do
           Thread.new do
             loop do
-              @enum.any? ? evaluate(*@enum.next, &work) : break
+              item = queue.pop
+              item != EOQ ? evaluate(item, &work) : break
             end
           end
         end
+        
+        begin
+          loop { queue.push @enum.next }
+        rescue StopIteration
+        ensure
+          @pool_size.times { queue.push EOQ }
+        end
+
         threads.each(&:join)
         @enum.rewind
       else
@@ -99,8 +123,8 @@ class Enumerator
     end
 
     def raise_error(method)
-      raise ArgumentError, "tried to call async #{method} without a block"
+      raise ArgumentError, "Tried to call async #{method} without a block"
     end
     
   end
-end
+end

data/test/async_enum_test/benchmark_test.rb

@@ -8,5 +8,4 @@ class BenchmarkTest < Test
     end
   end
   
-  
 end

data/test/async_enum_test/hash_compatible_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class HashCompatibleTest < Test
+  
+  setup do
+    @hash = { a: 1, b: 2 }
+  end
+  
+  test 'hash compatible unlimited' do
+    values = @hash.async.map do |key, value|
+      [key, value * 2]
+    end
+    assert_equal [[:a, 2], [:b, 4]], values
+  end
+  
+  test 'hash compatible' do
+    values = @hash.async(2).map do |key, value|
+      [key, value * 2]
+    end
+    assert_equal [[:a, 2], [:b, 4]], values
+  end
+  
+end

data/test/async_enum_test/thread_pool_test.rb

@@ -21,4 +21,17 @@ class ThreadPoolTest < Test
     assert_equal [2, 3, 4, 5, 6, 7, 8, 9], vals
   end
   
-end
+  test 'pools with hash' do
+    values = { a: 1, b: 2 }.async(2).map do |key, value|
+      [key, value * 2]
+    end
+    assert_equal [[:a, 2], [:b, 4]], values
+  end
+  
+  test 'doesnt throw fiber error' do
+    # implicitly will fail if error is raised
+    5.times.async(2).each { sleep 0.00001 }
+    assert true
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async_enum
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - aj0strow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - test/async_enum_test/benchmark_test.rb
 - test/async_enum_test/definitions_test.rb
 - test/async_enum_test/enumerator_async_test.rb
+- test/async_enum_test/hash_compatible_test.rb
 - test/async_enum_test/thread_pool_test.rb
 - test/test_helper.rb
 homepage: http://github.com/aj0strow/async_enum
@@ -89,5 +90,6 @@ test_files:
 - test/async_enum_test/benchmark_test.rb
 - test/async_enum_test/definitions_test.rb
 - test/async_enum_test/enumerator_async_test.rb
+- test/async_enum_test/hash_compatible_test.rb
 - test/async_enum_test/thread_pool_test.rb
 - test/test_helper.rb