hamster 0.1.23 → 0.2.0

data/lib/hamster/set.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 require 'hamster/trie'
 require 'hamster/list'
 
@@ -9,6 +11,8 @@ module Hamster
 
   class Set
 
+    extend Forwardable
+
     def initialize(trie = Trie.new)
       @trie = trie
     end
@@ -16,19 +20,19 @@ module Hamster
     def empty?
       @trie.empty?
     end
-    alias_method :null?, :empty?
+    def_delegator :self, :empty?, :null?
 
     def size
       @trie.size
     end
-    alias_method :length, :size
+    def_delegator :self, :size, :length
 
     def include?(item)
       @trie.has_key?(item)
     end
-    alias_method :member?, :include?
-    alias_method :contains?, :include?
-    alias_method :elem?, :include?
+    def_delegator :self, :include?, :member?
+    def_delegator :self, :include?, :contains?
+    def_delegator :self, :include?, :elem?
 
     def add(item)
       if include?(item)
@@ -37,7 +41,7 @@ module Hamster
         self.class.new(@trie.put(item, nil))
       end
     end
-    alias_method :<<, :add
+    def_delegator :self, :add, :<<
 
     def delete(key)
       trie = @trie.delete(key)
@@ -52,7 +56,7 @@ module Hamster
       return self unless block_given?
       @trie.each { |entry| yield(entry.key) }
     end
-    alias_method :foreach, :each
+    def_delegator :self, :each, :foreach
 
     def map
       return self unless block_given?
@@ -62,14 +66,14 @@ module Hamster
         self.class.new(@trie.reduce(Trie.new) { |trie, entry| trie.put(yield(entry.key), nil) })
       end
     end
-    alias_method :collect, :map
+    def_delegator :self, :map, :collect
 
     def reduce(memo)
       return memo unless block_given?
       @trie.reduce(memo) { |memo, entry| yield(memo, entry.key) }
     end
-    alias_method :inject, :reduce
-    alias_method :fold, :reduce
+    def_delegator :self, :reduce, :inject
+    def_delegator :self, :reduce, :fold
 
     def filter
       return self unless block_given?
@@ -80,29 +84,30 @@ module Hamster
         self.class.new(trie)
       end
     end
-    alias_method :select, :filter
-    alias_method :find_all, :filter
+    def_delegator :self, :filter, :select
+    def_delegator :self, :filter, :find_all
 
     def remove
       return self unless block_given?
       filter { |item| !yield(item) }
     end
-    alias_method :reject, :remove
-    alias_method :delete_if, :remove
+    def_delegator :self, :remove, :reject
+    def_delegator :self, :remove, :delete_if
 
     def any?
       return any? { |item| item } unless block_given?
       each { |item| return true if yield(item) }
       false
     end
-    alias_method :exist?, :any?
-    alias_method :exists?, :any?
+    def_delegator :self, :any?, :exist?
+    def_delegator :self, :any?, :exists?
 
     def all?
       return all? { |item| item } unless block_given?
       each { |item| return false unless yield(item) }
       true
     end
+    def_delegator :self, :all?, :forall?
 
     def none?
       return none? { |item| item } unless block_given?
@@ -115,11 +120,11 @@ module Hamster
       each { |item| return item if yield(item) }
       nil
     end
-    alias_method :detect, :find
+    def_delegator :self, :find, :detect
 
     def partition(&block)
       return self unless block_given?
-      Stream.new(filter(&block)) { Sequence.new(reject(&block)) }
+      Stream.new { Sequence.new(filter(&block), Sequence.new(reject(&block))) }
     end
 
     def grep(pattern, &block)
@@ -133,7 +138,15 @@ module Hamster
     def head
       find { true }
     end
-    alias_method :first, :head
+    def_delegator :self, :head, :first
+
+    def product
+      reduce(1, &:*)
+    end
+
+    def sum
+      reduce(0, &:+)
+    end
 
     def sort(&block)
       to_list.sort(&block)
@@ -150,20 +163,21 @@ module Hamster
     def eql?(other)
       other.is_a?(self.class) && @trie.eql?(other.instance_eval{@trie})
     end
-    alias_method :==, :eql?
+    def_delegator :self, :eql?, :==
 
     def dup
       self
     end
-    alias_method :clone, :dup
-    alias_method :uniq, :dup
-    alias_method :nub, :dup
-    alias_method :to_set, :dup
+    def_delegator :self, :dup, :clone
+    def_delegator :self, :dup, :uniq
+    def_delegator :self, :dup, :nub
+    def_delegator :self, :dup, :to_set
+    def_delegator :self, :dup, :remove_duplicates
 
     def to_a
       reduce([]) { |a, item| a << item }
     end
-    alias_method :entries, :to_a
+    def_delegator :self, :to_a, :entries
 
     def to_list
       reduce(EmptyList) { |list, item| list.cons(item) }

data/lib/hamster/stack.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 require 'hamster/list'
 
 module Hamster
@@ -8,6 +10,8 @@ module Hamster
 
   class Stack
 
+    extend Forwardable
+
     def initialize(list)
       @list = list
     end
@@ -19,7 +23,7 @@ module Hamster
     def size
       @list.size
     end
-    alias_method :length, :size
+    def_delegator :self, :size, :length
 
     def top
       @list.head
@@ -28,7 +32,7 @@ module Hamster
     def push(item)
       self.class.new(@list.cons(item))
     end
-    alias_method :<<, :push
+    def_delegator :self, :push, :<<
 
     def pop
       list = @list.tail
@@ -48,17 +52,17 @@ module Hamster
       return false unless other.class.equal?(self.class)
       @list.eql?(other.instance_eval{@list})
     end
-    alias_method :==, :eql?
+    def_delegator :self, :eql?, :==
 
     def dup
       self
     end
-    alias_method :clone, :dup
+    def_delegator :self, :dup, :clone
 
     def to_a
       @list.to_a
     end
-    alias_method :entries, :to_a
+    def_delegator :self, :to_a, :entries
 
     def to_list
       @list

data/lib/hamster/trie.rb

@@ -1,7 +1,11 @@
+require 'forwardable'
+
 module Hamster
 
   class Trie
 
+    extend Forwardable
+
     def initialize(significant_bits = 0, entries = [], children = [])
       @significant_bits = significant_bits
       @entries = entries
@@ -94,7 +98,7 @@ module Hamster
       end
       true
     end
-    alias_method :==, :eql?
+    def_delegator :self, :eql?, :==
 
     protected
 

data/lib/hamster/version.rb

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

data/spec/hamster/hash/all_spec.rb

@@ -4,46 +4,50 @@ require 'hamster/hash'
 
 describe Hamster::Hash do
 
-  describe "#all?" do
+  [:all?, :forall?].each do |method|
 
-    describe "when empty" do
+    describe "##{method}" do
 
-      before do
-        @hash = Hamster.hash
-      end
-
-      it "with a block returns true" do
-        @hash.all? {}.should == true
-      end
+      describe "when empty" do
 
-      it "with no block returns true" do
-        @hash.all?.should == true
-      end
+        before do
+          @hash = Hamster.hash
+        end
 
-    end
+        it "with a block returns true" do
+          @hash.send(method) {}.should == true
+        end
 
-    describe "when not empty" do
+        it "with no block returns true" do
+          @hash.send(method).should == true
+        end
 
-      before do
-        @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
       end
 
-      describe "with a block" do
+      describe "when not empty" do
 
-        it "returns true if the block always returns true" do
-          @hash.all? { |key, value| true }.should == true
+        before do
+          @hash = Hamster.hash("A" => "aye", "B" => "bee", "C" => "see")
         end
 
-        it "returns false if the block ever returns false" do
-          @hash.all? { |key, value| key == "D" || value == "dee" }.should == false
+        describe "with a block" do
+
+          it "returns true if the block always returns true" do
+            @hash.send(method) { |key, value| 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
 
-      end
+        describe "with no block" do
 
-      describe "with no block" do
+          it "returns true" do
+            @hash.send(method).should == true
+          end
 
-        it "returns true" do
-          @hash.all?.should == true
         end
 
       end

data/spec/hamster/hash/reduce_spec.rb

@@ -42,7 +42,7 @@ describe Hamster::Hash do
         describe "with no block" do
 
           before do
-            @result = @original.send(method,"ABC")
+            @result = @original.send(method, "ABC")
           end
 
           it "returns the memo" do

data/spec/hamster/hash/uniq_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../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

data/spec/hamster/list/all_spec.rb

@@ -4,98 +4,98 @@ require 'hamster/list'
 
 describe Hamster::List do
 
-  describe "#all?" do
+  [:all?, :forall?].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 "on a really big list" do
 
-      it "list" do
-        @list = (0...STACK_OVERFLOW_DEPTH).reduce(Hamster.list) { |list, i| list.cons(i) }
-      end
+        before do
+          @list = Hamster.interval(0, STACK_OVERFLOW_DEPTH)
+        end
+
+        it "doesn't run out of stack" do
+          lambda { @list.send(method) }.should_not raise_error
+        end
 
-      after do
-        @list.all? { true }
       end
 
-    end
+      describe "when empty" do
 
-    describe "when empty" do
+        before do
+          @list = Hamster.list
+        end
 
-      before do
-        @list = Hamster.list
-      end
+        it "with a block returns true" do
+          @list.send(method) {}.should == true
+        end
 
-      it "with a block returns true" do
-        @list.all? {}.should == true
-      end
+        it "with no block returns true" do
+          @list.send(method).should == true
+        end
 
-      it "with no block returns true" do
-        @list.all?.should == true
       end
 
-    end
+      describe "when not empty" do
 
-    describe "when not empty" do
+        describe "with a block" do
 
-      describe "with a block" do
+          before do
+            @list = Hamster.list("A", "B", "C")
+          end
 
-        before do
-          @list = Hamster.list("A", "B", "C")
-        end
+          describe "if the block always returns true" do
 
-        describe "if the block always returns true" do
+            before do
+              @result = @list.send(method) { |item| true }
+            end
 
-          before do
-            @result = @list.all? { |item| true }
-          end
+            it "returns true" do
+              @result.should == true
+            end
 
-          it "returns true" do
-            @result.should == true
           end
 
-        end
+          describe "if the block ever returns false" do
 
-        describe "if the block ever returns false" do
+            before do
+              @result = @list.send(method) { |item| item == "D" }
+            end
 
-          before do
-            @result = @list.all? { |item| item == "D" }
-          end
+            it "returns false" do
+              @result.should == false
+            end
 
-          it "returns false" do
-            @result.should == false
           end
 
         end
 
-      end
+        describe "with no block" do
 
-      describe "with no block" do
+          describe "if all values are truthy" do
 
-        describe "if all values are truthy" do
+            before do
+              @result = Hamster.list(true, "A").send(method)
+            end
 
-          before do
-            @result = Hamster.list(true, "A").all?
-          end
+            it "returns true" do
+              @result.should == true
+            end
 
-          it "returns true" do
-            @result.should == true
           end
 
-        end
+          [nil, false].each do |value|
 
-        [nil, false].each do |value|
+            describe "if any value is #{value.inspect}" do
 
-          describe "if any value is #{value.inspect}" do
+              before do
+                @result = Hamster.list(value, true, "A").send(method)
+              end
 
-            before do
-              @result = Hamster.list(value, true, "A").all?
-            end
+              it "returns false" do
+                @result.should == false
+              end
 
-            it "returns false" do
-              @result.should == false
             end
 
           end