enumerating 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI2YTQ2Y2Y0ZmFjOTljNmEzMjU2ZDc4YTFkNWE3ZjY0MWY4Mjg1Ng==
+    NzY5YTdhMzFkMDM1MzkxMGMyZDAyNTUxNmIxMzg4MzYzMTM5OTczZQ==
   data.tar.gz: !binary |-
-    ODUwMjlhZmYzN2M1ZTgxNTkwNmI4N2E4YTg5YzI5ZmY2NTJiNTgyZQ==
+    OGU1MzVhZWViMTM4YWE1MWQ1YTljYmZmZDU0NTAyZWJiMjJkMzViOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWYzMjdhYTNlYjE3ZjRkODI0NDQzMmQ0YTA3NDIwNjFjMDViMWYwNjZhMmVk
-    OTBiZWEwMTJjODY2NjFiYzhlYzMwMGI4ODUwNTU3MWViNjYyYzNhNzIwNTdj
-    ZWEwNGRkMWZjY2ZkYjM1YzUwZjJhNzc2YzZmNDcxNDBjYTg0MTE=
+    NWZkYzRhMmE0NmE1YjFkYWEzNWUyMTc3ODYxNjM1YWVlY2U3YTk0ZWRiMGI0
+    MzA5MTI1N2Q0ZGRlYzMyMzliN2QxNWExOWE4Y2QxOTIzYmIxZGJkYTc1YTY0
+    NTgyMWY4OTQ5MTZiZDU1N2NmYjM4MTI0MGMxZTJiYmRjZjg5YzM=
   data.tar.gz: !binary |-
-    M2U3ZWJjYjY0NjlkOGQyOTg2MjVhOTYzMTk1NjgzYjg2OGFkM2E5MzBiMGYz
-    ZjU2ZmZmNTJjMjIwYmRiNGNjYTk4Yzg3YTBkNjVmMTQzYjNhMjUxMzRlNDE1
-    OGQyNjUxMTg2NjE1ZGEyODJhZDczNDA1Nzc4OTEyY2ZmNjBiOGE=
+    ZjRjODJlZjhiZjQzYzVlMGNmZDlmMzUwN2M4NGE5ZDI1YjBlYTkyYTZlMjI2
+    ZWIyNWNjZjFkMGE5M2EwNzY4ZGI5MjMwMzRhNTY5ZjI2YTgwZTg1NDc0ZTkw
+    Y2FlYzFlZmM0YTY4MTZhNzA5Mjg3YmFhYjI0MGM4NzVjYmYwMTQ=

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode

data/Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rake", "~> 0.8.7"
+gem "rake", "~> 10.0.0"
 gem "rspec", ">= 2"

data/README.md

@@ -1,4 +1,4 @@
-Enumerating
+Enumerating [![Build Status](https://secure.travis-ci.org/mdub/enumerating.png?branch=master)](http://travis-ci.org/mdub/enumerating)
 ===========
 
 Lazy "filtering" and transforming

data/benchmarks/pipeline_bench.rb

@@ -2,18 +2,6 @@ require 'benchmark'
 
 $: << File.expand_path("../../lib", __FILE__)
 
-if defined?(Fiber)
-  require "lazing"
-  module Enumerable
-    alias :lazing_select :selecting
-    alias :lazing_collect :collecting
-  end
-end
-
-require "enumerating"
-
-require 'facets'
-
 array = (1..100000).to_a
 
 # Test scenario:
@@ -54,22 +42,53 @@ end
   array.select { |x| x.even? }.collect { |x| x*x }
 end
 
-benchmark "enumerating", @control do
-  array.selecting { |x| x.even? }.collecting { |x| x*x }
+def can_require?(library)
+  require(library)
+  true
+rescue LoadError
+  printf "%-36s ----------------- N/A -----------------\n", library
+  false
 end
 
-if defined?(Fiber)
+if can_require?("enumerating")
+
+  benchmark "enumerating", @control do
+    array.selecting { |x| x.even? }.collecting { |x| x*x }
+  end
+
+end
+
+if defined?(Fiber) && can_require?("lazing")
+
+  module Enumerable
+    alias :lazing_select :selecting
+    alias :lazing_collect :collecting
+  end
+
   benchmark "lazing", @control do
     array.lazing_select { |x| x.even? }.lazing_collect { |x| x*x }
   end
+
 end
 
 if array.respond_to?(:lazy)
+
   benchmark "ruby2 Enumerable#lazy", @control do
     array.lazy.select { |x| x.even? }.lazy.collect { |x| x*x }
   end
+
+elsif can_require?("backports/2.0.0/enumerable")
+
+  benchmark "backports Enumerable#lazy", @control do
+    array.lazy.select { |x| x.even? }.lazy.collect { |x| x*x }
+  end
+
 end
 
-benchmark "facets Enumerable#defer", @control do
-  array.defer.select { |x| x.even? }.collect { |x| x*x }
+if can_require? "facets"
+
+  benchmark "facets Enumerable#defer", @control do
+    array.defer.select { |x| x.even? }.collect { |x| x*x }
+  end
+
 end

data/lib/enumerating/filtering.rb

@@ -10,10 +10,14 @@ module Enumerating
       @generator = generator
     end
 
+    DONE = "done-#{self.object_id}".to_sym
+
     def each
       return to_enum unless block_given?
       yielder = proc { |x| yield x }
-      @generator.call(yielder)
+      catch DONE do
+        @generator.call(yielder)
+      end
     end
 
   end
@@ -73,7 +77,7 @@ module Enumerable
       if n > 0
         each_with_index do |element, index|
           output.call(element)
-          break if index + 1 == n
+          throw Enumerating::Filter::DONE if index + 1 == n
         end
       end
     end
@@ -82,7 +86,7 @@ module Enumerable
   def taking_while
     Enumerating::Filter.new do |output|
       each do |element|
-        break unless yield(element)
+        throw Enumerating::Filter::DONE unless yield(element)
         output.call(element)
       end
     end

data/lib/enumerating/merging.rb

@@ -22,7 +22,7 @@ module Enumerating
       end
 
       def each
-        while true do
+        loop do
           discard_empty_enumerators
           break if @enumerators.empty?
           yield next_enumerator.next
@@ -58,7 +58,7 @@ module Enumerating
 end
 
 class << Enumerating
-  
+
   def merging(*enumerables)
     Enumerating::Merger.new(enumerables)
   end
@@ -66,5 +66,5 @@ class << Enumerating
   def merging_by(*enumerables, &block)
     Enumerating::Merger.new(enumerables, &block)
   end
-  
+
 end

data/lib/enumerating/threading.rb

@@ -1,51 +1,14 @@
+require 'enumerating/filtering'
 require 'enumerating/prefetching'
 
-module Enumerating
-
-  class ThreadStarter
-
-    include Enumerable
-
-    def initialize(source, block)
-      @source = source
-      @block = block
-    end
-
-    def each
-      @source.each do |source_item|
-        thread = Thread.new do
-          @block.call(source_item)
-        end
-        yield thread
-      end
-    end
-
-  end
-
-  class ThreadJoiner
-
-    include Enumerable
-
-    def initialize(threads)
-      @threads = threads
-    end
-
-    def each
-      @threads.each do |thread|
-        thread.join
-        yield thread.value
-      end
-    end
-
-  end
-
-end
-
 module Enumerable
 
   def threading(max_threads, &block)
-    threads = Enumerating::ThreadStarter.new(self, block)
-    Enumerating::ThreadJoiner.new(threads.prefetching(max_threads - 1))
+    collecting do |item|
+      Thread.new { block.call(item) }
+    end.prefetching(max_threads - 1).collecting do |thread|
+      thread.join; thread.value
+    end
   end
 
 end

data/lib/enumerating/version.rb

@@ -1,3 +1,3 @@
 module Enumerating
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

data/spec/enumerating/filtering_spec.rb

@@ -82,6 +82,10 @@ describe Enumerable do
       [1,2].with_time_bomb.taking(2).to_a.should == [1,2]
     end
 
+    it "is stackable" do
+      [1,2].taking(2).taking(2).to_a.should == [1,2]
+    end
+
     it "copes with 0" do
       [].with_time_bomb.taking(0).to_a.should == []
     end

data/spec/enumerating/merging_spec.rb

@@ -13,8 +13,8 @@ describe Enumerating, :needs_enumerators => true do
     end
 
     it "is lazy" do
-      @enum1 = [1,3]
-      @enum2 = [2,4].with_time_bomb
+      @enum1 = [1,3,6]
+      @enum2 = [2,4,7].with_time_bomb
       @merge = Enumerating.merging(@enum1, @enum2)
       @merge.take(4).should == [1,2,3,4]
     end
@@ -32,4 +32,4 @@ describe Enumerating, :needs_enumerators => true do
 
   end
 
-end
+end

data/spec/enumerating/threading_spec.rb

@@ -16,23 +16,27 @@ describe Enumerable do
       [1,2,3].with_time_bomb.threading(2) { |x| x * 2 }.first.should == 2
     end
 
+    def round(n, accuracy = 0.02)
+      (n / accuracy).round.to_f * accuracy
+    end
+
     it "runs the specified number of threads in parallel" do
-      delays = [0.01, 0.01, 0.01]
+      delays = [0.03, 0.03, 0.03]
       start = Time.now
       delays.threading(2) do |delay|
         sleep(delay)
       end.to_a
-      (Time.now - start).round(2).should eq(0.01 * 2)
+      round(Time.now - start).should eq(0.06)
     end
 
     it "acts as a sliding window" do
-      delays = [0.05, 0.04, 0.03, 0.02, 0.01]
+      delays = [0.1, 0.08, 0.06, 0.04, 0.02]
       start = Time.now
       elapsed_times = delays.threading(3) do |delay|
         sleep(delay)
-        (Time.now - start).round(2)
+        round(Time.now - start)
       end
-      elapsed_times.to_a.should eq([0.05, 0.04, 0.03, 0.07, 0.06])
+      elapsed_times.to_a.should eq([0.1, 0.08, 0.06, 0.14, 0.12])
     end
 
     it "surfaces exceptions" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerating
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies: []
 description: Enumerating extends Enumerable with "lazy" versions of various operations,
   allowing streamed processing of large (or even infinite) collections.  Even in Ruby
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - README.md