mongoid 3.0.23 → 3.1.0

data/lib/mongoid/finders.rb

@@ -13,15 +13,23 @@ module Mongoid
     delegate \
       :aggregates,
       :avg,
+      :distinct,
       :each,
+      :each_with_index,
       :extras,
       :find_and_modify,
       :find_or_create_by,
       :find_or_initialize_by,
+      :first_or_create,
+      :first_or_create!,
+      :first_or_initialize,
+      :for_js,
+      :geo_near,
       :includes,
       :map_reduce,
       :max,
       :min,
+      :pluck,
       :sum,
       :update,
       :update_all, to: :with_default_scope

data/lib/mongoid/hierarchy.rb

@@ -131,6 +131,18 @@ module Mongoid
       object || self
     end
 
+    # Is this document the root document of the hierarchy?
+    #
+    # @example Is the document the root?
+    #   document._root?
+    #
+    # @return [ true, false ] If the document is the root.
+    #
+    # @since 3.1.0
+    def _root?
+      _parent ? false : true
+    end
+
     module ClassMethods
 
       # Determines if the document is a subclass of another document.
@@ -161,7 +173,13 @@ module Mongoid
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup
         subclass.scopes = scopes.dup
-        subclass.autosaved_relations = autosaved_relations.dup
+
+        # We only need the _type field if inheritance is in play, but need to
+        # add to the root class as well for backwards compatibility.
+        unless fields.has_key?("_type")
+          field(:_type, default: self.name, type: String)
+        end
+        subclass.field(:_type, default: subclass.name, type: String)
       end
     end
   end

data/lib/mongoid/indexes.rb

@@ -23,7 +23,12 @@ module Mongoid
       def create_indexes
         return unless index_options
         index_options.each_pair do |spec, options|
-          collection.indexes.create(spec, options)
+          if database = options[:database]
+            with(consistency: :strong, database: database).
+              collection.indexes.create(spec, options.except(:database))
+          else
+            with(consistency: :strong).collection.indexes.create(spec, options)
+          end
         end and true
       end
 
@@ -37,9 +42,13 @@ module Mongoid
       #
       # @since 3.0.0
       def remove_indexes
-        with(consistency: :strong).collection.indexes.each do |spec|
-          next if spec["name"] == "_id_"
-          collection.indexes.drop(spec["key"])
+        indexed_database_names.each do |database|
+          collection = with(consistency: :strong, database: database).collection
+          collection.indexes.each do |spec|
+            unless spec["name"] == "_id_"
+              collection.indexes.drop(spec["key"])
+            end
+          end
         end and true
       end
 
@@ -123,6 +132,23 @@ module Mongoid
           normalized
         end
       end
+
+      # Get the names of all databases for this model that have index
+      # definitions.
+      #
+      # @api private
+      #
+      # @example Get the indexed database names.
+      #   Model.indexed_database_names
+      #
+      # @return [ Array<String> ] The names.
+      #
+      # @since 3.1.0
+      def indexed_database_names
+        index_options.values.map do |options|
+          options[:database] || database_name
+        end.uniq
+      end
     end
   end
 end

data/lib/mongoid/indexes/validators/options.rb

@@ -9,6 +9,7 @@ module Mongoid
 
         VALID_OPTIONS = [
           :background,
+          :database,
           :drop_dups,
           :name,
           :sparse,
@@ -17,10 +18,19 @@ module Mongoid
           :min,
           :bits,
           :bucket_size,
-          :expire_after_seconds
+          :expire_after_seconds,
+          :weights
         ]
 
-        VALID_TYPES = [ 1, -1, "2d", "geoHaystack" ]
+        VALID_TYPES = [
+          1,
+          -1,
+          "2d",
+          "2dsphere",
+          "geoHaystack",
+          "text",
+          "hashed"
+        ]
 
         # Validate the index specification.
         #

data/lib/mongoid/inspection.rb

@@ -29,7 +29,8 @@ module Mongoid
     def inspect_fields
       fields.map do |name, field|
         unless name == "_id"
-          "#{name}: #{@attributes[name].inspect}"
+          as = field.options[:as]
+          "#{name}#{as ? "(#{as})" : nil}: #{@attributes[name].inspect}"
         end
       end.compact
     end

data/lib/mongoid/matchers/strategies.rb

@@ -21,7 +21,7 @@ module Mongoid
     module Strategies
       extend self
 
-      MATCHERS = HashWithIndifferentAccess.new({
+      MATCHERS = {
         "$all" => Matchers::All,
         "$and" => Matchers::And,
         "$exists" => Matchers::Exists,
@@ -34,7 +34,7 @@ module Mongoid
         "$nin" => Matchers::Nin,
         "$or" => Matchers::Or,
         "$size" => Matchers::Size
-      })
+      }.with_indifferent_access
 
       # Get the matcher for the supplied key and value. Will determine the class
       # name from the key.
@@ -58,9 +58,9 @@ module Mongoid
             Default.new(extract_attribute(document, key))
           end
         else
-          case key
-            when "$or", :$or then Matchers::Or.new(value, document)
-            when "$and", :$and then Matchers::And.new(value, document)
+          case key.to_s
+            when "$or" then Matchers::Or.new(value, document)
+            when "$and" then Matchers::And.new(value, document)
             else Default.new(extract_attribute(document, key))
           end
         end

data/lib/mongoid/observer.rb

@@ -71,6 +71,9 @@ module Mongoid
   # * before_update
   # * around_update
   # * after_update
+  # * before_upsert
+  # * around_upsert
+  # * after_upsert
   # * before_save
   # * around_save
   # * after_save
@@ -107,29 +110,7 @@ module Mongoid
   # Observers are singletons and that call instantiates and registers them.
   class Observer < ActiveModel::Observer
 
-    # Instantiate the new observer. Will add all child observers as well.
-    #
-    # @example Instantiate the observer.
-    #   Mongoid::Observer.new
-    #
-    # @since 2.0.0.rc.8
-    def initialize
-      super and observed_descendants.each { |klass| add_observer!(klass) }
-    end
-
-    protected
-
-    # Get all the child observers.
-    #
-    # @example Get the children.
-    #   observer.observed_descendants
-    #
-    # @return [ Array<Class> ] The children.
-    #
-    # @since 2.0.0.rc.8
-    def observed_descendants
-      observed_classes.sum([]) { |klass| klass.descendants }
-    end
+    private
 
     # Adds the specified observer to the class.
     #
@@ -152,25 +133,35 @@ module Mongoid
     #
     # @since 2.0.0.rc.8
     def define_callbacks(klass)
-      tap do |observer|
-        observer_name = observer.class.name.underscore.gsub('/', '__')
-        Mongoid::Callbacks::CALLBACKS.each do |callback|
-          next unless respond_to?(callback)
-          callback_meth = :"_notify_#{observer_name}_for_#{callback}"
-          unless klass.respond_to?(callback_meth)
-            klass.send(:define_method, callback_meth) do |&block|
-              if value = observer.update(callback, self, &block)
-                value
-              else
-                block.call if block
-              end
+      observer = self
+      observer_name = observer.class.name.underscore.gsub('/', '__')
+      Mongoid::Callbacks.observables.each do |callback|
+        next unless respond_to?(callback)
+        callback_meth = :"_notify_#{observer_name}_for_#{callback}"
+        unless klass.respond_to?(callback_meth)
+          klass.send(:define_method, callback_meth) do |&block|
+            if value = observer.update(callback, self, &block)
+              value
+            else
+              block.call if block
             end
-            klass.send(callback, callback_meth)
           end
+          klass.send(callback, callback_meth)
         end
       end
+      self
     end
 
+    # Are the observers disabled for the object?
+    #
+    # @api private
+    #
+    # @example If the observer disabled?
+    #   Observer.disabled_for(band)
+    #
+    # @param [ Document ] object The model instance.
+    #
+    # @return [ true, false ] If the observer is disabled.
     def disabled_for?(object)
       klass = object.class
       return false unless klass.respond_to?(:observers)

data/lib/mongoid/persistence.rb

@@ -19,6 +19,7 @@ module Mongoid
   module Persistence
     extend ActiveSupport::Concern
     include Atomic
+    include Mongoid::Atomic::Positionable
 
     # Remove the document from the database with callbacks.
     #
@@ -113,18 +114,22 @@ module Mongoid
     #
     # @param [ Symbol ] field The name of an additional field to update.
     #
-    # @return [ true ] true.
+    # @return [ true/false ] false if record is new_record otherwise true.
     #
     # @since 3.0.0
     def touch(field = nil)
+      return false if _root.new_record?
       current = Time.now
       write_attribute(:updated_at, current) if fields["updated_at"]
       write_attribute(field, current) if field
-      _root.collection.find(atomic_selector).update(touch_atomic_updates(field))
-      without_autobuild do
-        touchables.each { |name| send(name).try(:touch) }
+
+      touches = touch_atomic_updates(field)
+      unless touches.empty?
+        selector = atomic_selector
+        _root.collection.find(selector).update(positionally(selector, touches))
       end
-      move_changes and true
+      run_callbacks(:touch, :after)
+      true
     end
 
     # Update the document in the database.
@@ -220,16 +225,26 @@ module Mongoid
       # @example Create a new document.
       #   Person.create(:title => "Mr")
       #
-      # @param [ Hash ] attributes The attributes to create with.
+      # @example Create multiple new documents.
+      #   Person.create({ title: "Mr" }, { title: "Mrs" })
+      #
+      # @param [ Hash, Array ] attributes The attributes to create with, or an
+      #   Array of multiple attributes for multiple documents.
       # @param [ Hash ] options A mass-assignment protection options. Supports
       #   :as and :without_protection
       #
-      # @return [ Document ] The newly created document.
-      def create(attributes = {}, options = {}, &block)
+      # @return [ Document, Array<Document> ] The newly created document(s).
+      #
+      # @since 1.0.0
+      def create(attributes = nil, options = {}, &block)
         _creating do
-          doc = new(attributes, options, &block)
-          doc.save
-          doc
+          if attributes.is_a?(::Array)
+            attributes.map { |attrs| create(attrs, options, &block) }
+          else
+            doc = new(attributes, options, &block)
+            doc.save
+            doc
+          end
         end
       end
 
@@ -241,17 +256,27 @@ module Mongoid
       # @example Create a new document.
       #   Person.create!(:title => "Mr")
       #
-      # @param [ Hash ] attributes The attributes to create with.
+      # @example Create multiple new documents.
+      #   Person.create!({ title: "Mr" }, { title: "Mrs" })
+      #
+      # @param [ Hash, Array ] attributes The attributes to create with, or an
+      #   Array of multiple attributes for multiple documents.
       # @param [ Hash ] options A mass-assignment protection options. Supports
       #   :as and :without_protection
       #
-      # @return [ Document ] The newly created document.
+      # @return [ Document, Array<Document> ] The newly created document(s).
+      #
+      # @since 1.0.0
       def create!(attributes = {}, options = {}, &block)
         _creating do
-          doc = new(attributes, options, &block)
-          fail_validate!(doc) unless doc.insert.errors.empty?
-          fail_callback!(doc, :create!) if doc.new_record?
-          doc
+          if attributes.is_a?(::Array)
+            attributes.map { |attrs| create!(attrs, options, &block) }
+          else
+            doc = new(attributes, options, &block)
+            fail_validate!(doc) unless doc.insert.errors.empty?
+            fail_callback!(doc, :create!) if doc.new_record?
+            doc
+          end
         end
       end
 

data/lib/mongoid/persistence/atomic.rb

@@ -209,17 +209,22 @@ module Mongoid
 
       # Performs the atomic $unset on the supplied field.
       #
-      # @example Remove the field.
-      #   person.unset(:age)
+      # @example
+      #   Remove the field.
+      #     person.unset(:age)
+      #   Remove fields age and score.
+      #     person.unset([:age, :score])
       #
-      # @param [ Symbol ] field The field name.
+      # @param [ Symbol, Array<Object> ] fields The fields name.
       # @param [ Hash ] options The mongo persistence options.
       #
       # @return [ nil ] Always nil.
       #
       # @since 2.1.0
-      def unset(field, options = {})
-        Unset.new(self, field, 1, options).persist
+      def unset(*args)
+        fields = args.__find_args__
+        options = fields[-1].is_a?(Hash) ? fields.delete_at(-1) : {}
+        Unset.new(self, fields, true, options).persist
       end
     end
   end

data/lib/mongoid/persistence/atomic/operation.rb

@@ -5,8 +5,9 @@ module Mongoid
 
       # This is the included module for all atomic operation objects.
       module Operation
+        include Mongoid::Atomic::Positionable
 
-        attr_accessor :document, :field, :value, :options
+        attr_accessor :document, :fields, :value, :options
 
         # Get the collection to be used for persistence.
         #
@@ -31,10 +32,18 @@ module Mongoid
         # @param [ Hash ] options The persistence options.
         #
         # @since 2.0.0
-        def initialize(document, field, value, options = {})
-          @document, @field, @value =
-            document, document.database_field_name(field.to_s), value
+        def initialize(document, fields, value, options = {})
+          @document, @value = document, value
           @options = options
+
+          @fields = Array.wrap(fields).collect do |field|
+            document.database_field_name(field.to_s)
+          end
+
+          self.class.send(:define_method, :field) do
+            @fields.first
+          end if @fields.length == 1
+
         end
 
         # Get the atomic operation to perform.
@@ -48,7 +57,10 @@ module Mongoid
         #
         # @since 2.0.0
         def operation(modifier)
-          { modifier => { path => cast_value } }
+          hash = Hash[fields.collect do |field|
+            [path(field), cast_value]
+          end]
+          { modifier => hash }
         end
 
         # Get the path to the field that is getting atomically updated.
@@ -59,7 +71,7 @@ module Mongoid
         # @return [ String, Symbol ] The path to the field.
         #
         # @since 2.1.0
-        def path
+        def path(field = field)
           position = document.atomic_position
           position.blank? ? field : "#{position}.#{field}"
         end
@@ -108,9 +120,14 @@ module Mongoid
         #
         # @since 3.0.0
         def execute(name)
-          if !document.new_record?
-            collection.find(document.atomic_selector).update(operation(name))
-            document.remove_change(field)
+          unless document.new_record?
+            selector = document.atomic_selector
+            collection.find(selector).update(positionally(selector, operation(name)))
+            if fields.length > 1
+              document.remove_change(fields)
+            else
+              document.remove_change(field)
+            end
           end
         end