array_enumerator 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886b0a972c29f5806d9c556cb9c212b4cd5e107a
-  data.tar.gz: 9bbd84df8ad76af18fca06f1c1c2278fd672dd3e
+  metadata.gz: 717b631e00dfada746e1fb188835e71463d661ff
+  data.tar.gz: 295e77d737a45b2c44e89b84b27ef53a85c9a218
 SHA512:
-  metadata.gz: 0027e5400913049582dbd0b53fdb96fd26984fcd64ecb99604be18d2c21689a1f9064861b48543a4bbc9cc27f42c6c26966b8cf00ed51660d090224576e335a7
-  data.tar.gz: 30682aa4a63b7157722db7fc2dfe55615224fb29511570fbef91a767d99c791b3b646be04aea539cf09012d3f17c58969f787730368d8c32c3fe136bb01ace7c
+  metadata.gz: cd6b34c9b01b1db40506eb7daa8299291d501bc714e138d3c7d611e5c805d53395b9feaac593e52d5f6650320bbb8b730c0215a7421a21622931f6aae41bc364
+  data.tar.gz: ba4d6c33d2fe1c8909ea669a6af599232004100b4024cfbd2b5f7a073d091acb2b210de7c8283b903e218202bc383de3fe7b7ed4cbbb1733706a03400f4f9d03

data/Gemfile

@@ -6,10 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.8"
+  gem "rspec", "~> 3.3.0"
+  gem "rdoc", "~> 4.2.0"
+  gem "bundler", "~> 1.9.2"
+  gem "jeweler", "~> 2.0.1"
 end
 
 gem "codeclimate-test-reporter", group: :test, require: nil

data/Gemfile.lock

@@ -1,69 +1,80 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.8)
     builder (3.2.2)
-    codeclimate-test-reporter (0.4.3)
+    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
-    diff-lcs (1.1.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.8)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.3.2)
-    highline (1.6.21)
-    jeweler (1.8.8)
+    hashie (3.4.2)
+    highline (1.7.2)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.2.0)
-    multi_json (1.10.1)
+    json (1.8.3)
+    jwt (1.5.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.6.0)
+    rack (1.6.4)
     rake (10.4.2)
-    rdoc (3.12.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.9.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler (~> 1.9.2)
   codeclimate-test-reporter
-  jeweler (~> 1.8.8)
-  rdoc (~> 3.12)
-  rspec (~> 2.8.0)
+  jeweler (~> 2.0.1)
+  rdoc (~> 4.2.0)
+  rspec (~> 3.3.0)

data/README.md

@@ -38,12 +38,18 @@ a_enum = ArrayEnumerator.new(enum)
 Call array-methods like you normally would:
 ```ruby
 a_enum.empty? #=> false
+a_enum.none? => false
+a_enum.any? => true
 a_enum.first #=> 1
 a_enum.shift #=> 2
 a_enum[2] #=> 3
 a_enum.each_index { |count| puts "Count: #{count}" }
 a_enum.length #=> 3
 a_enum.select { |element| element.to_f }.to_a #=> [0.0, 1.0, 2.0 etc]
+a_enum << 1001 # push also works
+a_enum.unshift -1
+a_enum.min #=> 0
+a_enum.max #=> 999
 ```
 
 ### Collect

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/array_enumerator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: array_enumerator 0.0.9 ruby lib
+# stub: array_enumerator 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "array_enumerator"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2015-07-04"
+  s.date = "2015-07-05"
   s.description = "Enumerator abstraction layer that emulates certain array functionality (methods like empty?, slice, shift and more) by using a small cache and other tricks without loading all the data from the enumerator at the same time."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -35,28 +35,28 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/array_enumerator"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.0"
   s.summary = "Enumerator abstraction layer that emulates certain array functionality (methods)."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.3.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.2.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.9.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
+      s.add_dependency(%q<rspec>, ["~> 3.3.0"])
+      s.add_dependency(%q<rdoc>, ["~> 4.2.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.9.2"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
+    s.add_dependency(%q<rspec>, ["~> 3.3.0"])
+    s.add_dependency(%q<rdoc>, ["~> 4.2.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.9.2"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
   end
 end
 

data/lib/array_enumerator.rb

@@ -3,6 +3,8 @@ class ArrayEnumerator
   class ArrayCorruptedError < RuntimeError; end
   class CannotCallBeforeEnd < RuntimeError; end
 
+  include Enumerable
+
   # Takes an enumerator to work with as argument.
   def initialize(enum = nil, &blk)
     if enum
@@ -16,6 +18,9 @@ class ArrayEnumerator
       raise "No enum or block was given."
     end
 
+    @eles = []
+    @end_eles = []
+
     # Used to calculate length without depending corruption.
     @length_cache = 0
 
@@ -26,17 +31,31 @@ class ArrayEnumerator
     @mutex = Mutex.new
   end
 
+  def push(object)
+    raise ArrayCorruptedError if @end
+    @end_eles << object
+  end
+
+  def <<(object)
+    push(object)
+  end
+
+  def unshift(object)
+    check_corrupted
+    @eles << object
+  end
+
   # Cache the first elements (if not cached already) and returns it.
   def first
     check_corrupted
-    cache_ele if !@eles || @eles.empty?
+    cache_ele if @eles.empty?
     return @eles.first
   end
 
-  # Returns true if the array is empty.
+  # Returns true if the array-enumerator is empty.
   def empty?
     if @empty == nil
-      cache_ele if !@eles
+      cache_ele if @length_cache == 0
 
       if @length_cache > 0
         @empty = false
@@ -109,21 +128,23 @@ class ArrayEnumerator
     end
   end
 
-  # Returns a enumerator that can yield the all the lements (both cached and future un-cached ones).
+  # Returns a enumerator that can yield all the elements (both cached and future un-cached ones).
   def to_enum
     check_corrupted
     @array_corrupted = true
 
     return Enumerator.new do |yielder|
-      if @eles
-        while ele = @eles.shift
-          yielder << ele
-        end
+      while ele = @eles.shift
+        yielder << ele
       end
 
       yield_rest do |ele|
         yielder << ele
       end
+
+      while ele = @end_eles.shift
+        yielder << ele
+      end
     end
   end
 
@@ -136,7 +157,7 @@ class ArrayEnumerator
   def select
     return ArrayEnumerator.new do |y|
       check_corrupted
-      self.each do |element|
+      each do |element|
         y << element if yield(element)
       end
     end
@@ -165,9 +186,9 @@ class ArrayEnumerator
     elsif args[0] && args[1] && args[0] > 0 && args[1] > 0
       need_eles = args[0] + args[1]
     elsif args[0] < 0 || args[1] < 0
-      raise "Slice cant take negative arguments."
+      raise ArgumentError, "Slice cant take negative arguments."
     else
-      raise "Dont now what to do with args: '#{args}'."
+      raise ArgumentError, "Dont now what to do with args: '#{args}'."
     end
 
     @eles ||= []
@@ -187,7 +208,7 @@ class ArrayEnumerator
     end
 
     @eles ||= []
-    cache_ele(amount - @eles.length) if !@eles || @eles.length < amount
+    cache_ele(amount - @eles.length) if @eles.length < amount
     res = @eles.shift(*args)
 
     # Since we are removing an element, the length should go down with the amount of elements captured.
@@ -204,7 +225,7 @@ class ArrayEnumerator
     check_corrupted
 
     return ArrayEnumerator.new do |y|
-      self.each do |element|
+      each do |element|
         y << yield(element)
       end
     end
@@ -255,8 +276,6 @@ private
 
   # Caches a given amount of elements.
   def cache_ele(amount = 1)
-    @eles ||= []
-
     begin
       @mutex.synchronize do
         while @eles.length <= amount
@@ -271,8 +290,6 @@ private
 
   # Forces the rest of the elements to be cached.
   def cache_all
-    @eles ||= []
-
     begin
       @mutex.synchronize do
         while ele = @enum.next

data/spec/array_enumerator_spec.rb

@@ -17,15 +17,15 @@ describe "ArrayEnumerator" do
     end
 
     3.times do |count|
-      enum.shift.should eq count
+      expect(enum.shift).to eq count
     end
   end
 
   it "#shift" do
     cont = %w[a b c d e].to_enum
     ae = ArrayEnumerator.new(cont)
-    ae.shift.should eq "a"
-    ae.to_a.should eq %w[b c d e]
+    expect(ae.shift).to eq "a"
+    expect(ae.to_a).to eq %w[b c d e]
   end
 
   describe "#each" do
@@ -36,11 +36,11 @@ describe "ArrayEnumerator" do
 
       count = 0
       ae.each do |ele|
-        ele.should eq arr[count]
+        expect(ele).to eq arr[count]
         count += 1
       end
 
-      count.should eq 3
+      expect(count).to eq 3
     end
   end
 
@@ -50,33 +50,31 @@ describe "ArrayEnumerator" do
       cont = arr.to_enum
       ae = ArrayEnumerator.new(cont)
 
-      ae.empty?.should eq false
-      ae.none?.should eq false
-      ae.any?.should eq true
+      expect(ae.empty?).to eq false
+      expect(ae.none?).to eq false
+      expect(ae.any?).to eq true
 
       count = 0
       ae.each do |ele|
-        ele.should eq arr[count]
+        expect(ele).to eq arr[count]
         count += 1
       end
 
-      count.should eq 3
+      expect(count).to eq 3
 
       expect { ae.to_a }.to raise_error(ArrayEnumerator::ArrayCorruptedError)
       expect { ae.first }.to raise_error(ArrayEnumerator::ArrayCorruptedError)
 
-      expect {
-        ae.each { |ele| raise "Should never get here?" }
-      }.to raise_error(ArrayEnumerator::ArrayCorruptedError)
+      expect { ae.each { |ele| raise "Should never get here?" } }.to raise_error(ArrayEnumerator::ArrayCorruptedError)
     end
 
     it "still be able to get the first element after testing if empty" do
       cont = %w[a b c].to_enum
       ae = ArrayEnumerator.new(cont)
-      ae.empty?.should eq false
-      ae.none?.should eq false
-      ae.any?.should eq true
-      ae.first.should eq "a"
+      expect(ae.empty?).to eq false
+      expect(ae.none?).to eq false
+      expect(ae.any?).to eq true
+      expect(ae.first).to eq "a"
     end
   end
 
@@ -90,7 +88,7 @@ describe "ArrayEnumerator" do
       # ignore.
     end
 
-    ae.length.should eq 5
+    expect(ae.length).to eq 5
   end
 
   it "#slice" do
@@ -110,14 +108,14 @@ describe "ArrayEnumerator" do
     ]
 
     runs.each do |args|
-      arr.slice(*args).should eq ae.slice(*args)
+      expect(arr.slice(*args)).to eq ae.slice(*args)
     end
 
     fails.each do |args|
       expect {
         res2 = ae.slice(*args)
         raise "Should have failed but didnt."
-      }.to raise_error
+      }.to raise_error(ArgumentError)
     end
   end
 
@@ -127,38 +125,41 @@ describe "ArrayEnumerator" do
 
     expect = 0
     ae.each_index do |num|
-      num.should eq expect
-      ae[num].should eq arr[num]
+      expect(num).to eq expect
+      expect(ae[num]).to eq arr[num]
       expect += 1
     end
   end
 
   it "#select" do
-    result = a_enum_10.select { |element| element == 5 || element == 7 }.to_a
-    result.should eq [5, 7]
+    result = a_enum_10.select { |element| element == 5 || element == 7 }
+    expect(result.class).to eq ArrayEnumerator
+    expect(result.to_a).to eq [5, 7]
   end
 
   it "#reject" do
-    result = a_enum_10.reject { |element| element == 5 || element == 7}.to_a
-    result.should eq [0, 1, 2, 3, 4, 6, 8, 9]
+    result = a_enum_10.reject { |element| element == 5 || element == 7}
+    expect(result.class).to eq ArrayEnumerator
+    expect(result.to_a).to eq [0, 1, 2, 3, 4, 6, 8, 9]
   end
 
   it "#compact" do
     a_enum = ArrayEnumerator.new([0, nil, 1, 2, 3, 4, nil, 5].to_enum)
-    a_enum.compact.to_a.should eq [0, 1, 2, 3, 4, 5]
+    expect(a_enum.compact.to_a).to eq [0, 1, 2, 3, 4, 5]
   end
 
   describe "#collect" do
     it "should return a new enumerator yielding the new values one by one" do
       collected_a_enum = a_enum_10.collect { |element| element + 1000 }
+      expect(collected_a_enum.class).to eq ArrayEnumerator
 
       count = 0
       collected_a_enum.each do |number|
-        number.should eq (count + 1000)
+        expect(number).to eq (count + 1000)
         count += 1
       end
 
-      count.should eq 10
+      expect(count).to eq 10
     end
 
     it "should work with map and block-symbols" do
@@ -166,11 +167,64 @@ describe "ArrayEnumerator" do
 
       count = 0
       collected_a_enum.each do |number|
-        number.should eq count.to_f
+        expect(number).to eq count.to_f
+        count += 1
+      end
+
+      expect(count).to eq 10
+    end
+  end
+
+  describe '#push' do
+    it 'adds extra objects' do
+      a_enum_10.push 10
+
+      count = 0
+      a_enum_10.each do |number|
+        expect(count).to eq number
+        count += 1
+      end
+
+      expect(count).to eq 11
+    end
+
+    it 'doesnt allow push after end has been reached' do
+      a_enum_10.each do
+        # do nothing
+      end
+
+      expect { a_enum_10 << 10 }.to raise_error(ArrayEnumerator::ArrayCorruptedError)
+    end
+  end
+
+  describe '#unshift' do
+    it 'prepends objects' do
+      a_enum_10.unshift -1
+
+      count = -1
+      a_enum_10.each do |number|
+        expect(count).to eq number
         count += 1
       end
 
-      count.should eq 10
+      expect(count).to eq 10
+    end
+
+    it 'doesnt allow unshift after starting iteration' do
+      a_enum_10.each { }
+      expect { a_enum_10.unshift -1 }.to raise_error(ArrayEnumerator::ArrayCorruptedError)
     end
   end
+
+  it '#max' do
+    expect(a_enum_10.max).to eq 9
+  end
+
+  it '#min' do
+    expect(a_enum_10.min).to eq 0
+  end
+
+  it '#minmax' do
+    expect(a_enum_10.minmax).to eq [0, 9]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: array_enumerator
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: 2.0.1
 description: Enumerator abstraction layer that emulates certain array functionality
   (methods like empty?, slice, shift and more) by using a small cache and other tricks
   without loading all the data from the enumerator at the same time.
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Enumerator abstraction layer that emulates certain array functionality (methods).