mongoid 2.3.1 → 2.3.2

data/CHANGELOG.md

@@ -8,7 +8,40 @@ For instructions on upgrading to newer versions, visit
 * Ranges can now be passed to #where criteria to create a $gte/$lte query under the
   covers. `Person.where(dob: start_date...end_date)`
 
-## 2.3.1 \[ In Development \] \[ Branch: 2.3.0-stable \]
+## 2.3.2 \[ In Development \] \[ Branch: 2.3.0-stable \]
+
+* \#1347 Fix embedded matchers when provided a hash value that does not have a
+  modifier as a key.
+
+* \#1346 Dup default sorting criteria when calling first/last on a criteria.
+
+* \#1343 When passing no arguments to `Criteria#all_of` return all documents.
+  (Chris Leishman)
+
+* \#1339 Ensure destroy callbacks are run on cascadable children when deleting via
+  nested attributes.
+
+* \#1324 Setting `inverse_of: nil` on a many-to-many referencing the same class
+  returns nil for the inverse foreign key.
+
+* \#1323 Allow both strings and symbols as ids in the attributes array for
+  nested attributes. (Michael Wood)
+
+* \#1312 Setting a logger on the config now accepts anything that quacks like a
+  logger.
+
+* \#1297 Don't hit the database when accessing relations if the base is new.
+
+* \#1239 Allow appending of referenced relations in create blocks, post default set.
+
+* \#1236 Ensure all models are loaded in rake tasks, so even in threadsafe mode
+  all indexes can be created.
+
+* \#736 Calling #reload on embedded documents now works properly.
+
+### Resolved Issues
+
+## 2.3.1
 
 ### Resolved Issues
 

data/lib/mongoid.rb

@@ -28,10 +28,10 @@ require "active_support/inflector"
 require "active_support/time_with_zone"
 require "active_model"
 require "mongo"
-require "mongoid/errors"
 require "mongoid/extensions"
-require "mongoid/relations"
+require "mongoid/errors"
 require "mongoid/threaded"
+require "mongoid/relations"
 require "mongoid/atomic"
 require "mongoid/attributes"
 require "mongoid/callbacks"
@@ -64,6 +64,7 @@ require "mongoid/named_scope"
 require "mongoid/nested_attributes"
 require "mongoid/observer"
 require "mongoid/persistence"
+require "mongoid/reloading"
 require "mongoid/safety"
 require "mongoid/scope"
 require "mongoid/serialization"

data/lib/mongoid/atomic.rb

@@ -101,7 +101,15 @@ module Mongoid #:nodoc:
     #
     # @since 2.2.0
     def atomic_pulls
-      @atomic_pulls ||= {}
+      delayed_atomic_pulls.inject({}) do |pulls, (name, docs)|
+        pulls.tap do |pull|
+          docs.each do |doc|
+            (pull[doc.atomic_path] ||= []).push(doc.as_document)
+            doc.destroyed = true
+            doc.flagged_for_destroy = false
+          end
+        end
+      end
     end
 
     # Add the document as an atomic pull.
@@ -113,7 +121,8 @@ module Mongoid #:nodoc:
     #
     # @since 2.2.0
     def add_atomic_pull(document)
-      (atomic_pulls[document.atomic_path] ||= []).push(document.as_document)
+      document.flagged_for_destroy = true
+      (delayed_atomic_pulls[document.metadata.name.to_s] ||= []).push(document)
     end
 
     # Get all the push attributes that need to occur.
@@ -175,6 +184,18 @@ module Mongoid #:nodoc:
       @delayed_atomic_sets ||= {}
     end
 
+    # Get a hash of atomic pulls that are pending.
+    #
+    # @example Get the atomic pulls.
+    #   document.delayed_atomic_pulls
+    #
+    # @return [ Hash ] name/document pairs.
+    #
+    # @since 2.3.2
+    def delayed_atomic_pulls
+      @delayed_atomic_pulls ||= {}
+    end
+
     private
 
     # Get the atomic paths utility for this document.

data/lib/mongoid/attributes.rb

@@ -175,27 +175,6 @@ module Mongoid #:nodoc:
       end
     end
 
-    # Begin the assignment of attributes. While in this block embedded
-    # documents will not autosave themselves in order to allow the document to
-    # be in a valid state.
-    #
-    # @example Execute the assignment.
-    #   _assigning do
-    #     person.attributes = { :addresses => [ address ] }
-    #   end
-    #
-    # @return [ Object ] The yielded value.
-    #
-    # @since 2.2.0
-    def _assigning
-      begin
-        Threaded.begin_assign
-        yield
-      ensure
-        Threaded.exit_assign
-      end
-    end
-
     # Used for allowing accessor methods for dynamic attributes.
     #
     # @param [ String, Symbol ] name The name of the method.

data/lib/mongoid/callbacks.rb

@@ -82,6 +82,8 @@ module Mongoid #:nodoc:
       [].tap do |children|
         relations.each_pair do |name, metadata|
           next unless metadata.cascading_callbacks?
+          delayed_pulls = delayed_atomic_pulls[name]
+          children.concat(delayed_pulls) if delayed_pulls
           child = send(name)
           Array.wrap(child).each do |doc|
             children.push(doc) if cascadable_child?(kind, doc)
@@ -121,7 +123,13 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def child_callback_type(kind, child)
-      kind == :update && child.new_record? ? :create : kind
+      if kind == :update
+        return :create if child.new_record?
+        return :destroy if child.flagged_for_destroy?
+        kind
+      else
+        kind
+      end
     end
   end
 end

data/lib/mongoid/components.rb

@@ -34,10 +34,12 @@ module Mongoid #:nodoc
     include Mongoid::NestedAttributes
     include Mongoid::Persistence
     include Mongoid::Relations
+    include Mongoid::Reloading
     include Mongoid::Safety
     include Mongoid::Serialization
     include Mongoid::Sharding
     include Mongoid::State
+    include Mongoid::Threaded::Lifecycle
     include Mongoid::Timestamps::Timeless
     include Mongoid::Validations
     include Mongoid::Callbacks

data/lib/mongoid/config.rb

@@ -166,8 +166,10 @@ module Mongoid #:nodoc
     # @return [ Logger ] The newly set logger.
     def logger=(logger)
       case logger
-        when Logger then @logger = logger
-        when false, nil then @logger = nil
+      when false, nil then @logger = nil
+      when true then @logger = default_logger
+      else
+        @logger = logger if logger.respond_to?(:info)
       end
     end
 

data/lib/mongoid/contexts/mongo.rb

@@ -158,10 +158,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The first document in the collection.
       def first
-        opts = process_options
-        sorting = opts[:sort] ||= []
-        sorting << [:_id, :asc]
-        attributes = klass.collection.find_one(selector, opts)
+        attributes = klass.collection.find_one(selector, options_with_default_sorting)
         attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
       end
       alias :one :first
@@ -225,10 +222,8 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The last document in the collection.
       def last
-        opts = process_options
-        sorting = opts[:sort] ||= []
-        sorting << [:_id, :asc]
-        opts[:sort] = sorting.map{ |option| [ option[0], option[1].invert ] }.uniq
+        opts = options_with_default_sorting
+        opts[:sort] = opts[:sort].map{ |option| [ option[0], option[1].invert ] }.uniq
         attributes = klass.collection.find_one(selector, opts)
         attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
       end
@@ -374,6 +369,22 @@ module Mongoid #:nodoc:
         value && value.do_or_do_not(:nan?) ? nil : value
       end
 
+      # Get the options hash with the default sorting options provided.
+      #
+      # @example Get the options.
+      #   criteria.options_with_default_sorting
+      #
+      # @return [ Hash ] The options.
+      #
+      # @since 2.3.2
+      def options_with_default_sorting
+        process_options.tap do |opts|
+          sorting = opts[:sort] ? opts[:sort].dup : []
+          sorting << [:_id, :asc]
+          opts[:sort] = sorting
+        end
+      end
+
       # Filters the field list. If no fields have been supplied, then it will be
       # empty. If fields have been defined then _type will be included as well.
       #

data/lib/mongoid/criterion/inclusion.rb

@@ -34,10 +34,12 @@ module Mongoid #:nodoc:
       # @since 2.3.0
       def all_of(*args)
         clone.tap do |crit|
-          criterion = @selector["$and"] || []
-          converted = BSON::ObjectId.convert(klass, args.flatten)
-          expanded = converted.collect { |hash| hash.expand_complex_criteria }
-          crit.selector["$and"] = criterion.concat(expanded)
+          unless args.empty?
+            criterion = @selector["$and"] || []
+            converted = BSON::ObjectId.convert(klass, args.flatten)
+            expanded = converted.collect { |hash| hash.expand_complex_criteria }
+            crit.selector["$and"] = criterion.concat(expanded)
+          end
         end
       end
 

data/lib/mongoid/dirty.rb

@@ -19,6 +19,7 @@ module Mongoid #:nodoc:
       atomic_pulls.clear
       atomic_unsets.clear
       delayed_atomic_sets.clear
+      delayed_atomic_pulls.clear
       changed_attributes.clear
     end
 

data/lib/mongoid/document.rb

@@ -129,38 +129,14 @@ module Mongoid #:nodoc:
         @attributes ||= {}
         options ||= {}
         process(attrs, options[:as] || :default, !options[:without_protection]) do
-          yield self if block_given?
           identify
           apply_defaults
+          yield(self) if block_given?
         end
         run_callbacks(:initialize) { self }
       end
     end
 
-    # Reloads the +Document+ attributes from the database. If the document has
-    # not been saved then an error will get raised if the configuration option
-    # was set.
-    #
-    # @example Reload the document.
-    #   person.reload
-    #
-    # @raise [ Errors::DocumentNotFound ] If the document was deleted.
-    #
-    # @return [ Document ] The document, reloaded.
-    def reload
-      reloaded = collection.find_one(:_id => id)
-      if Mongoid.raise_not_found_error
-        raise Errors::DocumentNotFound.new(self.class, id) if reloaded.nil?
-      end
-      @attributes = {}.merge(reloaded || {})
-      changed_attributes.clear
-      apply_defaults
-      tap do
-        reload_relations
-        run_callbacks(:initialize)
-      end
-    end
-
     # Return an array with this +Document+ only in it.
     #
     # @example Return the document in an array.

data/lib/mongoid/extensions/hash/criteria_helpers.rb

@@ -26,6 +26,19 @@ module Mongoid #:nodoc:
             end
           end
         end
+
+        # Get the id attribute from this hash, whether it's prefixed with an
+        # underscore or is a symbol.
+        #
+        # @example Extract the id.
+        #   { :_id => 1 }.extract_id
+        #
+        # @return [ Object ] The value of the id.
+        #
+        # @since 2.3.2
+        def extract_id
+          self["id"] || self["_id"] || self[:id] || self[:_id]
+        end
       end
     end
   end

data/lib/mongoid/extensions/object/yoda.rb

@@ -19,6 +19,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.rc.1
         def do_or_do_not(name, *args)
+          return nil unless name
           respond_to?(name) ? send(name, *args) : nil
         end
 

data/lib/mongoid/matchers/strategies.rb

@@ -51,7 +51,12 @@ module Mongoid #:nodoc:
       # @since 2.0.0.rc.7
       def matcher(document, key, value)
         if value.is_a?(Hash)
-          MATCHERS[value.keys.first].new(extract_attribute(document, key))
+          matcher = MATCHERS[value.keys.first]
+          if matcher
+            matcher.new(extract_attribute(document, key))
+          else
+            Default.new(extract_attribute(document, key))
+          end
         else
           case key
             when "$or" then Matchers::Or.new(value, document)

data/lib/mongoid/persistence.rb

@@ -168,7 +168,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The newly created document.
       def create(attributes = {}, options = {}, &block)
-        creating do
+        _creating do
           new(attributes, options, &block).tap { |doc| doc.save }
         end
       end
@@ -187,7 +187,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Document ] The newly created document.
       def create!(attributes = {}, options = {}, &block)
-        creating do
+        _creating do
           new(attributes, options, &block).tap do |doc|
             fail_validate!(doc) if doc.insert.errors.any?
             fail_callback!(doc, :create!) if doc.new?
@@ -259,25 +259,6 @@ module Mongoid #:nodoc:
       def fail_callback!(document, method)
         raise Errors::Callback.new(document.class, method)
       end
-
-      private
-
-      # Execute a block in creating mode.
-      #
-      # @example Execute in creating mode.
-      #   creating do
-      #     relation.push(doc)
-      #   end
-      #
-      # @return [ Object ] The return value of the block.
-      #
-      # @since 2.1.0
-      def creating
-        Threaded.begin_create
-        yield
-      ensure
-        Threaded.exit_create
-      end
     end
   end
 end

data/lib/mongoid/railtie.rb

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

data/lib/mongoid/relations/accessors.rb

@@ -22,8 +22,8 @@ module Mongoid # :nodoc:
       # @return [ Proxy ] The relation.
       #
       # @since 2.0.0.rc.1
-      def build(name, object, metadata, options = {})
-        relation = create_relation(object, metadata, options[:loading])
+      def build(name, object, metadata)
+        relation = create_relation(object, metadata)
         set_relation(name, relation)
       end
 
@@ -38,9 +38,9 @@ module Mongoid # :nodoc:
       # @return [ Proxy ] The relation.
       #
       # @since 2.0.0.rc.1
-      def create_relation(object, metadata, loading = false)
+      def create_relation(object, metadata)
         type = @attributes[metadata.inverse_type]
-        target = metadata.builder(object, loading).build(type)
+        target = metadata.builder(self, object).build(type)
         target ? metadata.relation.new(self, target, metadata) : nil
       end
 
@@ -97,7 +97,9 @@ module Mongoid # :nodoc:
                 instance_variable_get(variable)
               else
                 _building do
-                  build(name, attributes[metadata.key], metadata, :loading => true)
+                  _loading do
+                    build(name, attributes[metadata.key], metadata)
+                  end
                 end
               end
             end

data/lib/mongoid/relations/binding.rb

@@ -4,36 +4,9 @@ module Mongoid # :nodoc:
 
     # Superclass for all objects that bind relations together.
     class Binding
-      attr_reader :base, :target, :metadata
-
-      # Execute a block in binding mode.
-      #
-      # @example Execute in binding mode.
-      #   binding do
-      #     relation.push(doc)
-      #   end
-      #
-      # @return [ Object ] The return value of the block.
-      #
-      # @since 2.1.0
-      def binding
-        Threaded.begin_bind
-        yield
-      ensure
-        Threaded.exit_bind
-      end
+      include Threaded::Lifecycle
 
-      # Is the current thread in binding mode?
-      #
-      # @example Is the thread in binding mode?
-      #   binding.binding?
-      #
-      # @return [ true, false ] If the thread is binding.
-      #
-      # @since 2.1.0
-      def binding?
-        Threaded.binding?
-      end
+      attr_reader :base, :target, :metadata
 
       # Create the new binding.
       #