mongoid 2.0.0.beta.14 → 2.0.0.beta.15

data/lib/mongoid.rb

@@ -64,6 +64,7 @@ require "mongoid/hierarchy"
 require "mongoid/identity"
 require "mongoid/indexes"
 require "mongoid/javascript"
+require "mongoid/json"
 require "mongoid/keys"
 require "mongoid/logger"
 require "mongoid/matchers"

data/lib/mongoid/associations.rb

@@ -20,8 +20,9 @@ module Mongoid # :nodoc:
       cattr_accessor :embedded
       self.embedded = false
 
-      class_inheritable_accessor :associations
+      class_inheritable_accessor :associations, :cascades
       self.associations = {}
+      self.cascades = {}
 
       delegate :embedded, :embedded?, :to => "self.class"
     end
@@ -57,8 +58,8 @@ module Mongoid # :nodoc:
         next unless association.macro == :referenced_in
         foreign_key = association.options.foreign_key
         if send(foreign_key).nil?
-          target = send(name)
-          send("#{foreign_key}=", target ? target.id : nil)
+          proxy = send(name)
+          send("#{foreign_key}=", proxy && proxy.target ? proxy.id : nil)
         end
       end
     end
@@ -204,6 +205,7 @@ module Mongoid # :nodoc:
         set_callback :save, :before do |document|
           document.update_associations(name)
         end
+        add_cascade(name, options)
       end
 
       alias :has_many_related :references_many
@@ -223,10 +225,14 @@ module Mongoid # :nodoc:
       #   end
       def references_one(name, options = {}, &block)
         opts = optionize(name, options, constraint(name, options, :one), &block)
-        associate(Associations::ReferencesOne, opts)
+        type = Associations::ReferencesOne
+        associate(type, opts)
+        add_builder(type, opts)
+        add_creator(type, opts)
         set_callback :save, :before do |document|
           document.update_association(name)
         end
+        add_cascade(name, options)
       end
 
       alias :has_one_related :references_one
@@ -269,7 +275,20 @@ module Mongoid # :nodoc:
       def associate(type, options)
         name = options.name.to_s
         associations[name] = MetaData.new(type, options)
-        define_method(name) { memoized(name) { type.instantiate(self, options) } }
+        define_method(name) do
+          memoized(name) do
+            proxy = type.new(self, options)
+            case proxy
+            when Associations::ReferencesOne,
+                 Associations::EmbedsOne,
+                 Associations::ReferencedIn,
+                 Associations::EmbeddedIn
+              proxy.target ? proxy : nil
+            else
+              proxy
+            end
+          end
+        end
         define_method("#{name}=") do |object|
           unmemoize(name)
           memoized(name) { type.update(object, self, options) }
@@ -284,10 +303,10 @@ module Mongoid # :nodoc:
           attrs = params[0]
           attr_options = params[1] || {}
           reset(name) do
-            unless type == Associations::EmbedsOne && attr_options[:update_only]
-              type.new(self, (attrs || {}).stringify_keys, options)
-            end
-          end
+            proxy = type.new(self, options)
+            proxy.build((attrs || {}).stringify_keys)
+            proxy
+          end unless type == Associations::EmbedsOne && attr_options[:update_only]
         end
       end
 
@@ -304,6 +323,12 @@ module Mongoid # :nodoc:
         end
       end
 
+      # Create the callbacks for dependent deletes and destroys.
+      def add_cascade(name, options)
+        dependent = options[:dependent]
+        self.cascades[name] = dependent if dependent
+      end
+
       # build the options given the params.
       def optionize(name, options, foreign_key, &block)
         Associations::Options.new(

data/lib/mongoid/associations/embedded_in.rb

@@ -14,10 +14,16 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # target: The parent +Document+
+      # document: The child +Document+
       # options: The association options
-      def initialize(target, options)
-        @target, @options = target, options
+      def initialize(document, options, target = nil)
+        if target
+          inverse = determine_name(target, options)
+          document.parentize(target, inverse)
+          document.notify
+          target.unmemoize(inverse)
+        end
+        @target, @options = document._parent, options
         extends(options)
       end
 
@@ -28,20 +34,14 @@ module Mongoid #:nodoc:
         @target
       end
 
-      class << self
-        # Creates the new association by setting the internal
-        # document as the passed in Document. This should be the
-        # parent.
-        #
-        # Options:
-        #
-        # document: The parent +Document+
-        # options: The association options
-        def instantiate(document, options)
-          target = document._parent
-          target.nil? ? nil : new(target, options)
-        end
+      protected
+      def determine_name(target, options)
+        inverse = options.inverse_of
+        return inverse unless inverse.is_a?(Array)
+        inverse.detect { |name| target.respond_to?(name) }
+      end
 
+      class << self
         # Returns the macro used to create the association.
         def macro
           :embedded_in
@@ -55,18 +55,7 @@ module Mongoid #:nodoc:
         #
         # A new +EmbeddedIn+ association proxy.
         def update(target, child, options)
-          inverse = determine_name(target, options)
-          child.parentize(target, inverse)
-          child.notify
-          target.unmemoize(inverse)
-          instantiate(child, options)
-        end
-
-        protected
-        def determine_name(target, options)
-          inverse = options.inverse_of
-          return inverse unless inverse.is_a?(Array)
-          inverse.detect { |name| target.respond_to?(name) }
+          new(child, options, target)
         end
       end
     end

data/lib/mongoid/associations/embeds_many.rb

@@ -250,18 +250,6 @@ module Mongoid #:nodoc:
       end
 
       class << self
-
-        # Preferred method of creating a new +EmbedsMany+ association. It will
-        # delegate to new.
-        #
-        # Options:
-        #
-        # document: The parent +Document+
-        # options: The association options
-        def instantiate(document, options, target_array = nil)
-          new(document, options, target_array)
-        end
-
         # Returns the macro used to create the association.
         def macro
           :embeds_many
@@ -274,9 +262,9 @@ module Mongoid #:nodoc:
           parent.raw_attributes.delete(options.name)
           children.assimilate(parent, options)
           if children && children.first.is_a?(Mongoid::Document)
-            instantiate(parent, options, children)
+            new(parent, options, children)
           else
-            instantiate(parent, options)
+            new(parent, options)
           end
         end
       end

data/lib/mongoid/associations/embeds_one.rb

@@ -10,6 +10,14 @@ module Mongoid #:nodoc:
         @target = attrs.assimilate(@parent, @options, type); self
       end
 
+      # Replaces the target with a new object
+      #
+      # Returns the association proxy
+      def replace(obj)
+        @target = obj
+        self
+      end
+
       # Creates the new association by finding the attributes in
       # the parent document with its name, and instantiating a
       # new document for it.
@@ -26,9 +34,16 @@ module Mongoid #:nodoc:
       # Returns:
       #
       # A new +HashOne+ association proxy.
-      def initialize(document, attrs, options, target = nil)
+      def initialize(document, options, target = nil)
         @parent, @options  = document, options
-        @target = target ? target : attrs.assimilate(@parent, @options, attrs.klass)
+
+        if target
+          replace(target)
+        else
+          attributes = document.raw_attributes[options.name]
+          build(attributes) unless attributes.blank?
+        end
+
         extends(options)
       end
 
@@ -49,23 +64,6 @@ module Mongoid #:nodoc:
       end
 
       class << self
-        # Preferred method of instantiating a new +EmbedsOne+, since nil values
-        # will be handled properly.
-        #
-        # Options:
-        #
-        # document: The parent +Document+
-        # options: The association options.
-        #
-        # Returns:
-        #
-        # A new +EmbedsOne+ association proxy.
-        def instantiate(document, options, target = nil)
-          attributes = document.raw_attributes[options.name]
-          return nil if attributes.blank? && target.nil?
-          new(document, attributes, options, target)
-        end
-
         # Returns the macro used to create the association.
         def macro
           :embeds_one
@@ -89,7 +87,7 @@ module Mongoid #:nodoc:
         # A new +EmbedsOne+ association proxy.
         def update(child, parent, options)
           child.assimilate(parent, options)
-          instantiate(parent, options, child.is_a?(Hash) ? nil : child)
+          new(parent, options, child.is_a?(Hash) ? nil : child)
         end
       end
     end

data/lib/mongoid/associations/options.rb

@@ -9,6 +9,12 @@ module Mongoid #:nodoc:
         self.merge!(attributes)
       end
 
+      # For relational associations we want to know if we cascade deletes or
+      # destroys to associations.
+      def dependent
+        self[:dependent]
+      end
+
       # Returns the extension if it exists, nil if not.
       def extension
         self[:extend]

data/lib/mongoid/associations/referenced_in.rb

@@ -11,27 +11,28 @@ module Mongoid #:nodoc:
       #
       # document: The +Document+ that contains the relationship.
       # options: The association +Options+.
-      def initialize(document, foreign_key, options, target = nil)
+      def initialize(document, options, target = nil)
         @options = options
-        @target = target || options.klass.find(foreign_key)
-        extends(options)
-      end
 
-      class << self
-        # Instantiate a new +ReferencedIn+ or return nil if the foreign key is
-        # nil. It is preferrable to use this method over the traditional call
-        # to new.
-        #
-        # Options:
-        #
-        # document: The +Document+ that contains the relationship.
-        # options: The association +Options+.
-        def instantiate(document, options, target = nil)
+        if target
+          replace(target)
+        else
           foreign_key = document.send(options.foreign_key)
-          return nil if foreign_key.blank? && target.nil?
-          new(document, foreign_key, options, target)
+          replace(options.klass.find(foreign_key)) unless foreign_key.blank?
         end
 
+        extends(options)
+      end
+
+      # Replaces the target with a new object
+      #
+      # Returns the association proxy
+      def replace(obj)
+        @target = obj
+        self
+      end
+
+      class << self
         # Returns the macro used to create the association.
         def macro
           :referenced_in
@@ -51,7 +52,7 @@ module Mongoid #:nodoc:
         # <tt>ReferencedIn.update(person, game, options)</tt>
         def update(target, document, options)
           document.send("#{options.foreign_key}=", target ? target.id : nil)
-          instantiate(document, options, target)
+          new(document, options, target)
         end
       end
     end

data/lib/mongoid/associations/references_many_as_array.rb

@@ -86,7 +86,7 @@ module Mongoid #:nodoc:
         #
         # Example:
         #
-        # <tt>RelatesToManyAsArray.update(preferences, person, options)</tt>
+        # <tt>ReferencesManyAsArray.update(preferences, person, options)</tt>
         def update(target, document, options)
           target.each do |child|
             document.send(options.name) << child

data/lib/mongoid/associations/references_one.rb

@@ -5,19 +5,13 @@ module Mongoid #:nodoc:
     # separate collection or database.
     class ReferencesOne < Proxy
 
-      delegate :nil?, :to => :target
-
       # Builds a new Document and sets it as the association.
       #
       # Returns the newly created object.
       def build(attributes = {})
-        @target = @klass.instantiate(attributes)
-        inverse = @target.associations.values.detect do |metadata|
-          metadata.options.klass == @parent.class
-        end
-        name = inverse.name
-        @target.send("#{name}=", @parent)
-        @target
+        target = @klass.instantiate(attributes)
+        replace(target)
+        target
       end
 
       # Builds a new Document and sets it as the association, then saves the
@@ -28,6 +22,20 @@ module Mongoid #:nodoc:
         build(attributes).tap(&:save)
       end
 
+      # Replaces the target with a new object
+      #
+      # Returns the association proxy
+      def replace(obj)
+        @target = obj
+        inverse = @target.associations.values.detect do |metadata|
+          metadata.options.klass == @parent.class
+        end
+        name = inverse.name
+        @target.send("#{name}=", @parent)
+
+        self
+      end
+
       # Initializing a related association only requires looking up the objects
       # by their ids.
       #
@@ -35,10 +43,10 @@ module Mongoid #:nodoc:
       #
       # document: The +Document+ that contains the relationship.
       # options: The association +Options+.
-      def initialize(document, options, target = nil)
+      def initialize(document, options)
         @parent, @klass = document, options.klass
         @foreign_key = options.foreign_key
-        @target = target || @klass.first(:conditions => { @foreign_key => @parent.id })
+        @target = @klass.first(:conditions => { @foreign_key => @parent.id })
         extends(options)
       end
 
@@ -57,16 +65,6 @@ module Mongoid #:nodoc:
       end
 
       class << self
-        # Preferred method for creating the new +RelatesToMany+ association.
-        #
-        # Options:
-        #
-        # document: The +Document+ that contains the relationship.
-        # options: The association +Options+.
-        def instantiate(document, options, target = nil)
-          new(document, options, target)
-        end
-
         # Returns the macro used to create the association.
         def macro
           :references_one
@@ -87,10 +85,10 @@ module Mongoid #:nodoc:
         def update(target, document, options)
           if target
             name = document.class.to_s.underscore
-            target.send("#{name}=", document)
-            return instantiate(document, options, target)
+            proxy = new(document, options)
+            proxy.replace(target)
           end
-          target
+          proxy
         end
       end
     end

data/lib/mongoid/components.rb

@@ -20,6 +20,7 @@ module Mongoid #:nodoc
       include Mongoid::Fields
       include Mongoid::Hierarchy
       include Mongoid::Indexes
+      include Mongoid::JSON
       include Mongoid::Keys
       include Mongoid::Matchers
       include Mongoid::Memoization

data/lib/mongoid/config.rb

@@ -7,6 +7,7 @@ module Mongoid #:nodoc
 
     attr_accessor \
       :allow_dynamic_fields,
+      :include_root_in_json,
       :reconnect_time,
       :parameterize_keys,
       :persist_in_safe_mode,
@@ -74,12 +75,10 @@ module Mongoid #:nodoc
     # The master +Mongo::DB+
     def master
       raise Errors::InvalidDatabase.new(nil) unless @master
-
       if @reconnect
         @reconnect = false
         reconnect!
       end
-
       @master
     end
 
@@ -193,6 +192,7 @@ module Mongoid #:nodoc
     # <tt>config.reset</tt>
     def reset
       @allow_dynamic_fields = true
+      @include_root_in_json = false
       @parameterize_keys = true
       @persist_in_safe_mode = false
       @raise_not_found_error = true

data/lib/mongoid/document.rb

@@ -7,21 +7,6 @@ module Mongoid #:nodoc:
 
       attr_accessor :association_name
       attr_reader :new_record
-
-      unless self.instance_of?(Class) and self.name == ""
-        (@@descendants ||= {})[self] = :seen
-      end
-    end
-
-    class << self
-
-      # Returns all classes that have included Mongoid::Document.
-      #
-      # This will not get subclasses of the top level models, for those we will
-      # use Class.descendents in the rake task for indexes.
-      def descendants
-        (@@descendants ||= {}).keys
-      end
     end
 
     module ClassMethods #:nodoc:
@@ -31,8 +16,8 @@ module Mongoid #:nodoc:
       # This method must remain in the +Document+ module, even though its
       # behavior affects items in the Hierarchy module.
       def inherited(subclass)
-        super(subclass)
         self.hereditary = true
+        super
       end
 
       # Instantiate a new object, only when loaded from the database or when

data/lib/mongoid/extensions.rb

@@ -114,4 +114,8 @@ end
 
 class BSON::ObjectID #:nodoc
   extend Mongoid::Extensions::ObjectID::Conversions
+
+  def as_json(options = nil)
+    to_s
+  end
 end

data/lib/mongoid/json.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  # This module is for hooking in to +ActiveModel+s serialization to let
+  # configuring the ability to include the root in JSON happen from the Mongoid
+  # config.
+  module JSON
+    extend ActiveSupport::Concern
+
+    # We need to redefine where the JSON configuration is getting defined,
+    # similar to +ActiveRecord+.
+    included do
+      undef_method :include_root_in_json
+      delegate :include_root_in_json, :to => ::Mongoid
+    end
+  end
+end

data/lib/mongoid/persistence.rb

@@ -26,7 +26,7 @@ module Mongoid #:nodoc:
     #
     # <tt>document.destroy</tt>
     def destroy(options = {})
-      run_callbacks(:destroy) { self.destroyed = true if _remove(options) }
+      run_callbacks(:destroy) { _remove(options) }
     end
 
     # Insert a new +Document+ into the database. Will return the document
@@ -47,7 +47,10 @@ module Mongoid #:nodoc:
     #
     # TODO: Will get rid of other #remove once observable pattern killed.
     def _remove(options = {})
-      Remove.new(self, options).persist
+      if Remove.new(self, options).persist
+        self.destroyed = true
+        cascading_remove!
+      end; true
     end
 
     alias :delete :_remove
@@ -131,6 +134,19 @@ module Mongoid #:nodoc:
     # <tt>document.save</tt>
     alias :save :upsert
 
+    protected
+
+    # Perform all cascading deletes or destroys.
+    def cascading_remove!
+      cascades.each do |name, option|
+        association = send(name)
+        if association
+          documents = association.target.to_a
+          documents.each { |doc| doc.send(option) }
+        end
+      end
+    end
+
     module ClassMethods #:nodoc:
 
       # Create a new +Document+. This will instantiate a new document and

data/lib/mongoid/persistence/remove.rb

@@ -35,7 +35,7 @@ module Mongoid #:nodoc:
           ).persist
         else
           @collection.remove({ :_id => @document.id }, @options)
-        end
+        end; true
       end
     end
   end

data/lib/mongoid/railties/database.rake

@@ -57,7 +57,18 @@ namespace :db do
   if not Rake::Task.task_defined?("db:create_indexes")
     desc 'Create the indexes defined on your mongoid models'
     task :create_indexes => :environment do
-      ::Rails::Mongoid.index_children(Mongoid::Document.descendants)
+      documents = []
+      Dir.glob("app/models/**/*.rb").sort.each do |file|
+        model = file.match(/\/(\w+).rb$/)[1]
+        klass = model.classify.constantize
+        begin
+          documents << klass unless klass.embedded
+        rescue => e
+          # Just for non-mongoid objects that dont have the embedded
+          # attribute at the class level.
+        end
+      end
+      ::Rails::Mongoid.index_children(documents)
     end
   end
 

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.beta.14"
+  VERSION = "2.0.0.beta.15"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  hash: 62196479
+  hash: 62196477
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 14
-  version: 2.0.0.beta.14
+  - 15
+  version: 2.0.0.beta.15
 platform: ruby
 authors: 
 - Durran Jordan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 -04:00
+date: 2010-07-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -253,6 +253,7 @@ files:
 - lib/mongoid/indexes.rb
 - lib/mongoid/javascript/functions.yml
 - lib/mongoid/javascript.rb
+- lib/mongoid/json.rb
 - lib/mongoid/keys.rb
 - lib/mongoid/logger.rb
 - lib/mongoid/matchers/all.rb