djsun-mongo_mapper 0.5.5.2 → 0.5.5.3

data/VERSION

@@ -1 +1 @@
-0.5.5.2
+0.5.5.3

data/djsun-mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{djsun-mongo_mapper}
-  s.version = "0.5.5.2"
+  s.version = "0.5.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-19}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]

data/lib/mongo_mapper/embedded_document.rb

@@ -270,7 +270,12 @@ module MongoMapper
       end
 
       def ==(other)
-        other.is_a?(self.class) && id == other.id
+        ignore = { '_id' => nil }
+        attributes.merge(ignore) == other.attributes.merge(ignore)
+      end
+      
+      def eql?(other)
+        other.is_a?(self.class) && (self == other)
       end
 
       def id

data/test/functional/associations/test_namespace.rb

@@ -4,12 +4,6 @@ require 'models'
 class NamespaceTest < Test::Unit::TestCase
   include Hollywood
 
-  def setup
-    Movie.collection.clear
-    Actor.collection.clear
-    Role.collection.clear
-  end
-  
   context "Hollywood namespace" do
     setup do
       @movie = Movie.create

data/test/unit/test_document.rb

@@ -160,24 +160,62 @@ class DocumentTest < Test::Unit::TestCase
         clone.age.should == 27
       end
     end
-
     
-    context "equality" do
-      should "be equal if id and class are the same" do
-        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
+    context "==" do
+      should "be == if key values are the same" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 1")
+        doc_1.should == doc_2
+        doc_2.should == doc_1 # check transitivity
       end
 
-      should "not be equal if class same but id different" do
-        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
+      should "not be == if key values are different" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 2")
+        doc_1.should_not == doc_2
+        doc_2.should_not == doc_1 # check transitivity
       end
 
-      should "not be equal if id same but class different" do
-        @another_document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
+      should "not care about type" do
+        @person = Class.new do
+          include MongoMapper::EmbeddedDocument
+
+          key :name, String
+          key :age, Integer
         end
+        doc = @document.new('name' => "Doc 1")
+        person = @person.new('name' => "Doc 1")
+        doc.should == person
+        person.should == doc # check transitivity
+      end
+    end
+
+    context "eql?" do
+      should "be eql? if type matches and key values are the same" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 1")
+        doc_1.should eql?(doc_2)
+        doc_2.should eql?(doc_1) # check transitivity
+      end
+
+      should "not be == if type matches but key values are different" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 2")
+        doc_1.should_not eql?(doc_2)
+        doc_2.should_not eql?(doc_1) # check transitivity
+      end
 
-        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
+      should "not be eql? if types are different even if values are the same" do
+        @person = Class.new do
+          include MongoMapper::EmbeddedDocument
+
+          key :name, String
+          key :age, Integer
+        end
+        doc = @document.new('name' => "Doc 1")
+        person = @person.new('name' => "Doc 1")
+        doc.should_not eql?(person)
+        person.should_not eql?(doc) # check transitivity
       end
     end
   end # instance of a document

data/test/unit/test_embedded_document.rb

@@ -644,22 +644,63 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
-    context "equality" do
-      should "be equal if id and class are the same" do
-        (@document.new('_id' => 1) == @document.new('_id' => 1)).should be(true)
+    context "==" do
+      should "be == if key values are the same" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 1")
+        doc_1.should == doc_2
+        doc_2.should == doc_1 # check transitivity
       end
 
-      should "not be equal if class same but id different" do
-        (@document.new('_id' => 1) == @document.new('_id' => 2)).should be(false)
+      should "not be == if key values are different" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 2")
+        doc_1.should_not == doc_2
+        doc_2.should_not == doc_1 # check transitivity
       end
 
-      should "not be equal if id same but class different" do
-        @another_document = Class.new do
-          include MongoMapper::Document
+      should "not care about type" do
+        @person = Class.new do
+          include MongoMapper::EmbeddedDocument
+
+          key :name, String
+          key :age, Integer
         end
+        doc = @document.new('name' => "Doc 1")
+        person = @person.new('name' => "Doc 1")
+        doc.should == person
+        person.should == doc # check transitivity
+      end
+    end
+
+    context "eql?" do
+      should "be eql? if type matches and key values are the same" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 1")
+        doc_1.should eql?(doc_2)
+        doc_2.should eql?(doc_1) # check transitivity
+      end
 
-        (@document.new('_id' => 1) == @another_document.new('_id' => 1)).should be(false)
+      should "not be == if type matches but key values are different" do
+        doc_1 = @document.new('name' => "Doc 1")
+        doc_2 = @document.new('name' => "Doc 2")
+        doc_1.should_not eql?(doc_2)
+        doc_2.should_not eql?(doc_1) # check transitivity
+      end
+
+      should "not be eql? if types are different even if values are the same" do
+        @person = Class.new do
+          include MongoMapper::EmbeddedDocument
+
+          key :name, String
+          key :age, Integer
+        end
+        doc = @document.new('name' => "Doc 1")
+        person = @person.new('name' => "Doc 1")
+        doc.should_not eql?(person)
+        person.should_not eql?(doc) # check transitivity
       end
     end
+
   end # instance of a embedded document
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djsun-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.5.2
+  version: 0.5.5.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2009-10-19 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency