mongoid 3.1.6 → 4.0.2

data/lib/mongoid/railtie.rb

@@ -7,20 +7,11 @@ require "rails/mongoid"
 
 module Rails
   module Mongoid
-    class Railtie < Rails::Railtie
 
-      # Determine which generator to use. app_generators was introduced after
-      # 3.0.0.
-      #
-      # @example Get the generators method.
-      #   railtie.generators
-      #
-      # @return [ Symbol ] The method name to use.
-      #
-      # @since 2.0.0.rc.4
-      def self.generator
-        config.respond_to?(:app_generators) ? :app_generators : :generators
-      end
+    # Hooks Mongoid into Rails 3 and higher.
+    #
+    # @since 2.0.0
+    class Railtie < Rails::Railtie
 
       # Mapping of rescued exceptions to HTTP responses
       #
@@ -37,7 +28,7 @@ module Rails
         }
       end
 
-      config.send(generator).orm :mongoid, migration: false
+      config.app_generators.orm :mongoid, migration: false
 
       if config.action_dispatch.rescue_responses
         config.action_dispatch.rescue_responses.merge!(rescue_responses)
@@ -56,11 +47,15 @@ module Rails
       #       config.mongoid.persist_in_safe_mode = true
       #     end
       #   end
+      #
+      # @since 2.0.0
       config.mongoid = ::Mongoid::Config
 
       # Initialize Mongoid. This will look for a mongoid.yml in the config
       # directory and configure mongoid appropriately.
-      initializer "setup database" do
+      #
+      # @since 2.0.0
+      initializer "mongoid.load-config" do
         config_file = Rails.root.join("config", "mongoid.yml")
         if config_file.file?
           begin
@@ -79,64 +74,41 @@ module Rails
 
       # Set the proper error types for Rails. DocumentNotFound errors should be
       # 404s and not 500s, validation errors are 422s.
-      initializer "load http errors" do |app|
-        config.after_initialize do
-          unless config.action_dispatch.rescue_responses
-            ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)
-          end
+      #
+      # @since 2.0.0
+      config.after_initialize do
+        unless config.action_dispatch.rescue_responses
+          ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)
         end
       end
 
       # Due to all models not getting loaded and messing up inheritance queries
       # and indexing, we need to preload the models in order to address this.
       #
-      # This will happen every request in development, once in ther other
+      # This will happen for every request in development, once in other
       # environments.
-      initializer "preload all application models" do |app|
+      #
+      # @since 2.0.0
+      initializer "mongoid.preload-models" do |app|
         config.to_prepare do
-          if $rails_rake_task
-            # We previously got rid of this, however in the case where
-            # threadsafe! is enabled we must load all models so things like
-            # creating indexes works properly.
-            ::Rails::Mongoid.load_models(app)
-          else
-            ::Rails::Mongoid.preload_models(app)
-          end
+          ::Rails::Mongoid.preload_models(app)
         end
       end
 
-      # Need to include the Mongoid identity map middleware.
-      initializer "include the identity map" do |app|
-        app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"
-      end
-
-      # Instantitate any registered observers after Rails initialization and
-      # instantiate them after being reloaded in the development environment
-      initializer "instantiate observers" do
-        config.after_initialize do
-          ::Mongoid::instantiate_observers
-          ActionDispatch::Reloader.to_prepare do
-            ::Mongoid.instantiate_observers
-          end
+      config.after_initialize do
+        # Unicorn clears the START_CTX when a worker is forked, so if we have
+        # data in START_CTX then we know we're being preloaded. Unicorn does
+        # not provide application-level hooks for executing code after the
+        # process has forked, so we reconnect lazily.
+        if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
+          ::Mongoid.default_session.disconnect if ::Mongoid.configured?
         end
-      end
-
-      initializer "reconnect to master if application is preloaded" do
-        config.after_initialize do
-          # Unicorn clears the START_CTX when a worker is forked, so if we have
-          # data in START_CTX then we know we're being preloaded. Unicorn does
-          # not provide application-level hooks for executing code after the
-          # process has forked, so we reconnect lazily.
-          if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
-            ::Mongoid.default_session.disconnect if ::Mongoid.configured?
-          end
 
-          # Passenger provides the :starting_worker_process event for executing
-          # code after it has forked, so we use that and reconnect immediately.
-          if ::Mongoid.running_with_passenger?
-            PhusionPassenger.on_event(:starting_worker_process) do |forked|
-              ::Mongoid.default_session.disconnect if forked
-            end
+        # Passenger provides the :starting_worker_process event for executing
+        # code after it has forked, so we use that and reconnect immediately.
+        if ::Mongoid::Config.running_with_passenger?
+          PhusionPassenger.on_event(:starting_worker_process) do |forked|
+            ::Mongoid.default_session.disconnect if forked
           end
         end
       end
@@ -145,6 +117,8 @@ module Rails
       # code, so we have no way in the intitializer to know if we are
       # generating a mongoid.yml. So instead of failing, we catch all the
       # errors and print them out.
+      #
+      # @since 3.0.0
       def handle_configuration_error(e)
         puts "There is a configuration error with the current mongoid.yml."
         puts e.message

data/lib/mongoid/railties/database.rake

@@ -1,3 +1,5 @@
+load 'mongoid/tasks/database.rake'
+
 namespace :db do
 
   unless Rake::Task.task_defined?("db:drop")
@@ -21,12 +23,12 @@ namespace :db do
 
   unless Rake::Task.task_defined?("db:setup")
     desc "Create the database, and initialize with the seed data"
-    task :setup => [ "db:create", "db:mongoid:create_indexes", "db:seed" ]
+    task :setup => [ "db:create", "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 +53,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
 
@@ -66,24 +66,8 @@ namespace :db do
   end
 
   namespace :mongoid do
-    desc "Create the indexes defined on your mongoid models"
-    task :create_indexes => :environment do
-      ::Rails::Mongoid.create_indexes
-    end
-
-    desc "Remove the indexes defined on your mongoid models without questions!"
-    task :remove_indexes => :environment do
-      ::Rails::Mongoid.remove_indexes
-    end
-
-    desc "Drops the database for the current Rails.env"
-    task :drop => :environment do
-      ::Mongoid::Sessions.default.drop
-    end
-
-    desc "Drop all collections except the system collections"
-    task :purge => :environment do
-      ::Mongoid.purge!
+    task :load_models do
+      ::Rails.application.eager_load! if defined?(Rails)
     end
   end
 end

data/lib/mongoid/relations.rb

@@ -46,7 +46,8 @@ module Mongoid
     include Touchable
     include CounterCache
 
-    attr_accessor :metadata
+    attr_accessor :__metadata
+    alias :relation_metadata :__metadata
 
     # Determine if the document itself is embedded in another document via the
     # proper channels. (If it has a parent document.)
@@ -70,7 +71,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def embedded_many?
-      metadata && metadata.macro == :embeds_many
+      __metadata && __metadata.macro == :embeds_many
     end
 
     # Determine if the document is part of an embeds_one relation.
@@ -82,7 +83,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def embedded_one?
-      metadata && metadata.macro == :embeds_one
+      __metadata && __metadata.macro == :embeds_one
     end
 
     # Get the metadata name for this document. If no metadata was defined
@@ -97,8 +98,8 @@ module Mongoid
     #
     # @since 3.0.0
     def metadata_name
-      raise Errors::NoMetadata.new(self.class.name) unless metadata
-      metadata.name
+      raise Errors::NoMetadata.new(self.class.name) unless __metadata
+      __metadata.name
     end
 
     # Determine if the document is part of an references_many relation.
@@ -110,7 +111,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def referenced_many?
-      metadata && metadata.macro == :has_many
+      __metadata && __metadata.macro == :has_many
     end
 
     # Determine if the document is part of an references_one relation.
@@ -122,7 +123,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def referenced_one?
-      metadata && metadata.macro == :has_one
+      __metadata && __metadata.macro == :has_one
     end
 
     # Convenience method for iterating through the loaded relations and
@@ -136,27 +137,12 @@ 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
     end
-
-    module ClassMethods
-
-      # This is convenience for librarys still on the old API.
-      #
-      # @example Get the associations.
-      #   Person.associations
-      #
-      # @return [ Hash ] The relations.
-      #
-      # @since 2.3.1
-      def associations
-        self.relations
-      end
-    end
   end
 end

data/lib/mongoid/relations/accessors.rb

@@ -12,10 +12,10 @@ module Mongoid
       # document is nil, then sets the relation on this document.
       #
       # @example Build the relation.
-      #   person.__build__(:addresses, { :id => 1 }, metadata)
+      #   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)
@@ -145,7 +110,7 @@ module Mongoid
 
       def needs_no_database_query?(object, metadata)
         object.is_a?(Document) && !object.embedded? &&
-          object.id == attributes[metadata.key]
+          object._id == attributes[metadata.key]
       end
 
       # Is the current code executing without autobuild functionality?
@@ -190,12 +155,11 @@ module Mongoid
         #   person.game?
         #
         # @param [ String, Symbol ] name The name of the relation.
-        # @param [ Metadata ] The metadata.
         #
         # @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 +184,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
@@ -232,7 +200,6 @@ module Mongoid
         #   Person.ids_getter("addresses", metadata)
         #
         # @param [ String, Symbol ] name The name of the relation.
-        # @param [ Metadata] metadata The metadata for the relation.
         #
         # @return [ Class ] The class being set up.
         def ids_getter(name, metadata)
@@ -243,7 +210,6 @@ module Mongoid
           self
         end
 
-
         # Defines the setter for the relation. This does a few things based on
         # some conditions. If there is an existing association, a target
         # substitution will take place, otherwise a new relation will be
@@ -261,9 +227,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