hamster 1.0.1.pre.rc3 → 2.0.0

data/spec/lib/hamster/sorted_set/size_spec.rb

@@ -10,7 +10,7 @@ describe Hamster::SortedSet do
         [%w[A B C], 3],
       ].each do |values, result|
         it "returns #{result} for #{values.inspect}" do
-          Hamster.sorted_set(*values).send(method).should == result
+          SS[*values].send(method).should == result
         end
       end
     end

data/spec/lib/hamster/sorted_set/slice_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 require "hamster/sorted_set"
 
 describe Hamster::SortedSet do
-  let(:sorted_set) { Hamster.sorted_set(1,2,3,4) }
-  let(:big) { Hamster::SortedSet.new(1..10000) }
+  let(:sorted_set) { SS[1,2,3,4] }
+  let(:big) { SS.new(1..10000) }
 
   [:slice, :[]].each do |method|
     describe "##{method}" do
@@ -21,7 +21,7 @@ describe Hamster::SortedSet do
         end
 
         it "leaves the original unchanged" do
-          sorted_set.should eql(Hamster.sorted_set(1,2,3,4))
+          sorted_set.should eql(SS[1,2,3,4])
         end
       end
 
@@ -41,189 +41,205 @@ describe Hamster::SortedSet do
 
       context "when passed a positive integral index and count" do
         it "returns 'count' elements starting from 'index'" do
-          sorted_set.send(method, 0, 0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 0, 1).should eql(Hamster.sorted_set(1))
-          sorted_set.send(method, 0, 2).should eql(Hamster.sorted_set(1,2))
-          sorted_set.send(method, 0, 4).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 0, 6).should eql(Hamster.sorted_set(1,2,3,4))
+          sorted_set.send(method, 0, 0).should  eql(SS.empty)
+          sorted_set.send(method, 0, 1).should  eql(SS[1])
+          sorted_set.send(method, 0, 2).should  eql(SS[1,2])
+          sorted_set.send(method, 0, 4).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, 0, 6).should  eql(SS[1,2,3,4])
           sorted_set.send(method, 0, -1).should be_nil
           sorted_set.send(method, 0, -2).should be_nil
           sorted_set.send(method, 0, -4).should be_nil
-          sorted_set.send(method, 2, 0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 2, 1).should eql(Hamster.sorted_set(3))
-          sorted_set.send(method, 2, 2).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, 2, 4).should eql(Hamster.sorted_set(3,4))
+          sorted_set.send(method, 2, 0).should  eql(SS.empty)
+          sorted_set.send(method, 2, 1).should  eql(SS[3])
+          sorted_set.send(method, 2, 2).should  eql(SS[3,4])
+          sorted_set.send(method, 2, 4).should  eql(SS[3,4])
           sorted_set.send(method, 2, -1).should be_nil
-          sorted_set.send(method, 4, 0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 4, 2).should eql(Hamster.sorted_set)
+          sorted_set.send(method, 4, 0).should  eql(SS.empty)
+          sorted_set.send(method, 4, 2).should  eql(SS.empty)
           sorted_set.send(method, 4, -1).should be_nil
-          sorted_set.send(method, 5, 0).should be_nil
-          sorted_set.send(method, 5, 2).should be_nil
+          sorted_set.send(method, 5, 0).should  be_nil
+          sorted_set.send(method, 5, 2).should  be_nil
           sorted_set.send(method, 5, -1).should be_nil
-          sorted_set.send(method, 6, 0).should be_nil
-          sorted_set.send(method, 6, 2).should be_nil
+          sorted_set.send(method, 6, 0).should  be_nil
+          sorted_set.send(method, 6, 2).should  be_nil
           sorted_set.send(method, 6, -1).should be_nil
 
-          big.send(method, 0, 3).should eql(Hamster.sorted_set(1,2,3))
-          big.send(method, 1023, 4).should eql(Hamster.sorted_set(1024,1025,1026,1027))
-          big.send(method, 1024, 4).should eql(Hamster.sorted_set(1025,1026,1027,1028))
+          big.send(method, 0, 3).should    eql(SS[1,2,3])
+          big.send(method, 1023, 4).should eql(SS[1024,1025,1026,1027])
+          big.send(method, 1024, 4).should eql(SS[1025,1026,1027,1028])
         end
 
         it "leaves the original unchanged" do
-          sorted_set.should eql(Hamster.sorted_set(1,2,3,4))
+          sorted_set.should eql(SS[1,2,3,4])
         end
       end
 
       context "when passed a negative integral index and count" do
         it "returns 'count' elements, starting from index which is number 'index.abs' counting from the end of the array" do
-          sorted_set.send(method, -1, 0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1, 1).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1, 2).should eql(Hamster.sorted_set(4))
+          sorted_set.send(method, -1, 0).should  eql(SS.empty)
+          sorted_set.send(method, -1, 1).should  eql(SS[4])
+          sorted_set.send(method, -1, 2).should  eql(SS[4])
           sorted_set.send(method, -1, -1).should be_nil
-          sorted_set.send(method, -2, 0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -2, 1).should eql(Hamster.sorted_set(3))
-          sorted_set.send(method, -2, 2).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, -2, 4).should eql(Hamster.sorted_set(3,4))
+          sorted_set.send(method, -2, 0).should  eql(SS.empty)
+          sorted_set.send(method, -2, 1).should  eql(SS[3])
+          sorted_set.send(method, -2, 2).should  eql(SS[3,4])
+          sorted_set.send(method, -2, 4).should  eql(SS[3,4])
           sorted_set.send(method, -2, -1).should be_nil
-          sorted_set.send(method, -4, 0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -4, 1).should eql(Hamster.sorted_set(1))
-          sorted_set.send(method, -4, 2).should eql(Hamster.sorted_set(1,2))
-          sorted_set.send(method, -4, 4).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, -4, 6).should eql(Hamster.sorted_set(1,2,3,4))
+          sorted_set.send(method, -4, 0).should  eql(SS.empty)
+          sorted_set.send(method, -4, 1).should  eql(SS[1])
+          sorted_set.send(method, -4, 2).should  eql(SS[1,2])
+          sorted_set.send(method, -4, 4).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, -4, 6).should  eql(SS[1,2,3,4])
           sorted_set.send(method, -4, -1).should be_nil
-          sorted_set.send(method, -5, 0).should be_nil
-          sorted_set.send(method, -5, 1).should be_nil
+          sorted_set.send(method, -5, 0).should  be_nil
+          sorted_set.send(method, -5, 1).should  be_nil
           sorted_set.send(method, -5, 10).should be_nil
           sorted_set.send(method, -5, -1).should be_nil
 
-          big.send(method, -1, 1).should eql(Hamster.sorted_set(10000))
-          big.send(method, -1, 2).should eql(Hamster.sorted_set(10000))
-          big.send(method, -6, 2).should eql(Hamster.sorted_set(9995,9996))
+          big.send(method, -1, 1).should eql(SS[10000])
+          big.send(method, -1, 2).should eql(SS[10000])
+          big.send(method, -6, 2).should eql(SS[9995,9996])
         end
       end
 
       context "when passed a Range" do
         it "returns the elements whose indexes are within the given Range" do
-          sorted_set.send(method, 0..-1).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 0..-10).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 0..0).should eql(Hamster.sorted_set(1))
-          sorted_set.send(method, 0..1).should eql(Hamster.sorted_set(1,2))
-          sorted_set.send(method, 0..2).should eql(Hamster.sorted_set(1,2,3))
-          sorted_set.send(method, 0..3).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 0..4).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 0..10).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 2..-10).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 2..0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 2..2).should eql(Hamster.sorted_set(3))
-          sorted_set.send(method, 2..3).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, 2..4).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, 3..0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 3..3).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, 3..4).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, 4..0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 4..4).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 4..5).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 5..0).should be_nil
-          sorted_set.send(method, 5..5).should be_nil
-          sorted_set.send(method, 5..6).should be_nil
-
-          big.send(method, 159..162).should eql(Hamster.sorted_set(160,161,162,163))
-          big.send(method, 160..162).should eql(Hamster.sorted_set(161,162,163))
-          big.send(method, 161..162).should eql(Hamster.sorted_set(162,163))
-          big.send(method, 9999..10100).should eql(Hamster.sorted_set(10000))
-          big.send(method, 10000..10100).should eql(Hamster.sorted_set)
+          sorted_set.send(method, 0..-1).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, 0..-10).should eql(SS.empty)
+          sorted_set.send(method, 0..0).should   eql(SS[1])
+          sorted_set.send(method, 0..1).should   eql(SS[1,2])
+          sorted_set.send(method, 0..2).should   eql(SS[1,2,3])
+          sorted_set.send(method, 0..3).should   eql(SS[1,2,3,4])
+          sorted_set.send(method, 0..4).should   eql(SS[1,2,3,4])
+          sorted_set.send(method, 0..10).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, 2..-10).should eql(SS.empty)
+          sorted_set.send(method, 2..0).should   eql(SS.empty)
+          sorted_set.send(method, 2..2).should   eql(SS[3])
+          sorted_set.send(method, 2..3).should   eql(SS[3,4])
+          sorted_set.send(method, 2..4).should   eql(SS[3,4])
+          sorted_set.send(method, 3..0).should   eql(SS.empty)
+          sorted_set.send(method, 3..3).should   eql(SS[4])
+          sorted_set.send(method, 3..4).should   eql(SS[4])
+          sorted_set.send(method, 4..0).should   eql(SS.empty)
+          sorted_set.send(method, 4..4).should   eql(SS.empty)
+          sorted_set.send(method, 4..5).should   eql(SS.empty)
+          sorted_set.send(method, 5..0).should   be_nil
+          sorted_set.send(method, 5..5).should   be_nil
+          sorted_set.send(method, 5..6).should   be_nil
+
+          big.send(method, 159..162).should     eql(SS[160,161,162,163])
+          big.send(method, 160..162).should     eql(SS[161,162,163])
+          big.send(method, 161..162).should     eql(SS[162,163])
+          big.send(method, 9999..10100).should  eql(SS[10000])
+          big.send(method, 10000..10100).should eql(SS.empty)
           big.send(method, 10001..10100).should be_nil
 
-          sorted_set.send(method, 0...-1).should eql(Hamster.sorted_set(1,2,3))
-          sorted_set.send(method, 0...-10).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 0...0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 0...1).should eql(Hamster.sorted_set(1))
-          sorted_set.send(method, 0...2).should eql(Hamster.sorted_set(1,2))
-          sorted_set.send(method, 0...3).should eql(Hamster.sorted_set(1,2,3))
-          sorted_set.send(method, 0...4).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 0...10).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, 2...-10).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 2...0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 2...2).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 2...3).should eql(Hamster.sorted_set(3))
-          sorted_set.send(method, 2...4).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, 3...0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 3...3).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 3...4).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, 4...0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 4...4).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 4...5).should eql(Hamster.sorted_set)
-          sorted_set.send(method, 5...0).should be_nil
-          sorted_set.send(method, 5...5).should be_nil
-          sorted_set.send(method, 5...6).should be_nil
-
-          big.send(method, 159...162).should eql(Hamster.sorted_set(160,161,162))
-          big.send(method, 160...162).should eql(Hamster.sorted_set(161,162))
-          big.send(method, 161...162).should eql(Hamster.sorted_set(162))
-          big.send(method, 9999...10100).should eql(Hamster.sorted_set(10000))
-          big.send(method, 10000...10100).should eql(Hamster.sorted_set)
+          sorted_set.send(method, 0...-1).should  eql(SS[1,2,3])
+          sorted_set.send(method, 0...-10).should eql(SS.empty)
+          sorted_set.send(method, 0...0).should   eql(SS.empty)
+          sorted_set.send(method, 0...1).should   eql(SS[1])
+          sorted_set.send(method, 0...2).should   eql(SS[1,2])
+          sorted_set.send(method, 0...3).should   eql(SS[1,2,3])
+          sorted_set.send(method, 0...4).should   eql(SS[1,2,3,4])
+          sorted_set.send(method, 0...10).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, 2...-10).should eql(SS.empty)
+          sorted_set.send(method, 2...0).should   eql(SS.empty)
+          sorted_set.send(method, 2...2).should   eql(SS.empty)
+          sorted_set.send(method, 2...3).should   eql(SS[3])
+          sorted_set.send(method, 2...4).should   eql(SS[3,4])
+          sorted_set.send(method, 3...0).should   eql(SS.empty)
+          sorted_set.send(method, 3...3).should   eql(SS.empty)
+          sorted_set.send(method, 3...4).should   eql(SS[4])
+          sorted_set.send(method, 4...0).should   eql(SS.empty)
+          sorted_set.send(method, 4...4).should   eql(SS.empty)
+          sorted_set.send(method, 4...5).should   eql(SS.empty)
+          sorted_set.send(method, 5...0).should   be_nil
+          sorted_set.send(method, 5...5).should   be_nil
+          sorted_set.send(method, 5...6).should   be_nil
+
+          big.send(method, 159...162).should     eql(SS[160,161,162])
+          big.send(method, 160...162).should     eql(SS[161,162])
+          big.send(method, 161...162).should     eql(SS[162])
+          big.send(method, 9999...10100).should  eql(SS[10000])
+          big.send(method, 10000...10100).should eql(SS.empty)
           big.send(method, 10001...10100).should be_nil
 
-          sorted_set.send(method, -1..-1).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1...-1).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1..3).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1...3).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1..4).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1...4).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1..10).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1...10).should eql(Hamster.sorted_set(4))
-          sorted_set.send(method, -1..0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1..-4).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1...-4).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1..-6).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -1...-6).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -2..-2).should eql(Hamster.sorted_set(3))
-          sorted_set.send(method, -2...-2).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -2..-1).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, -2...-1).should eql(Hamster.sorted_set(3))
-          sorted_set.send(method, -2..10).should eql(Hamster.sorted_set(3,4))
-          sorted_set.send(method, -2...10).should eql(Hamster.sorted_set(3,4))
-
-          big.send(method, -1..-1).should eql(Hamster.sorted_set(10000))
-          big.send(method, -1..9999).should eql(Hamster.sorted_set(10000))
-          big.send(method, -1...9999).should eql(Hamster.sorted_set)
-          big.send(method, -2...9999).should eql(Hamster.sorted_set(9999))
-          big.send(method, -2..-1).should eql(Hamster.sorted_set(9999,10000))
-
-          sorted_set.send(method, -4..-4).should eql(Hamster.sorted_set(1))
-          sorted_set.send(method, -4..-2).should eql(Hamster.sorted_set(1,2,3))
-          sorted_set.send(method, -4...-2).should eql(Hamster.sorted_set(1,2))
-          sorted_set.send(method, -4..-1).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, -4...-1).should eql(Hamster.sorted_set(1,2,3))
-          sorted_set.send(method, -4..3).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, -4...3).should eql(Hamster.sorted_set(1,2,3))
-          sorted_set.send(method, -4..4).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, -4...4).should eql(Hamster.sorted_set(1,2,3,4))
-          sorted_set.send(method, -4..0).should eql(Hamster.sorted_set(1))
-          sorted_set.send(method, -4...0).should eql(Hamster.sorted_set)
-          sorted_set.send(method, -4..1).should eql(Hamster.sorted_set(1,2))
-          sorted_set.send(method, -4...1).should eql(Hamster.sorted_set(1))
-
-          sorted_set.send(method, -5..-5).should be_nil
+          sorted_set.send(method, -1..-1).should  eql(SS[4])
+          sorted_set.send(method, -1...-1).should eql(SS.empty)
+          sorted_set.send(method, -1..3).should   eql(SS[4])
+          sorted_set.send(method, -1...3).should  eql(SS.empty)
+          sorted_set.send(method, -1..4).should   eql(SS[4])
+          sorted_set.send(method, -1...4).should  eql(SS[4])
+          sorted_set.send(method, -1..10).should  eql(SS[4])
+          sorted_set.send(method, -1...10).should eql(SS[4])
+          sorted_set.send(method, -1..0).should   eql(SS.empty)
+          sorted_set.send(method, -1..-4).should  eql(SS.empty)
+          sorted_set.send(method, -1...-4).should eql(SS.empty)
+          sorted_set.send(method, -1..-6).should  eql(SS.empty)
+          sorted_set.send(method, -1...-6).should eql(SS.empty)
+          sorted_set.send(method, -2..-2).should  eql(SS[3])
+          sorted_set.send(method, -2...-2).should eql(SS.empty)
+          sorted_set.send(method, -2..-1).should  eql(SS[3,4])
+          sorted_set.send(method, -2...-1).should eql(SS[3])
+          sorted_set.send(method, -2..10).should  eql(SS[3,4])
+          sorted_set.send(method, -2...10).should eql(SS[3,4])
+
+          big.send(method, -1..-1).should    eql(SS[10000])
+          big.send(method, -1..9999).should  eql(SS[10000])
+          big.send(method, -1...9999).should eql(SS.empty)
+          big.send(method, -2...9999).should eql(SS[9999])
+          big.send(method, -2..-1).should    eql(SS[9999,10000])
+
+          sorted_set.send(method, -4..-4).should  eql(SS[1])
+          sorted_set.send(method, -4..-2).should  eql(SS[1,2,3])
+          sorted_set.send(method, -4...-2).should eql(SS[1,2])
+          sorted_set.send(method, -4..-1).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, -4...-1).should eql(SS[1,2,3])
+          sorted_set.send(method, -4..3).should   eql(SS[1,2,3,4])
+          sorted_set.send(method, -4...3).should  eql(SS[1,2,3])
+          sorted_set.send(method, -4..4).should   eql(SS[1,2,3,4])
+          sorted_set.send(method, -4...4).should  eql(SS[1,2,3,4])
+          sorted_set.send(method, -4..0).should   eql(SS[1])
+          sorted_set.send(method, -4...0).should  eql(SS.empty)
+          sorted_set.send(method, -4..1).should   eql(SS[1,2])
+          sorted_set.send(method, -4...1).should  eql(SS[1])
+
+          sorted_set.send(method, -5..-5).should  be_nil
           sorted_set.send(method, -5...-5).should be_nil
-          sorted_set.send(method, -5..-4).should be_nil
-          sorted_set.send(method, -5..-1).should be_nil
-          sorted_set.send(method, -5..10).should be_nil
+          sorted_set.send(method, -5..-4).should  be_nil
+          sorted_set.send(method, -5..-1).should  be_nil
+          sorted_set.send(method, -5..10).should  be_nil
 
           big.send(method, -10001..-1).should be_nil
         end
 
         it "leaves the original unchanged" do
-          sorted_set.should eql(Hamster.sorted_set(1,2,3,4))
+          sorted_set.should eql(SS[1,2,3,4])
         end
       end
     end
 
+    context "when passed an empty Range" do
+      it "does not lose custom sort order" do
+        ss = SS.new(["yogurt", "cake", "pistachios"]) { |word| word.length }
+        ss = ss.send(method, 1...1).add("tea").add("fruitcake").add("toast")
+        ss.to_a.should == ["tea", "toast", "fruitcake"]
+      end
+    end
+
+    context "when passed a length of zero" do
+      it "does not lose custom sort order" do
+        ss = SS.new(["yogurt", "cake", "pistachios"]) { |word| word.length }
+        ss = ss.send(method, 0, 0).add("tea").add("fruitcake").add("toast")
+        ss.to_a.should == ["tea", "toast", "fruitcake"]
+      end
+    end
+
     context "when passed a subclass of Range" do
       it "works the same as with a Range" do
         subclass = Class.new(Range)
-        sorted_set.send(method, subclass.new(1,2)).should eql(Hamster.sorted_set(2,3))
-        sorted_set.send(method, subclass.new(-3,-1,true)).should eql(Hamster.sorted_set(2,3))
+        sorted_set.send(method, subclass.new(1,2)).should eql(SS[2,3])
+        sorted_set.send(method, subclass.new(-3,-1,true)).should eql(SS[2,3])
       end
     end
 

data/spec/lib/hamster/sorted_set/sorting_spec.rb

@@ -13,12 +13,12 @@ describe Hamster::SortedSet do
         [%w[Ichi Ni San], %w[Ni San Ichi]],
       ].each do |values, expected|
         describe "on #{values.inspect}" do
-          let(:sorted_set) { Hamster.sorted_set(*values) { |item| item.reverse }}
+          let(:sorted_set) { SS.new(values) { |item| item.reverse }}
 
           context "with a block" do
             it "preserves the original" do
               sorted_set.send(method, &comparator)
-              sorted_set.to_a.should == Hamster.sorted_set(*values) { |item| item.reverse }
+              sorted_set.to_a.should == SS.new(values) { |item| item.reverse }
             end
 
             it "returns #{expected.inspect}" do
@@ -30,7 +30,7 @@ describe Hamster::SortedSet do
           context "without a block" do
             it "preserves the original" do
               sorted_set.send(method)
-              sorted_set.to_a.should == Hamster.sorted_set(*values) { |item| item.reverse }
+              sorted_set.to_a.should == SS.new(values) { |item| item.reverse }
             end
 
             it "returns #{expected.sort.inspect}" do

data/spec/lib/hamster/sorted_set/subset_spec.rb

@@ -18,7 +18,7 @@ describe Hamster::SortedSet do
     ].each do |a, b, expected|
       context "for #{a.inspect} and #{b.inspect}" do
         it "returns #{expected}"  do
-          Hamster.sorted_set(*a).subset?(Hamster.sorted_set(*b)).should == expected
+          SS[*a].subset?(SS[*b]).should == expected
         end
       end
     end
@@ -40,7 +40,7 @@ describe Hamster::SortedSet do
     ].each do |a, b, expected|
       context "for #{a.inspect} and #{b.inspect}" do
         it "returns #{expected}"  do
-          Hamster.sorted_set(*a).proper_subset?(Hamster.sorted_set(*b)).should == expected
+          SS[*a].proper_subset?(SS[*b]).should == expected
         end
       end
     end

data/spec/lib/hamster/sorted_set/superset_spec.rb

@@ -18,7 +18,7 @@ describe Hamster::SortedSet do
     ].each do |a, b, expected|
       context "for #{a.inspect} and #{b.inspect}" do
         it "returns #{expected}"  do
-          Hamster.sorted_set(*a).superset?(Hamster.sorted_set(*b)).should == expected
+          SS[*a].superset?(SS[*b]).should == expected
         end
       end
     end
@@ -40,7 +40,7 @@ describe Hamster::SortedSet do
     ].each do |a, b, expected|
       context "for #{a.inspect} and #{b.inspect}" do
         it "returns #{expected}"  do
-          Hamster.sorted_set(*a).proper_superset?(Hamster.sorted_set(*b)).should == expected
+          SS[*a].proper_superset?(SS[*b]).should == expected
         end
       end
     end

data/spec/lib/hamster/sorted_set/take_spec.rb

@@ -10,17 +10,46 @@ describe Hamster::SortedSet do
       [%w[A B C], 2, %w[A B]],
     ].each do |values, number, expected|
       context "#{number} from #{values.inspect}" do
-        let(:sorted_set) { Hamster.sorted_set(*values) }
+        let(:sorted_set) { SS[*values] }
 
         it "preserves the original" do
           sorted_set.take(number)
-          sorted_set.should eql(Hamster.sorted_set(*values))
+          sorted_set.should eql(SS[*values])
         end
 
         it "returns #{expected.inspect}" do
-          sorted_set.take(number).should eql(Hamster.sorted_set(*expected))
+          sorted_set.take(number).should eql(SS[*expected])
         end
       end
     end
+
+    context "when argument is at least size of receiver" do
+      let(:sorted_set) { SS[6, 7, 8, 9] }
+      it "returns self" do
+        sorted_set.take(sorted_set.size).should be(sorted_set)
+        sorted_set.take(sorted_set.size + 1).should be(sorted_set)
+      end
+    end
+
+    context "when the set has a custom order" do
+      let(:sorted_set) { SS.new([1, 2, 3]) { |x| -x }}
+      it "maintains the custom order" do
+        sorted_set.take(1).to_a.should == [3]
+        sorted_set.take(2).to_a.should == [3, 2]
+        sorted_set.take(3).to_a.should == [3, 2, 1]
+      end
+
+      it "keeps the comparator even when set is cleared" do
+        s = sorted_set.take(0)
+        s.add(4).add(5).add(6).to_a.should == [6, 5, 4]
+      end
+    end
+
+    context "when called on a subclass" do
+      it "should return an instance of the subclass" do
+        subclass = Class.new(Hamster::SortedSet)
+        subclass.new([1,2,3]).take(1).class.should be(subclass)
+      end
+    end
   end
 end