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

data/spec/hamster/set/find_spec.rb

@@ -1,13 +1,9 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   [:find, :detect].each do |method|
-
     describe "##{method}" do
-
       [
         [[], "A", nil],
         [[], nil, nil],
@@ -21,7 +17,6 @@ describe Hamster::Set do
       ].each do |values, item, expected|
 
         describe "on #{values.inspect}" do
-
           before do
             @set = Hamster.set(*values)
           end
@@ -31,23 +26,15 @@ describe Hamster::Set do
             it "returns #{expected.inspect}" do
               @set.send(method) { |x| x == item }.should == expected
             end
-
           end
 
           describe "without a block" do
-
             it "returns nil" do
               @set.send(method).should be_nil
             end
-
           end
-
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/set/flatten_spec.rb

@@ -1,11 +1,8 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster do
-
   describe "#flatten" do
-
     [
       [["A"], ["A"]],
       [%w[A B C], %w[A B C]],
@@ -14,7 +11,6 @@ describe Hamster do
     ].each do |values, expected|
 
       describe "on #{values}" do
-
         before do
           @original = Hamster.set(*values)
           @result = @original.flatten
@@ -27,13 +23,10 @@ describe Hamster do
         it "returns the inlined values" do
           @result.should == Hamster.set(*expected)
         end
-
       end
-
     end
 
     describe "on an empty set" do
-
       before do
         @result = Hamster.set.flatten
       end
@@ -41,9 +34,14 @@ describe Hamster do
       it "returns an empty set" do
         @result.should equal(Hamster.set)
       end
-
     end
 
+    context "from a subclass" do
+      it "returns an instance of the subclass" do
+        @subclass = Class.new(Hamster::Set)
+        @subclass.new.flatten.class.should be(@subclass)
+        @subclass.new(Hamster.set(1), Hamster.set(2)).class.should be(@subclass)
+      end
+    end
   end
-
-end
+end

data/spec/hamster/set/group_by_spec.rb

@@ -1,15 +1,10 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   [:group_by, :group].each do |method|
-
     describe "##{method}" do
-
       describe "with a block" do
-
         [
           [[], []],
           [[1], [true => Hamster.set(1)]],
@@ -17,7 +12,6 @@ describe Hamster::Set do
         ].each do |values, expected|
 
           describe "on #{values.inspect}" do
-
             before do
               original = Hamster.set(*values)
               @result = original.send(method, &:odd?)
@@ -26,15 +20,11 @@ describe Hamster::Set do
             it "returns #{expected.inspect}" do
               @result.should == Hamster.hash(*expected)
             end
-
           end
-
         end
-
       end
 
       describe "without a block" do
-
         [
           [[], []],
           [[1], [1 => Hamster.set(1)]],
@@ -42,7 +32,6 @@ describe Hamster::Set do
         ].each do |values, expected|
 
           describe "on #{values.inspect}" do
-
             before do
               original = Hamster.set(*values)
               @result = original.group_by
@@ -51,15 +40,17 @@ describe Hamster::Set do
             it "returns #{expected.inspect}" do
               @result.should == Hamster.hash(*expected)
             end
-
           end
-
         end
-
       end
 
+      context "from a subclass" do
+        it "returns an Hash whose values are instances of the subclass" do
+          @subclass = Class.new(Hamster::Set)
+          @instance = @subclass.new(1, 'string', :symbol)
+          @instance.group_by { |x| x.class }.values.each { |v| v.class.should be(@subclass) }
+        end
+      end
     end
-
   end
-
-end
+end

data/spec/hamster/set/head_spec.rb

@@ -1,15 +1,10 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   [:head, :first].each do |method|
-
     describe "##{method}" do
-
       describe "on an empty set" do
-
         before do
           @result = Hamster.set.send(method)
         end
@@ -17,11 +12,9 @@ describe Hamster::Set do
         it "returns nil" do
           @returns.should be_nil
         end
-
       end
 
       describe "on a non-empty set" do
-
         before do
           @result = Hamster.set("A", "B", "C").send(method)
         end
@@ -29,11 +22,7 @@ describe Hamster::Set do
         it "returns an arbitrary value from the set" do
           %w[A B C].should include(@result)
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/set/immutable_spec.rb

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

data/spec/hamster/set/include_spec.rb

@@ -1,13 +1,9 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   [:include?, :member?, :contains?, :elem?].each do |method|
-
     describe "##{method}" do
-
       before do
         @set = Hamster.set("A", "B", "C", 2.0, nil)
       end
@@ -17,7 +13,6 @@ describe Hamster::Set do
         it "returns true for an existing value (#{value.inspect})" do
           @set.send(method, value).should == true
         end
-
       end
 
       it "returns false for a non-existing value" do
@@ -27,9 +22,6 @@ describe Hamster::Set do
       it "uses #eql? for equality" do
         @set.send(method, 2).should == false
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/set/inspect_spec.rb

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

data/spec/hamster/set/intersection_spec.rb

@@ -1,13 +1,9 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   [:intersection, :intersect, :&].each do |method|
-
     describe "##{method}" do
-
       [
         [[], [], []],
         [["A"], [], []],
@@ -17,7 +13,6 @@ describe Hamster::Set do
       ].each do |a, b, expected|
 
         describe "returns #{expected.inspect}" do
-
           before do
             @a = Hamster.set(*a)
             @b = Hamster.set(*b)
@@ -34,13 +29,8 @@ describe Hamster::Set do
           after  do
             @result.should == Hamster.set(*expected)
           end
-
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/set/join_spec.rb

@@ -1,13 +1,9 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   describe "#join" do
-
     describe "with a separator" do
-
       [
         [[], ""],
         [["A"], "A"],
@@ -15,7 +11,6 @@ describe Hamster::Set do
       ].each do |values, expected|
 
         describe "on #{values.inspect}" do
-
           before do
             @original = Hamster.set(*values)
             @result = @original.join("|")
@@ -28,15 +23,11 @@ describe Hamster::Set do
           it "returns #{expected.inspect}" do
             @result.should == expected
           end
-
         end
-
       end
-
     end
 
     describe "without a separator" do
-
       [
         [[], ""],
         [["A"], "A"],
@@ -44,7 +35,6 @@ describe Hamster::Set do
       ].each do |values, expected|
 
         describe "on #{values.inspect}" do
-
           before do
             @original = Hamster.set(*values)
             @result = @original.join
@@ -57,13 +47,8 @@ describe Hamster::Set do
           it "returns #{expected.inspect}" do
             @result.should == expected
           end
-
         end
-
       end
-
     end
-
   end
-
-end
+end

data/spec/hamster/set/map_spec.rb

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

data/spec/hamster/set/marshal_spec.rb

@@ -1,11 +1,8 @@
 require "spec_helper"
-
 require "hamster/set"
 
 describe Hamster::Set do
-
   describe "#marshal_dump/#marshal_load" do
-
     let(:ruby) { File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"]) }
 
     let(:child_cmd) do
@@ -28,7 +25,5 @@ describe Hamster::Set do
       reloaded_hash.should include :one
       reloaded_hash.should include :two
     end
-
   end
-
-end
+end