hamster 0.1.22 → 0.1.23

data/History.rdoc

@@ -1,3 +1,21 @@
+=== 0.1.23 / 2010-01-11
+
+* Implement List#product.
+
+* Implement List#sum.
+
+* Implement List#last.
+
+* Implement List#init.
+
+* Alias #reject as #remove.
+
+* Alias #each as #foreach.
+
+* Rename Hash#remove as Hash#delete.
+
+* Rename Set#remove as Set#delete.
+
 === 0.1.22 / 2010-01-10
 
 * Implement List#union (aliased as #|).

data/README.rdoc

@@ -81,14 +81,17 @@ The <tt>Hamster::Hash</tt> version on the other hand was unchanged from the orig
 
 Well, I could show you one but I'd have to re-write--or at least wrap--most <tt>Hash</tt> methods to make it generic, or at least write some application-specific code that synchronised using a <tt>Mutex</tt> and ... well ... it's hard, I always make mistakes, I always end up with weird edge cases and race conditions so, I'll leave that as an exercise for you :)
 
-And don't forget that even if threading isn't a concern for you, the safety provided by immutability is worth it.
+And don't forget that even if threading isn't a concern for you, the safety provided by immutability is worth it, not to mention the lazy implementations.
 
-== So, you mentioned Sets, Lists, and Stacks?
+== But doesn't Ruby 1.9 now support lazy behaviour using Enumerators?
 
-Indeed I did.
+Sure does but they're implemented using Fibers which can't be shared across threads. All Hamster types are inherently thread-safe and sharable.
 
-=== Sets
+Moreover, Ruby's Enumerable module always returns an array -- calling <tt>Set#filter</tt> returns an <tt>Array</tt> -- whereas Hamster classes are almost always closed under a given operation. That is, Calling <tt>#filter</tt> on <tt>Set</tt> will return a <tt>Set</tt>, on a <tt>List</tt> will return a <tt>List</tt>, etc.
+
+== So, you mentioned Sets, Lists, and Stacks?
 
+Indeed I did.
 
 === Lists
 
@@ -161,6 +164,8 @@ How is this even possible? It's possible because <tt>IO#to_list</tt> creates a l
 
 === Stacks
 
+=== Sets
+
 == Disclaimer
 
 Hamster started out as a spike to prove a point and has since morphed into something I actually use. My primary concern has been to round out the functionality with good test coverage and clean, readable code.

data/lib/hamster/hash.rb

@@ -42,8 +42,8 @@ module Hamster
     end
     alias_method :[]=, :put
 
-    def remove(key)
-      trie = @trie.remove(key)
+    def delete(key)
+      trie = @trie.delete(key)
       if trie.equal?(@trie)
         self
       else
@@ -55,6 +55,7 @@ module Hamster
       return self unless block_given?
       @trie.each { |entry| yield(entry.key, entry.value) }
     end
+    alias_method :foreach, :each
 
     def map
       return self unless block_given?
@@ -85,11 +86,12 @@ module Hamster
     alias_method :select, :filter
     alias_method :find_all, :filter
 
-    def reject
+    def remove
       return self unless block_given?
-      select { |key, value| !yield(key, value) }
+      filter { |key, value| !yield(key, value) }
     end
-    alias_method :delete_if, :reject
+    alias_method :reject, :remove
+    alias_method :delete_if, :remove
 
     def any?
       if block_given?

data/lib/hamster/list.rb

@@ -62,6 +62,7 @@ module Hamster
         list = list.tail
       end
     end
+    alias_method :foreach, :each
 
     def map(&block)
       return self unless block_given?
@@ -90,11 +91,12 @@ module Hamster
     alias_method :select, :filter
     alias_method :find_all, :filter
 
-    def reject(&block)
+    def remove(&block)
       return self unless block_given?
       filter { |item| !yield(item) }
     end
-    alias_method :delete_if, :reject
+    alias_method :reject, :remove
+    alias_method :delete_if, :remove
 
     def take_while(&block)
       return self unless block_given?
@@ -173,7 +175,7 @@ module Hamster
 
     def partition(&block)
       return self unless block_given?
-      Stream.new(filter(&block)) { Sequence.new(reject(&block)) }
+      Stream.new(filter(&block)) { Sequence.new(remove(&block)) }
     end
 
     def append(other)
@@ -226,10 +228,7 @@ module Hamster
     end
 
     def count(&block)
-      return length unless block_given?
-      count = 0
-      each { |item| count += 1 if yield(item) }
-      count
+      filter(&block).size
     end
 
     def clear
@@ -270,6 +269,27 @@ module Hamster
     end
     alias_method :|, :union
 
+    def init
+      return EmptyList if tail.empty?
+      Stream.new(head) { tail.init }
+    end
+
+    def last
+      list = self
+      while !list.tail.empty?
+        list = list.tail
+      end
+      list.head
+    end
+
+    def product
+      reduce(1, &:*)
+    end
+
+    def sum
+      reduce(0, &:+)
+    end
+
     def eql?(other)
       return false unless other.is_a?(List)
 
@@ -398,10 +418,11 @@ module Hamster
       alias_method :select, :filter
       alias_method :find_all, :filter
 
-      def reject
+      def remove
         self
       end
-      alias_method :delete_if, :reject
+      alias_method :reject, :remove
+      alias_method :delete_if, :remove
 
       def take_while
         self

data/lib/hamster/set.rb

@@ -39,8 +39,8 @@ module Hamster
     end
     alias_method :<<, :add
 
-    def remove(key)
-      trie = @trie.remove(key)
+    def delete(key)
+      trie = @trie.delete(key)
       if trie.equal?(@trie)
         self
       else
@@ -52,6 +52,7 @@ module Hamster
       return self unless block_given?
       @trie.each { |entry| yield(entry.key) }
     end
+    alias_method :foreach, :each
 
     def map
       return self unless block_given?
@@ -82,11 +83,12 @@ module Hamster
     alias_method :select, :filter
     alias_method :find_all, :filter
 
-    def reject
+    def remove
       return self unless block_given?
       filter { |item| !yield(item) }
     end
-    alias_method :delete_if, :reject
+    alias_method :reject, :remove
+    alias_method :delete_if, :remove
 
     def any?
       return any? { |item| item } unless block_given?
@@ -125,10 +127,7 @@ module Hamster
     end
 
     def count(&block)
-      return length unless block_given?
-      count = 0
-      each { |item| count += 1 if yield(item) }
-      count
+      filter(&block).size
     end
 
     def head
@@ -167,7 +166,7 @@ module Hamster
     alias_method :entries, :to_a
 
     def to_list
-      reduce(Hamster.list) { |list, item| list.cons(item) }
+      reduce(EmptyList) { |list, item| list.cons(item) }
     end
 
     def inspect

data/lib/hamster/stack.rb

@@ -70,6 +70,6 @@ module Hamster
 
   end
 
-  EmptyStack = Stack.new(Hamster.list)
+  EmptyStack = Stack.new(EmptyList)
 
 end

data/lib/hamster/trie.rb

@@ -10,9 +10,7 @@ module Hamster
 
     # Returns the number of key-value pairs in the trie.
     def size
-      count = 0
-      each { count += 1 }
-      count
+      reduce(0) { |memo, item| memo.succ }
     end
 
     # Returns <tt>true</tt> if the trie contains no key-value pairs.
@@ -40,7 +38,7 @@ module Hamster
     end
 
     def filter
-      reduce(self) { |trie, entry| yield(entry) ? trie : trie.remove(entry.key) }
+      reduce(self) { |trie, entry| yield(entry) ? trie : trie.delete(entry.key) }
     end
 
     # Returns a copy of <tt>self</tt> with the given value associated with the key.
@@ -77,9 +75,9 @@ module Hamster
       end
     end
 
-    # Returns a copy of <tt>self</tt> with the given key (and associated value) removed. If not found, returns <tt>self</tt>.
-    def remove(key)
-      find_and_remove(key) || Trie.new(@significant_bits)
+    # Returns a copy of <tt>self</tt> with the given key (and associated value) deleted. If not found, returns <tt>self</tt>.
+    def delete(key)
+      find_and_delete(key) || Trie.new(@significant_bits)
     end
 
     def include?(key, value)
@@ -109,15 +107,15 @@ module Hamster
     # Returns a replacement instance after removing the specified key.
     # If not found, returns <tt>self</tt>.
     # If empty, returns <tt>nil</tt>.
-    def find_and_remove(key)
+    def find_and_delete(key)
       index = index_for(key)
       entry = @entries[index]
       if entry && entry.key.eql?(key)
-        return remove_at(index)
+        return delete_at(index)
       else
         child = @children[index]
         if child
-          copy = child.find_and_remove(key)
+          copy = child.find_and_delete(key)
           if !copy.equal?(child)
             children = @children.dup
             children[index] = copy
@@ -129,14 +127,14 @@ module Hamster
     end
 
     # Returns a replacement instance after removing the specified entry. If empty, returns <tt>nil</tt>
-    def remove_at(index = @entries.index { |e| e })
+    def delete_at(index = @entries.index { |e| e })
       yield(@entries[index]) if block_given?
       if size > 1
         entries = @entries.dup
         child = @children[index]
         if child
           children = @children.dup
-          children[index] = child.remove_at do |entry|
+          children[index] = child.delete_at do |entry|
             entries[index] = entry
           end
         else

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.1.22".freeze
+  VERSION = "0.1.23".freeze
 
 end

data/spec/hamster/hash/delete_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../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
+
+      it "preserves the original" do
+        @original.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
+      end
+
+      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
+
+      it "preserves the original values" do
+        @original.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
+      end
+
+      it "returns self" do
+        @result.should equal(@original)
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/hash/each_spec.rb

@@ -4,30 +4,34 @@ require 'hamster/hash'
 
 describe Hamster::Hash do
 
-  describe "#each" do
+  [:each, :foreach].each do |method|
 
-    before do
-      @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
-    end
-
-    describe "with a block (internal iteration)" do
+    describe "##{method}" do
 
-      it "returns nil" do
-        @hash.each {}.should be_nil
+      before do
+        @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       end
 
-      it "yields all key/value pairs" do
-        actual_pairs = {}
-        @hash.each { |key, value| actual_pairs[key] = value }
-        actual_pairs.should == {"A" => "aye", "B" => "bee", "C" => "see"}
+      describe "with a block (internal iteration)" do
+
+        it "returns nil" do
+          @hash.send(method) {}.should be_nil
+        end
+
+        it "yields all key/value pairs" do
+          actual_pairs = {}
+          @hash.send(method) { |key, value| actual_pairs[key] = value }
+          actual_pairs.should == {"A" => "aye", "B" => "bee", "C" => "see"}
+        end
+
       end
 
-    end
+      describe "with no block" do
 
-    describe "with no block" do
+        it "returns self" do
+          @hash.send(method).should equal(@hash)
+        end
 
-      it "returns self" do
-        @hash.each.should equal(@hash)
       end
 
     end

data/spec/hamster/hash/remove_spec.rb

@@ -4,40 +4,56 @@ require 'hamster/hash'
 
 describe Hamster::Hash do
 
-  describe "#remove" do
+  [:remove, :reject, :delete_if].each do |method|
 
-    before do
-      @original = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
-    end
-
-    describe "with an existing key" do
+    describe "##{method}" do
 
       before do
-        @result = @original.remove("B")
+        @original = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       end
 
-      it "preserves the original" do
-        @original.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
-      end
+      describe "when nothing matches" do
+
+        before do
+          @result = @original.send(method) { |key, value| false }
+        end
+
+        it "returns self" do
+          @result.should equal(@original)
+        end
 
-      it "returns a copy with the remaining key/value pairs" do
-        @result.should == Hamster.hash("A" => "aye", "C" => "see")
       end
 
-    end
+      describe "when only some things match" do
 
-    describe "with a non-existing key" do
+        describe "with a block" do
 
-      before do
-        @result = @original.remove("D")
-      end
+          before do
+            @result = @original.send(method) { |key, value| key == "A" && value == "aye" }
+          end
 
-      it "preserves the original values" do
-        @original.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
-      end
+          it "preserves the original" do
+            @original.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
+          end
+
+          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
+
+          it "returns self" do
+            @result.should equal(@original)
+          end
+
+        end
 
-      it "returns self" do
-        @result.should equal(@original)
       end
 
     end

data/spec/hamster/list/each_spec.rb

@@ -4,61 +4,65 @@ require 'hamster/list'
 
 describe Hamster::List do
 
-  describe "#each" do
+  [:each, :foreach].each do |method|
 
-    describe "doesn't run out of stack space on a really big" do
+    describe "##{method}" do
 
-      it "stream" do
-        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
-      end
+      describe "doesn't run out of stack space on a really big" do
 
-      it "list" do
-        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
-      end
+        it "stream" do
+          @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+        end
 
-      after do
-        @list.each { }
-      end
+        it "list" do
+          @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+        end
 
-    end
+        after do
+          @list.send(method) { }
+        end
 
-    [
-      [],
-      ["A"],
-      ["A", "B", "C"],
-    ].each do |values|
+      end
 
-      describe "on #{values.inspect}" do
+      [
+        [],
+        ["A"],
+        ["A", "B", "C"],
+      ].each do |values|
 
-        before do
-          @original = Hamster.list(*values)
-        end
-
-        describe "with a block" do
+        describe "on #{values.inspect}" do
 
           before do
-            @items = []
-            @result = @original.each { |value| @items << value }
+            @original = Hamster.list(*values)
           end
 
-          it "iterates over the items in order" do
-            @items.should == values
-          end
+          describe "with a block" do
 
-          it "returns nil" do
-            @result.should be_nil
-          end
+            before do
+              @items = []
+              @result = @original.send(method) { |value| @items << value }
+            end
 
-        end
+            it "iterates over the items in order" do
+              @items.should == values
+            end
 
-        describe "without a block" do
+            it "returns nil" do
+              @result.should be_nil
+            end
 
-          before do
-            @result = @original.each
           end
 
-          it "returns self" do
-            @result.should equal(@original)
+          describe "without a block" do
+
+            before do
+              @result = @original.send(method)
+            end
+
+            it "returns self" do
+              @result.should equal(@original)
+            end
+
           end
 
         end

data/spec/hamster/list/init_spec.rb

@@ -16,16 +16,14 @@ describe Hamster::List do
 
         before do
           @original = Hamster.list(*values)
-          pending do
-            @result = @original.init
-          end
+          @result = @original.init
         end
 
         it "preserves the original" do
           @original.should == Hamster.list(*values)
         end
 
-        it "returns #{expected.inspect}" do
+        it "returns the list without the last element: #{expected.inspect}" do
           @result.should == Hamster.list(*expected)
         end
 

data/spec/hamster/list/last_spec.rb

@@ -6,9 +6,25 @@ describe Hamster::List do
 
   describe "#last" do
 
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.last
+      end
+
+    end
+
     [
       [[], nil],
-      [["A"], ["A"]],
+      [["A"], "A"],
       [["A", "B", "C"], "C"],
     ].each do |values, expected|
 
@@ -16,13 +32,11 @@ describe Hamster::List do
 
         before do
           original = Hamster.list(*values)
-          pending do
-            @result = original.last
-          end
+          @result = original.last
         end
 
         it "returns #{expected.inspect}" do
-          @result.should == Hamster.list(*expected)
+          @result.should == expected
         end
 
       end

data/spec/hamster/list/product_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/list'
+
+describe Hamster::List do
+
+  describe "#product" do
+
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.product
+      end
+
+    end
+
+    [
+      [[], 1],
+      [[2], 2],
+      [[1, 3, 5, 7, 11], 1155],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          original = Hamster.list(*values)
+          @result = original.product
+        end
+
+        it "returns #{expected.inspect}" do
+          @result.should == expected
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/list/{reject_spec.rb → remove_spec.rb}

@@ -4,7 +4,7 @@ require 'hamster/list'
 
 describe Hamster::List do
 
-  [:reject, :delete_if].each do |method|
+  [:remove, :reject, :delete_if].each do |method|
 
     describe "##{method}" do
 

data/spec/hamster/list/sum_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/list'
+
+describe Hamster::List do
+
+  describe "#sum" do
+
+    describe "doesn't run out of stack space on a really big" do
+
+      it "stream" do
+        @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+      end
+
+      it "list" do
+        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
+      end
+
+      after do
+        @list.sum
+      end
+
+    end
+
+    [
+      [[], 0],
+      [[2], 2],
+      [[1, 3, 5, 7, 11], 27],
+    ].each do |values, expected|
+
+      describe "on #{values.inspect}" do
+
+        before do
+          original = Hamster.list(*values)
+          @result = original.sum
+        end
+
+        it "returns #{expected.inspect}" do
+          @result.should == expected
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/list/union_spec.rb

@@ -36,6 +36,7 @@ describe Hamster::List do
         [[], [], []],
         [["A"], [], ["A"]],
         [["A", "B", "C"], [], ["A", "B", "C"]],
+        [["A", "A"], ["A"], ["A"]],
       ].each do |a, b, expected|
 
         describe "returns #{expected.inspect}" do

data/spec/hamster/set/delete_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require 'hamster/set'
+
+describe Hamster::Set do
+
+  describe "#delete" do
+
+    before do
+      @original = Hamster.set("A", "B", "C")
+    end
+
+    describe "with an existing value" do
+
+      before do
+        @result = @original.delete("B")
+      end
+
+      it "preserves the original" do
+        @original.should == Hamster.set("A", "B", "C")
+      end
+
+      it "returns a copy with the remaining of values" do
+        @result.should == Hamster.set("A", "C")
+      end
+
+    end
+
+    describe "with a non-existing value" do
+
+      before do
+        @result = @original.delete("D")
+      end
+
+      it "preserves the original values" do
+        @original.should == Hamster.set("A", "B", "C")
+      end
+
+      it "returns self" do
+        @result.should equal(@original)
+      end
+
+    end
+
+  end
+
+end

data/spec/hamster/set/each_spec.rb

@@ -5,30 +5,34 @@ require 'hamster/set'
 
 describe Hamster::Set do
 
-  describe "#each" do
+  [:each, :foreach].each do |method|
 
-    before do
-      @set = Hamster.set("A", "B", "C")
-    end
-
-    describe "with a block (internal iteration)" do
+    describe "##{method}" do
 
-      it "returns nil" do
-        @set.each {}.should be_nil
+      before do
+        @set = Hamster.set("A", "B", "C")
       end
 
-      it "yields all values" do
-        actual_values = Set[]
-        @set.each { |value| actual_values << value }
-        actual_values.should == Set["A", "B", "C"]
+      describe "with a block (internal iteration)" do
+
+        it "returns nil" do
+          @set.send(method) {}.should be_nil
+        end
+
+        it "yields all values" do
+          actual_values = Set[]
+          @set.send(method) { |value| actual_values << value }
+          actual_values.should == Set["A", "B", "C"]
+        end
+
       end
 
-    end
+      describe "with no block" do
 
-    describe "with no block" do
+        it "returns self" do
+          @set.send(method).should equal(@set)
+        end
 
-      it "returns self" do
-        @set.each.should equal(@set)
       end
 
     end

data/spec/hamster/set/remove_spec.rb

@@ -4,40 +4,56 @@ require 'hamster/set'
 
 describe Hamster::Set do
 
-  describe "#remove" do
+  [:remove, :reject, :delete_if].each do |method|
 
-    before do
-      @original = Hamster.set("A", "B", "C")
-    end
-
-    describe "with an existing value" do
+    describe "##{method}" do
 
       before do
-        @result = @original.remove("B")
+        @original = Hamster.set("A", "B", "C")
       end
 
-      it "preserves the original" do
-        @original.should == Hamster.set("A", "B", "C")
-      end
+      describe "when nothing matches" do
+
+        before do
+          @result = @original.send(method) { |item| false }
+        end
+
+        it "returns self" do
+          @result.should equal(@original)
+        end
 
-      it "returns a copy with the remaining of values" do
-        @result.should == Hamster.set("A", "C")
       end
 
-    end
+      describe "when only some things match" do
 
-    describe "with a non-existing value" do
+        describe "with a block" do
 
-      before do
-        @result = @original.remove("D")
-      end
+          before do
+            @result = @original.send(method) { |item| item == "A" }
+          end
 
-      it "preserves the original values" do
-        @original.should == Hamster.set("A", "B", "C")
-      end
+          it "preserves the original" do
+            @original.should == Hamster.set("A", "B", "C")
+          end
+
+          it "returns a set with the matching values" do
+            @result.should == Hamster.set("B", "C")
+          end
+
+        end
+
+        describe "with no block" do
+
+          before do
+            @result = @original.send(method)
+          end
+
+          it "returns self" do
+            @result.should equal(@original)
+          end
+
+        end
 
-      it "returns self" do
-        @result.should equal(@original)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hamster
 version: !ruby/object:Gem::Version 
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors: 
 - Simon Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +11:00
+date: 2010-01-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - spec/hamster/hash/any_spec.rb
 - spec/hamster/hash/construction_spec.rb
 - spec/hamster/hash/copying_spec.rb
+- spec/hamster/hash/delete_spec.rb
 - spec/hamster/hash/each_spec.rb
 - spec/hamster/hash/empty_spec.rb
 - spec/hamster/hash/eql_spec.rb
@@ -60,7 +61,6 @@ files:
 - spec/hamster/hash/none_spec.rb
 - spec/hamster/hash/put_spec.rb
 - spec/hamster/hash/reduce_spec.rb
-- spec/hamster/hash/reject_spec.rb
 - spec/hamster/hash/remove_spec.rb
 - spec/hamster/hash/size_spec.rb
 - spec/hamster/list/all_spec.rb
@@ -96,13 +96,15 @@ files:
 - spec/hamster/list/none_spec.rb
 - spec/hamster/list/one_spec.rb
 - spec/hamster/list/partition_spec.rb
+- spec/hamster/list/product_spec.rb
 - spec/hamster/list/reduce_spec.rb
-- spec/hamster/list/reject_spec.rb
+- spec/hamster/list/remove_spec.rb
 - spec/hamster/list/reverse_spec.rb
 - spec/hamster/list/size_spec.rb
 - spec/hamster/list/sorting_spec.rb
 - spec/hamster/list/span_spec.rb
 - spec/hamster/list/split_at_spec.rb
+- spec/hamster/list/sum_spec.rb
 - spec/hamster/list/tail_spec.rb
 - spec/hamster/list/take_spec.rb
 - spec/hamster/list/take_while_spec.rb
@@ -118,6 +120,7 @@ files:
 - spec/hamster/set/construction_spec.rb
 - spec/hamster/set/copying_spec.rb
 - spec/hamster/set/count_spec.rb
+- spec/hamster/set/delete_spec.rb
 - spec/hamster/set/each_spec.rb
 - spec/hamster/set/empty_spec.rb
 - spec/hamster/set/eql_spec.rb
@@ -134,7 +137,6 @@ files:
 - spec/hamster/set/none_spec.rb
 - spec/hamster/set/partition_spec.rb
 - spec/hamster/set/reduce_spec.rb
-- spec/hamster/set/reject_spec.rb
 - spec/hamster/set/remove_spec.rb
 - spec/hamster/set/size_spec.rb
 - spec/hamster/set/sorting_spec.rb

data/spec/hamster/hash/reject_spec.rb

@@ -1,63 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-require 'hamster/hash'
-
-describe Hamster::Hash do
-
-  [: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
-
-        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
-
-          it "preserves the original" do
-            @original.should == Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
-          end
-
-          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
-
-          it "returns self" do
-            @result.should equal(@original)
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/spec/hamster/set/reject_spec.rb

@@ -1,63 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-require 'hamster/set'
-
-describe Hamster::Set do
-
-  [:reject, :delete_if].each do |method|
-
-    describe "##{method}" do
-
-      before do
-        @original = Hamster.set("A", "B", "C")
-      end
-
-      describe "when nothing matches" do
-
-        before do
-          @result = @original.send(method) { |item| false }
-        end
-
-        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) { |item| item == "A" }
-          end
-
-          it "preserves the original" do
-            @original.should == Hamster.set("A", "B", "C")
-          end
-
-          it "returns a set with the matching values" do
-            @result.should == Hamster.set("B", "C")
-          end
-
-        end
-
-        describe "with no block" do
-
-          before do
-            @result = @original.send(method)
-          end
-
-          it "returns self" do
-            @result.should equal(@original)
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end