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

data/spec/hamster/hash/immutable_spec.rb

@@ -1,12 +1,9 @@
 require "spec_helper"
-
 require "hamster/immutable"
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   it "includes Immutable" do
     Hamster::Hash.should include(Hamster::Immutable)
   end
-
 end

data/spec/hamster/hash/inspect_spec.rb

@@ -1,11 +1,8 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   describe "#inspect" do
-
     [
       [[], "{}"],
       [["A" => "aye"], "{\"A\" => \"aye\"}"],
@@ -13,7 +10,6 @@ describe Hamster::Hash do
     ].each do |values, expected|
 
       describe "on #{values.inspect}" do
-
         before do
           original = Hamster.hash(*values)
           @result = original.inspect
@@ -22,11 +18,7 @@ describe Hamster::Hash do
         it "returns #{expected.inspect}" do
           @result.should == expected
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/keys_spec.rb

@@ -1,12 +1,9 @@
 require "spec_helper"
-
 require "hamster/hash"
 require "hamster/set"
 
 describe Hamster::Hash do
-
   describe "#keys" do
-
     before do
       hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       @result = hash.keys
@@ -16,6 +13,8 @@ describe Hamster::Hash do
       @result.should == Hamster.set("A", "B", "C")
     end
 
+    it "returns frozen String keys" do
+      @result.each { |s| s.should be_frozen }
+    end
   end
-
-end
+end

data/spec/hamster/hash/map_spec.rb

@@ -1,15 +1,10 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   [:map, :collect].each do |method|
-
     describe "##{method}" do
-
       describe "when empty" do
-
         before do
           @original = Hamster.hash
           @mapped = @original.send(method) {}
@@ -18,17 +13,14 @@ describe Hamster::Hash do
         it "returns self" do
           @mapped.should equal(@original)
         end
-
       end
 
       describe "when not empty" do
-
         before do
           @original = Hamster.hash("A" => "aye", "B"  => "bee", "C" => "see")
         end
 
         describe "with a block" do
-
           before do
             @mapped = @original.send(method) { |key, value| [key.downcase, value.upcase] }
           end
@@ -40,11 +32,9 @@ describe Hamster::Hash do
           it "returns a new hash with the mapped values" do
             @mapped.should == Hamster.hash("a" => "AYE", "b"  => "BEE", "c" => "SEE")
           end
-
         end
 
         describe "with no block" do
-
           before do
             @result = @original.send(method)
           end
@@ -52,13 +42,8 @@ describe Hamster::Hash do
           it "returns self" do
             @result.should equal(@original)
           end
-
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/merge_spec.rb

@@ -1,13 +1,9 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   [:merge, :+].each do |method|
-
     describe "##{method}" do
-
       [
         [[], [], []],
         [["A" => "aye"], [], ["A" => "aye"]],
@@ -16,21 +12,19 @@ describe Hamster::Hash do
       ].each do |a, b, expected|
 
         describe "for #{a.inspect} and #{b.inspect}" do
-
           before do
             @result = Hamster.hash(*a).send(method, Hamster.hash(*b))
           end
 
-          it "returns #{expected.inspect}"  do
+          it "returns #{expected.inspect} when passed a Hamster::Hash"  do
             @result.should == Hamster.hash(*expected)
           end
 
+          it "returns #{expected.inspect} when passed a Ruby Hash" do
+            Hamster.hash(*a).send(method, Hash[*b]).should == Hamster.hash(*expected)
+          end
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/new_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+require "hamster/hash"
+
+describe Hamster::Hash do
+  describe "new" do
+    describe "from a subclass" do
+      before do
+        @subclass = Class.new(Hamster::Hash)
+        @instance = @subclass.new("some" => "values")
+      end
+
+      it "should return an instance of the subclass" do
+        @instance.class.should be @subclass
+      end
+
+      it "should return a frozen instance" do
+        @instance.frozen?.should be true
+      end
+    end
+  end
+end

data/spec/hamster/hash/put_spec.rb

@@ -1,17 +1,13 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   describe "#put" do
-
     before do
       @original = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
     end
 
     describe "with a block" do
-
       it "passes the value to the block" do
         @original.put("A") { |value| value.should == "aye" }
       end
@@ -25,11 +21,9 @@ describe Hamster::Hash do
         result = @original.put("A", &:upcase)
         result.get("A").should == "AYE"
       end
-
     end
 
     describe "with a unique key" do
-
       before do
         @result = @original.put("D", "dee")
       end
@@ -41,11 +35,9 @@ describe Hamster::Hash do
       it "returns a copy with the superset of key/value pairs" do
         @result.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see", "D" => "dee")
       end
-
     end
 
     describe "with a duplicate key" do
-
       before do
         @result = @original.put("C", "sea")
       end
@@ -57,9 +49,19 @@ describe Hamster::Hash do
       it "returns a copy with the superset of key/value pairs" do
         @result.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "sea")
       end
-
     end
 
-  end
+    context "when a String is inserted as key and then mutated" do
+      before do
+        @string = "a string!"
+        @hash = Hamster.hash(@string => 'a value!')
+        @string.upcase!
+      end
 
-end
+      it "is not affected" do
+        @hash['a string!'].should == 'a value!'
+        @hash['A STRING!'].should be_nil
+      end
+    end
+  end
+end

data/spec/hamster/hash/reduce_spec.rb

@@ -1,15 +1,10 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   [:reduce, :inject, :fold, :foldr].each do |method|
-
     describe "##{method}" do
-
       describe "when empty" do
-
         before do
           @original = Hamster.hash
           @result = @original.send(method, "ABC") {}
@@ -18,17 +13,14 @@ describe Hamster::Hash do
         it "returns the memo" do
           @result.should == "ABC"
         end
-
       end
 
       describe "when not empty" do
-
         before do
           @original = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
         end
 
         describe "with a block" do
-
           before do
             @result = @original.send(method, 0) { |memo, key, value| memo + 1 }
           end
@@ -36,11 +28,9 @@ describe Hamster::Hash do
           it "returns the final memo" do
             @result.should == 3
           end
-
         end
 
         describe "with no block" do
-
           before do
             @result = @original.send(method, "ABC")
           end
@@ -48,13 +38,15 @@ describe Hamster::Hash do
           it "returns the memo" do
             @result.should == "ABC"
           end
-
         end
-
       end
 
+      context "from a subclass" do
+        it "returns an instance of the subclass" do
+          @subclass = Class.new(Hamster::Set)
+          @instance = @subclass.new(*(1..100).to_a)
+        end
+      end
     end
-
   end
-
-end
+end

data/spec/hamster/hash/remove_spec.rb

@@ -1,19 +1,14 @@
 require "spec_helper"
-
 require "hamster/hash"
 
 describe Hamster::Hash do
-
   [:remove, :reject, :delete_if].each do |method|
-
     describe "##{method}" do
-
       before do
         @original = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       end
 
       describe "when nothing matches" do
-
         before do
           @result = @original.send(method) { |key, value| false }
         end
@@ -21,13 +16,10 @@ describe Hamster::Hash do
         it "returns self" do
           @result.should equal(@original)
         end
-
       end
 
       describe "when only some things match" do
-
         describe "with a block" do
-
           before do
             @result = @original.send(method) { |key, value| key == "A" && value == "aye" }
           end
@@ -39,11 +31,9 @@ describe Hamster::Hash do
           it "returns a set with the matching values" do
             @result.should == Hamster.hash("B" => "bee", "C" => "see")
           end
-
         end
 
         describe "with no block" do
-
           before do
             @result = @original.send(method)
           end
@@ -51,13 +41,8 @@ describe Hamster::Hash do
           it "returns self" do
             @result.should equal(@original)
           end
-
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/hash/uniq_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
 
   [:uniq, :nub, :remove_duplicates].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/values_spec.rb

@@ -1,12 +1,9 @@
 require "spec_helper"
-
 require "hamster/hash"
 require "hamster/set"
 
 describe Hamster::Hash do
-
   describe "#values" do
-
     before do
       hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       @result = hash.values
@@ -16,7 +13,6 @@ describe Hamster::Hash do
       @result.should be_a Hamster::List
       @result.to_a.sort.should == %w(aye bee see)
     end
-
   end
 
   describe "#values with duplicates" do
@@ -30,5 +26,4 @@ describe Hamster::Hash do
       @result.to_a.sort.should == [15, 15, 19]
     end
   end
-
-end
+end

data/spec/hamster/immutable/copying_spec.rb

@@ -1,17 +1,13 @@
 require "spec_helper"
-
 require "hamster/immutable"
 
 describe Hamster::Immutable do
-
   class Fixture
     include Hamster::Immutable
   end
 
   [:dup, :clone].each do |method|
-
     describe "##{method}" do
-
       before do
         @original = Fixture.new
         @result = @original.send(method)
@@ -20,9 +16,6 @@ describe Hamster::Immutable do
       it "returns self" do
         @result.should equal(@original)
       end
-
     end
-
   end
-
-end
+end