mongoid 2.2.6 → 2.3.0

data/lib/mongoid/persistence/deletion.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
         document.freeze
         document.destroyed = true
         IdentityMap.remove(document)
-        Threaded.clear_safety_options!
+        Threaded.clear_options!
         true
       end
     end

data/lib/mongoid/persistence/insertion.rb

@@ -31,7 +31,7 @@ module Mongoid #:nodoc:
 
             unless result == false
               doc.move_changes
-              Threaded.clear_safety_options!
+              Threaded.clear_options!
             end
           end
         end

data/lib/mongoid/persistence/modification.rb

@@ -28,7 +28,7 @@ module Mongoid #:nodoc:
           unless result == false
             document.reset_persisted_children
             document.move_changes
-            Threaded.clear_safety_options!
+            Threaded.clear_options!
           end
         end
       end

data/lib/mongoid/railtie.rb

@@ -95,7 +95,7 @@ module Rails #:nodoc:
       # environments.
       initializer "preload all application models" do |app|
         config.to_prepare do
-          ::Rails::Mongoid.load_models(app) unless $rails_rake_task
+          ::Rails::Mongoid.preload_models(app) unless $rails_rake_task
         end
       end
 

data/lib/mongoid/railties/database.rake

@@ -79,7 +79,15 @@ namespace :db do
 
     desc 'Create the indexes defined on your mongoid models'
     task :create_indexes => :environment do
-      ::Rails::Mongoid.create_indexes("app/models/**/*.rb")
+      engines_models_paths = Rails.application.railties.engines.map do |engine|
+        engine.paths["app/models"].paths
+      end
+      root_models_paths = Rails.application.paths["app/models"]
+      models_paths = engines_models_paths.push(root_models_paths).flatten
+
+      models_paths.each do |path|
+        ::Rails::Mongoid.create_indexes("#{path}/**/*.rb")
+      end
     end
 
     def convert_ids(obj)

data/lib/mongoid/relations.rb

@@ -3,6 +3,7 @@ require "mongoid/relations/accessors"
 require "mongoid/relations/auto_save"
 require "mongoid/relations/cascading"
 require "mongoid/relations/constraint"
+require "mongoid/relations/conversions"
 require "mongoid/relations/cyclic"
 require "mongoid/relations/proxy"
 require "mongoid/relations/bindings"

data/lib/mongoid/relations/accessors.rb

@@ -96,7 +96,7 @@ module Mongoid # :nodoc:
               if instance_variable_defined?(variable) && !reload
                 instance_variable_get(variable)
               else
-                building do
+                _building do
                   build(name, attributes[metadata.key], metadata, :loading => true)
                 end
               end

data/lib/mongoid/relations/builders.rb

@@ -35,14 +35,14 @@ module Mongoid # :nodoc:
       # Execute a block in building mode.
       #
       # @example Execute in building mode.
-      #   building do
+      #   _building do
       #     relation.push(doc)
       #   end
       #
       # @return [ Object ] The return value of the block.
       #
       # @since 2.1.0
-      def building
+      def _building
         Threaded.begin_build
         yield
       ensure
@@ -65,8 +65,10 @@ module Mongoid # :nodoc:
         def builder(name, metadata)
           tap do
             define_method("build_#{name}") do |*args|
-              document = Factory.build(metadata.klass, args.first || {})
-              building do
+              attributes = args.first || {}
+              options = args.size > 1 ? args[1] : {}
+              document = Factory.build(metadata.klass, attributes, options)
+              _building do
                 send("#{name}=", document)
               end
             end

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

@@ -17,31 +17,9 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             return [] if object.is_a?(Array)
-            crit = metadata.criteria(convertable(metadata, object))
+            crit = metadata.criteria(Conversions.flag(object, metadata))
             IdentityMap.get(crit.klass, crit.selector) || crit
           end
-
-          private
-
-          # Get the value for the foreign key in convertable or unconvertable
-          # form.
-          #
-          # @example Get the value.
-          #   builder.convertable
-          #
-          # @return [ String, BSON::ObjectId ] The string or object id.
-          #
-          # @since 2.0.2
-          def convertable(metadata, object)
-            inverse = metadata.inverse_klass
-            if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
-              object
-            else
-              object.tap do |obj|
-                obj.unconvertable_to_bson = true if obj.is_a?(String)
-              end
-            end
-          end
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless query?
-            criteria = metadata.criteria(object)
+            criteria = metadata.criteria(Conversions.flag(object, metadata))
             IdentityMap.get(criteria.klass, criteria.selector) || criteria.first
           end
         end

data/lib/mongoid/relations/cascading.rb

@@ -26,9 +26,11 @@ module Mongoid # :nodoc:
       # @since 2.0.0.rc.1
       def cascade!
         cascades.each do |name|
-          metadata = relations[name]
-          strategy = metadata.cascade_strategy
-          strategy.new(self, metadata).cascade
+          if !metadata || !metadata.versioned?
+            meta = relations[name]
+            strategy = meta.cascade_strategy
+            strategy.new(self, meta).cascade
+          end
         end
       end
 

data/lib/mongoid/relations/conversions.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Relations #:nodoc:
+
+    # Contains utility methods for object id conversion.
+    module Conversions
+      extend self
+
+      # Mark the provided object as unconvertable to bson or not, and always
+      # return the provided object.
+      #
+      # @example Flag the object.
+      #   Conversions.flag(metadata, 15)
+      #
+      # @param [ Object ] object The object to flag.
+      # @param [ Metadata ] The relation metadata.
+      #
+      # @return [ Object ] The provided object.
+      #
+      # @since 2.3.0
+      def flag(object, metadata)
+        inverse = metadata.inverse_klass
+        if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
+          object
+        else
+          object.tap do |obj|
+            if obj.is_a?(String)
+              obj.unconvertable_to_bson = true
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -55,13 +55,13 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def atomically(modifier, &block)
-          updater = Threaded.update_consumer(collection_name) ||
-            Threaded.set_update_consumer(collection_name, MODIFIERS[modifier].new)
+          updater = Threaded.update_consumer(root_class) ||
+            Threaded.set_update_consumer(root_class, MODIFIERS[modifier].new)
           count_executions do
             block.call if block
           end.tap do
             if @executions.zero?
-              Threaded.set_update_consumer(collection_name, nil)
+              Threaded.set_update_consumer(root_class, nil)
               updater.execute(collection)
             end
           end

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

@@ -89,7 +89,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          target.persisted? && !binding? && !building?
+          target.persisted? && !binding? && !_building?
         end
 
         class << self

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

@@ -26,7 +26,7 @@ module Mongoid # :nodoc:
             args.flatten.each do |doc|
               next unless doc
               append(doc)
-              doc.save if persistable? && !assigning?
+              doc.save if persistable? && !_assigning?
             end
           end
         end
@@ -40,11 +40,12 @@ module Mongoid # :nodoc:
         #   person.people.build(:name => "Bozo")
         #
         # @param [ Hash ] attributes The attributes to build the document with.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type Optional class to build the document with.
         #
         # @return [ Document ] The new document.
-        def build(attributes = {}, type = nil)
-          Factory.build(type || metadata.klass, attributes).tap do |doc|
+        def build(attributes = {}, options = {}, type = nil)
+          Factory.build(type || metadata.klass, attributes, options).tap do |doc|
             doc.identify
             append(doc)
             yield(doc) if block_given?
@@ -86,11 +87,12 @@ module Mongoid # :nodoc:
         #   person.movies.create(:name => "Bozo")
         #
         # @param [ Hash ] attributes The attributes to build the document with.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type Optional class to create the document with.
         #
         # @return [ Document ] The newly created document.
-        def create(attributes = {}, type = nil, &block)
-          build(attributes, type, &block).tap { |doc| doc.save }
+        def create(attributes = {}, options = {}, type = nil, &block)
+          build(attributes, options, type, &block).tap { |doc| doc.save }
         end
 
         # Create a new document in the relation. This is essentially the same
@@ -101,13 +103,14 @@ module Mongoid # :nodoc:
         #   person.addresses.create!(:street => "Unter der Linden")</tt>
         #
         # @param [ Hash ] attributes The attributes to build the document with.
+        # @param [ Hash ] options The scoped assignment options.
         # @param [ Class ] type Optional class to create the document with.
         #
         # @raise [ Errors::Validations ] If a validation error occured.
         #
         # @return [ Document ] The newly created document.
-        def create!(attributes = {}, type = nil, &block)
-          build(attributes, type, &block).tap { |doc| doc.save! }
+        def create!(attributes = {}, options = {}, type = nil, &block)
+          build(attributes, options, type, &block).tap { |doc| doc.save! }
         end
 
         # Delete the supplied document from the target. This method is proxied
@@ -124,7 +127,7 @@ module Mongoid # :nodoc:
         def delete(document)
           target.delete_one(document).tap do |doc|
             if doc && !binding?
-              if assigning?
+              if _assigning?
                 base.add_atomic_pull(doc)
               else
                 doc.delete(:suppress => true)
@@ -232,7 +235,7 @@ module Mongoid # :nodoc:
         def substitute(replacement)
           tap do |proxy|
             if replacement.blank?
-              if assigning? && !proxy.empty?
+              if _assigning? && !proxy.empty?
                 base.atomic_unsets.push(proxy.first.atomic_path)
               end
               proxy.clear
@@ -242,13 +245,13 @@ module Mongoid # :nodoc:
                   replacement = Many.builder(metadata, replacement).build
                 end
                 proxy.target = replacement.compact
-                if assigning?
+                if _assigning?
                   base.delayed_atomic_sets[metadata.name.to_s] = proxy.as_document
                 end
                 proxy.target.each_with_index do |doc, index|
                   integrate(doc)
                   doc._index = index
-                  doc.save if base.persisted? && !assigning?
+                  doc.save if base.persisted? && !_assigning?
                 end
               end
             end
@@ -400,7 +403,7 @@ module Mongoid # :nodoc:
           criteria.size.tap do
             criteria.each do |doc|
               target.delete_one(doc)
-              doc.send(method, :suppress => true) unless assigning?
+              doc.send(method, :suppress => true) unless _assigning?
               unbind_one(doc)
             end
             reindex
@@ -515,7 +518,7 @@ module Mongoid # :nodoc:
           #
           # @since 2.1.0
           def valid_options
-            [ :as, :cyclic, :order, :versioned ]
+            [ :as, :cascade_callbacks, :cyclic, :order, :versioned ]
           end
 
           # Get the default validation setting for the relation. Determines if

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

@@ -36,7 +36,7 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def substitute(replacement)
           tap do |proxy|
-            if assigning?
+            if _assigning?
               base.atomic_unsets.push(proxy.atomic_path)
             else
               proxy.delete if persistable?
@@ -73,7 +73,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          base.persisted? && !binding? && !building? && !assigning?
+          base.persisted? && !binding? && !_building? && !_assigning?
         end
 
         class << self
@@ -183,7 +183,7 @@ module Mongoid # :nodoc:
           #
           # @since 2.1.0
           def valid_options
-            [ :as, :cyclic ]
+            [ :as, :cascade_callbacks, :cyclic ]
           end
 
           # Get the default validation setting for the relation. Determines if

data/lib/mongoid/relations/metadata.rb

@@ -89,6 +89,19 @@ module Mongoid # :nodoc:
         end
       end
 
+      # Is this an embedded relations that allows callbacks to cascade down to
+      # it?
+      #
+      # @example Does the relation have cascading callbacks?
+      #   metadata.cascading_callbacks?
+      #
+      # @return [ true, false ] If the relation cascades callbacks.
+      #
+      # @since 2.3.0
+      def cascading_callbacks?
+        !!self[:cascade_callbacks]
+      end
+
       # Returns the name of the class that this relation contains. If the
       # class_name was provided as an option this will return that, otherwise
       # it will determine the name from the name property.
@@ -189,7 +202,10 @@ module Mongoid # :nodoc:
       #
       # @since 2.2.0
       def eager_load(criteria)
-        relation.eager_load(self, criteria.clone)
+        relation.eager_load(
+          self,
+          criteria.clone.tap { |crit| crit.inclusions.clear }
+        )
       end
 
       # Will determine if the relation is an embedded one or not. Currently
@@ -229,19 +245,6 @@ module Mongoid # :nodoc:
         !!extension
       end
 
-      # Does this metadata have a forced nil inverse_of defined. (Used in many
-      # to manies)
-      #
-      # @example Is this a forced nil inverse?
-      #   metadata.forced_nil_inverse?
-      #
-      # @return [ true, false ] If inverse_of has been explicitly set to nil.
-      #
-      # @since 2.3.3
-      def forced_nil_inverse?
-        has_key?(:inverse_of) && inverse_of.nil?
-      end
-
       # Handles all the logic for figuring out what the foreign_key is for each
       # relations query. The logic is as follows:
       #
@@ -773,7 +776,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def determine_cyclic_inverse
-        underscored = class_name.underscore
+        underscored = class_name.demodulize.underscore
         klass.relations.each_pair do |key, meta|
           if key =~ /#{underscored.singularize}|#{underscored.pluralize}/ &&
             meta.relation != relation
@@ -823,6 +826,7 @@ module Mongoid # :nodoc:
         default = klass.relations[inverse_klass.name.underscore]
         return default.name if default
         klass.relations.each_pair do |key, meta|
+          next if meta.versioned? || meta.name == name
           if meta.class_name == inverse_class_name
             return key.to_sym
           end

data/lib/mongoid/relations/proxy.rb

@@ -17,7 +17,6 @@ module Mongoid # :nodoc:
       # Backwards compatibility with Mongoid beta releases.
       delegate :klass, :to => :metadata
       delegate :bind_one, :unbind_one, :to => :binding
-      delegate :collection_name, :to => :base
 
       # Convenience for setting the target and the metadata properties since
       # all proxies will need to do this.
@@ -54,12 +53,12 @@ module Mongoid # :nodoc:
       # Is the current thread in assigning mode?
       #
       # @example Is the current thread in assigning mode?
-      #   proxy.assigning?
+      #   proxy._assigning?
       #
       # @return [ true, false ] If the thread is assigning.
       #
       # @since 2.1.0
-      def assigning?
+      def _assigning?
         Threaded.assigning?
       end
 
@@ -78,12 +77,12 @@ module Mongoid # :nodoc:
       # Is the current thread in building mode?
       #
       # @example Is the current thread in building mode?
-      #   proxy.building?
+      #   proxy._building?
       #
       # @return [ true, false ] If the thread is building.
       #
       # @since 2.1.0
-      def building?
+      def _building?
         Threaded.building?
       end