mongoid 0.9.8 → 0.9.9

data/lib/mongoid/associations/has_one.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     class HasOne #:nodoc:
 
       delegate :==, :to => :document
-      attr_reader :document, :parent, :options
+      attr_reader :association_name, :document, :parent, :options
 
       # Build a new object for the association.
       def build(attributes)
@@ -32,7 +32,7 @@ module Mongoid #:nodoc:
       # attributes: The attributes of the decorated object.
       # options: The association options.
       def initialize(document, attributes, options)
-        @parent, @options = document, options
+        @parent, @options, @association_name = document, options, options.name
         unless attributes.nil?
           @document = attributes.assimilate(@parent, @options)
         end
@@ -43,6 +43,17 @@ module Mongoid #:nodoc:
         @document.send(name, *args)
       end
 
+      # Used for setting the association via a nested attributes setter on the
+      # parent +Document+.
+      def nested_build(attributes)
+        build(attributes)
+      end
+
+      # Need to override here for when the underlying document is nil.
+      def valid?
+        @document ? @document.valid? : false
+      end
+
       class << self
         # Preferred method of instantiating a new +HasOne+, since nil values
         # will be handled properly.

data/lib/mongoid/associations/{relates_to_many.rb → has_one_related.rb}

@@ -1,7 +1,26 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class RelatesToMany < DelegateClass(Array) #:nodoc:
+    class HasOneRelated #:nodoc:
+
+      delegate :==, :nil?, :to => :document
+      attr_reader :klass, :document
+
+      # Builds a new Document and sets it as the association.
+      #
+      # Returns the newly created object.
+      def build(attributes)
+        @document = @klass.instantiate(attributes)
+        @document.send("#{@foreign_key}=", @parent.id)
+      end
+
+      # Builds a new Document and sets it as the association, then saves the
+      # newly created document.
+      #
+      # Returns the newly created object.
+      def create(attributes)
+        build(attributes); @document.save; @document
+      end
 
       # Initializing a related association only requires looking up the objects
       # by their ids.
@@ -11,9 +30,14 @@ module Mongoid #:nodoc:
       # document: The +Document+ that contains the relationship.
       # options: The association +Options+.
       def initialize(document, options)
-        name = document.class.to_s.foreign_key
-        @documents = options.klass.all(:conditions => { name => document.id })
-        super(@documents)
+        @parent, @klass = document, options.klass
+        @foreign_key = document.class.to_s.foreign_key
+        @document = @klass.first(:conditions => { @foreign_key => @parent.id })
+      end
+
+      # Delegate all missing methods over to the +Document+.
+      def method_missing(name, *args)
+        @document.send(name, *args)
       end
 
       class << self
@@ -29,7 +53,7 @@ module Mongoid #:nodoc:
 
         # Returns the macro used to create the association.
         def macro
-          :relates_to_many
+          :has_one_related
         end
 
         # Perform an update of the relationship of the parent and child. This
@@ -37,16 +61,17 @@ module Mongoid #:nodoc:
         #
         # Options:
         #
-        # related: The related object
-        # parent: The parent +Document+ to update.
+        # related: The related object to update.
+        # document: The parent +Document+.
         # options: The association +Options+
         #
         # Example:
         #
-        # <tt>RelatesToOne.update(game, person, options)</tt>
+        # <tt>HasManyToRelated.update(game, person, options)</tt>
         def update(related, document, options)
           name = document.class.to_s.underscore
-          related.each { |child| child.send("#{name}=", document) }
+          related.send("#{name}=", document)
+          related
         end
       end
 

data/lib/mongoid/attributes.rb

@@ -1,13 +1,113 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-  module Attributes #:nodoc:
-    # Process the provided attributes casting them to their proper values if a
-    # field exists for them on the +Document+. This will be limited to only the
-    # attributes provided in the suppied +Hash+ so that no extra nil values get
-    # put into the document's attributes.
-    def process(attrs = {})
-      attrs.each_pair do |key, value|
-        send("#{key}=", value)
+  module Attributes
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+        extend ClassMethods
+      end
+    end
+    module InstanceMethods
+      # Process the provided attributes casting them to their proper values if a
+      # field exists for them on the +Document+. This will be limited to only the
+      # attributes provided in the suppied +Hash+ so that no extra nil values get
+      # put into the document's attributes.
+      def process(attrs = {})
+        attrs.each_pair do |key, value|
+          send("#{key}=", value)
+        end
+      end
+
+      # Read a value from the +Document+ attributes. If the value does not exist
+      # it will return nil.
+      #
+      # Options:
+      #
+      # name: The name of the attribute to get.
+      #
+      # Example:
+      #
+      # <tt>person.read_attribute(:title)</tt>
+      def read_attribute(name)
+        fields[name].get(@attributes[name])
+      end
+
+      # Remove a value from the +Document+ attributes. If the value does not exist
+      # it will fail gracefully.
+      #
+      # Options:
+      #
+      # name: The name of the attribute to remove.
+      #
+      # Example:
+      #
+      # <tt>person.remove_attribute(:title)</tt>
+      def remove_attribute(name)
+        @attributes.delete(name)
+      end
+
+      # Write a single attribute to the +Document+ attribute +Hash+. This will
+      # also fire the before and after update callbacks, and perform any
+      # necessary typecasting.
+      #
+      # Options:
+      #
+      # name: The name of the attribute to update.
+      # value: The value to set for the attribute.
+      #
+      # Example:
+      #
+      # <tt>person.write_attribute(:title, "Mr.")</tt>
+      #
+      # This will also cause the observing +Document+ to notify it's parent if
+      # there is any.
+      def write_attribute(name, value)
+        run_callbacks(:before_update)
+        @attributes[name] = fields[name].set(value)
+        run_callbacks(:after_update)
+        notify
+      end
+
+      # Writes the supplied attributes +Hash+ to the +Document+. This will only
+      # overwrite existing attributes if they are present in the new +Hash+, all
+      # others will be preserved.
+      #
+      # Options:
+      #
+      # attrs: The +Hash+ of new attributes to set on the +Document+
+      #
+      # Example:
+      #
+      # <tt>person.write_attributes(:title => "Mr.")</tt>
+      #
+      # This will also cause the observing +Document+ to notify it's parent if
+      # there is any.
+      def write_attributes(attrs)
+        process(attrs)
+        notify
+      end
+    end
+
+    module ClassMethods
+      # Defines attribute setters for the associations specified by the names.
+      # This will work for a has one or has many association.
+      #
+      # Example:
+      #
+      #   class Person < Mongoid::Document
+      #     has_one :name
+      #     has_many :addresses
+      #
+      #     accepts_nested_attributes_for :name, :addresses
+      #   end
+      def accepts_nested_attributes_for(*args)
+        args.flatten.each do |name|
+          define_method("#{name}_attributes=") do |attrs|
+            association = send(name)
+            update(association, true)
+            association.nested_build(attrs)
+          end
+        end
       end
     end
   end

data/lib/mongoid/commands.rb

@@ -5,7 +5,6 @@ require "mongoid/commands/delete_all"
 require "mongoid/commands/destroy"
 require "mongoid/commands/destroy_all"
 require "mongoid/commands/save"
-require "mongoid/commands/quick_save"
 require "mongoid/commands/validate"
 
 module Mongoid #:nodoc:
@@ -56,19 +55,12 @@ module Mongoid #:nodoc:
       # returns false then a +ValidationError+ will be raised.
       def save!
         if new_record?
-          return Create.execute(self) || (raise ValidationsError.new(self.errors.full_messages))
+          return Create.execute(self) || (raise Errors::Validations.new(self.errors))
         else
-          return Save.execute(self) || (raise ValidationsError.new(self.errors.full_messages))
+          return Save.execute(self) || (raise Errors::Validations.new(self.errors))
         end
       end
 
-      # Performs a save with no validations and no callbacks. This is used in
-      # relational association saves, and is not recommended for use by
-      # anything else.
-      def quick_save
-        QuickSave.execute(self)
-      end
-
       # Update the attributes of the +Document+. Will call save after the
       # attributes have been updated.
       def update_attributes(attrs = {})
@@ -97,7 +89,7 @@ module Mongoid #:nodoc:
       # validation.
       def create!(attributes = {})
         document = Create.execute(new(attributes))
-        raise ValidationsError.new(self.errors.full_messages) unless document.errors.empty?
+        raise Errors::Validations.new(self.errors) unless document.errors.empty?
         return document
       end
 

data/lib/mongoid/commands/save.rb

@@ -14,12 +14,8 @@ module Mongoid #:nodoc:
         return false unless Validate.execute(doc)
         doc.run_callbacks :before_save
         parent = doc.parent
-        if parent
-          Save.execute(parent)
-        else
-          collection = doc.collection
-          collection ? collection.save(doc.attributes) : raise(MissingParentError.new(doc))
-        end
+        doc.new_record = false
+        parent ? Save.execute(parent) : doc.collection.save(doc.attributes)
         doc.run_callbacks :after_save
         return true
       end

data/lib/mongoid/document.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
       #
       # Returns: <tt>Mongo::Collection</tt>
       def collection
-        return nil if embedded?
+        raise Errors::InvalidCollection.new(self) if embedded?
         @collection_name ||= self.to_s.demodulize.tableize
         @collection ||= Mongoid.database.collection(@collection_name)
       end
@@ -195,6 +195,11 @@ module Mongoid #:nodoc:
       @new_record == true
     end
 
+    # Sets the new_record boolean - used after document is saved.
+    def new_record=(saved)
+      @new_record = saved
+    end
+
     # Set the changed state of the +Document+ then notify observers that it has changed.
     #
     # Example:
@@ -223,34 +228,6 @@ module Mongoid #:nodoc:
       add_observer(object)
     end
 
-    # Read a value from the +Document+ attributes. If the value does not exist
-    # it will return nil.
-    #
-    # Options:
-    #
-    # name: The name of the attribute to get.
-    #
-    # Example:
-    #
-    # <tt>person.read_attribute(:title)</tt>
-    def read_attribute(name)
-      fields[name].get(@attributes[name])
-    end
-
-    # Remove a value from the +Document+ attributes. If the value does not exist
-    # it will fail gracefully.
-    #
-    # Options:
-    #
-    # name: The name of the attribute to remove.
-    #
-    # Example:
-    #
-    # <tt>person.remove_attribute(:title)</tt>
-    def remove_attribute(name)
-      @attributes.delete(name)
-    end
-
     # Reloads the +Document+ attributes from the database.
     def reload
       @attributes = collection.find_one(:_id => id).with_indifferent_access
@@ -290,47 +267,6 @@ module Mongoid #:nodoc:
       notify
     end
 
-    # Write a single attribute to the +Document+ attribute +Hash+. This will
-    # also fire the before and after update callbacks, and perform any
-    # necessary typecasting.
-    #
-    # Options:
-    #
-    # name: The name of the attribute to update.
-    # value: The value to set for the attribute.
-    #
-    # Example:
-    #
-    # <tt>person.write_attribute(:title, "Mr.")</tt>
-    #
-    # This will also cause the observing +Document+ to notify it's parent if
-    # there is any.
-    def write_attribute(name, value)
-      run_callbacks(:before_update)
-      @attributes[name] = fields[name].set(value)
-      run_callbacks(:after_update)
-      notify
-    end
-
-    # Writes the supplied attributes +Hash+ to the +Document+. This will only
-    # overwrite existing attributes if they are present in the new +Hash+, all
-    # others will be preserved.
-    #
-    # Options:
-    #
-    # attrs: The +Hash+ of new attributes to set on the +Document+
-    #
-    # Example:
-    #
-    # <tt>person.write_attributes(:title => "Mr.")</tt>
-    #
-    # This will also cause the observing +Document+ to notify it's parent if
-    # there is any.
-    def write_attributes(attrs)
-      process(attrs)
-      notify
-    end
-
     protected
     def generate_key
       if primary_key

data/lib/mongoid/errors.rb

@@ -0,0 +1,34 @@
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # Raised when invalid options are passed into a constructor.
+    class InvalidOptions < RuntimeError; end
+
+    # Raised when the database connection has not been set up.
+    class InvalidDatabase < RuntimeError; end
+
+    # Raised when a persisence method ending in ! fails validation.
+    class Validations < RuntimeError
+      def initialize(errors)
+        @errors = errors
+      end
+      def message
+        "Validation failed: #{@errors.full_messages}"
+      end
+    end
+
+    # This error is raised when trying to access a Mongo::Collection from an
+    # embedded document.
+    class InvalidCollection < RuntimeError
+      def initialize(klass)
+        @klass = klass
+      end
+      def message
+        "Access to the collection for #{@klass.name} is not allowed " +
+          "since it is an embedded document, please access a collection from " +
+          "the root document"
+      end
+    end
+
+  end
+end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-12}
+  s.date = %q{2009-12-13}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -24,11 +24,12 @@ Gem::Specification.new do |s|
      "lib/mongoid.rb",
      "lib/mongoid/associations.rb",
      "lib/mongoid/associations/belongs_to.rb",
+     "lib/mongoid/associations/belongs_to_related.rb",
      "lib/mongoid/associations/has_many.rb",
+     "lib/mongoid/associations/has_many_related.rb",
      "lib/mongoid/associations/has_one.rb",
+     "lib/mongoid/associations/has_one_related.rb",
      "lib/mongoid/associations/options.rb",
-     "lib/mongoid/associations/relates_to_many.rb",
-     "lib/mongoid/associations/relates_to_one.rb",
      "lib/mongoid/attributes.rb",
      "lib/mongoid/commands.rb",
      "lib/mongoid/commands/create.rb",
@@ -36,12 +37,12 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/delete_all.rb",
      "lib/mongoid/commands/destroy.rb",
      "lib/mongoid/commands/destroy_all.rb",
-     "lib/mongoid/commands/quick_save.rb",
      "lib/mongoid/commands/save.rb",
      "lib/mongoid/commands/validate.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/dynamic_finder.rb",
+     "lib/mongoid/errors.rb",
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/accessors.rb",
      "lib/mongoid/extensions/array/assimilation.rb",
@@ -71,12 +72,13 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_spec.rb",
+     "spec/unit/mongoid/associations/has_many_related_spec.rb",
      "spec/unit/mongoid/associations/has_many_spec.rb",
+     "spec/unit/mongoid/associations/has_one_related_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations/options_spec.rb",
-     "spec/unit/mongoid/associations/relates_to_many_spec.rb",
-     "spec/unit/mongoid/associations/relates_to_one_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
@@ -84,13 +86,13 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/delete_spec.rb",
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
-     "spec/unit/mongoid/commands/quick_save_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands/validate_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/dynamic_finder_spec.rb",
+     "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
@@ -123,12 +125,13 @@ Gem::Specification.new do |s|
     "spec/integration/mongoid/associations_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec_helper.rb",
+     "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_spec.rb",
+     "spec/unit/mongoid/associations/has_many_related_spec.rb",
      "spec/unit/mongoid/associations/has_many_spec.rb",
+     "spec/unit/mongoid/associations/has_one_related_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations/options_spec.rb",
-     "spec/unit/mongoid/associations/relates_to_many_spec.rb",
-     "spec/unit/mongoid/associations/relates_to_one_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
@@ -136,13 +139,13 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/delete_spec.rb",
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
-     "spec/unit/mongoid/commands/quick_save_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands/validate_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/dynamic_finder_spec.rb",
+     "spec/unit/mongoid/errors_spec.rb",
      "spec/unit/mongoid/extensions/array/accessors_spec.rb",
      "spec/unit/mongoid/extensions/array/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",