enumerating 1.0.0 → 1.1.0

data/Gemfile

@@ -2,5 +2,5 @@ source :rubygems
 
 gemspec
 
-gem "rake"
+gem "rake", "~> 0.8.7"
 gem "rspec", ">= 2"

data/README.markdown

@@ -10,6 +10,7 @@ Enumerating extends Enumerable with "lazy" versions of various common operations
 * `#rejecting` selects elements that fail a test block (like `Enumerable#reject`)
 * `#collecting` applies a transforming block to each element (like `Enumerable#collect`)
 * `#uniqing` discards duplicates (like `Enumerable#uniq`)
+* `#taking`, `#taking_while`, `#dropping` and `#dropping_while` also do what you expect
 
 We say the "...ing" variants are "lazy", because they defer per-element processing until the result is used.  They return Enumerable "result proxy" objects, rather than Arrays, and only perform the actual filtering (or transformation) as the result proxy is enumerated.
 
@@ -70,6 +71,13 @@ Enumerating also provides some interesting ways to combine several Enumerable co
     array2 = [2,4,7]
     Enumerating.zipping(array1, array2)    # generates: [1,2], [3,4], [6,7]
 
+`Enumerating.concatenating` concatenates collections.
+
+    array1 = [1,3,6]
+    array2 = [2,4,7]
+    Enumerating.concatenating(array1, array2)
+                                          # generates: [1,3,6,2,4,7]
+
 `Enumerating.merging` merges multiple collections, preserving sort-order.  The inputs are assumed to be sorted already.
 
     array1 = [1,4,5]

data/lib/enumerating/concatenating.rb

@@ -0,0 +1,28 @@
+
+module Enumerating
+  
+  class Concatenator
+    
+    include Enumerable
+    
+    def initialize(enumerables)
+      @enumerables = enumerables
+    end
+    
+    def each(&block)
+      @enumerables.each do |enumerable|
+        enumerable.each(&block)
+      end
+    end
+    
+  end
+
+end
+
+class << Enumerating
+
+  def concatenating(*enumerables)
+    Enumerating::Concatenator.new(enumerables)
+  end
+
+end

data/lib/enumerating/filtering.rb

@@ -64,5 +64,44 @@ module Enumerable
     end
   end
   
+  def taking(n)
+    Enumerating::Filter.new do |output|
+      if n > 0
+        each_with_index do |element, index|
+          output.call(element) 
+          break if index + 1 == n
+        end
+      end
+    end
+  end
+  
+  def taking_while
+    Enumerating::Filter.new do |output|
+      each do |element|
+        break unless yield(element)
+        output.call(element)
+      end
+    end
+  end
+  
+  def dropping(n)
+    Enumerating::Filter.new do |output|
+      each_with_index do |element, index|
+        next if index < n
+        output.call(element)
+      end
+    end
+  end
+  
+  def dropping_while
+    Enumerating::Filter.new do |output|
+      taking = false
+      each do |element|
+        taking ||= !yield(element)
+        output.call(element) if taking
+      end
+    end
+  end
+  
 end
 

data/lib/enumerating/mixing.rb

@@ -1,2 +1,3 @@
+require 'enumerating/concatenating'
 require 'enumerating/merging'
 require 'enumerating/zipping'

data/lib/enumerating/version.rb

@@ -1,3 +1,3 @@
 module Enumerating
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/spec/enumerating/concatenating_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Enumerating do
+
+  describe ".concatenating" do
+    
+    it "concatenates multiple Enumerables" do
+      @array1 = [1,5,3]
+      @array2 = [2,9,4]
+      @zip = Enumerating.concatenating(@array1, @array2)
+      @zip.to_a.should == [1,5,3,2,9,4]
+    end
+
+    it "is lazy" do
+      @zip = Enumerating.concatenating([3,4], [1,2].with_time_bomb)
+      @zip.take(3).should == [3,4,1]
+    end
+    
+  end
+  
+end

data/spec/enumerating/filtering_spec.rb

@@ -70,5 +70,61 @@ describe Enumerable do
     end
 
   end
+  
+  describe "#taking" do
+    
+    it "includes the specified number" do
+      @array = [1,2,3,4]
+      @array.taking(3).to_a.should == [1,2,3]
+    end
+    
+    it "is lazy" do
+      [1,2].with_time_bomb.taking(2).to_a.should == [1,2]
+    end
+    
+    it "copes with 0" do
+      [].with_time_bomb.taking(0).to_a.should == []
+    end
+    
+  end
+  
+  describe "#taking_while" do
+    
+    it "takes elements as long as the predicate is true" do
+      @array = [2,4,6,3]
+      @array.taking_while(&:even?).to_a.should == [2,4,6]
+    end
+    
+    it "is lazy" do
+      [2,3].with_time_bomb.taking_while(&:even?).to_a.should == [2]
+    end
+    
+  end
+  
+  describe "#dropping" do
+    
+    it "excludes the specified number" do
+      @array = [1,2,3,4]
+      @array.dropping(2).to_a.should == [3,4]
+    end
+    
+    it "is lazy" do
+      [1,2,3,4].with_time_bomb.dropping(2).taking(1).to_a.should == [3]
+    end
+    
+  end
+  
+  describe "#dropping_while" do
+    
+    it "drops elements as long as the predicate is true" do
+      @array = [2,4,6,3,4]
+      @array.dropping_while(&:even?).to_a.should == [3,4]
+    end
+    
+    it "is lazy" do
+      [2,3].with_time_bomb.dropping_while(&:even?).taking(1).to_a.should == [3]
+    end
+    
+  end
 
 end

data/spec/enumerating/zipping_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Enumerating, :needs_enumerators => true do
 
-  describe "#zipping" do
+  describe ".zipping" do
 
     it "zips together multiple Enumerables" do
       @array1 = [1,3,6]

metadata

@@ -2,7 +2,7 @@
 name: enumerating
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mike Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-05-26 00:00:00 Z
 dependencies: []
 
 description: Enumerating extends Enumerable with "lazy" versions of various operations, allowing streamed processing of large (or even infinite) collections.  Even in Ruby 1.8.x.
@@ -29,11 +29,13 @@ files:
 - benchmarks/pipeline_bench.rb
 - enumerating.gemspec
 - lib/enumerating.rb
+- lib/enumerating/concatenating.rb
 - lib/enumerating/filtering.rb
 - lib/enumerating/merging.rb
 - lib/enumerating/mixing.rb
 - lib/enumerating/version.rb
 - lib/enumerating/zipping.rb
+- spec/enumerating/concatenating_spec.rb
 - spec/enumerating/filtering_spec.rb
 - spec/enumerating/merging_spec.rb
 - spec/enumerating/zipping_spec.rb
@@ -66,7 +68,9 @@ signing_key:
 specification_version: 3
 summary: Lazy filtering/transforming of Enumerable collections
 test_files: 
+- spec/enumerating/concatenating_spec.rb
 - spec/enumerating/filtering_spec.rb
 - spec/enumerating/merging_spec.rb
 - spec/enumerating/zipping_spec.rb
 - spec/spec_helper.rb
+has_rdoc: