mongoid 3.1.6 → 4.0.2

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

@@ -66,7 +66,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Embedded::One.new(base, target, metadata)
+          Bindings::Embedded::One.new(base, target, __metadata)
         end
 
         # Are we able to persist this relation?

data/lib/mongoid/relations/macros.rb

@@ -51,13 +51,11 @@ module Mongoid
         # @param [ Hash ] options The relation options.
         # @param [ Proc ] block Optional block for defining extensions.
         def embedded_in(name, options = {}, &block)
-          if ancestors.include?(Mongoid::Versioning)
-            raise Errors::VersioningNotOnRoot.new(self)
-          end
           meta = characterize(name, Embedded::In, options, &block)
           self.embedded = true
           relate(name, meta)
           builder(name, meta).creator(name, meta)
+          touchable(meta)
           add_counter_cache_callbacks(meta) if meta.counter_cached?
           meta
         end
@@ -306,6 +304,7 @@ module Mongoid
               key,
               type: type,
               identity: true,
+              overwrite: true,
               metadata: metadata,
               default: metadata.foreign_key_default
             )
@@ -351,7 +350,7 @@ module Mongoid
         # @param [ Metadata ] metadata The metadata for the relation.
         def relate(name, metadata)
           self.relations = relations.merge(name.to_s => metadata)
-          getter(name, metadata).setter(name, metadata).existence_check(name, metadata)
+          getter(name, metadata).setter(name, metadata).existence_check(name)
         end
       end
     end

data/lib/mongoid/relations/many.rb

@@ -21,11 +21,11 @@ module Mongoid
         size == 0
       end
 
-        # Creates a new document on the references many relation. This will
-        # save the document if the parent has been persisted.
-        #
-        # @example Create and save the new document.
-        #   person.posts.create(:text => "Testing")
+      # Creates a new document on the references many relation. This will
+      # save the document if the parent has been persisted.
+      #
+      # @example Create and save the new document.
+      #   person.posts.create(:text => "Testing")
       #
       # @overload create(attributes = nil, options = {}, type = nil)
       #   @param [ Hash ] attributes The attributes to create with.
@@ -39,10 +39,14 @@ module Mongoid
       # @return [ Document ] The newly created document.
       #
       # @since 2.0.0.beta.1
-      def create(attributes = nil, options = {}, type = nil, &block)
-        doc = build(attributes, options, type, &block)
-        base.persisted? ? doc.save : raise_unsaved(doc)
-        doc
+      def create(attributes = nil, type = nil, &block)
+        if attributes.is_a?(::Array)
+          attributes.map { |attrs| create(attrs, type, &block) }
+        else
+          doc = build(attributes, type, &block)
+          base.persisted? ? doc.save : raise_unsaved(doc)
+          doc
+        end
       end
 
       # Creates a new document on the references many relation. This will
@@ -54,7 +58,6 @@ module Mongoid
       #
       # @overload create!(attributes = nil, options = {}, type = nil)
       #   @param [ Hash ] attributes The attributes to create with.
-      #   @param [ Hash ] options The scoped assignment options.
       #   @param [ Class ] type The optional type of document to create.
       #
       # @overload create!(attributes = nil, type = nil)
@@ -66,10 +69,14 @@ module Mongoid
       # @return [ Document ] The newly created document.
       #
       # @since 2.0.0.beta.1
-      def create!(attributes = nil, options = {}, type = nil, &block)
-        doc = build(attributes, options, type, &block)
-        base.persisted? ? doc.save! : raise_unsaved(doc)
-        doc
+      def create!(attributes = nil, type = nil, &block)
+        if attributes.is_a?(::Array)
+          attributes.map { |attrs| create!(attrs, type, &block) }
+        else
+          doc = build(attributes, type, &block)
+          base.persisted? ? doc.save! : raise_unsaved(doc)
+          doc
+        end
       end
 
       # Find the first document given the conditions, or creates a new document
@@ -78,9 +85,8 @@ module Mongoid
       # @example Find or create.
       #   person.posts.find_or_create_by(:title => "Testing")
       #
-      # @overload find_or_create_by(attributes = nil, options = {}, type = nil)
+      # @overload find_or_create_by(attributes = nil, type = nil)
       #   @param [ Hash ] attributes The attributes to search or create with.
-      #   @param [ Hash ] options The scoped assignment options.
       #   @param [ Class ] type The optional type of document to create.
       #
       # @overload find_or_create_by(attributes = nil, type = nil)
@@ -88,8 +94,29 @@ module Mongoid
       #   @param [ Class ] type The optional type of document to create.
       #
       # @return [ Document ] An existing document or newly created one.
-      def find_or_create_by(attrs = {}, options = {}, type = nil, &block)
-        find_or(:create, attrs, options, type, &block)
+      def find_or_create_by(attrs = {}, type = nil, &block)
+        find_or(:create, attrs, type, &block)
+      end
+
+      # Find the first document given the conditions, or creates a new document
+      # with the conditions that were supplied. This will raise an error if validation fails.
+      #
+      # @example Find or create.
+      #   person.posts.find_or_create_by!(:title => "Testing")
+      #
+      # @overload find_or_create_by!(attributes = nil, type = nil)
+      #   @param [ Hash ] attributes The attributes to search or create with.
+      #   @param [ Class ] type The optional type of document to create.
+      #
+      # @overload find_or_create_by!(attributes = nil, type = nil)
+      #   @param [ Hash ] attributes The attributes to search or create with.
+      #   @param [ Class ] type The optional type of document to create.
+      #
+      # @raise [ Errors::Validations ] If validation failed.
+      #
+      # @return [ Document ] An existing document or newly created one.
+      def find_or_create_by!(attrs = {}, type = nil, &block)
+        find_or(:create!, attrs, type, &block)
       end
 
       # Find the first +Document+ given the conditions, or instantiates a new document
@@ -98,9 +125,8 @@ module Mongoid
       # @example Find or initialize.
       #   person.posts.find_or_initialize_by(:title => "Test")
       #
-      # @overload find_or_initialize_by(attributes = {}, options = {}, type = nil)
+      # @overload find_or_initialize_by(attributes = {}, type = nil)
       #   @param [ Hash ] attributes The attributes to search or initialize with.
-      #   @param [ Hash ] options The scoped assignment options.
       #   @param [ Class ] type The optional subclass to build.
       #
       # @overload find_or_initialize_by(attributes = {}, type = nil)
@@ -108,8 +134,8 @@ module Mongoid
       #   @param [ Class ] type The optional subclass to build.
       #
       # @return [ Document ] An existing document or newly instantiated one.
-      def find_or_initialize_by(attrs = {}, options = {}, type = nil, &block)
-        find_or(:build, attrs, options, type, &block)
+      def find_or_initialize_by(attrs = {}, type = nil, &block)
+        find_or(:build, attrs, type, &block)
       end
 
       # This proxy can never be nil.
@@ -191,10 +217,9 @@ module Mongoid
       # @example Find or create|initialize.
       #   person.addresses.find_or(:create, :street => "Bond")
       #
-      # @overload find_or(method, attributes = {}, options = {}, type = nil)
+      # @overload find_or(method, attributes = {}, type = nil)
       #   @param [ Symbol ] method The method name, create or new.
       #   @param [ Hash ] attributes The attributes to search or build with.
-      #   @param [ Hash ] options The scoped assignment options.
       #   @param [ Class ] type The optional subclass to build.
       #
       # @overload find_or(attributes = {}, type = nil)
@@ -203,14 +228,9 @@ module Mongoid
       #   @param [ Class ] type The optional subclass to build.
       #
       # @return [ Document ] A matching document or a new/created one.
-      def find_or(method, attrs = {}, options = {}, type = nil, &block)
-        if options.is_a? Class
-          options, type = {}, options
-        end
-
+      def find_or(method, attrs = {}, type = nil, &block)
         attrs["_type"] = type.to_s if type
-
-        where(attrs).first || send(method, attrs, options, type, &block)
+        where(attrs).first || send(method, attrs, type, &block)
       end
     end
   end

data/lib/mongoid/relations/marshalable.rb

@@ -12,7 +12,7 @@ module Mongoid
       #
       # @since 3.0.15
       def marshal_dump
-        [ base, target, metadata ]
+        [ base, target, __metadata ]
       end
 
       # Takes the provided data and sets it back on the proxy.
@@ -24,8 +24,8 @@ module Mongoid
       #
       # @since 3.0.15
       def marshal_load(data)
-        @base, @target, @metadata = data
-        extend_proxy(metadata.extension) if metadata.extension?
+        @base, @target, @__metadata = data
+        extend_proxy(__metadata.extension) if __metadata.extension?
       end
     end
   end

data/lib/mongoid/relations/metadata.rb

@@ -229,20 +229,6 @@ module Mongoid
         !!dependent
       end
 
-      # Get the criteria needed to eager load this relation.
-      #
-      # @example Get the eager loading criteria.
-      #   metadata.eager_load(criteria)
-      #
-      # @param [ Array<Object> ] ids The ids of the returned parents.
-      #
-      # @return [ Criteria ] The eager loading criteria.
-      #
-      # @since 2.2.0
-      def eager_load(ids)
-        relation.eager_load(self, ids)
-      end
-
       # Will determine if the relation is an embedded one or not. Currently
       # only checks against embeds one and many.
       #
@@ -398,8 +384,7 @@ module Mongoid
   order:        #{order.inspect}
   polymorphic:  #{polymorphic?}
   relation:     #{relation}
-  setter:       #{setter}
-  versioned:    #{versioned?}>
+  setter:       #{setter}>
 }
       end
 
@@ -460,21 +445,6 @@ module Mongoid
         !!inverse_class_name
       end
 
-      # Is the inverse field bindable? Ie, do we have more than one definition
-      # on the parent class with the same polymorphic name (as).
-      #
-      # @example Is the inverse of bindable?
-      #   metadata.inverse_of_bindable?
-      #
-      # @return [ true, false ] If the relation needs the inverse of field set.
-      #
-      # @since 3.0.6
-      def inverse_field_bindable?
-        @inverse_field_bindable ||= (inverse_klass.relations.values.count do |meta|
-          meta.as == as
-        end > 1)
-      end
-
       # Used for relational many to many only. This determines the name of the
       # foreign key field on the inverse side of the relation, since in this
       # case there are keys on both sides.
@@ -579,31 +549,6 @@ module Mongoid
         @inverse_type_setter ||= inverse_type.__setter__
       end
 
-      # Returns the name of the field in which to store the name of the inverse
-      # field for the polymorphic relation.
-      #
-      # @example Get the name of the field.
-      #   metadata.inverse_of_field
-      #
-      # @return [ String ] The name of the field for storing the name of the
-      #   inverse field.
-      #
-      # @since 2.4.5
-      def inverse_of_field
-        @inverse_of_field ||= determine_inverse_for(:field)
-      end
-
-      # Gets the setter for the field that stores the name of the inverse field
-      # on a polymorphic relation.
-      #
-      # @example Get the inverse type setter.
-      #   metadata.inverse_of_field_setter
-      #
-      # @return [ String ] The name of the setter.
-      def inverse_of_field_setter
-        @inverse_of_field_setter ||= inverse_of_field.__setter__
-      end
-
       # This returns the key that is to be used to grab the attributes for the
       # relation or the foreign key or id that a referenced relation will use
       # to query for the object.
@@ -823,18 +768,6 @@ module Mongoid
         end
       end
 
-      # Is this relation using Mongoid's internal versioning system?
-      #
-      # @example Is this relation versioned?
-      #   metadata.versioned?
-      #
-      # @return [ true, false ] If the relation uses Mongoid versioning.
-      #
-      # @since 2.1.0
-      def versioned?
-        !!self[:versioned]
-      end
-
       # Returns the metadata itself. Here for compatibility with Rails
       # association metadata.
       #
@@ -977,9 +910,13 @@ module Mongoid
       # @since 3.0.0
       def find_from_parts(modules)
         modules.find do |mod|
-          ActiveSupport::Inflector.constantize(mod).constants.include?(
-            name.to_s.classify.to_sym
-          )
+          if mod.blank?
+            false
+          else
+            ActiveSupport::Inflector.constantize(mod).constants.include?(
+              name.to_s.classify.to_sym
+            )
+          end
         end
       end
 
@@ -1033,15 +970,13 @@ module Mongoid
       # @since 2.0.0.rc.1
       def determine_foreign_key
         return self[:foreign_key].to_s if self[:foreign_key]
-        suffix = relation.foreign_key_suffix
+        return nil if relation.embedded?
+
         if relation.stores_foreign_key?
           relation.foreign_key(name)
         else
-          if polymorphic?
-            "#{self[:as]}#{suffix}"
-          else
-            inverse_of ? "#{inverse_of}#{suffix}" : inverse_class_name.foreign_key
-          end
+          suffix = relation.foreign_key_suffix
+          "#{inverse}#{suffix}"
         end
       end
 
@@ -1112,8 +1047,8 @@ module Mongoid
       # @since 3.0.0
       def inverse_relation_candidates
         relations_metadata.select do |meta|
-          next if meta.versioned? || meta.name == name
-          meta.class_name == inverse_class_name
+          next if meta.name == name
+          (meta.class_name == inverse_class_name) && !meta.forced_nil_inverse?
         end
       end
 

data/lib/mongoid/relations/nested_builder.rb

@@ -63,11 +63,11 @@ module Mongoid
       # @param [ Class ] klass The class we're trying to convert for.
       # @param [ String ] id The id, usually coming from the form.
       #
-      # @return [ Moped::BSON::ObjectId, String, Object ] The converted id.
+      # @return [ BSON::ObjectId, String, Object ] The converted id.
       #
       # @since 2.0.0.rc.6
       def convert_id(klass, id)
-        klass.using_object_ids? ? Moped::BSON::ObjectId.mongoize(id) : id
+        klass.using_object_ids? ? BSON::ObjectId.mongoize(id) : id
       end
     end
   end

data/lib/mongoid/relations/one.rb

@@ -53,7 +53,7 @@ module Mongoid
       #
       # @since 4.0.0
       def __evolve_object_id__
-        target.id
+        target._id
       end
     end
   end

data/lib/mongoid/relations/options.rb

@@ -42,6 +42,7 @@ module Mongoid
             )
           end
         end
+        true
       end
     end
   end

data/lib/mongoid/relations/polymorphic.rb

@@ -29,7 +29,6 @@ module Mongoid
             self.polymorphic = true
             if metadata.relation.stores_foreign_key?
               field(metadata.inverse_type, type: String)
-              field(metadata.inverse_of_field, type: Symbol)
             end
           end
           self

data/lib/mongoid/relations/proxy.rb

@@ -12,16 +12,17 @@ module Mongoid
       # We undefine most methods to get them sent through to the target.
       instance_methods.each do |method|
         undef_method(method) unless
-          method =~ /(^__|^send|^object_id|^respond_to|^tap|extend_proxy)/
+          method =~ /(^__|^send|^object_id|^respond_to|^tap|extend_proxy|extend_proxies)/
       end
 
       include Threaded::Lifecycle
       include Marshalable
 
-      attr_accessor :base, :loaded, :metadata, :target
+      attr_accessor :base, :__metadata, :target
+      alias :relation_metadata :__metadata
 
       # Backwards compatibility with Mongoid beta releases.
-      delegate :foreign_key, :inverse_foreign_key, to: :metadata
+      delegate :foreign_key, :inverse_foreign_key, to: :__metadata
       delegate :bind_one, :unbind_one, to: :binding
       delegate :collection_name, to: :base
 
@@ -37,9 +38,14 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def init(base, target, metadata)
-        @base, @target, @metadata = base, target, metadata
+        @base, @target, @__metadata = base, target, metadata
         yield(self) if block_given?
-        extend_proxy(metadata.extension) if metadata.extension?
+        extend_proxies(metadata.extension) if metadata.extension?
+      end
+
+      # Allow extension to be an array and extend each module
+      def extend_proxies(*extension)
+        extension.flatten.each {|ext| extend_proxy(ext) }
       end
 
       # Get the class from the metadata, or return nil if no metadata present.
@@ -51,7 +57,7 @@ module Mongoid
       #
       # @since 3.0.15
       def klass
-        metadata ? metadata.klass : nil
+        __metadata ? __metadata.klass : nil
       end
 
       # Resets the criteria inside the relation proxy. Used by many to many
@@ -103,7 +109,7 @@ module Mongoid
       #
       # @since 3.0.0
       def with(options)
-        Threaded.set_persistence_options(klass, options)
+        @persistence_options = options
         self
       end
 
@@ -119,6 +125,7 @@ module Mongoid
       # @since 2.0.0
       def collection
         root = base._root
+        root.with(@persistence_options)
         root.collection unless root.embedded?
       end
 
@@ -131,7 +138,7 @@ module Mongoid
       #
       # @since 2.0.0.rc.4
       def characterize_one(document)
-        document.metadata = metadata unless document.metadata
+        document.__metadata = __metadata unless document.__metadata
       end
 
       # Default behavior of method missing should be to delegate all calls
@@ -153,7 +160,7 @@ module Mongoid
       #
       # @since 2.0.0
       def raise_mixed
-        raise Errors::MixedRelations.new(base.class, metadata.klass)
+        raise Errors::MixedRelations.new(base.class, __metadata.klass)
       end
 
       # When the base is not yet saved and the user calls create or create!
@@ -183,11 +190,12 @@ module Mongoid
       # @since 3.1.0
       def callback_method(callback_name)
         methods = []
-        if metadata[callback_name]
-          if metadata[callback_name].is_a? Array
-            methods.concat(metadata[callback_name])
+        metadata = __metadata[callback_name]
+        if metadata
+          if metadata.is_a?(Array)
+            methods.concat(metadata)
           else
-            methods << metadata[callback_name]
+            methods << metadata
           end
         end
         methods
@@ -230,34 +238,6 @@ module Mongoid
         def apply_ordering(criteria, metadata)
           metadata.order ? criteria.order_by(metadata.order) : criteria
         end
-
-        # Get the criteria that is used to eager load a relation of this
-        # type.
-        #
-        # @example Get the eager load criteria.
-        #   Proxy.eager_load(metadata, criteria)
-        #
-        # @param [ Metadata ] metadata The relation metadata.
-        # @param [ Array<Object> ] ids The ids of the base docs.
-        #
-        # @return [ Criteria ] The criteria to eager load the relation.
-        #
-        # @since 2.2.0
-        def eager_load_ids(metadata, ids)
-          klass, foreign_key = metadata.klass, metadata.foreign_key
-          eager_loaded = klass.any_in(foreign_key => ids).entries
-          ids.each do |id|
-            sel = { foreign_key => id }
-            sel.merge!(metadata.type_relation) if klass.hereditary?
-            IdentityMap.clear_many(klass, sel)
-          end
-          eager_loaded.each do |doc|
-            base_id = doc.__send__(foreign_key)
-            sel = { foreign_key => base_id }
-            sel.merge!(metadata.type_relation) if klass.hereditary?
-            yield(doc,  sel)
-          end
-        end
       end
     end
   end