epitools 0.5.64 → 0.5.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c97e30eb1552bb115bad441fa21bf0c5e1a58a10
-  data.tar.gz: 5559b075618fdc77e4bc55ece12b42dc8cf4ad49
+  metadata.gz: 94166d901d6ab0595ed2a71eec10b24d91d52fec
+  data.tar.gz: 1eecd4e24c563b3622a20f3da7606c2bd558ed60
 SHA512:
-  metadata.gz: b61f7535b2d27d437bedc30197de4de5b09a4d2234f8580c33779a37b9337031e31a6e071995ffeb111ef87a195dec7502ee5aba42b15d7899d836a5980888bf
-  data.tar.gz: cb9807f3b5953ece8e40171aa48363042c5610a28aea82c1702f6b7ce3c2f536106294f7b06a45b42b86491715b83b05267d65b15609fdf14e46df3cd51f97fb
+  metadata.gz: beea01a551fa4042079de50f34ad39e75d1b7d42a996350c4983febfa63cb0771e525f7eeb949907a9d27be3bbc27f53dd6774e0dfd847b21aa0986bec986328
+  data.tar.gz: 65e93518be6608ee373e76ed7dddc9c1ef53b9fe1182f96409d9cad75b880e218ada0ff8d56c6e2cf8fac226c6a451e6c88914a9b2d48de817e508b7ec16a17f

data/VERSION

@@ -1 +1 @@
-0.5.64
+0.5.65

data/lib/epitools/core_ext/enumerable.rb

@@ -58,10 +58,6 @@ module Enumerable
   #   #=> [ ["Chapter 1", ...], ["Chapter 2", ...], etc. ]
   #
   def split_at(matcher=nil, options={}, &block)
-    # TODO: Ruby 1.9 returns Enumerators for everything now. Maybe use that?
-
-    return self unless self.any?
-
     include_boundary = options[:include_boundary] || false
 
     if matcher.nil?
@@ -75,43 +71,42 @@ module Enumerable
       end
     end
 
-    chunks = []
-    current_chunk = []
+    Enumerator.new do |yielder|
+      current_chunk = []
+      splits        = 0
+      max_splits    = options[:once] == true ? 1 : options[:max_splits]
 
-    splits = 0
-    max_splits = options[:once] == true ? 1 : options[:max_splits]
+      each do |e|
 
-    each do |e|
+        if boundary_test_proc.call(e) and (max_splits == nil or splits < max_splits)
 
-      if boundary_test_proc.call(e) and (max_splits == nil or splits < max_splits)
+          if current_chunk.empty? and not include_boundary
+            next # hit 2 boundaries in a row... just keep moving, people!
+          end
 
-        if current_chunk.empty? and not include_boundary
-          next # hit 2 boundaries in a row... just keep moving, people!
-        end
+          if options[:after]
+            # split after boundary
+            current_chunk << e        if include_boundary   # include the boundary, if necessary
+            yielder << current_chunk                         # shift everything after the boundary into the resultset
+            current_chunk = []                              # start a new result
+          else
+            # split before boundary
+            yielder << current_chunk                         # shift before the boundary into the resultset
+            current_chunk = []                              # start a new result
+            current_chunk << e        if include_boundary   # include the boundary, if necessary
+          end
+
+          splits += 1
 
-        if options[:after]
-          # split after boundary
-          current_chunk << e        if include_boundary   # include the boundary, if necessary
-          chunks << current_chunk                         # shift everything after the boundary into the resultset
-          current_chunk = []                              # start a new result
         else
-          # split before boundary
-          chunks << current_chunk                         # shift before the boundary into the resultset
-          current_chunk = []                              # start a new result
-          current_chunk << e        if include_boundary   # include the boundary, if necessary
+          current_chunk << e
         end
 
-        splits += 1
-
-      else
-        current_chunk << e
       end
 
-    end
+      yielder << current_chunk if current_chunk.any?
 
-    chunks << current_chunk if current_chunk.any?
-
-    chunks # resultset
+    end
   end
 
   #

data/spec/core_ext_spec.rb

@@ -470,23 +470,23 @@ describe Enumerable do
   end
   
   it "splits" do
-    [1,2,3,4,5].split_at     {|e| e == 3}.should == [ [1,2], [4,5] ]
-    [1,2,3,4,5].split_after  {|e| e == 3}.should == [ [1,2,3], [4,5] ]
-    [1,2,3,4,5].split_before {|e| e == 3}.should == [ [1,2], [3,4,5] ]
+    [1,2,3,4,5].split_at     {|e| e == 3}.to_a.should == [ [1,2], [4,5] ]
+    [1,2,3,4,5].split_after  {|e| e == 3}.to_a.should == [ [1,2,3], [4,5] ]
+    [1,2,3,4,5].split_before {|e| e == 3}.to_a.should == [ [1,2], [3,4,5] ]
 
     result = "a\nb\n---\nc\nd\n".lines.split_at(/---/)
     result.map_recursively(&:strip).should == [ %w[a b], %w[c d] ]
   end
 
-  it "handles nested things" do
+  it "splits with nested things" do
     array = [ [],["a"],"a",[1,2,3] ]
 
     lambda { 
       array.split_at("a")
     }.should_not raise_error
     
-    array.split_at("a").should     == [ array[0..1], array[3..3] ] 
-    array.split_at([1,2,3]).should == [ array[0..2] ]
+    array.split_at("a").to_a.should     == [ array[0..1], array[3..3] ] 
+    array.split_at([1,2,3]).to_a.should == [ array[0..2] ]
   end
   
   it "handles arbitrary objects" do
@@ -495,7 +495,7 @@ describe Enumerable do
     particular = arbitrary.new(1,2,3)
     array = [ arbitrary.new, arbitrary.new, particular, arbitrary.new]
     
-    array.split_at(particular).should == [ array[0..1], array[3..3] ]    
+    array.split_at(particular).to_a.should == [ array[0..1], array[3..3] ]    
   end
   
   it "sums" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.64
+  version: 0.5.65
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec