mongomodel 0.3.0 → 0.3.1

data/lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb

@@ -52,17 +52,17 @@ module MongoModel
           doc
         end
         
-        def create(*args, &block)
+        def create(*args)
           scoped.create(*args) do |doc|
             set_inverse_association(doc)
-            block.call(doc) if block
+            yield doc if block_given?
           end
         end
         
-        def create!(*args, &block)
+        def create!(*args)
           scoped.create!(*args) do |doc|
             set_inverse_association(doc)
-            block.call(doc) if block
+            yield doc if block_given?
           end
         end
         
@@ -119,22 +119,25 @@ module MongoModel
         
         delegate :ensure_class, :to => :association
         
-        def build(*args, &block)
-          doc = association.build(*args, &block)
-          self << doc
-          doc
+        def build(*args)
+          association.build(*args) do |doc|
+            self << doc
+            yield doc if block_given?
+          end
         end
         
-        def create(*args, &block)
-          doc = association.create(*args, &block)
-          self << doc
-          doc
+        def create(*args)
+          association.create(*args) do |doc|
+            self << doc
+            yield doc if block_given?
+          end
         end
         
-        def create!(*args, &block)
-          doc = association.create!(*args, &block)
-          self << doc
-          doc
+        def create!(*args)
+          association.create!(*args) do |doc|
+            self << doc
+            yield doc if block_given?
+          end
         end
         
         def []=(index, doc)

data/lib/mongomodel/document.rb

@@ -5,6 +5,10 @@ require 'active_support/core_ext/string/inflections'
 
 module MongoModel
   class Document < EmbeddedDocument
+    def ==(other)
+      self.class == other.class && id == other.id
+    end
+    
     include DocumentExtensions::Persistence
     include DocumentExtensions::OptimisticLocking
     include DocumentExtensions::CollectionModifiers

data/lib/mongomodel/embedded_document.rb

@@ -1,7 +1,7 @@
 module MongoModel
   class EmbeddedDocument
     def ==(other)
-      other.is_a?(self.class) && other.attributes == attributes
+      self.class == other.class && attributes == other.attributes
     end
     
     include Attributes

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/mongomodel/document_spec.rb

@@ -13,6 +13,25 @@ module MongoModel
       property.default(mock('instance', :generate_id => 'abc-123')).should == 'abc-123'
     end
     
+    describe "equality" do
+      define_class(:DocumentA, Document)
+      define_class(:DocumentB, Document)
+    
+      subject { DocumentA.new(:id => 'test') }
+    
+      it "should be equal to another document of the same class with the same id" do
+        subject.should == DocumentA.new(:id => 'test')
+      end
+      
+      it "should not be equal to another document of the same class with a different id" do
+        subject.should_not == DocumentA.new(:id => 'not-test')
+      end
+      
+      it "should not be equal to another document of a different class with the same id" do
+        subject.should_not == DocumentB.new(:id => 'test')
+      end
+    end
+    
     describe "single collection inheritance" do
       define_class(:Event, Document)
       define_class(:SpecialEvent, :Event)

data/spec/mongomodel/embedded_document_spec.rb

@@ -2,31 +2,6 @@ require 'spec_helper'
 
 module MongoModel
   specs_for(EmbeddedDocument, Document) do
-    describe "equality" do
-      define_class(:DocumentA, described_class) do
-        property :name, String
-      end
-      
-      define_class(:DocumentB, described_class) do
-        property :name, String
-      end
-    
-      subject { DocumentA.new(:id => 'test', :name => 'Test') }
-    
-      it "should be equal to another document of the same class with identical attributes" do
-        subject.should == DocumentA.new(:id => 'test', :name => 'Test')
-      end
-      
-      it "should not be equal to another document of the same class with different attributes" do
-        subject.should_not == DocumentA.new(:id => 'test', :name => 'Different')
-        subject.should_not == DocumentA.new(:id => 'test', :name => 'Test', :special_attribute => 'Different')
-      end
-      
-      it "should not be equal to another document of a different class with identical attributes" do
-        subject.should_not == DocumentB.new(:id => 'test', :name => 'Different')
-      end
-    end
-    
     it "should be an abstract class" do
       described_class.should be_an_abstract_class
     end
@@ -58,6 +33,31 @@ module MongoModel
     let(:parent) { Parent.new(:event => special) }
     let(:reloaded) { parent.save!; Parent.find(parent.id) }
     
+    describe "equality" do
+      define_class(:DocumentA, EmbeddedDocument) do
+        property :name, String
+      end
+      
+      define_class(:DocumentB, EmbeddedDocument) do
+        property :name, String
+      end
+    
+      subject { DocumentA.new(:id => 'test', :name => 'Test') }
+    
+      it "should be equal to another document of the same class with identical attributes" do
+        subject.should == DocumentA.new(:id => 'test', :name => 'Test')
+      end
+      
+      it "should not be equal to another document of the same class with different attributes" do
+        subject.should_not == DocumentA.new(:id => 'test', :name => 'Different')
+        subject.should_not == DocumentA.new(:id => 'test', :name => 'Test', :special_attribute => 'Different')
+      end
+      
+      it "should not be equal to another document of a different class with identical attributes" do
+        subject.should_not == DocumentB.new(:id => 'test', :name => 'Different')
+      end
+    end
+    
     describe "single collection inheritance" do
       it "should not typecast to parent type when assigning to property" do
         parent.event.should be_an_instance_of(SpecialEvent)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sam Pohlenz