hamster 1.0.1.pre.rc.1 → 1.0.1.pre.rc2

data/spec/hamster/experimental/mutable_set/delete_spec.rb

@@ -1,47 +1,37 @@
 require "spec_helper"
-
 require "hamster/experimental/mutable_set"
 
-describe Hamster::Set do
+describe Hamster::MutableSet do
+  let(:mutable) { Hamster.mutable_set(*values) }
 
   describe "#delete" do
+    let(:values) { %w[A B C] }
+    let(:delete) { mutable.delete(value) }
 
-    before do
-      @set = Hamster.mutable_set("A", "B", "C")
-    end
-
-    describe "with an existing value" do
-
-      before do
-        @result = @set.delete("B")
-      end
+    context "with an existing value" do
+      let(:value) { "B" }
 
       it "returns self" do
-        @result.should equal(@set)
+        expect(delete).to eq(mutable)
       end
 
       it "modifies the set to remove the value" do
-        @set.should == Hamster.mutable_set("A", "C")
+        delete
+        expect(mutable).to eq(Hamster.mutable_set("A", "C"))
       end
-
     end
 
-    describe "with a non-existing value" do
+    context "with a non-existing value" do
+      let(:value) { "D" }
 
-      before do
-        @result = @set.delete("D")
+      it "returns self" do
+        expect(delete).to eq(mutable)
       end
 
       it "preserves the original values" do
-        @set.should == Hamster.mutable_set("A", "B", "C")
+        delete
+        expect(mutable).to eq(Hamster.mutable_set("A", "B", "C"))
       end
-
-      it "returns self" do
-        @result.should equal(@set)
-      end
-
     end
-
   end
-
 end

data/spec/hamster/experimental/mutable_stack/pop_spec.rb

@@ -1,41 +1,35 @@
 require "spec_helper"
-
 require "hamster/experimental/mutable_stack"
 
 describe Hamster::MutableStack do
+  let(:mutable_stack) { Hamster.mutable_stack(*values) }
 
-  [:pop, :dequeue].each do |method|
-
-    describe "##{method}" do
-
-      [
-        [[], nil, []],
-        [["A"], "A", []],
-        [%w[A B], "B", ["A"]],
-        [%w[A B C], "C", %w[A B]],
-      ].each do |initial_state, return_value, resulting_state|
+  describe "#pop" do
+    let(:pop) { mutable_stack.pop }
 
-        describe "on #{initial_state.inspect}" do
-
-          before do
-            @stack = Hamster.mutable_stack(*initial_state)
-            @result = @stack.send(method)
-          end
-
-          it "returns #{return_value.inspect}" do
-            @result.should == return_value
-          end
+    context "with values" do
+      let(:values) { %w[A B C] }
+      it "returns the last value" do
+        expect(pop).to eq("C")
+      end
 
-          it "modifies the stack to #{resulting_state.inspect}" do
-            @stack.should == Hamster.mutable_stack(*resulting_state)
-          end
+      it "modifies the original collection" do
+        pop
+        expect(mutable_stack).to eq(Hamster.mutable_stack("A", "B"))
+      end
+    end
 
-        end
+    context "without values" do
+      let(:values) { [] }
 
+      it "returns nil" do
+        expect(pop).to be(nil)
       end
 
+      it "doesn't change the original stack" do
+        pop
+        expect(mutable_stack).to eq(Hamster.mutable_stack(*values))
+      end
     end
-
   end
-
 end

data/spec/hamster/experimental/mutable_stack/push_spec.rb

@@ -1,41 +1,21 @@
 require "spec_helper"
-
 require "hamster/experimental/mutable_stack"
 
 describe Hamster::MutableStack do
+  let(:mutable_stack) { Hamster.mutable_stack(*values) }
 
-  [:push, :<<, :enqueue].each do |method|
-
-    describe "##{method}" do
-
-      [
-        [[], "A", ["A"]],
-        [["A"], "B", %w[A B]],
-        [["A"], "A", %w[A A]],
-        [%w[A B C], "D", %w[A B C D]],
-      ].each do |initial_state, new_value, resulting_state|
-
-        describe "on #{initial_state.inspect} with #{new_value.inspect}" do
-
-          before do
-            @stack = Hamster.mutable_stack(*initial_state)
-            @result = @stack.send(method, new_value)
-          end
-
-          it "returns self" do
-            @result.should equal(@stack)
-          end
-
-          it "modifies the stack to #{resulting_state.inspect}" do
-            @stack.should == Hamster.mutable_stack(*resulting_state)
-          end
-
-        end
-
-      end
+  describe "#push" do
+    let(:values) { %w[A B C] }
+    let(:value) { "Z" }
+    let(:push) { mutable_stack.push(value) }
 
+    it "returns the stack" do
+      expect(push).to eq(mutable_stack)
     end
 
+    it "modifies the stack to include the new value" do
+      push
+      expect(mutable_stack).to eq(Hamster.mutable_stack("A", "B", "C", "Z"))
+    end
   end
-
 end

data/spec/hamster/hash/all_spec.rb

@@ -1,59 +1,46 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
+  let(:hash) { Hamster.hash(values) }
 
   [:all?, :forall?].each do |method|
-
     describe "##{method}" do
+      context "when empty" do
+        let(:values) { Hash.new }
 
-      describe "when empty" do
-
-        before do
-          @hash = Hamster.hash
-        end
-
-        it "with a block returns true" do
-          @hash.send(method) {}.should == true
+        context "without a block" do
+          it "returns true" do
+            hash.send(method).should == true
+          end
         end
 
-        it "with no block returns true" do
-          @hash.send(method).should == true
+        context "with a block" do
+          it "returns true" do
+            hash.send(method) { false }.should == true
+          end
         end
-
       end
 
-      describe "when not empty" do
+      context "when not empty" do
+        let(:values) { { "A" => 1, "B" => 2, "C" => 3 } }
 
-        before do
-          @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
+        context "without a block" do
+          it "returns true" do
+            hash.send(method).should == true
+          end
         end
 
-        describe "with a block" do
-
+        context "with a block" do
           it "returns true if the block always returns true" do
-            @hash.send(method) { |key, value| true }.should == true
+            hash.send(method) { true }.should == true
           end
 
           it "returns false if the block ever returns false" do
-            @hash.send(method) { |key, value| key == "D" || value == "dee" }.should == false
-          end
-
-        end
-
-        describe "with no block" do
-
-          it "returns true" do
-            @hash.send(method).should == true
+            hash.send(method) { |k,v| k != 'C' }.should == false
           end
-
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/any_spec.rb

@@ -1,15 +1,10 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   [:any?, :exist?, :exists?].each do |method|
-
     describe "##{method}" do
-
       describe "when empty" do
-
         before do
           @hash = Hamster.hash
         end
@@ -21,11 +16,9 @@ describe Hamster::Hash do
         it "with no block returns false" do
           @hash.send(method).should == false
         end
-
       end
 
       describe "when not empty" do
-
         before do
           @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see", nil => "NIL")
         end
@@ -45,23 +38,15 @@ describe Hamster::Hash do
             it "returns false if the block always returns false" do
               @hash.send(method) { |key, value| key == "D" && value == "dee" }.should == false
             end
-
           end
-
         end
 
         describe "with no block" do
-
           it "returns true" do
             @hash.send(method).should == true
           end
-
         end
-
       end
-
     end
-
   end
-
 end

data/spec/hamster/hash/clear_spec.rb

@@ -1,9 +1,7 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   describe "#clear" do
 
     [
@@ -13,7 +11,6 @@ describe Hamster::Hash do
     ].each do |values|
 
       describe "on #{values}" do
-
         before do
           @original = Hamster.hash(*values)
           @result = @original.clear
@@ -26,11 +23,7 @@ describe Hamster::Hash do
         it "returns an empty hash" do
           @result.should equal(Hamster.hash)
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/construction_spec.rb

@@ -1,25 +1,20 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   describe ".hash" do
-
     describe "with nothing" do
-
       before do
         @hash = Hamster.hash
       end
 
-      it "returns an empty hash" do
+      it "returns the canonical empty hash" do
         @hash.should be_empty
+        @hash.should equal(Hamster::EmptyHash)
       end
-
     end
 
     describe "with an implicit hash" do
-
       before do
         @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       end
@@ -27,9 +22,6 @@ describe Hamster::Hash do
       it "is equivalent to repeatedly using #put" do
         @hash.should == Hamster.hash.put("A", "aye").put("B", "bee").put("C", "see")
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/copying_spec.rb

@@ -1,23 +1,16 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   before do
     @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
   end
 
   [:dup, :clone].each do |method|
-
     describe "##{method}" do
-
       it "returns self" do
         @hash.send(method).should equal(@hash)
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/delete_spec.rb

@@ -1,17 +1,13 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   describe "#delete" do
-
     before do
       @original = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
     end
 
     describe "with an existing key" do
-
       before do
         @result = @original.delete("B")
       end
@@ -23,11 +19,9 @@ describe Hamster::Hash do
       it "returns a copy with the remaining key/value pairs" do
         @result.should == Hamster.hash("A" => "aye", "C" => "see")
       end
-
     end
 
     describe "with a non-existing key" do
-
       before do
         @result = @original.delete("D")
       end
@@ -39,9 +33,6 @@ describe Hamster::Hash do
       it "returns self" do
         @result.should equal(@original)
       end
-
     end
-
   end
-
-end
+end