lazily 0.1.1 → 0.1.2

data/README.md

@@ -134,10 +134,6 @@ Q: Why use Lazily, when Ruby 2.x has built-in lazy enumerations?
 - Features: Lazily provides some extra features not present in Ruby 2.0, such as multi-threaded lazy enumeration.
 - Speed: Despite being implemented in pure Ruby, `Enumerable#lazily` actually performs a little better than `Enumerable#lazy`.
 
-Q: When would you use built-in Ruby lazy enumerations, rather than Lazily?
-
-- I wouldn't.
-
 ### Others
 
 See also:

data/lib/lazily/filtering.rb

@@ -10,9 +10,9 @@ module Lazily
     # @see ::Enumerable#collect
     #
     def collect(&transformation)
-      filter("collect") do |output, done|
+      filter("collect") do |yielder|
         each do |element|
-          output.call yield(element)
+          yielder.call yield(element)
         end
       end
     end
@@ -26,9 +26,9 @@ module Lazily
     # @see ::Enumerable#select
     #
     def select(&predicate)
-      filter("select") do |output, done|
+      filter("select") do |yielder|
         each do |element|
-          output.call(element) if yield(element)
+          yielder.call(element) if yield(element)
         end
       end
     end
@@ -44,9 +44,9 @@ module Lazily
     # @see ::Enumerable#reject
     #
     def reject
-      filter("reject") do |output, done|
+      filter("reject") do |yielder|
         each do |element|
-          output.call(element) unless yield(element)
+          yielder.call(element) unless yield(element)
         end
       end
     end
@@ -61,7 +61,7 @@ module Lazily
     # @see ::Enumerable#uniq
     #
     def uniq
-      filter("uniq") do |output, done|
+      filter("uniq") do |yielder|
         seen = Set.new
         each do |element|
           key = if block_given?
@@ -69,7 +69,7 @@ module Lazily
           else
             element
           end
-          output.call(element) if seen.add?(key)
+          yielder.call(element) if seen.add?(key)
         end
       end
     end
@@ -82,11 +82,11 @@ module Lazily
     # @see ::Enumerable#take
     #
     def take(n)
-      filter("take") do |output, done|
+      filter("take") do |yielder, all_done|
         if n > 0
           each_with_index do |element, index|
-            output.call(element)
-            throw done if index + 1 == n
+            yielder.call(element)
+            throw all_done if index + 1 == n
           end
         end
       end
@@ -99,10 +99,10 @@ module Lazily
     # @see ::Enumerable#take_while
     #
     def take_while(&predicate)
-      filter("take_while") do |output, done|
+      filter("take_while") do |yielder, all_done|
         each do |element|
-          throw done unless yield(element)
-          output.call(element)
+          throw all_done unless yield(element)
+          yielder.call(element)
         end
       end
     end
@@ -115,10 +115,10 @@ module Lazily
     # @see ::Enumerable#drop
     #
     def drop(n)
-      filter("drop") do |output, done|
+      filter("drop") do |yielder|
         each_with_index do |element, index|
           next if index < n
-          output.call(element)
+          yielder.call(element)
         end
       end
     end
@@ -130,11 +130,11 @@ module Lazily
     # @see ::Enumerable#drop_while
     #
     def drop_while(&predicate)
-      filter("drop_while") do |output, done|
+      filter("drop_while") do |yielder|
         take = false
         each do |element|
           take ||= !yield(element)
-          output.call(element) if take
+          yielder.call(element) if take
         end
       end
     end
@@ -146,7 +146,7 @@ module Lazily
     # @see ::Enumerable#grep
     #
     def grep(pattern)
-      filter("grep") do |output, done|
+      filter("grep") do |yielder|
         each do |element|
           if pattern === element
             result = if block_given?
@@ -154,7 +154,7 @@ module Lazily
             else
               element
             end
-            output.call(result)
+            yielder.call(result)
           end
         end
       end
@@ -167,12 +167,12 @@ module Lazily
     # @see ::Array#flatten
     #
     def flatten(level = 1)
-      filter("flatten") do |output, done|
+      filter("flatten") do |yielder|
         each do |element|
           if level > 0 && element.respond_to?(:each)
-            element.flatten(level - 1).each(&output)
+            element.flatten(level - 1).each(&yielder)
           else
-            output.call(element)
+            yielder.call(element)
           end
         end
       end
@@ -191,9 +191,9 @@ module Lazily
     # @see ::Array#compact
     #
     def compact
-      filter("compact") do |output, done|
+      filter("compact") do |yielder|
         each do |element|
-          output.call(element) unless element.nil?
+          yielder.call(element) unless element.nil?
         end
       end
     end
@@ -239,11 +239,16 @@ module Lazily
     end
 
     def each
-      done = "done-#{object_id}".to_sym
       return to_enum unless block_given?
       yielder = proc { |x| yield x }
-      catch done do
-        @generator.call(yielder, done)
+      if @generator.arity == 2
+        # we might want to terminate early
+        all_done = "Lazily::loop-done-#{object_id}".to_sym
+        catch all_done do
+          @generator.call(yielder, all_done)
+        end
+      else
+        @generator.call(yielder)
       end
     end
 

data/lib/lazily/version.rb

@@ -1,3 +1,3 @@
 module Lazily
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazily
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies: []
 description: ! "    Lazily implements \"lazy\" versions of many Enumerable methods,\n
   \   allowing streamed processing of large (or even infinite) collections.\n\n    It's
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3464940325120125091
+      hash: 1657751678053576424
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3464940325120125091
+      hash: 1657751678053576424
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23