mongoid 3.1.7 → 4.0.0.alpha1

data/lib/mongoid/railties/database.rake

@@ -24,9 +24,9 @@ namespace :db do
     task :setup => [ "db:create", "db:mongoid:create_indexes", "db:seed" ]
   end
 
-  unless Rake::Task.task_defined?("db:reseed")
-    desc "Delete data and seed"
-    task :reseed => [ "db:drop", "db:seed" ]
+  unless Rake::Task.task_defined?("db:reset")
+    desc "Delete data and loads the seeds"
+    task :reset => [ "db:drop", "db:seed" ]
   end
 
   unless Rake::Task.task_defined?("db:create")
@@ -51,9 +51,7 @@ namespace :db do
 
   unless Rake::Task.task_defined?("db:test:prepare")
     namespace :test do
-      task :prepare do
-        # noop
-      end
+      task :prepare => "mongoid:create_indexes"
     end
   end
 
@@ -68,11 +66,19 @@ namespace :db do
   namespace :mongoid do
     desc "Create the indexes defined on your mongoid models"
     task :create_indexes => :environment do
+      ::Rails.application.eager_load!
       ::Rails::Mongoid.create_indexes
     end
 
+    desc "Remove indexes that exist in the database but aren't specified on the models"
+    task :remove_undefined_indexes => :environment do
+      ::Rails.application.eager_load!
+      ::Rails::Mongoid.remove_undefined_indexes
+    end
+
     desc "Remove the indexes defined on your mongoid models without questions!"
     task :remove_indexes => :environment do
+      ::Rails.application.eager_load!
       ::Rails::Mongoid.remove_indexes
     end
 

data/lib/mongoid/relations.rb

@@ -136,9 +136,9 @@ module Mongoid
     # @since 2.1.6
     def reload_relations
       relations.each_pair do |name, meta|
-        if instance_variable_defined?("@#{name}")
-          if _parent.nil? || instance_variable_get("@#{name}") != _parent
-            remove_instance_variable("@#{name}")
+        if instance_variable_defined?("@_#{name}")
+          if _parent.nil? || instance_variable_get("@_#{name}") != _parent
+            remove_instance_variable("@_#{name}")
           end
         end
       end

data/lib/mongoid/relations/accessors.rb

@@ -15,7 +15,7 @@ module Mongoid
       #   person.__build__(:addresses, { :id => 1 }, metadata)
       #
       # @param [ String, Symbol ] name The name of the relation.
-      # @param [ Hash, Moped::BSON::ObjectId ] object The id or attributes to use.
+      # @param [ Hash, BSON::ObjectId ] object The id or attributes to use.
       # @param [ Metadata ] metadata The relation's metadata.
       # @param [ true, false ] building If we are in a build operation.
       #
@@ -44,20 +44,6 @@ module Mongoid
         target ? metadata.relation.new(self, target, metadata) : nil
       end
 
-      # Determines if the relation exists or not.
-      #
-      # @example Does the relation exist?
-      #   person.relation_exists?(:people)
-      #
-      # @param [ String ] name The name of the relation to check.
-      #
-      # @return [ true, false ] True if set and not nil, false if not.
-      #
-      # @since 2.0.0.rc.1
-      def relation_exists?(name)
-        ivar(name)
-      end
-
       # Resets the criteria inside the relation proxy. Used by many to many
       # relations to keep the underlying ids array in sync.
       #
@@ -68,7 +54,7 @@ module Mongoid
       #
       # @since 3.0.14
       def reset_relation_criteria(name)
-        if instance_variable_defined?("@#{name}")
+        if instance_variable_defined?("@_#{name}")
           send(name).reset_unloaded
         end
       end
@@ -86,7 +72,7 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def set_relation(name, relation)
-        instance_variable_set("@#{name}", relation)
+        instance_variable_set("@_#{name}", relation)
       end
 
       private
@@ -106,34 +92,13 @@ module Mongoid
       # @return [ Proxy ] The relation.
       #
       # @since 3.0.16
-      def get_relation(name, metadata, reload = false)
-        variable = "@#{name}"
-        value = if instance_variable_defined?(variable) && !reload
-          instance_variable_get(variable)
-        else
-          _building do
-            _loading do
-              __build__(name, attributes[metadata.key], metadata)
-            end
-          end
-        end
-        if value.nil? && metadata.autobuilding? && !without_autobuild?
-          send("build_#{name}")
-        else
+      def get_relation(name, metadata, object, reload = false)
+        if !reload && (value = ivar(name)) != false
           value
-        end
-      end
-
-      # @todo: Durran: Refactor before release, but this fixes the issue with
-      # the extra queries.
-      def get_relation_for_set(name, metadata, object)
-        variable = "@#{name}"
-        value = if instance_variable_defined?(variable)
-          instance_variable_get(variable)
         else
           _building do
             _loading do
-              if needs_no_database_query?(object, metadata)
+              if object && needs_no_database_query?(object, metadata)
                 __build__(name, object, metadata)
               else
                 __build__(name, attributes[metadata.key], metadata)
@@ -195,7 +160,7 @@ module Mongoid
         # @return [ Class ] The model being set up.
         #
         # @since 3.0.0
-        def existence_check(name, metadata)
+        def existence_check(name)
           module_eval <<-END
             def #{name}?
               without_autobuild { !__send__(:#{name}).blank? }
@@ -220,7 +185,11 @@ module Mongoid
         # @since 2.0.0.rc.1
         def getter(name, metadata)
           re_define_method(name) do |reload = false|
-            get_relation(name, metadata, reload)
+            value = get_relation(name, metadata, nil, reload)
+            if value.nil? && metadata.autobuilding? && !without_autobuild?
+              value = send("build_#{name}")
+            end
+            value
           end
           self
         end
@@ -261,9 +230,7 @@ module Mongoid
         def setter(name, metadata)
           re_define_method("#{name}=") do |object|
             without_autobuild do
-              if metadata.many?
-                set_relation(name, get_relation(name, metadata).substitute(object.substitutable))
-              elsif value = get_relation_for_set(name, metadata, object)
+              if value = get_relation(name, metadata, object)
                 set_relation(name, value.substitute(object.substitutable))
               else
                 __build__(name, object.substitutable, metadata)

data/lib/mongoid/relations/auto_save.rb

@@ -7,11 +7,6 @@ module Mongoid
     module AutoSave
       extend ActiveSupport::Concern
 
-      included do
-        class_attribute :autosaved_relations
-        self.autosaved_relations = []
-      end
-
       # Used to prevent infinite loops in associated autosaves.
       #
       # @example Is the document autosaved?
@@ -44,15 +39,8 @@ module Mongoid
       #   document.changed_for_autosave?
       #
       # @since 3.1.3
-      def changed_for_autosave?
-        new_record? || changed? || marked_for_destruction?
-      end
-
-      # Returns the relation, if it exists
-      #
-      # @since 3.1.3
-      def relation_changed_for_autosave(metadata)
-        ivar(metadata.name) if self.class.autosaved_relations.include?(metadata.name)
+      def changed_for_autosave?(doc)
+        doc.new_record? || doc.changed? || doc.marked_for_destruction?
       end
 
       module ClassMethods
@@ -68,39 +56,30 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def autosave(metadata)
-          if metadata.autosave? && autosavable?(metadata)
-            autosaved_relations.push(metadata.name)
-            set_callback :save, :after, unless: :autosaved? do |document|
-              # @todo: Durran: Remove with Rails 4 after callback termination.
+          if metadata.autosave? && !metadata.embedded?
+            save_method = :"autosave_documents_for_#{metadata.name}"
+            define_method(save_method) do
+
               if before_callback_halted?
                 self.before_callback_halted = false
               else
                 __autosaving__ do
-                  if document.changed_for_autosave? || relation = document.relation_changed_for_autosave(metadata)
-                    relation = document.__send__(metadata.name) unless relation
-                    (relation.do_or_do_not(:in_memory) || Array.wrap(relation)).each do |doc|
-                      doc.save
-                    end if relation
+                  if relation = ivar(metadata.name)
+                    options = persistence_options || {}
+                    if :belongs_to == metadata.macro
+                      relation.with(options).save if changed_for_autosave?(relation)
+                    else
+                      Array(relation).each { |d| d.with(options).save if changed_for_autosave?(d) }
+                    end
                   end
                 end
               end
             end
+
+            after_save save_method, unless: :autosaved?
           end
         end
 
-        # Can the autosave be added?
-        #
-        # @example Can the autosave be added?
-        #   Person.autosavable?(metadata)
-        #
-        # @param [ Metadata ] metadata The relation metadata.
-        #
-        # @return [ true, false ] If the autosave is able to be added.
-        #
-        # @since 3.0.0
-        def autosavable?(metadata)
-          !autosaved_relations.include?(metadata.name) && !metadata.embedded?
-        end
       end
     end
   end

data/lib/mongoid/relations/binding.rb

@@ -157,27 +157,6 @@ module Mongoid
         end
       end
 
-      # Bind the inverse of field, when in a polymorphic relation.
-      #
-      # @api private
-      #
-      # @example Bind the inverse of field.
-      #   binding.bind_inverse_of_field(doc)
-      #
-      # @param [ Document ] doc The document to bind.
-      # @param [ String ] name The name of the relation.
-      #
-      # @since 3.0.0
-      def bind_inverse_of_field(doc, name)
-        if metadata.inverse_field_bindable?
-          if inverse_metadata = metadata.inverse_metadata(doc)
-            if setter = inverse_metadata.inverse_of_field_setter
-              doc.you_must(setter, name)
-            end
-          end
-        end
-      end
-
       # Bind the provided document with the base from the parent relation.
       #
       # @api private
@@ -193,7 +172,6 @@ module Mongoid
         bind_foreign_key(doc, record_id(base))
         bind_polymorphic_type(doc, base.class.name)
         bind_inverse(doc, base)
-        bind_inverse_of_field(doc, metadata.name)
       end
 
       def record_id(base)
@@ -234,7 +212,6 @@ module Mongoid
         bind_foreign_key(doc, nil)
         bind_polymorphic_type(doc, nil)
         bind_inverse(doc, nil)
-        bind_inverse_of_field(doc, nil)
       end
     end
   end

data/lib/mongoid/relations/bindings/embedded/many.rb

@@ -23,9 +23,7 @@ module Mongoid
           def bind_one(doc)
             doc.parentize(base)
             binding do
-              unless metadata.versioned?
-                doc.do_or_do_not(metadata.inverse_setter(target), base)
-              end
+              doc.do_or_do_not(metadata.inverse_setter(target), base)
             end
           end
 

data/lib/mongoid/relations/bindings/referenced/in.rb

@@ -25,11 +25,10 @@ module Mongoid
               bind_polymorphic_inverse_type(base, target.class.name)
               if inverse = metadata.inverse(target)
                 if set_base_metadata
-                  bind_inverse_of_field(base, base.metadata_name)
                   if base.referenced_many?
-                    target.__send__(inverse).push(base) unless Mongoid.using_identity_map?
+                    target.__send__(inverse).push(base)
                   else
-                    target.do_or_do_not(metadata.inverse_setter(target), base)
+                    target.set_relation(inverse, base)
                   end
                 end
               end
@@ -47,18 +46,14 @@ module Mongoid
           def unbind_one
             binding do
               inverse = metadata.inverse(target)
-              if !inverse && metadata.inverse_of_field
-                inverse = base.__send__(metadata.inverse_of_field)
-              end
               bind_foreign_key(base, nil)
               bind_polymorphic_inverse_type(base, nil)
-              bind_inverse_of_field(base, nil)
               if inverse
                 set_base_metadata
                 if base.referenced_many?
                   target.__send__(inverse).delete(base)
                 else
-                  target.__send__("#{inverse}=", nil)
+                  target.set_relation(inverse, nil)
                 end
               end
             end

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

@@ -20,7 +20,9 @@ module Mongoid
             binding do
               inverse_keys = doc.you_must(metadata.inverse_foreign_key)
               if inverse_keys
-                inverse_keys.push(inverse_record_id(doc))
+                unless inverse_keys.include?(inverse_record_id(doc))
+                  inverse_keys.push(inverse_record_id(doc))
+                end
                 doc.reset_relation_criteria(metadata.inverse)
               end
               base.synced[metadata.foreign_key] = true

data/lib/mongoid/relations/builder.rb

@@ -17,7 +17,7 @@ module Mongoid
       #
       # @param [ Document ] base The base document.
       # @param [ Metdata ] metadata The metadata for the relation.
-      # @param [ Hash, Moped::BSON::ObjectId ] object The attributes to build from or
+      # @param [ Hash, BSON::ObjectId ] object The attributes to build from or
       #   id to query with.
       #
       # @since 2.0.0.rc.1

data/lib/mongoid/relations/builders.rb

@@ -65,7 +65,7 @@ module Mongoid
         def builder(name, metadata)
           re_define_method("build_#{name}") do |*args|
             attributes, options = parse_args(*args)
-            document = Factory.build(metadata.klass, attributes, options)
+            document = Factory.build(metadata.klass, attributes)
             _building do
               child = send("#{name}=", document)
               child.run_callbacks(:build)
@@ -90,7 +90,7 @@ module Mongoid
         def creator(name, metadata)
           re_define_method("create_#{name}") do |*args|
             attributes, options = parse_args(*args)
-            document = Factory.build(metadata.klass, attributes, options)
+            document = Factory.build(metadata.klass, attributes)
             doc = send("#{name}=", document)
             doc.save
             save if new_record? && metadata.stores_foreign_key?

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -16,7 +16,6 @@ module Mongoid
           #   many.build(person)
           #
           # @param [ Document ] parent The parent document of the relation.
-          # @param [ Hash ] options The mass assignment options.
           #
           # @return [ Array ] The attributes.
           def build(parent, options = {})
@@ -25,10 +24,10 @@ module Mongoid
               raise Errors::TooManyNestedAttributeRecords.new(existing, options[:limit])
             end
             attributes.each do |attrs|
-              if attrs.respond_to?(:with_indifferent_access)
-                process_attributes(parent, attrs.with_indifferent_access, options)
+              if attrs.is_a?(::Hash)
+                process_attributes(parent, attrs.with_indifferent_access)
               else
-                process_attributes(parent, attrs[1].with_indifferent_access, options)
+                process_attributes(parent, attrs[1].with_indifferent_access)
               end
             end
           end
@@ -93,10 +92,9 @@ module Mongoid
           #
           # @param [ Document ] parent The parent document.
           # @param [ Hash ] attrs The single document attributes to process.
-          # @param [ Hash ] options the mass assignment options.
           #
           # @since 2.0.0
-          def process_attributes(parent, attrs, options)
+          def process_attributes(parent, attrs)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
               first = existing.first
@@ -105,10 +103,10 @@ module Mongoid
               if destroyable?(attrs)
                 destroy(parent, existing, doc)
               else
-                update_document(doc, attrs, options)
+                update_document(doc, attrs)
               end
             else
-              existing.push(Factory.build(metadata.klass, attrs, options)) unless destroyable?(attrs)
+              existing.push(Factory.build(metadata.klass, attrs)) unless destroyable?(attrs)
             end
           end
 
@@ -127,7 +125,7 @@ module Mongoid
           # @since 3.0.10
           def destroy(parent, relation, doc)
             doc.flagged_for_destroy = true
-            if !doc.embedded? || parent.new_record? || doc.paranoid?
+            if !doc.embedded? || parent.new_record?
               destroy_document(relation, doc)
             else
               parent.flagged_destroys.push(->{ destroy_document(relation, doc) })
@@ -159,15 +157,14 @@ module Mongoid
           #
           # @param [ Document ] doc The document to update.
           # @param [ Hash ] attrs The attributes.
-          # @param [ Hash ] options The options.
           #
           # @since 3.0.10
-          def update_document(doc, attrs, options)
+          def update_document(doc, attrs)
             attrs.delete_id
             if metadata.embedded?
-              doc.assign_attributes(attrs, options)
+              doc.assign_attributes(attrs)
             else
-              doc.update_attributes(attrs, options)
+              doc.update_attributes(attrs)
             end
           end
         end