hamster 0.1.12 → 0.1.13

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.13 / 2009-12-10
+
+* Stack now fully functional
+
 === 0.1.12 / 2009-12-10
 
 * List methods are now lazy where feasible

data/lib/hamster/list.rb

@@ -36,6 +36,7 @@ module Hamster
     def cons(item)
       Sequence.new(item, self)
     end
+    alias_method :>>, :cons
 
     def each(&block)
       block_given? or return self

data/lib/hamster/stack.rb

@@ -2,8 +2,8 @@ require 'hamster/list'
 
 module Hamster
 
-  def self.stack
-    EmptyStack
+  def self.stack(*items)
+    items.inject(EmptyStack) { |stack, item| stack.push(item) }
   end
 
   class Stack
@@ -28,6 +28,7 @@ module Hamster
     def push(item)
       self.class.new(@list.cons(item))
     end
+    alias_method :<<, :push
 
     def pop
       list = @list.tail
@@ -50,6 +51,10 @@ module Hamster
     end
     alias_method :clone, :dup
 
+    def inspect
+      @list.inspect
+    end
+
   end
 
   EmptyStack = Stack.new(Hamster.list)

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.1.12".freeze
+  VERSION = "0.1.13".freeze
 
 end

data/spec/hamster/list/cadr_spec.rb

@@ -18,14 +18,14 @@ describe Hamster::List do
       [["A", "B", "C"], :cddr, Hamster.list("C")],
       [["A", "B", "C"], :cdddr, Hamster.list],
       [["A", "B", "C"], :cddddr, Hamster.list],
-    ].each do |values, method, result|
+    ].each do |values, method, expected|
 
       describe "on #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{result}" do
-          list.send(method).should == result
+        it "returns #{expected}" do
+          list.send(method).should == expected
         end
 
       end

data/spec/hamster/list/cons_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::List do
+
+  [:cons, :>>].each do |method|
+
+    describe "##{method}" do
+
+      [
+        [[], "A", ["A"]],
+        [["A"], "B", ["B", "A"]],
+        [["A"], "A", ["A", "A"]],
+        [["A", "B", "C"], "D", ["D", "A", "B", "C"]],
+      ].each do |values, new_value, expected|
+
+        describe "on #{values.inspect} with #{new_value.inspect}" do
+
+          original = Hamster.list(*values)
+          result = original.send(method, new_value)
+
+          it "preserves the original" do
+            original.should == Hamster.list(*values)
+          end
+
+          it "returns #{expected.inspect}" do
+            result.should == Hamster.list(*expected)
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/list/drop_spec.rb

@@ -10,14 +10,14 @@ describe Hamster::List do
       [["A"], -1, ["A"]],
       [["A", "B", "C"], 0, ["A", "B", "C"]],
       [["A", "B", "C"], 2, ["C"]],
-    ].each do |values, number, result|
+    ].each do |values, number, expected|
 
       describe "#{number} from #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{result}" do
-          list.drop(number).should == Hamster.list(*result)
+        it "returns #{expected}" do
+          list.drop(number).should == Hamster.list(*expected)
         end
 
       end

data/spec/hamster/list/drop_while_spec.rb

@@ -8,7 +8,7 @@ describe Hamster::List do
       [[], []],
       [["A"], []],
       [["A", "B", "C"], ["C"]],
-    ].each do |values, result|
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
@@ -16,8 +16,8 @@ describe Hamster::List do
 
         describe "with a block" do
 
-          it "returns #{result}" do
-            list.drop_while { |item| item < "C" }.should == Hamster.list(*result)
+          it "returns #{expected}" do
+            list.drop_while { |item| item < "C" }.should == Hamster.list(*expected)
           end
 
         end

data/spec/hamster/list/empty_spec.rb

@@ -8,14 +8,14 @@ describe Hamster::List do
       [[], true],
       [["A"], false],
       [["A", "B", "C"], false],
-    ].each do |values, result|
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{result}" do
-          list.empty?.should == result
+        it "returns #{expected}" do
+          list.empty?.should == expected
         end
 
       end

data/spec/hamster/list/eql_spec.rb

@@ -16,15 +16,15 @@ describe Hamster::List do
         [["A"], ["A", "B"], false],
         [["A", "B", "C"], ["A", "B", "C"], true],
         [["C", "A", "B"], ["A", "B", "C"], false],
-      ].each do |a, b, result|
+      ].each do |a, b, expected|
 
         describe "on #{a.inspect} and #{b.inspect}" do
 
           a = Hamster.list(*a)
           b = Hamster.list(*b)
 
-          it "returns #{result}" do
-            a.send(method, b).should == result
+          it "returns #{expected}" do
+            a.send(method, b).should == expected
           end
 
         end

data/spec/hamster/list/filter_spec.rb

@@ -12,7 +12,7 @@ describe Hamster::List do
         [["A", "B", "C"], ["A", "B", "C"]],
         [["A", "b", "C"], ["A", "C"]],
         [["a", "b", "c"], []],
-      ].each do |values, result|
+      ].each do |values, expected|
 
         describe "on #{values.inspect}" do
 
@@ -20,8 +20,8 @@ describe Hamster::List do
 
           describe "with a block" do
 
-            it "returns #{result}" do
-              list.send(method) { |item| item == item.upcase }.should == Hamster.list(*result)
+            it "returns #{expected}" do
+              list.send(method) { |item| item == item.upcase }.should == Hamster.list(*expected)
             end
 
             it "is lazy" do

data/spec/hamster/list/head_spec.rb

@@ -8,14 +8,14 @@ describe Hamster::List do
       [[], nil],
       [["A"], "A"],
       [["A", "B", "C"], "A"],
-    ].each do |values, result|
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{result}" do
-          list.head.should == result
+        it "returns #{expected}" do
+          list.head.should == expected
         end
 
       end

data/spec/hamster/list/include_spec.rb

@@ -16,14 +16,14 @@ describe Hamster::List do
         [["A", "B", nil], "B", true],
         [["A", "B", nil], nil, true],
         [["A", "B", nil], "C", false],
-      ].each do |values, item, result|
+      ].each do |values, item, expected|
 
         describe "on #{values.inspect}" do
 
           list = Hamster.list(*values)
 
-          it "returns #{result}" do
-            list.send(method, item).should == result
+          it "returns #{expected}" do
+            list.send(method, item).should == expected
           end
 
         end

data/spec/hamster/list/inspect_spec.rb

@@ -5,17 +5,17 @@ describe Hamster::List do
   describe "#inspect" do
 
     [
-      [],
-      ["A"],
-      ["A", "B", "C"],
-    ].each do |values|
+      [[], "[]"],
+      [["A"], "[\"A\"]"],
+      [["A", "B", "C"], "[\"A\", \"B\", \"C\"]"]
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{values.inspect}" do
-          list.inspect.should == values.inspect
+        it "returns #{expected}" do
+          list.inspect.should == expected
         end
 
       end

data/spec/hamster/list/map_spec.rb

@@ -10,7 +10,7 @@ describe Hamster::List do
         [[], []],
         [["A"], ["a"]],
         [["A", "B", "C"], ["a", "b", "c"]],
-      ].each do |values, result|
+      ].each do |values, expected|
 
         describe "on #{values.inspect}" do
 
@@ -18,8 +18,8 @@ describe Hamster::List do
 
           describe "with a block" do
 
-            it "returns #{result}" do
-              list.send(method) { |item| item.downcase }.should == Hamster.list(*result)
+            it "returns #{expected}" do
+              list.send(method) { |item| item.downcase }.should == Hamster.list(*expected)
             end
 
             it "is lazy" do

data/spec/hamster/list/reduce_spec.rb

@@ -10,7 +10,7 @@ describe Hamster::List do
         [[], "@"],
         [["A"], "@a"],
         [["A", "B", "C"], "@abc"],
-      ].each do |values, result|
+      ].each do |values, expected|
 
         describe "on #{values.inspect}" do
 
@@ -18,8 +18,8 @@ describe Hamster::List do
 
           describe "with a block" do
 
-            it "returns #{result.inspect}" do
-              list.send(method, "@") { |memo, item| memo << item.downcase }.should == result
+            it "returns #{expected.inspect}" do
+              list.send(method, "@") { |memo, item| memo << item.downcase }.should == expected
             end
 
           end

data/spec/hamster/list/reject_spec.rb

@@ -10,7 +10,7 @@ describe Hamster::List do
       [["A", "B", "C"], ["A", "B", "C"]],
       [["A", "b", "C"], ["A", "C"]],
       [["a", "b", "c"], []],
-    ].each do |values, result|
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
@@ -18,8 +18,8 @@ describe Hamster::List do
 
         describe "with a block" do
 
-          it "returns #{result}" do
-            list.reject { |item| item == item.downcase }.should == Hamster.list(*result)
+          it "returns #{expected}" do
+            list.reject { |item| item == item.downcase }.should == Hamster.list(*expected)
           end
 
           it "is lazy" do

data/spec/hamster/list/size_spec.rb

@@ -10,14 +10,14 @@ describe Hamster::List do
         [[], 0],
         [["A"], 1],
         [["A", "B", "C"], 3],
-      ].each do |values, result|
+      ].each do |values, expected|
 
         describe "on #{values.inspect}" do
 
           list = Hamster.list(*values)
 
-          it "returns #{result}" do
-            list.send(method).should == result
+          it "returns #{expected}" do
+            list.send(method).should == expected
           end
 
         end

data/spec/hamster/list/tail_spec.rb

@@ -8,14 +8,14 @@ describe Hamster::List do
       [[], []],
       [["A"], []],
       [["A", "B", "C"], ["B", "C"]],
-    ].each do |values, result|
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{result}" do
-          list.tail.should == Hamster.list(*result)
+        it "returns #{expected}" do
+          list.tail.should == Hamster.list(*expected)
         end
 
       end

data/spec/hamster/list/take_spec.rb

@@ -10,14 +10,14 @@ describe Hamster::List do
       [["A"], -1, []],
       [["A", "B", "C"], 0, []],
       [["A", "B", "C"], 2, ["A", "B"]],
-    ].each do |values, number, result|
+    ].each do |values, number, expected|
 
       describe "#{number} from #{values.inspect}" do
 
         list = Hamster.list(*values)
 
-        it "returns #{result}" do
-          list.take(number).should == Hamster.list(*result)
+        it "returns #{expected}" do
+          list.take(number).should == Hamster.list(*expected)
         end
 
       end

data/spec/hamster/list/take_while_spec.rb

@@ -8,7 +8,7 @@ describe Hamster::List do
       [[], []],
       [["A"], ["A"]],
       [["A", "B", "C"], ["A", "B"]],
-    ].each do |values, result|
+    ].each do |values, expected|
 
       describe "on #{values.inspect}" do
 
@@ -16,8 +16,8 @@ describe Hamster::List do
 
         describe "with a block" do
 
-          it "returns #{result}" do
-            list.take_while { |item| item < "C" }.should == Hamster.list(*result)
+          it "returns #{expected}" do
+            list.take_while { |item| item < "C" }.should == Hamster.list(*expected)
           end
 
           it "is lazy" do

data/spec/hamster/stack/construction_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster do
+
+  describe ".stack" do
+
+    describe "with no arguments" do
+
+      before do
+        @stack = Hamster.stack
+      end
+
+      it "always returns the same instance" do
+        @stack.should equal(Hamster.stack)
+      end
+
+      it "returns an empty stack" do
+        @stack.should be_empty
+      end
+
+    end
+
+    describe "with a number of items" do
+
+      before do
+        @stack = Hamster.stack("A", "B", "C")
+      end
+
+      it "always returns a different instance" do
+        @stack.should_not equal(Hamster.stack("A", "B", "C"))
+      end
+
+      it "is the same as repeatedly using #push" do
+        @stack.should == Hamster.stack.push("A").push("B").push("C")
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/stack/copying_spec.rb

@@ -2,16 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Hamster::Stack do
 
-  before do
-    @stack = Hamster.stack.push("A").push("B").push("C")
-  end
-
   [:dup, :clone].each do |method|
 
-    describe "##{method}" do
+    [
+      [],
+      ["A"],
+      ["A", "B", "C"],
+    ].each do |values|
+
+      describe "on #{values.inspect}" do
+
+        stack = Hamster.stack(*values)
+
+        it "returns self" do
+          stack.send(method).should equal(stack)
+        end
 
-      it "returns self" do
-        @stack.send(method).should equal(@stack)
       end
 
     end

data/spec/hamster/stack/empty_spec.rb

@@ -4,12 +4,22 @@ describe Hamster::Stack do
 
   describe "#empty?" do
 
-    it "initially returns true" do
-      Hamster.stack.should be_empty
-    end
+    [
+      [[], true],
+      [["A"], false],
+      [["A", "B", "C"], false],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        stack = Hamster.stack(*values)
+
+        it "returns #{expected}" do
+          stack.empty?.should == expected
+        end
+
+      end
 
-    it "returns false once items have been added" do
-      Hamster.stack.push("A").should_not be_empty
     end
 
   end

data/spec/hamster/stack/eql_spec.rb

@@ -2,26 +2,35 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Hamster::Stack do
 
-  describe "#eql?" do
+  [:eql?, :==].each do |method|
 
-    before do
-      @stack = Hamster.stack.push("A").push("B").push("C")
-    end
+    describe "##{method}" do
 
-    it "is true for the same instance" do
-      @stack.should eql(@stack)
-    end
+      [
+        [[], [], true],
+        [["A"], [], false],
+        [[], ["A"], false],
+        [["A"], ["A"], true],
+        [["A"], ["B"], false],
+        [["A", "B"], ["A"], false],
+        [["A"], ["A", "B"], false],
+        [["A", "B", "C"], ["A", "B", "C"], true],
+        [["C", "A", "B"], ["A", "B", "C"], false],
+      ].each do |a, b, expected|
 
-    it "is true for two instances with the same sequence of values" do
-      @stack.should eql(Hamster.stack.push("A").push("B").push("C"))
-    end
+        describe "on #{a.inspect} and #{b.inspect}" do
 
-    it "is false for two instances with the difference sequence of values" do
-      @stack.should_not eql(Hamster.stack.push("A").push("C").push("B"))
-    end
+          a = Hamster.stack(*a)
+          b = Hamster.stack(*b)
+
+          it "returns #{expected}" do
+            a.send(method, b).should == expected
+          end
+
+        end
+
+      end
 
-    it "is false for two instances with the similar but differently sized sequence of values" do
-      @stack.should_not eql(Hamster.stack.push("A").push("B"))
     end
 
   end

data/spec/hamster/stack/inspect_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::Stack do
+
+  describe "#inspect" do
+
+    [
+      [[], "[]"],
+      [["A"], "[\"A\"]"],
+      [["A", "B", "C"], "[\"C\", \"B\", \"A\"]"]
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        stack = Hamster.stack(*values)
+
+        it "returns #{expected}" do
+          stack.inspect.should == expected
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/stack/pop_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::Stack do
+
+  describe "#pop" do
+
+    [
+      [["A", "B"], ["A"]],
+      [["A", "B", "C"], ["A", "B"]],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        original = Hamster.stack(*values)
+        result = original.pop
+
+        it "preserves the original" do
+          original.should == Hamster.stack(*values)
+        end
+
+        it "returns #{expected.inspect}" do
+          result.should == Hamster.stack(*expected)
+        end
+
+      end
+
+    end
+
+    [
+      [],
+      ["A"],
+    ].each do |values|
+
+      describe "on #{values.inspect}" do
+
+        original = Hamster.stack(*values)
+        result = original.pop
+
+        it "preserves the original" do
+          original.should == Hamster.stack(*values)
+        end
+
+        it "returns the empty stack" do
+          result.should equal(Hamster.stack)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/stack/push_spec.rb

@@ -2,19 +2,34 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Hamster::Stack do
 
-  describe "#push" do
+  [:push, :<<].each do |method|
 
-    before do
-      @original = Hamster.stack.push("A")
-      @result = @original.push("B")
-    end
+    describe "##{method}" do
 
-    it "preserves the original" do
-      @original.top.should == "A"
-    end
+      [
+        [[], "A", ["A"]],
+        [["A"], "B", ["A", "B"]],
+        [["A"], "A", ["A", "A"]],
+        [["A", "B", "C"], "D", ["A", "B", "C", "D"]],
+      ].each do |values, new_value, expected|
+
+        describe "on #{values.inspect} with #{new_value.inspect}" do
+
+          original = Hamster.stack(*values)
+          result = original.send(method, new_value)
+
+          it "preserves the original" do
+            original.should == Hamster.stack(*values)
+          end
+
+          it "returns #{expected.inspect}" do
+            result.should == Hamster.stack(*expected)
+          end
+
+        end
+
+      end
 
-    it "returns a new stack with the new value at the top" do
-      @result.top.should == "B"
     end
 
   end

data/spec/hamster/stack/size_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::Stack do
+
+  [:size, :length].each do |method|
+
+    describe "##{method}" do
+
+      [
+        [[], 0],
+        [["A"], 1],
+        [["A", "B", "C"], 3],
+      ].each do |values, expected|
+
+        describe "on #{values.inspect}" do
+
+          stack = Hamster.stack(*values)
+
+          it "returns #{expected}" do
+            stack.send(method).should == expected
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/stack/top_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::Stack do
+
+  describe "#top" do
+
+    [
+      [[], nil],
+      [["A"], "A"],
+      [["A", "B", "C"], "C"],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        original = Hamster.stack(*values)
+        result = original.top
+
+        it "preserves the original" do
+          original.should == Hamster.stack(*values)
+        end
+
+        it "returns #{expected.inspect}" do
+          result.should == expected
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hamster
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Simon Harris
@@ -49,6 +49,7 @@ files:
 - spec/hamster/hash/remove_spec.rb
 - spec/hamster/hash/size_spec.rb
 - spec/hamster/list/cadr_spec.rb
+- spec/hamster/list/cons_spec.rb
 - spec/hamster/list/construction_spec.rb
 - spec/hamster/list/copying_spec.rb
 - spec/hamster/list/drop_spec.rb
@@ -84,10 +85,15 @@ files:
 - spec/hamster/set/reject_spec.rb
 - spec/hamster/set/remove_spec.rb
 - spec/hamster/set/size_spec.rb
+- spec/hamster/stack/construction_spec.rb
 - spec/hamster/stack/copying_spec.rb
 - spec/hamster/stack/empty_spec.rb
 - spec/hamster/stack/eql_spec.rb
+- spec/hamster/stack/inspect_spec.rb
+- spec/hamster/stack/pop_spec.rb
 - spec/hamster/stack/push_spec.rb
+- spec/hamster/stack/size_spec.rb
+- spec/hamster/stack/top_spec.rb
 - spec/hamster/trie/remove_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb