hamster 0.1.7 → 0.1.8

data/History.rdoc

@@ -1,6 +1,10 @@
+=== 0.1.8 / 2009-11-29
+
+* Add convenience constructors: List[], Set[], and Hash[]
+
 === 0.1.7 / 2009-11-27
 
-* Implemented eql?/== for Hash and Set.
+* Implemented #eql?/== for Hash and Set.
 
 === 0.1.6 / 2009-11-23
 

data/lib/hamster/hash.rb

@@ -2,6 +2,10 @@ module Hamster
 
   class Hash
 
+    def self.[](pairs)
+      pairs.reduce(self.new) { |hash, pair| hash.put(pair.first, pair.last) }
+    end
+
     def initialize(trie = Trie.new)
       @trie = trie
     end
@@ -54,9 +58,7 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      return true if equal?(other)
-      return false unless self.class.equal?(other.class)
-      return @trie.eql?(other.instance_eval{@trie})
+      other.is_a?(self.class) && @trie.eql?(other.instance_eval{@trie})
     end
     alias :== :eql?
 

data/lib/hamster/list.rb

@@ -2,7 +2,11 @@ module Hamster
 
   class List
 
-    include Enumerable
+    def self.[](*items)
+      list = self.new
+      items.reverse_each { |item| list = list.cons(item) }
+      list
+    end
 
     def initialize(head = nil, tail = self)
       @head = head
@@ -24,12 +28,12 @@ module Hamster
     end
 
     # Returns the first item.
-    def car
+    def head
       @head
     end
 
     # Returns a copy of <tt>self</tt> without the first item.
-    def cdr
+    def tail
       @tail
     end
 
@@ -51,7 +55,10 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      blammo!
+      return true if other.equal?(self)
+      return false unless other.is_a?(self.class)
+      return true if other.empty? && empty?
+      return other.head == head && other.tail.eql?(tail)
     end
     alias :== :eql?
 
@@ -60,7 +67,7 @@ module Hamster
       self
     end
     alias :clone :dup
-    
+
     def map
       if empty?
         self
@@ -68,7 +75,7 @@ module Hamster
         @tail.map { |item| yield(item) }.cons(yield(@head))
       end
     end
-    
+
     def reduce(memo)
       if empty?
         memo
@@ -94,8 +101,8 @@ module Hamster
     def accessor(sequence)
       sequence.split(//).reverse!.inject(self) do |memo, char|
         case char
-        when "a" then memo.car
-        when "d" then memo.cdr
+        when "a" then memo.head
+        when "d" then memo.tail
         end
       end
     end

data/lib/hamster/set.rb

@@ -2,6 +2,10 @@ module Hamster
 
   class Set
 
+    def self.[](*items)
+      items.reduce(self.new) { |set, item| set.add(item) }
+    end
+
     def initialize(trie = Trie.new)
       @trie = trie
     end
@@ -50,9 +54,7 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      return true if equal?(other)
-      return false unless self.class.equal?(other.class)
-      return @trie.eql?(other.instance_eval{@trie})
+      other.is_a?(self.class) && @trie.eql?(other.instance_eval{@trie})
     end
     alias :== :eql?
 

data/lib/hamster/stack.rb

@@ -38,7 +38,7 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      equal?(other) || (self.class.equal?(other.class) && @list.eql?(other.instance_eval{@list}))
+      other.is_a?(self.class) && @list.eql?(other.instance_eval{@list})
     end
     alias :== :eql?
 

data/lib/hamster/trie.rb

@@ -79,9 +79,11 @@ module Hamster
 
     # Returns <tt>true</tt> if . <tt>eql?</tt> is synonymous with <tt>==</tt>
     def eql?(other)
-      return true if equal?(other)
-      return false unless self.class.equal?(other.class) && self.size == other.size
-      each { |entry| return false unless other.include?(entry.key, entry.value) }
+      return true if other.equal?(self)
+      return false unless other.is_a?(self.class) && other.size == size
+      each do |entry|
+        return false unless other.include?(entry.key, entry.value)
+      end
       true
     end
     alias :== :eql?

data/lib/hamster/version.rb

@@ -1,5 +1,5 @@
 module Hamster
 
-  VERSION = "0.1.7".freeze
+  VERSION = "0.1.8".freeze
 
 end

data/spec/hamster/hash/construction_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::Hash do
+
+  describe ".[]" do
+
+    before do
+      @hash = Hamster::Hash["A" => "aye", "B" => "bee", "C" => "see"]
+    end
+
+    it "is equivalent to repeatedly using #put" do
+      @hash.should eql(Hamster::Hash.new.put("A", "aye").put("B", "bee").put("C", "see"))
+    end
+
+  end
+
+end

data/spec/hamster/list/accessor_spec.rb

@@ -10,7 +10,7 @@ describe Hamster::List do
 
     describe "##{method_name}" do
 
-      it "initially returns nil" do
+      it "when empty is nil" do
         Hamster::List.new.send(method_name).should be_nil
       end
 

data/spec/hamster/list/car_spec.rb

@@ -2,14 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Hamster::List do
 
-  describe "#car" do
+  describe "#head" do
 
     it "initially returns nil" do
-      Hamster::List.new.car.should be_nil
+      Hamster::List.new.head.should be_nil
     end
 
     it "returns the first item in the list" do
-      Hamster::List.new.cons("A").car.should == "A"
+      Hamster::List.new.cons("A").head.should == "A"
     end
 
   end

data/spec/hamster/list/construction_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::List do
+
+  describe ".[]" do
+
+    before do
+      @list = Hamster::List["A", "B", "C"]
+    end
+
+    it "is equivalent to repeatedly using #cons" do
+      @list.should eql(Hamster::List.new.cons("C").cons("B").cons("A"))
+    end
+
+  end
+
+end

data/spec/hamster/list/eql_spec.rb

@@ -6,15 +6,11 @@ describe Hamster::List do
 
     it "is true for the same instance" do
       list = Hamster::List.new
-      pending do
-        list.should eql(list)
-      end
+      list.should eql(list)
     end
 
     it "is true for two empty instances" do
-      pending do
-        Hamster::List.new.should eql(Hamster::List.new)
-      end
+      Hamster::List.new.should eql(Hamster::List.new)
     end
 
   end

data/spec/hamster/set/construction_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Hamster::Set do
+
+  describe ".[]" do
+
+    before do
+      @set = Hamster::Set["A", "B", "C"]
+    end
+
+    it "is equivalent to repeatedly using #add" do
+      @set.should eql(Hamster::Set.new.add("A").add("B").add("C"))
+    end
+
+  end
+
+end

data/spec/hamster/stack/eql_spec.rb

@@ -10,9 +10,7 @@ describe Hamster::Stack do
     end
 
     it "is true for two empty instances" do
-      pending do
-        Hamster::Stack.new.should eql(Hamster::Stack.new)
-      end
+      Hamster::Stack.new.should eql(Hamster::Stack.new)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hamster
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Simon Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 +11:00
+date: 2009-11-29 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/hamster/trie.rb
 - lib/hamster/version.rb
 - lib/hamster.rb
+- spec/hamster/hash/construction_spec.rb
 - spec/hamster/hash/copying_spec.rb
 - spec/hamster/hash/each_spec.rb
 - spec/hamster/hash/empty_spec.rb
@@ -42,12 +43,14 @@ files:
 - spec/hamster/hash/remove_spec.rb
 - spec/hamster/list/accessor_spec.rb
 - spec/hamster/list/car_spec.rb
+- spec/hamster/list/construction_spec.rb
 - spec/hamster/list/copying_spec.rb
 - spec/hamster/list/each_spec.rb
 - spec/hamster/list/empty_spec.rb
 - spec/hamster/list/eql_spec.rb
 - spec/hamster/list/map_spec.rb
 - spec/hamster/list/reduce_spec.rb
+- spec/hamster/set/construction_spec.rb
 - spec/hamster/stack/copying_spec.rb
 - spec/hamster/stack/empty_spec.rb
 - spec/hamster/stack/eql_spec.rb