mongoid 0.6.6 → 0.6.7

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/lib/mongoid.rb

@@ -52,10 +52,6 @@ module Mongoid
   # checking equality on objects of different types.
   class TypeMismatchError < RuntimeError; end
 
-  # Raised when an association is defined that is not valid. Must
-  # be belongs_to, has_many, has_one
-  class InvalidAssociationError < RuntimeError; end
-
   # Raised when a persisence method ending in ! fails validation.
   class ValidationsError < RuntimeError; end
 

data/lib/mongoid/associations.rb

@@ -41,9 +41,9 @@ module Mongoid # :nodoc:
       #   class Address < Mongoid::Document
       #     belongs_to :person
       #   end
-      def belongs_to(association_name)
+      def belongs_to(association_name, options = {})
         @embedded = true
-        add_association(:belongs_to, association_name.to_s.classify, association_name)
+        add_association(Associations::BelongsTo, association_name, options)
       end
 
       # Adds the association from a parent document to its children. The name
@@ -64,7 +64,7 @@ module Mongoid # :nodoc:
       #     belongs_to :person
       #   end
       def has_many(association_name, options = {})
-        add_association(:has_many, association_name.to_s.classify, association_name, options)
+        add_association(Associations::HasMany, association_name, options)
       end
 
       # Adds the association from a parent document to its child. The name
@@ -85,18 +85,16 @@ module Mongoid # :nodoc:
       #     belongs_to :person
       #   end
       def has_one(association_name, options = {})
-        add_association(:has_one, association_name.to_s.titleize, association_name, options)
+        add_association(Associations::HasOne, association_name, options)
       end
 
       private
       # Adds the association to the associations hash with the type as the key,
       # then adds the accessors for the association.
-      def add_association(type, class_name, name, options = {})
+      def add_association(type, name, options = {})
         associations[name] = type
         define_method(name) do
-          if instance_variable_defined?("@#{name}")
-            return instance_variable_get("@#{name}")
-          end
+          return instance_variable_get("@#{name}") if instance_variable_defined?("@#{name}")
           proxy = Associations::Accessor.get(type, name, self, options)
           instance_variable_set("@#{name}", proxy)
         end

data/lib/mongoid/associations/accessor.rb

@@ -5,18 +5,8 @@ module Mongoid #:nodoc:
         # Gets an association, based on the type provided and
         # passes the name and document into the newly instantiated
         # association.
-        #
-        # If the type is invalid a InvalidAssociationError will be thrown.
         def get(type, name, document, options = {})
-          case type
-            when :belongs_to
-              BelongsTo.new(document)
-            when :has_many
-              HasMany.new(name, document, options)
-            when :has_one
-              document ? HasOne.new(name, document, options) : nil
-            else raise InvalidAssociationError
-          end
+          document ? type.new(name, document, options) : nil
         end
 
         # Set an object association. This is used to set the parent reference
@@ -31,12 +21,7 @@ module Mongoid #:nodoc:
         # object: The object that was passed in to the setter method.
         # options: optional options.
         def set(type, name, document, object, options ={})
-          case type
-            when :belongs_to then BelongsTo.update(document, object)
-            when :has_many then HasMany.update(object, document, name)
-            when :has_one then HasOne.update(object, document, name)
-            else raise InvalidAssociationError
-          end
+          type.update(object, document, name)
         end
       end
     end

data/lib/mongoid/associations/belongs_to.rb

@@ -9,7 +9,7 @@ module Mongoid #:nodoc:
       #
       # All method calls on this object will then be delegated
       # to the internal document itself.
-      def initialize(document)
+      def initialize(name, document, options = {})
         @document = document.parent
         decorate!
       end
@@ -25,13 +25,11 @@ module Mongoid #:nodoc:
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting a parent object as the association on the
         # +Document+. Will properly set a has_one or a has_many.
-        def update(child, parent)
+        def update(parent, child, name)
           name = child.class.name.demodulize.downcase
-          if parent.associations[name]
-            child.parentize(parent, name)
-          else
-            child.parentize(parent, name.tableize)
-          end
+          has_one = parent.associations[name]
+          child.parentize(parent, name) if has_one
+          child.parentize(parent, name.tableize) unless has_one
           child.notify
         end
       end

data/lib/mongoid/document.rb

@@ -37,7 +37,7 @@ module Mongoid #:nodoc:
       #
       # Returns: <tt>Mongo::Collection</tt>
       def collection
-        return nil if @embedded
+        return nil if embedded?
         @collection_name = self.to_s.demodulize.tableize
         @collection ||= Mongoid.database.collection(@collection_name)
       end
@@ -50,6 +50,11 @@ module Mongoid #:nodoc:
         Criteria.translate(*args).count(self)
       end
 
+      # return true if the +Document+ is embedded in another +Documnet+.
+      def embedded?
+        @embedded == true
+      end
+
       # Defines all the fields that are accessable on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.
@@ -186,6 +191,11 @@ module Mongoid #:nodoc:
       self.class.collection
     end
 
+    # Return true if the +Document+ is embedded in another +Document+.
+    def embedded?
+      self.class.embedded?
+    end
+
     # Get the fields for the Document class.
     def fields
       self.class.fields
@@ -206,7 +216,7 @@ module Mongoid #:nodoc:
     end
 
     def inspect
-      "Class: #{self.class.name} | Attributes: #{@attributes.inspect} | Parent: #{@parent.class.name}"
+      "#{self.class.name} : #{@attributes.inspect}"
     end
 
     # Return the +Document+ primary key.
@@ -235,6 +245,13 @@ module Mongoid #:nodoc:
       @attributes = HashWithIndifferentAccess.new(collection.find_one(:_id => id))
     end
 
+    # Return the root +Document+ in the object graph.
+    def root
+      object = self
+      while (object.parent) do object = object.parent; end
+      object || self
+    end
+
     # Returns the id of the Document
     def to_param
       id.to_s

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2009-11-10}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"

data/spec/integration/mongoid/document_spec.rb

@@ -223,7 +223,7 @@ describe Mongoid::Document do
     end
 
     it "allows the parent reference to change" do
-      @address.person = @person
+      @address.addressable = @person
       @address.save!
       @person.addresses.first.should == @address
     end

data/spec/spec_helper.rb

@@ -80,7 +80,7 @@ class Address < Mongoid::Document
   field :state
   field :comment_code
   key :street
-  belongs_to :person
+  belongs_to :addressable
 end
 
 class Name < Mongoid::Document

data/spec/unit/mongoid/associations/accessor_spec.rb

@@ -12,7 +12,7 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_many" do
 
       it "returns a HasMany" do
-        association = Mongoid::Associations::Accessor.get(:has_many, :addresses, @document)
+        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasMany, :addresses, @document)
         association.should be_a_kind_of(Mongoid::Associations::HasMany)
       end
 
@@ -23,7 +23,7 @@ describe Mongoid::Associations::Accessor do
       context "when document is not nil" do
 
         it "returns a HasOne" do
-          association = Mongoid::Associations::Accessor.get(:has_one, :name, @document)
+          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, :name, @document)
           association.should be_a_kind_of(Mongoid::Associations::HasOne)
         end
 
@@ -32,7 +32,7 @@ describe Mongoid::Associations::Accessor do
       context "when document is nil" do
 
         it "returns nil" do
-          association = Mongoid::Associations::Accessor.get(:has_one, :name, nil)
+          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, :name, nil)
           association.should be_nil
         end
 
@@ -43,20 +43,12 @@ describe Mongoid::Associations::Accessor do
     context "when type is belongs_to" do
 
       it "returns a BelongsTo" do
-        association = Mongoid::Associations::Accessor.get(:belongs_to, :person, @document)
+        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::BelongsTo, :person, @document)
         association.should be_a_kind_of(Mongoid::Associations::BelongsTo)
       end
 
     end
 
-    context "when type is invalid" do
-
-      it "raises an InvalidAssociationError" do
-        lambda { Mongoid::Associations::Accessor.get(:something, :person, @document) }.should raise_error
-      end
-
-    end
-
   end
 
   describe "#set" do
@@ -65,7 +57,7 @@ describe Mongoid::Associations::Accessor do
 
       it "returns a HasMany" do
         Mongoid::Associations::HasMany.expects(:update).with(@document, @object, :addresses)
-        Mongoid::Associations::Accessor.set(:has_many, :addresses, @document, @object)
+        Mongoid::Associations::Accessor.set(Mongoid::Associations::HasMany, :addresses, @document, @object)
       end
 
     end
@@ -74,7 +66,7 @@ describe Mongoid::Associations::Accessor do
 
       it "returns a HasOne" do
         Mongoid::Associations::HasOne.expects(:update).with(@document, @object, :name)
-        Mongoid::Associations::Accessor.set(:has_one, :name, @document, @object)
+        Mongoid::Associations::Accessor.set(Mongoid::Associations::HasOne, :name, @document, @object)
       end
 
     end
@@ -82,21 +74,12 @@ describe Mongoid::Associations::Accessor do
     context "when type is belongs_to" do
 
       it "returns a BelongsTo" do
-        Mongoid::Associations::BelongsTo.expects(:update).with(@document, @object)
-        Mongoid::Associations::Accessor.set(:belongs_to, :person, @document, @object)
+        Mongoid::Associations::BelongsTo.expects(:update).with(@object, @document, :person)
+        Mongoid::Associations::Accessor.set(Mongoid::Associations::BelongsTo, :person, @document, @object)
       end
 
     end
 
-    context "when type is invalid" do
-
-      it "raises an InvalidAssociationError" do
-        lambda {
-          Mongoid::Associations::Accessor.set(:something, :person, @document, @object)
-        }.should raise_error
-      end
-
-    end
   end
 
 end

data/spec/unit/mongoid/associations/belongs_to_spec.rb

@@ -2,46 +2,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helpe
 
 describe Mongoid::Associations::BelongsTo do
 
-  describe "#update" do
-
-    context "when child is a has one" do
-
-      before do
-        @name = Name.new(:first_name => "Test", :last_name => "User")
-        @person = Person.new(:title => "Mrs")
-        Mongoid::Associations::BelongsTo.update(@name, @person)
-      end
-
-      it "updates the parent document" do
-        @person.name.should == @name
-        @person.attributes[:name].except(:_id).should ==
-          { "first_name" => "Test", "last_name" => "User" }
-      end
-
-    end
-
-    context "when child is a has many" do
-
-      before do
-        @address = Address.new(:street => "Broadway")
-        @person = Person.new(:title => "Mrs")
-        Mongoid::Associations::BelongsTo.update(@address, @person)
-      end
-
-      it "updates the parent document" do
-        @person.addresses.first.should == @address
-      end
-
-    end
-
-  end
-
   describe "#find" do
 
     before do
       @parent = Name.new(:first_name => "Drexel")
       @document = stub(:parent => @parent)
-      @association = Mongoid::Associations::BelongsTo.new(@document)
+      @association = Mongoid::Associations::BelongsTo.new(:person, @document)
     end
 
     context "when finding by id" do
@@ -60,7 +26,7 @@ describe Mongoid::Associations::BelongsTo do
     before do
       @parent = Name.new(:first_name => "Drexel")
       @document = stub(:parent => @parent)
-      @association = Mongoid::Associations::BelongsTo.new(@document)
+      @association = Mongoid::Associations::BelongsTo.new(:person, @document)
     end
 
     context "when getting values" do
@@ -82,4 +48,38 @@ describe Mongoid::Associations::BelongsTo do
 
   end
 
+  describe "#update" do
+
+    context "when child is a has one" do
+
+      before do
+        @name = Name.new(:first_name => "Test", :last_name => "User")
+        @person = Person.new(:title => "Mrs")
+        Mongoid::Associations::BelongsTo.update(@person, @name, :person)
+      end
+
+      it "updates the parent document" do
+        @person.name.should == @name
+        @person.attributes[:name].except(:_id).should ==
+          { "first_name" => "Test", "last_name" => "User" }
+      end
+
+    end
+
+    context "when child is a has many" do
+
+      before do
+        @address = Address.new(:street => "Broadway")
+        @person = Person.new(:title => "Mrs")
+        Mongoid::Associations::BelongsTo.update(@person, @address, :person)
+      end
+
+      it "updates the parent document" do
+        @person.addresses.first.should == @address
+      end
+
+    end
+
+  end
+
 end

data/spec/unit/mongoid/associations_spec.rb

@@ -40,7 +40,7 @@ describe Mongoid::Associations do
       before do
         @person = Person.new(:title => "Mr")
         @address = Address.new(:street => "Picadilly Circus")
-        @address.person = @person
+        @address.addressable = @person
       end
 
       it "re-parentizes the association" do
@@ -60,12 +60,12 @@ describe Mongoid::Associations do
 
     it "creates a reader for the association" do
       address = Address.new
-      address.should respond_to(:person)
+      address.should respond_to(:addressable)
     end
 
     it "creates a writer for the association" do
       address = Address.new
-      address.should respond_to(:person=)
+      address.should respond_to(:addressable=)
     end
 
     it "allows the parent to be any type of class" do

data/spec/unit/mongoid/document_spec.rb

@@ -134,6 +134,48 @@ describe Mongoid::Document do
 
   end
 
+  describe ".embedded?" do
+
+    context "when the document is embedded" do
+
+      it "returns true" do
+        Address.embedded?.should be_true
+      end
+
+    end
+
+    context "when the document is not embedded" do
+
+      it "returns false" do
+        Person.embedded?.should be_false
+      end
+
+    end
+
+  end
+
+  describe "#embedded?" do
+
+    context "when the document is embedded" do
+
+      it "returns true" do
+        address = Address.new
+        address.embedded?.should be_true
+      end
+
+    end
+
+    context "when the document is not embedded" do
+
+      it "returns false" do
+        person = Person.new
+        person.embedded?.should be_false
+      end
+
+    end
+
+  end
+
   describe "#field" do
 
     context "with no options" do
@@ -524,6 +566,42 @@ describe Mongoid::Document do
 
   end
 
+  describe "#root" do
+
+    before do
+      @person = Person.new(:title => "Mr")
+      @phone_number = Phone.new(:number => "415-555-1212")
+      @country_code = CountryCode.new(:code => 1)
+      @phone_number.country_code = @country_code
+      @person.phone_numbers << @phone_number
+    end
+
+    context "when document is the root" do
+
+      it "returns self" do
+        @person.root.should == @person
+      end
+
+    end
+
+    context "when document is embedded one level" do
+
+      it "returns the parent" do
+        @phone_number.root.should == @person
+      end
+
+    end
+
+    context "when document is embedded multiple levels" do
+
+      it "returns the top level parent" do
+        @country_code.root.should == @person
+      end
+
+    end
+
+  end
+
   describe "#select" do
 
     it "returns a new criteria with select conditions added" do
@@ -773,7 +851,17 @@ describe Mongoid::Document do
 
         context "when association is a has_many" do
 
-          it "fails when any association fails validation"
+          it "fails when any association fails validation" do
+            Person.class_eval do
+              validates_associated :addresses
+            end
+            Address.class_eval do
+              validates_presence_of :street
+            end
+            @person.addresses << Address.new
+            @person.valid?.should be_false
+            @person.errors.on(:addresses).should_not be_nil
+          end
 
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency