mongoid 2.0.0.rc.7 → 2.0.0.rc.8

data/lib/mongoid/relations/metadata.rb

@@ -208,7 +208,8 @@ module Mongoid # :nodoc:
       # @since 2.0.0.rc.1
       def inverse_foreign_key
         @inverse_foreign_key ||=
-          (inverse_class_name.underscore << relation.foreign_key_suffix)
+          ( inverse_of ? inverse_of.to_s.singularize : inverse_class_name.underscore ) <<
+          relation.foreign_key_suffix
       end
 
       # Returns the inverse class of the proxied relation.
@@ -402,8 +403,9 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def determine_cyclic_inverse
+        underscored = class_name.underscore
         klass.relations.each_pair do |key, meta|
-          if key =~ /#{inverse_klass.name.underscore}/ &&
+          if key =~ /#{underscored.singularize}|#{underscored.pluralize}/ &&
             meta.relation != relation
             return key.to_sym
           end

data/lib/mongoid/relations/proxy.rb

@@ -14,7 +14,7 @@ module Mongoid # :nodoc:
 
       attr_accessor :base, :loaded, :metadata, :target
 
-      # Backwards compatibiloty with Mongoid beta releases.
+      # Backwards compatibility with Mongoid beta releases.
       delegate :klass, :to => :metadata
 
       # Convenience for setting the target and the metadata properties since
@@ -29,37 +29,24 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def init(base, target, metadata, &block)
-        @base, @building, @target, @metadata = base, false, target, metadata
-        yield block if block_given?
+        @base, @target, @metadata = base, target, metadata
+        block.call if block
         extend Module.new(&metadata.extension) if metadata.extension?
       end
 
       protected
 
-      # Yields to the block to allow the building flag to get set and unset for
-      # the supplied code.
+      # Get the collection from the root of the hierarchy.
       #
-      # @example Set the building status.
-      #   person.building { @target << Post.new }
+      # @example Get the collection.
+      #   relation.collection
       #
-      # @since 2.0.0.rc.1
-      def building(&block)
-        @building = true
-        yield block if block_given?
-        @building = false
-      end
-
-      # Convenience method for determining if we are building an association.
-      # We never want to save in this case.
-      #
-      # @example Are we currently building?
-      #   person.posts.building?
-      #
-      # @return [ true, false ] True if currently building, false if not.
+      # @return [ Collection ] The root's collection.
       #
-      # @since 2.0.0.rc.1
-      def building?
-        !!@building
+      # @since 2.0.0
+      def collection
+        root = base._root
+        root.collection unless root.embedded?
       end
 
       # Return a new document for the type of class we want to instantiate.
@@ -123,6 +110,34 @@ module Mongoid # :nodoc:
       def method_missing(name, *args, &block)
         target.send(name, *args, &block)
       end
+
+      # When the base document illegally references an embedded document this
+      # error will get raised.
+      #
+      # @example Raise the error.
+      #   relation.raise_mixed
+      #
+      # @raise [ Errors::MixedRelations ] The error.
+      #
+      # @since 2.0.0
+      def raise_mixed
+        raise Errors::MixedRelations.new(base.class, metadata.klass)
+      end
+
+      # When the base is not yet saved and the user calls create or create!
+      # on the relation, this error will get raised.
+      #
+      # @example Raise the error.
+      #   relation.raise_unsaved(post)
+      #
+      # @param [ Document ] doc The child document getting created.
+      #
+      # @raise [ Errors::UnsavedDocument ] The error.
+      #
+      # @since 2.0.0.rc.6
+      def raise_unsaved(doc)
+        raise Errors::UnsavedDocument.new(base, doc)
+      end
     end
   end
 end

data/lib/mongoid/relations/referenced/many.rb

@@ -29,6 +29,9 @@ module Mongoid #:nodoc:
           target.map(&:save) if base.persisted? && !options[:binding]
         end
 
+        alias :concat :<<
+        alias :push :<<
+
         # Clear the relation. Will delete the documents from the db if they are
         # already persisted.
         #
@@ -66,8 +69,8 @@ module Mongoid #:nodoc:
         # @param [ Class ] type The optional type of document to create.
         #
         # @return [ Document ] The newly created document.
-        def create(attributes = nil, type = nil)
-          build(attributes, type).tap do |doc|
+        def create(attributes = nil, type = nil, &block)
+          build(attributes, type, &block).tap do |doc|
             base.persisted? ? doc.save : raise_unsaved(doc)
           end
         end
@@ -85,8 +88,8 @@ module Mongoid #:nodoc:
         # @raise [ Errors::Validations ] If validation failed.
         #
         # @return [ Document ] The newly created document.
-        def create!(attributes = nil, type = nil)
-          build(attributes, type).tap do |doc|
+        def create!(attributes = nil, type = nil, &block)
+          build(attributes, type, &block).tap do |doc|
             base.persisted? ? doc.save! : raise_unsaved(doc)
           end
         end
@@ -104,10 +107,11 @@ module Mongoid #:nodoc:
         #
         # @return [ Integer ] The number of documents deleted.
         def delete_all(conditions = nil)
+          raise_mixed if klass.embedded?
           selector = (conditions || {})[:conditions] || {}
           target.delete_if { |doc| doc.matches?(selector) }
           metadata.klass.delete_all(
-            :conditions => selector.merge(metadata.foreign_key => base.id)
+            :conditions => criteria.selector.merge(selector)
           )
         end
 
@@ -124,10 +128,11 @@ module Mongoid #:nodoc:
         #
         # @return [ Integer ] The number of documents destroyd.
         def destroy_all(conditions = nil)
+          raise_mixed if klass.embedded?
           selector = (conditions || {})[:conditions] || {}
           target.delete_if { |doc| doc.matches?(selector) }
           metadata.klass.destroy_all(
-            :conditions => selector.merge(metadata.foreign_key => base.id)
+            :conditions => criteria.selector.merge(selector)
           )
         end
 
@@ -154,9 +159,8 @@ module Mongoid #:nodoc:
         # @param [ Hash ] options The options to search with.
         #
         # @return [ Document, Criteria ] The matching document(s).
-        def find(arg, options = {})
-          return criteria.id_criteria(arg) unless arg.is_a?(Symbol)
-          criteria.find(arg, :conditions => options[:conditions] || {})
+        def find(*args)
+          criteria.find(*args)
         end
 
         # Instantiate a new references_many relation. Will set the foreign key
@@ -182,6 +186,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.5
         def load!(options = {})
+          raise_mixed if klass.embedded?
           tap do |relation|
             unless relation.loaded?
               relation.target = target.entries
@@ -242,7 +247,7 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def unbind(options = {})
           binding.unbind(options)
-          if base.persisted?
+          unless base.new_record?
             target.each(&:delete) unless options[:binding]
             target.each(&:save) if options[:nullify]
           end
@@ -261,7 +266,8 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def append(document, options = {})
-          load!(options) and target.push(document)
+          init_target if !initialized? && !loaded?
+          target.push(document)
           characterize_one(document)
           binding.bind_one(document, options)
         end
@@ -288,9 +294,39 @@ module Mongoid #:nodoc:
         #
         # @return [ Criteria ] A new criteria.
         def criteria
+          raise_mixed if klass.embedded?
           metadata.klass.where(metadata.foreign_key => base.id)
         end
 
+        # Tells if the target array been initialized.
+        #
+        # @example Is the target initialized?
+        #   relation.initialized?
+        #
+        # @return [ true, false ] If the target is an array.
+        #
+        # @since 2.0.0
+        def initialized?
+          !!@initialized
+        end
+
+        # Initializes the target of the proxy as an empty array instead of
+        # hitting the database.
+        #
+        # @example Initialize the target.
+        #   relation.init_target
+        #
+        # @raise [ Errors::MixedRelations ] If the class is embedded.
+        #
+        # @return [ true ] Always true.
+        #
+        # @since 2.0.0
+        def init_target
+          raise_mixed if klass.embedded?
+          @target = []
+          @initialized = true
+        end
+
         # If the target array does not respond to the supplied method then try to
         # find a named scope or criteria on the class and send the call there.
         #
@@ -309,21 +345,6 @@ module Mongoid #:nodoc:
           end
         end
 
-        # When the base is not yet saved and the user calls create or create!
-        # on the relation, this error will get raised.
-        #
-        # @example Raise the error.
-        #   relation.raise_unsaved(post)
-        #
-        # @param [ Document ] doc The child document getting created.
-        #
-        # @raise [ Errors::UnsavedDocument ] The error.
-        #
-        # @since 2.0.0.rc.6
-        def raise_unsaved(doc)
-          raise Errors::UnsavedDocument.new(base, doc)
-        end
-
         class << self
 
           # Return the builder that is responsible for generating the documents

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -17,14 +17,22 @@ module Mongoid # :nodoc:
         #   person.addresses.push(address)
         #
         # @example Concat with other documents.
-        #   perosn.addresses.concat([ address_one, address_two ])
+        #   person.addresses.concat([ address_one, address_two ])
         #
         # @param [ Document, Array<Document> ] *args Any number of documents.
         def <<(*args)
           options = default_options(args)
-          super(args)
-          base.save if base.persisted? && !options[:binding]
+          args.flatten.each do |doc|
+            return doc unless doc
+            append(doc, options)
+            if base.persisted? && !options[:binding]
+              doc.save
+              base.add_to_set(metadata.foreign_key, doc.id)
+            end
+          end
         end
+        alias :concat :<<
+        alias :push :<<
 
         # Creates a new document on the references many relation. This will
         # save the document if the parent has been persisted.
@@ -38,7 +46,10 @@ module Mongoid # :nodoc:
         # @return [ Document ] The newly created document.
         def create(attributes = nil, type = nil)
           build(attributes, type).tap do |doc|
-            doc.save and base.save if base.persisted?
+            if base.persisted?
+              doc.save
+              base.add_to_set(metadata.foreign_key, doc.id)
+            end
           end
         end
 
@@ -57,7 +68,10 @@ module Mongoid # :nodoc:
         # @return [ Document ] The newly created document.
         def create!(attributes = nil, type = nil)
           build(attributes, type).tap do |doc|
-            doc.save! and base.save! if base.persisted?
+            if base.persisted?
+              doc.save!
+              base.add_to_set(metadata.foreign_key, doc.id)
+            end
           end
         end
 
@@ -88,10 +102,7 @@ module Mongoid # :nodoc:
         #
         # @return [ Integer ] The number of documents deleted.
         def delete_all(conditions = nil)
-          selector = (conditions || {})[:conditions] || {}
-          target.delete_if { |doc| doc.matches?(selector) }
-          scoping = { :_id => { "$in" => base.send(metadata.foreign_key) } }
-          metadata.klass.delete_all(:conditions => selector.merge(scoping))
+          remove_all(conditions, :delete_all)
         end
 
         # Destroys all related documents from the database given the supplied
@@ -107,10 +118,7 @@ module Mongoid # :nodoc:
         #
         # @return [ Integer ] The number of documents destroyd.
         def destroy_all(conditions = nil)
-          selector = (conditions || {})[:conditions] || {}
-          target.delete_if { |doc| doc.matches?(selector) }
-          scoping = { :_id => { "$in" => base.send(metadata.foreign_key) } }
-          metadata.klass.destroy_all(:conditions => selector.merge(scoping))
+          remove_all(conditions, :destroy_all)
         end
 
         # Removes all associations between the base document and the target
@@ -204,7 +212,11 @@ module Mongoid # :nodoc:
         #
         # @return [ Criteria ] A new criteria.
         def criteria
-          metadata.klass.any_in(metadata.inverse_foreign_key => [ base.id ])
+          if metadata.inverse
+            metadata.klass.any_in(metadata.inverse_foreign_key => [ base.id ])
+          else
+            metadata.klass.where(:_id => { "$in" => base.send(metadata.foreign_key) })
+          end
         end
 
         # Dereferences the supplied document from the base of the relation.
@@ -219,6 +231,27 @@ module Mongoid # :nodoc:
           document.save
         end
 
+        # Remove all documents from the relation, either with a delete or a
+        # destroy depending on what this was called through.
+        #
+        # @example Destroy documents from the relation.
+        #   relation.remove_all(:conditions => { :num => 1 }, true)
+        #
+        # @param [ Hash ] conditions Conditions to filter by.
+        # @param [ true, false ] destroy If true then destroy, else delete.
+        #
+        # @return [ Integer ] The number of documents removed.
+        def remove_all(conditions = {}, method = :destroy)
+          cond = conditions || {}
+          target.delete_if do |doc|
+            doc.matches?(cond[:conditions] || {})
+          end
+          ids = criteria.merge(cond).only(:_id).map(&:_id)
+          criteria.merge(cond).send(method).tap do
+            base.pull_all(metadata.foreign_key, ids)
+          end
+        end
+
         class << self
 
           # Return the builder that is responsible for generating the documents

data/lib/mongoid/relations/referenced/one.rb

@@ -44,6 +44,20 @@ module Mongoid # :nodoc:
           end
         end
 
+        # Will load the target into an array if the target had not already been
+        # loaded.
+        #
+        # @example Load the relation into memory.
+        #   relation.load!
+        #
+        # @return [ One ] The relation.
+        #
+        # @since 2.0.0.rc.5
+        def load!(options = {})
+          raise_mixed if klass.embedded?
+          super(options)
+        end
+
         # Removes the association between the base document and the target
         # document by deleting the foreign key and the reference, orphaning
         # the target document in the process.

data/lib/mongoid/sharding.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+
+  # This module contains behaviour for adding shard key fields to updates.
+  module Sharding
+    extend ActiveSupport::Concern
+
+    included do
+      cattr_accessor :shard_key_fields
+      self.shard_key_fields = []
+
+      delegate :shard_key_fields, :to => "self.class"
+    end
+
+    # Get the document selector with the defined shard keys.
+    #
+    # @example Get the selector for the shard keys.
+    #   person.shard_key_selector
+    #
+    # @return [ Hash ] The shard key selector.
+    #
+    # @since 2.0.0
+    def shard_key_selector
+      {}.tap do |selector|
+        shard_key_fields.each do |field|
+          selector[field.to_s] = send(field)
+        end
+      end
+    end
+
+    module ClassMethods #:nodoc
+
+      # Specifies a shard key with the field(s) specified.
+      #
+      # @example Specify the shard key.
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     field :first_name, :type => String
+      #     field :last_name, :type => String
+      #
+      #     shard_key :first_name, :last_name
+      #   end
+      #
+      # @since 2.0.0
+      def shard_key(*names)
+        self.shard_key_fields = names
+      end
+    end
+  end
+end