lazily 0.1.0 → 0.1.1

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.rbx
 .yardoc
 Gemfile.lock
 doc

data/.travis.yml

@@ -5,3 +5,5 @@ rvm:
   - 2.0.0
   - jruby-18mode
   - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode

data/CHANGES.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.1.1 (2013-05-06)
+
+* Get lazy `#zip` working in Ruby 1.8.7.
+* Bug-fix: #prefetch and #take were interacting badly.
+* Make it all work in Rubinius.
+
+## 0.1.0 (2013-05-13)
+
+* Implement lazy versions of: `#grep`, `#collect_contact`, `#flatten` and `#compact`.
+* Make `#chunk` and `#slice_before` lazy.
+* Remove `#merge_by` in favour of enhanced `#merge`.
+* Remove `#uniq_by` in favour of enhanced `#uniq`.
+* Much refactoring.
+
 ## 0.0.1 (2013-04-19)
 
 * Initial version, ported from "enumerating".

data/lib/lazily/concatenating.rb

@@ -9,6 +9,11 @@ module Lazily
     # @param enumerables [Array<Enumerable>]
     # @return [Enumerable] elements of all the enumerables
     #
+    # @example
+    #   array1 = [1,4,5]
+    #   array2 = [2,3,6]
+    #   Lazily.concat(array1, array2)       #=> [1,4,5,2,3,6]
+    #
     def concat(*enumerables)
       Concatenator.new(enumerables)
     end

data/lib/lazily/enumerable.rb

@@ -4,6 +4,7 @@ module Lazily
 
     include ::Enumerable
 
+    # @return true
     def lazy?
       true
     end

data/lib/lazily/filtering.rb

@@ -10,7 +10,7 @@ module Lazily
     # @see ::Enumerable#collect
     #
     def collect(&transformation)
-      filter("collect") do |output|
+      filter("collect") do |output, done|
         each do |element|
           output.call yield(element)
         end
@@ -26,7 +26,7 @@ module Lazily
     # @see ::Enumerable#select
     #
     def select(&predicate)
-      filter("select") do |output|
+      filter("select") do |output, done|
         each do |element|
           output.call(element) if yield(element)
         end
@@ -44,7 +44,7 @@ module Lazily
     # @see ::Enumerable#reject
     #
     def reject
-      filter("reject") do |output|
+      filter("reject") do |output, done|
         each do |element|
           output.call(element) unless yield(element)
         end
@@ -61,7 +61,7 @@ module Lazily
     # @see ::Enumerable#uniq
     #
     def uniq
-      filter("uniq") do |output|
+      filter("uniq") do |output, done|
         seen = Set.new
         each do |element|
           key = if block_given?
@@ -82,11 +82,11 @@ module Lazily
     # @see ::Enumerable#take
     #
     def take(n)
-      filter("take") do |output|
+      filter("take") do |output, done|
         if n > 0
           each_with_index do |element, index|
             output.call(element)
-            throw Filter::DONE if index + 1 == n
+            throw done if index + 1 == n
           end
         end
       end
@@ -99,9 +99,9 @@ module Lazily
     # @see ::Enumerable#take_while
     #
     def take_while(&predicate)
-      filter("take_while") do |output|
+      filter("take_while") do |output, done|
         each do |element|
-          throw Filter::DONE unless yield(element)
+          throw done unless yield(element)
           output.call(element)
         end
       end
@@ -115,7 +115,7 @@ module Lazily
     # @see ::Enumerable#drop
     #
     def drop(n)
-      filter("drop") do |output|
+      filter("drop") do |output, done|
         each_with_index do |element, index|
           next if index < n
           output.call(element)
@@ -130,7 +130,7 @@ module Lazily
     # @see ::Enumerable#drop_while
     #
     def drop_while(&predicate)
-      filter("drop_while") do |output|
+      filter("drop_while") do |output, done|
         take = false
         each do |element|
           take ||= !yield(element)
@@ -146,7 +146,7 @@ module Lazily
     # @see ::Enumerable#grep
     #
     def grep(pattern)
-      filter("grep") do |output|
+      filter("grep") do |output, done|
         each do |element|
           if pattern === element
             result = if block_given?
@@ -167,7 +167,7 @@ module Lazily
     # @see ::Array#flatten
     #
     def flatten(level = 1)
-      filter("flatten") do |output|
+      filter("flatten") do |output, done|
         each do |element|
           if level > 0 && element.respond_to?(:each)
             element.flatten(level - 1).each(&output)
@@ -191,7 +191,7 @@ module Lazily
     # @see ::Array#compact
     #
     def compact
-      filter("compact") do |output|
+      filter("compact") do |output, done|
         each do |element|
           output.call(element) unless element.nil?
         end
@@ -238,13 +238,12 @@ module Lazily
       @generator = generator
     end
 
-    DONE = "Lazily::DONE".to_sym
-
     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)
+      catch done do
+        @generator.call(yielder, done)
       end
     end
 

data/lib/lazily/merging.rb

@@ -4,6 +4,19 @@ module Lazily
 
   class << self
 
+    # Merge a number of sorted Enumerables into a single sorted collection.
+    #
+    # Draws elements from enumerables as appropriate, to preserve the sort order. An optional block, if provided, is used for comparison of elements.
+    # Otherwise, natural element order is used.
+    #
+    # @param enumerables [Array<Enumerable>]
+    # @return [Enumerable] merged, sorted elements
+    #
+    # @example
+    #   array1 = [1,4,5]
+    #   array2 = [2,3,6]
+    #   Lazily.merge(array1, array2)        #=> [1,2,3,4,5,6]
+    #
     def merge(*enumerables, &block)
       Merger.new(enumerables, &block)
     end

data/lib/lazily/version.rb

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

data/lib/lazily/zipping.rb

@@ -28,11 +28,13 @@ module Lazily
 
     def each
       enumerators = @enumerables.map(&:to_enum)
+      exhausted = {}
       while true
         chunk = enumerators.map do |enumerator|
           begin
-            enumerator.next
+            enumerator.next unless exhausted[enumerator]
           rescue StopIteration
+            exhausted[enumerator] = true
             nil
           end
         end

data/spec/lazily/bugs_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+describe Lazily, "squashing bugs" do
+
+  example "#prefetch and #take interact well" do
+    [1,2,3].lazily.take(3).prefetch(2).take(1).to_a.should == [1]
+  end
+
+end

data/spec/lazily/merging_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Lazily, :needs_enumerators => true do
+describe Lazily do
 
   describe ".merge" do
 
@@ -32,4 +32,4 @@ describe Lazily, :needs_enumerators => true do
 
   end
 
-end
+end if defined?(::Enumerator)

data/spec/lazily/zipping_spec.rb

@@ -1,10 +1,10 @@
 require "spec_helper"
 
-describe Lazily, "zipping", :needs_enumerators => true do
+describe Lazily, "zipping" do
 
   let(:array1) { [1,3,6] }
   let(:array2) { [2,4,7] }
-  let(:array3) { [5,8] }
+  let(:array3) { [5] }
 
   describe ".zip" do
 

data/spec/spec_helper.rb

@@ -33,9 +33,3 @@ module Enumerable
   end
 
 end
-
-RSpec.configure do |config|
-  unless defined?(::Enumerator)
-    config.filter_run_excluding :needs_enumerators => true
-  end
-end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lazily
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-16 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
@@ -39,6 +40,7 @@ files:
 - lib/lazily/threading.rb
 - lib/lazily/version.rb
 - lib/lazily/zipping.rb
+- spec/lazily/bugs_spec.rb
 - spec/lazily/concatenating_spec.rb
 - spec/lazily/filtering_spec.rb
 - spec/lazily/merging_spec.rb
@@ -49,28 +51,36 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/mdub/lazily
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3464940325120125091
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3464940325120125091
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Lazy Enumerables for everybody!
 test_files:
+- spec/lazily/bugs_spec.rb
 - spec/lazily/concatenating_spec.rb
 - spec/lazily/filtering_spec.rb
 - spec/lazily/merging_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTA2Zjk3MzAxNDg4N2JhMGFhZDAyNTJjZmQ3YzExYzFkNDA4NmZlMw==
-  data.tar.gz: !binary |-
-    YmY5MzM3N2ZiYTZkZWVjNzMzNTE2NjhjMmQ1NDZhN2UyYjgxODcxOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OThlZDA3NGU5ZTAzMmUxZjY0ZmJkMGU3OGE0MDZhZGE0ZTE5NDI5ZDBlZmVi
-    ODFmYjEyYmVmNGUwYmMwMzllYjU0NGUwMTgwN2I5NTc5NjExM2U1MTI0MmY3
-    ZjYyOTJiZTMwN2I1ZGMwNmUzYWM5ZWZkMmZjZjJhYTkxOWRlYzI=
-  data.tar.gz: !binary |-
-    NDA3OTM0ZWMzOGNkMDY3M2JjNmYwYzg2Zjk4NmY0MjNlZDY2ZWZkY2I0NzMx
-    Y2E5MzJmODU5MTgyYTk4MjUxZWIxYWQwNzM5NjExNWRhNDFhYTgzYjM3NGE3
-    Yzk5NjVmMjBjMjBkMDcyZmM2YTAwNzI1YzcwZTA1NTBiZmIyZDM=