hamster 1.0.1.pre.rc3 → 2.0.0

data/spec/lib/hamster/vector/each_index_spec.rb

@@ -3,7 +3,7 @@ require "hamster/vector"
 
 describe Hamster::Vector do
   describe "#each_index" do
-    let(:vector) { Hamster.vector(1,2,3,4) }
+    let(:vector) { V[1,2,3,4] }
 
     context "with a block" do
       it "yields all the valid indices into the vector" do
@@ -26,7 +26,7 @@ describe Hamster::Vector do
 
     context "on an empty vector" do
       it "doesn't yield anything" do
-        Hamster.vector.each_index { fail }
+        V.empty.each_index { fail }
       end
     end
 

data/spec/lib/hamster/vector/each_spec.rb

@@ -2,45 +2,43 @@ require "spec_helper"
 require "hamster/vector"
 
 describe Hamster::Vector do
-  [:each, :foreach].each do |method|
-    describe "##{method}" do
-      describe "with no block" do
-        let(:vector) { Hamster.vector("A", "B", "C") }
+  describe "#each" do
+    describe "with no block" do
+      let(:vector) { V["A", "B", "C"] }
 
-        it "returns an Enumerator" do
-          vector.send(method).class.should be(Enumerator)
-          vector.send(method).to_a.should == vector
-        end
+      it "returns an Enumerator" do
+        vector.each.class.should be(Enumerator)
+        vector.each.to_a.should == vector
       end
+    end
 
-      [31, 32, 33, 1023, 1024, 1025].each do |size|
-        context "on a #{size}-item vector" do
-          describe "with a block" do
-            let(:vector) { V.new(1..size) }
+    [31, 32, 33, 1023, 1024, 1025].each do |size|
+      context "on a #{size}-item vector" do
+        describe "with a block" do
+          let(:vector) { V.new(1..size) }
 
-            it "returns self" do
-              items = []
-              vector.send(method) { |item| items << item }.should be(vector)
-            end
+          it "returns self" do
+            items = []
+            vector.each { |item| items << item }.should be(vector)
+          end
 
-            it "yields all the items" do
-              items = []
-              vector.send(method) { |item| items << item }
-              items.should == (1..size).to_a
-            end
+          it "yields all the items" do
+            items = []
+            vector.each { |item| items << item }
+            items.should == (1..size).to_a
+          end
 
-            it "iterates over the items in order" do
-              vector.send(method).first.should == 1
-              vector.send(method).to_a.last.should == size
-            end
+          it "iterates over the items in order" do
+            vector.each.first.should == 1
+            vector.each.to_a.last.should == size
           end
         end
       end
+    end
 
-      context "on an empty vector" do
-        it "doesn't yield anything" do
-          Hamster.vector.each { fail }
-        end
+    context "on an empty vector" do
+      it "doesn't yield anything" do
+        V.empty.each { fail }
       end
     end
   end

data/spec/lib/hamster/vector/each_with_index_spec.rb

@@ -4,7 +4,7 @@ require "hamster/vector"
 describe Hamster::Vector do
   describe "#each_with_index" do
     describe "with no block" do
-      let(:vector) { Hamster.vector("A", "B", "C") }
+      let(:vector) { V["A", "B", "C"] }
 
       it "returns an Enumerator" do
         vector.each_with_index.class.should be(Enumerator)
@@ -33,7 +33,7 @@ describe Hamster::Vector do
 
     context "on an empty vector" do
       it "doesn't yield anything" do
-        Hamster.vector.each_with_index { |item, index| fail }
+        V.empty.each_with_index { |item, index| fail }
       end
     end
   end

data/spec/lib/hamster/vector/empty_spec.rb

@@ -2,17 +2,15 @@ require "spec_helper"
 require "hamster/vector"
 
 describe Hamster::Vector do
-  [:empty?, :null?].each do |method|
-    describe "##{method}" do
-      [
-        [[], true],
-        [["A"], false],
-        [%w[A B C], false],
-      ].each do |values, expected|
-        describe "on #{values.inspect}" do
-          it "returns #{expected.inspect}" do
-            Hamster.vector(*values).send(method).should == expected
-          end
+  describe "#empty?" do
+    [
+      [[], true],
+      [["A"], false],
+      [%w[A B C], false],
+    ].each do |values, expected|
+      describe "on #{values.inspect}" do
+        it "returns #{expected.inspect}" do
+          V[*values].empty?.should == expected
         end
       end
     end
@@ -20,8 +18,8 @@ describe Hamster::Vector do
 
   describe ".empty" do
     it "returns the canonical empty vector" do
-      Hamster::Vector.empty.size.should be(0)
-      Hamster::Vector.empty.object_id.should be(Hamster::Vector.empty.object_id)
+      V.empty.size.should be(0)
+      V.empty.object_id.should be(V.empty.object_id)
     end
 
     context "from a subclass" do

data/spec/lib/hamster/vector/eql_spec.rb

@@ -3,7 +3,7 @@ require "hamster/vector"
 
 describe Hamster::Vector do
   describe "#eql" do
-    let(:vector) { Hamster.vector("A", "B", "C") }
+    let(:vector) { V["A", "B", "C"] }
 
     it "returns false when comparing with an array with the same contents" do
       vector.eql?(%w[A B C]).should == false
@@ -14,7 +14,7 @@ describe Hamster::Vector do
     end
 
     it "returns false when comparing an empty vector with an empty array" do
-      Hamster.vector.eql?([]).should == false
+      V.empty.eql?([]).should == false
     end
 
     it "returns false when comparing with a subclass of Hamster::Vector" do
@@ -23,7 +23,7 @@ describe Hamster::Vector do
   end
 
   describe "#==" do
-    let(:vector) { Hamster.vector("A", "B", "C") }
+    let(:vector) { V["A", "B", "C"] }
 
     it "returns true when comparing with an array with the same contents" do
       (vector == %w[A B C]).should == true
@@ -34,7 +34,7 @@ describe Hamster::Vector do
     end
 
     it "returns true when comparing an empty vector with an empty array" do
-      (Hamster.vector == []).should == true
+      (V.empty == []).should == true
     end
 
     it "returns true when comparing with a subclass of Hamster::Vector" do
@@ -60,8 +60,8 @@ describe Hamster::Vector do
         [%w[C A B], %w[A B C], false],
       ].each do |a, b, expected|
         describe "returns #{expected.inspect}" do
-          let(:vector_a) { Hamster.vector(*a) }
-          let(:vector_b) { Hamster.vector(*b) }
+          let(:vector_a) { V[*a] }
+          let(:vector_b) { V[*b] }
 
           it "for vectors #{a.inspect} and #{b.inspect}" do
             vector_a.send(method, vector_b).should == expected

data/spec/lib/hamster/vector/fetch_spec.rb

@@ -3,7 +3,7 @@ require "hamster/vector"
 
 describe Hamster::Vector do
   describe "#fetch" do
-    let(:vector) { Hamster.vector('a', 'b', 'c') }
+    let(:vector) { V['a', 'b', 'c'] }
 
     context "with no default provided" do
       context "when the index exists" do

data/spec/lib/hamster/vector/fill_spec.rb

@@ -3,37 +3,37 @@ require "hamster/vector"
 
 describe Hamster::Vector do
   describe "#fill" do
-    let(:vector) { Hamster.vector(1, 2, 3, 4, 5, 6) }
+    let(:vector) { V[1, 2, 3, 4, 5, 6] }
 
     it "can replace a range of items at the beginning of a vector" do
-      vector.fill(:a, 0, 3).should eql(Hamster.vector(:a, :a, :a, 4, 5, 6))
+      vector.fill(:a, 0, 3).should eql(V[:a, :a, :a, 4, 5, 6])
     end
 
     it "can replace a range of items in the middle of a vector" do
-      vector.fill(:a, 3, 2).should eql(Hamster.vector(1, 2, 3, :a, :a, 6))
+      vector.fill(:a, 3, 2).should eql(V[1, 2, 3, :a, :a, 6])
     end
 
     it "can replace a range of items at the end of a vector" do
-      vector.fill(:a, 4, 2).should eql(Hamster.vector(1, 2, 3, 4, :a, :a))
+      vector.fill(:a, 4, 2).should eql(V[1, 2, 3, 4, :a, :a])
     end
 
     it "can replace all the items in a vector" do
-      vector.fill(:a, 0, 6).should eql(Hamster.vector(:a, :a, :a, :a, :a, :a))
+      vector.fill(:a, 0, 6).should eql(V[:a, :a, :a, :a, :a, :a])
     end
 
     it "can fill past the end of the vector" do
-      vector.fill(:a, 3, 6).should eql(Hamster.vector(1, 2, 3, :a, :a, :a, :a, :a, :a))
+      vector.fill(:a, 3, 6).should eql(V[1, 2, 3, :a, :a, :a, :a, :a, :a])
     end
 
     context "with 1 argument" do
       it "replaces all the items in the vector by default" do
-        vector.fill(:a).should eql(Hamster.vector(:a, :a, :a, :a, :a, :a))
+        vector.fill(:a).should eql(V[:a, :a, :a, :a, :a, :a])
       end
     end
 
     context "with 2 arguments" do
       it "replaces up to the end of the vector by default" do
-        vector.fill(:a, 4).should eql(Hamster.vector(1, 2, 3, 4, :a, :a))
+        vector.fill(:a, 4).should eql(V[1, 2, 3, 4, :a, :a])
       end
     end
 
@@ -54,7 +54,7 @@ describe Hamster::Vector do
       context "on a #{size}-item vector" do
         it "works the same" do
           array = (0..size).to_a
-          vector = Hamster::Vector.new(array)
+          vector = V.new(array)
           [[:a, 0, 5], [:b, 31, 2], [:c, 32, 60], [:d, 1000, 20], [:e, 1024, 33], [:f, 1200, 35]].each do |obj, index, length|
             next if index > size
             vector = vector.fill(obj, index, length)

data/spec/lib/hamster/vector/first_spec.rb

@@ -2,18 +2,16 @@ require "spec_helper"
 require "hamster/vector"
 
 describe Hamster::Vector do
-  [:first, :head].each do |method|
-    describe "##{method}" do
-      [
-        [[], nil],
-        [["A"], "A"],
-        [%w[A B C], "A"],
-        [(1..32), 1],
-      ].each do |values, expected|
-        describe "on #{values.inspect}" do
-          it "returns #{expected.inspect}" do
-            Hamster.vector(*values).send(method).should == expected
-          end
+  describe "#first" do
+    [
+      [[], nil],
+      [["A"], "A"],
+      [%w[A B C], "A"],
+      [(1..32), 1],
+    ].each do |values, expected|
+      describe "on #{values.inspect}" do
+        it "returns #{expected.inspect}" do
+          V[*values].first.should == expected
         end
       end
     end

data/spec/lib/hamster/vector/flat_map_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+require "hamster/vector"
+
+describe Hamster::Vector do
+  let(:vector) { V[*values] }
+
+  describe "#flat_map" do
+    let(:block) { ->(item) { [item, item + 1, item * item] } }
+    let(:flat_map) { vector.flat_map(&block) }
+    let(:flattened_vector) { V[*flattened_values] }
+
+    shared_examples "checking flattened result" do
+      it "returns the flattened values as a Hamster::Vector" do
+        expect(flat_map).to eq(flattened_vector)
+      end
+
+      it "returns a Hamster::Vector" do
+        expect(flat_map).to be_a(Hamster::Vector)
+      end
+    end
+
+    context "with an empty vector" do
+      let(:values) { [] }
+      let(:flattened_values) { [] }
+
+      include_examples "checking flattened result"
+    end
+
+    context "with a block that returns an empty vector" do
+      let(:block) { ->(item) { [] } }
+      let(:values) { [1, 2, 3] }
+      let(:flattened_values) { [] }
+
+      include_examples "checking flattened result"
+    end
+
+    context "with a vector of one item" do
+      let(:values) { [7] }
+      let(:flattened_values) { [7, 8, 49] }
+
+      include_examples "checking flattened result"
+    end
+
+    context "with a vector of multiple items" do
+      let(:values) { [1, 2, 3] }
+      let(:flattened_values) { [1, 2, 1, 2, 3, 4, 3, 4, 9] }
+
+      include_examples "checking flattened result"
+    end
+  end
+end

data/spec/lib/hamster/vector/flatten_spec.rb

@@ -35,6 +35,21 @@ describe Hamster::Vector do
       end
     end
 
+    context "on a vector with no nested vectors" do
+      it "returns an unchanged vector" do
+        vector = V[1,2,3]
+        vector.flatten.should.eql?(V[1,2,3])
+      end
+
+      context "on a Vector larger than 32 items initialized with Vector.new" do
+        # Regression test, for problem discovered while working on GH issue #182
+        it "returns an unchanged vector" do
+          vector1,vector2 = 2.times.collect { V.new(0..33) }
+          vector1.flatten.should eql(vector2)
+        end
+      end
+    end
+
     it "leaves the original unmodified" do
       vector = V[1,2,3]
       vector.flatten

data/spec/lib/hamster/vector/get_spec.rb

@@ -7,13 +7,13 @@ describe Hamster::Vector do
       context "when empty" do
         it "always returns nil" do
           (-1..1).each do |i|
-            Hamster.vector.send(method, i).should be_nil
+            V.empty.send(method, i).should be_nil
           end
         end
       end
 
       context "when not empty" do
-        let(:vector) { Hamster.vector(*(1..1025)) }
+        let(:vector) { V[*(1..1025)] }
 
         context "with a positive index" do
           context "within the absolute bounds of the vector" do
@@ -54,10 +54,10 @@ describe Hamster::Vector do
             array = size.times.map { rand(10000) }
             vector = V.new(array)
             100.times do
-              if rand(1) == 0
+              if rand(2) == 0
                 value, index = rand(10000), rand(size)
                 array[index] = value
-                vector = vector.set(index, value)
+                vector = vector.put(index, value)
               else
                 index = rand(array.size)
                 array.delete_at(index)

data/spec/lib/hamster/vector/group_by_spec.rb

@@ -6,15 +6,15 @@ describe Hamster::Vector do
     context "with a block" do
       [
         [[], []],
-        [[1], [true => Hamster.vector(1)]],
-        [[1, 2, 3, 4], [true => Hamster.vector(1, 3), false => Hamster.vector(2, 4)]],
+        [[1], [true => V[1]]],
+        [[1, 2, 3, 4], [true => V[1, 3], false => V[2, 4]]],
       ].each do |values, expected|
         context "on #{values.inspect}" do
-          let(:vector) { Hamster.vector(*values) }
+          let(:vector) { V[*values] }
 
           it "returns #{expected.inspect}" do
-            vector.group_by(&:odd?).should eql(Hamster.hash(*expected))
-            vector.should eql(Hamster::Vector.new(values)) # make sure it hasn't changed
+            vector.group_by(&:odd?).should eql(H[*expected])
+            vector.should eql(V.new(values)) # make sure it hasn't changed
           end
         end
       end
@@ -23,15 +23,15 @@ describe Hamster::Vector do
     context "without a block" do
       [
         [[], []],
-        [[1], [1 => Hamster.vector(1)]],
-        [[1, 2, 3, 4], [1 => Hamster.vector(1), 2 => Hamster.vector(2), 3 => Hamster.vector(3), 4 => Hamster.vector(4)]],
+        [[1], [1 => V[1]]],
+        [[1, 2, 3, 4], [1 => V[1], 2 => V[2], 3 => V[3], 4 => V[4]]],
       ].each do |values, expected|
         context "on #{values.inspect}" do
-          let(:vector) { Hamster.vector(*values) }
+          let(:vector) { V[*values] }
 
           it "returns #{expected.inspect}" do
-            vector.group_by.should eql(Hamster.hash(*expected))
-            vector.should eql(Hamster::Vector.new(values)) # make sure it hasn't changed
+            vector.group_by.should eql(H[*expected])
+            vector.should eql(V.new(values)) # make sure it hasn't changed
           end
         end
       end
@@ -39,12 +39,12 @@ describe Hamster::Vector do
 
     context "on an empty vector" do
       it "returns an empty hash" do
-        Hamster.vector.group_by { |x| x }.should eql(Hamster.hash)
+        V.empty.group_by { |x| x }.should eql(H.empty)
       end
     end
 
     it "returns a hash without default proc" do
-      Hamster.vector(1,2,3).group_by { |x| x }.default_proc.should be_nil
+      V[1,2,3].group_by { |x| x }.default_proc.should be_nil
     end
 
     context "from a subclass" do