mongoid 5.4.1 → 6.1.1

data/lib/mongoid/errors/invalid_field.rb

@@ -29,10 +29,10 @@ module Mongoid
 
       private
 
-      # Get the origin of the method.
+      # Get the queryable of the method.
       #
       # @example Get the originating class or module.
-      #   error.origin(Person, :crazy_method_name)
+      #   error.queryable(Person, :crazy_method_name)
       #
       # @param [ Class ] klass The document class.
       # @param [ Symbol ] name The method name.

data/lib/mongoid/errors/invalid_persistence_option.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Raised when invalid options are used to create a persistence context.
+    #
+    # @since 6.0.0
+    class InvalidPersistenceOption < MongoidError
+
+      # Instantiate the persistence context option error.
+      #
+      # @example Create the error.
+      #   InvalidPersistenceOption.new(:invalid_option, [ :connect_timeout, :database ])
+      #
+      # @param [ Symbol ] invalid The invalid option.
+      # @param [ Array<Symbol> ] valid The allowed options.
+      #
+      # @since 6.0.0
+      def initialize(invalid, valid)
+        super(
+            compose_message(
+                "invalid_persistence_option",
+                { invalid: invalid, valid: valid }
+            )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_relation.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when trying to create a relation that conflicts with
+    # an already defined method.
+    #
+    # @since 6.0.0
+    class InvalidRelation < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the error.
+      #   InvalidRelation.new(person, :crazy_relation_name)
+      #
+      # @param [ Class ] klass The document class.
+      # @param [ Symbol ] name The method name.
+      def initialize(klass, name)
+        super(
+            compose_message(
+                "invalid_relation",
+                {
+                    name: name,
+                    origin: origin(klass, name),
+                    file: location(klass, name)[0],
+                    line: location(klass, name)[1]
+                }
+            )
+        )
+      end
+
+      private
+
+      # Get the queryable of the method.
+      #
+      # @example Get the originating class or module.
+      #   error.queryable(Person, :crazy_method_name)
+      #
+      # @param [ Class ] klass The document class.
+      # @param [ Symbol ] name The method name.
+      #
+      # @return [ Class, Module ] The originating class or module.
+      #
+      # @since 6.0.0
+      def origin(klass, name)
+        klass.instance_method(name).owner
+      end
+
+      # Get the location of the relation definition.
+      #
+      # @example Get the location of the method on the filesystem.
+      #   error.location(Person, :crazy_method_name)
+      #
+      # @param [ Class ] klass The document class.
+      # @param [ Symbol ] name The method name.
+      #
+      # @return [ Array<String, Integer> ] The location of the method.
+      #
+      # @since 6.0.0
+      def location(klass, name)
+        @location ||=
+            (klass.instance_method(name).source_location || [ "Unknown", 0 ])
+      end
+    end
+  end
+end

data/lib/mongoid/evolvable.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid
 
-  # Contains behaviour specific to evolving for origin queries.
+  # Contains behaviour specific to evolving for queryable queries.
   module Evolvable
 
     # Evolve the document into an object id.

data/lib/mongoid/extensions.rb

@@ -3,9 +3,6 @@ class BSON::ObjectId
   def as_json(options = nil)
     { "$oid" => to_s }
   end
-  def to_xml(options = nil)
-    ActiveSupport::XmlMini.to_tag(options[:root], self.to_s, options)
-  end
 end
 
 class Symbol
@@ -39,7 +36,6 @@ require "mongoid/extensions/module"
 require "mongoid/extensions/nil_class"
 require "mongoid/extensions/object"
 require "mongoid/extensions/object_id"
-require "mongoid/extensions/origin/regexp_raw"
 require "mongoid/extensions/range"
 require "mongoid/extensions/regexp"
 require "mongoid/extensions/set"

data/lib/mongoid/extensions/big_decimal.rb

@@ -28,6 +28,18 @@ module Mongoid
         to_s
       end
 
+      # Is the BigDecimal a number?
+      #
+      # @example Is the object a number?.
+      #   object.numeric?
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 6.0.0
+      def numeric?
+        true
+      end
+
       module ClassMethods
 
         # Convert the object from its mongo friendly ruby type to this type.
@@ -37,28 +49,25 @@ module Mongoid
         #
         # @param [ Object ] object The object to demongoize.
         #
-        # @return [ Object ] The object.
+        # @return [ BigDecimal, nil ] A BigDecimal derived from the object or nil.
         #
         # @since 3.0.0
         def demongoize(object)
-          if object
-            object.numeric? ? ::BigDecimal.new(object.to_s) : object
-          end
+          object && object.numeric? ? ::BigDecimal.new(object.to_s) : nil
         end
 
-        # Mongoize an object of any type to how it's stored in the db as a big
-        # decimal.
+        # Mongoize an object of any type to how it's stored in the db as a String.
         #
         # @example Mongoize the object.
         #   BigDecimal.mongoize(123)
         #
         # @param [ Object ] object The object to Mongoize
         #
-        # @return [ String ] The mongoized object.
+        # @return [ String, nil ] A String representing the object or nil.
         #
         # @since 3.0.7
         def mongoize(object)
-          object ? object.to_s : object
+          object && object.numeric? ? object.to_s : nil
         end
       end
     end

data/lib/mongoid/extensions/date.rb

@@ -4,6 +4,9 @@ module Mongoid
     module Date
 
       # Constant for epoch - used when passing invalid times.
+      #
+      # @deprecated No longer used as a return value from #mongoize passed
+      #   an invalid date string.
       EPOCH = ::Date.new(1970, 1, 1)
 
       # Convert the date into a time.
@@ -64,7 +67,7 @@ module Mongoid
               time = object.__mongoize_time__
               ::Time.utc(time.year, time.month, time.day)
             rescue ArgumentError
-              EPOCH
+              nil
             end
           end
         end

data/lib/mongoid/extensions/decimal128.rb

@@ -10,7 +10,7 @@ module Mongoid
       #
       # @return [ BSON::Decimal128 ] self.
       #
-      # @since 5.2.0
+      # @since 6.1.0
       def __evolve_decimal128__
         self
       end
@@ -26,7 +26,7 @@ module Mongoid
         #
         # @return [ BSON::Decimal128 ] The decimal128.
         #
-        # @since 5.2.0
+        # @since 6.1.0
         def evolve(object)
           object.__evolve_decimal128__
         end
@@ -36,4 +36,4 @@ module Mongoid
 end
 
 BSON::Decimal128.__send__(:include, Mongoid::Extensions::Decimal128)
-BSON::Decimal128.extend(Mongoid::Extensions::Decimal128::ClassMethods)
+BSON::Decimal128.extend(Mongoid::Extensions::Decimal128::ClassMethods)

data/lib/mongoid/extensions/hash.rb

@@ -105,6 +105,7 @@ module Mongoid
         keys = string.split(".")
         value = self
         keys.each do |key|
+          return nil if value.nil?
           nested = value[key] || value[key.to_i]
           value = nested
         end

data/lib/mongoid/extensions/string.rb

@@ -72,7 +72,8 @@ module Mongoid
         self =~ /\A(|_)id$/
       end
 
-      # Is the string a number?
+      # Is the string a number? The literals "NaN", "Infinity", and "-Infinity"
+      # are counted as numbers.
       #
       # @example Is the string a number.
       #   "1234.23".numeric?
@@ -81,7 +82,7 @@ module Mongoid
       #
       # @since 3.0.0
       def numeric?
-        true if Float(self) rescue (self == "NaN")
+        true if Float(self) rescue (self =~ /^NaN|\-?Infinity$/)
       end
 
       # Get the string as a getter string.
@@ -117,7 +118,7 @@ module Mongoid
       #
       # @since 3.0.15
       def valid_method_name?
-        /[@$"]/ !~ self
+        /[@$"-]/ !~ self
       end
 
       # Does the string end with _before_type_cast?

data/lib/mongoid/extensions/time.rb

@@ -4,6 +4,9 @@ module Mongoid
     module Time
 
       # Constant for epoch - used when passing invalid times.
+      #
+      # @deprecated No longer used as a return value from #mongoize passed
+      #   an invalid time string.
       EPOCH = ::Time.utc(1970, 1, 1, 0, 0, 0)
 
       # Turn the object from the ruby type we deal with to a Mongo friendly
@@ -76,7 +79,7 @@ module Mongoid
               ::Time.at(time.to_i, time.usec).utc
             end
           rescue ArgumentError
-            EPOCH
+            nil
           end
         end
       end

data/lib/mongoid/fields/validators/macro.rb

@@ -36,6 +36,24 @@ module Mongoid
           validate_options(klass, name, options)
         end
 
+        # Validate the relation definition.
+        #
+        # @example Validate the relation definition.
+        #   Macro.validate(Model, :name)
+        #
+        # @param [ Class ] klass The model class.
+        # @param [ Symbol ] name The field name.
+        # @param [ Hash ] options The provided options.
+        #
+        # @since 6.0.0
+        def validate_relation(klass, name, options = {})
+          [name, "#{name}?".to_sym, "#{name}=".to_sym].each do |n|
+            if Mongoid.destructive_fields.include?(n)
+              raise Errors::InvalidRelation.new(klass, n)
+            end
+          end
+        end
+
         private
 
         # Determine if the field name is allowed, if not raise an error.

data/lib/mongoid/findable.rb

@@ -6,12 +6,12 @@ module Mongoid
   #
   # @since 4.0.0
   module Findable
-    extend Origin::Forwardable
+    extend Mongoid::Criteria::Queryable::Forwardable
 
     select_with :with_default_scope
 
     # These are methods defined on the criteria that should also be accessible
-    # directly from the the class level.
+    # directly from the class level.
     delegate \
       :aggregates,
       :avg,

data/lib/mongoid/indexable.rb

@@ -31,8 +31,9 @@ module Mongoid
         index_specifications.each do |spec|
           key, options = spec.key, spec.options
           if database = options[:database]
-            with(database: database).
-              collection.indexes.create_one(key, options.except(:database))
+            with(database: database) do |klass|
+              klass.collection.indexes.create_one(key, options.except(:database))
+            end
           else
             collection.indexes.create_one(key, options)
           end
@@ -50,18 +51,19 @@ module Mongoid
       # @since 3.0.0
       def remove_indexes
         indexed_database_names.each do |database|
-          collection = with(database: database).collection
-          begin
-            collection.indexes.each do |spec|
-              unless spec["name"] == "_id_"
-                collection.indexes.drop_one(spec["key"])
-                logger.info(
-                  "MONGOID: Removed index '#{spec["name"]}' on collection " +
-                  "'#{collection.name}' in database '#{database}'."
-                )
+          with(database: database) do |klass|
+            begin
+              klass.collection.indexes.each do |spec|
+                unless spec["name"] == "_id_"
+                  klass.collection.indexes.drop_one(spec["key"])
+                  logger.info(
+                    "MONGOID: Removed index '#{spec["name"]}' on collection " +
+                    "'#{klass.collection.name}' in database '#{database}'."
+                  )
+                end
               end
-            end
-          rescue Mongo::Error::OperationFailure; end
+            rescue Mongo::Error::OperationFailure; end
+          end
         end and true
       end
 

data/lib/mongoid/interceptable.rb

@@ -125,12 +125,6 @@ module Mongoid
     # @since 2.3.0
     def run_callbacks(kind, *args, &block)
       cascadable_children(kind).each do |child|
-        # This is returning false for some destroy tests on 4.1.0.beta1,
-        # causing them to fail since 4.1.0 expects a block to be passed if the
-        # callbacks for the type are empty. If no block is passed then the nil
-        # return value gets interpreted as false and halts the chain.
-        #
-        # @see https://github.com/rails/rails/blob/master/activesupport/lib/active_support/callbacks.rb#L79
         if child.run_callbacks(child_callback_type(kind, child), *args) == false
           return false
         end
@@ -196,7 +190,7 @@ module Mongoid
     #
     # @since 2.3.0
     def cascadable_child?(kind, child, metadata)
-      return false if kind == :initialize || kind == :find
+      return false if kind == :initialize || kind == :find || kind == :touch
       return false if kind == :validate && metadata.validate?
       child.callback_executable?(kind) ? child.in_callback_state?(kind) : false
     end
@@ -259,22 +253,11 @@ module Mongoid
         send("_#{kind}_callbacks").each do |callback|
           chain.append(callback) if callback.kind == place
         end
-
-        if Gem::Version.new("4.1.0") <= Gem::Version.new(ActiveSupport::VERSION::STRING)
-          self.class.send :define_method, name do
-            runner = ActiveSupport::Callbacks::Filters::Environment.new(self, false, nil)
-            chain.compile.call(runner).value
-          end
-          self.class.send :protected, name
-        else
-          class_eval <<-EOM
-            def #{name}()
-              #{chain.compile}
-            end
-            protected :#{name}
-          EOM
+        self.class.send :define_method, name do
+          runner = ActiveSupport::Callbacks::Filters::Environment.new(self, false, nil)
+          chain.compile.call(runner).value
         end
-
+        self.class.send :protected, name
       end
       send(name)
     end

data/lib/mongoid/matchable.rb

@@ -12,6 +12,7 @@ require "mongoid/matchable/ne"
 require "mongoid/matchable/nin"
 require "mongoid/matchable/or"
 require "mongoid/matchable/size"
+require "mongoid/matchable/elem_match"
 require "mongoid/matchable/regexp"
 
 module Mongoid
@@ -28,6 +29,7 @@ module Mongoid
     # @since 1.0.0
     MATCHERS = {
       "$all" => All,
+      "$elemMatch" => ElemMatch,
       "$and" => And,
       "$exists" => Exists,
       "$gt" => Gt,
@@ -45,26 +47,26 @@ module Mongoid
     # MongoDB selector. Used for matching on embedded associations.
     #
     # @example Does the document match?
-    #   document.matches?(:title => { "$in" => [ "test" ] })
+    #   document._matches?(:title => { "$in" => [ "test" ] })
     #
     # @param [ Hash ] selector The MongoDB selector.
     #
     # @return [ true, false ] True if matches, false if not.
     #
     # @since 1.0.0
-    def matches?(selector)
+    def _matches?(selector)
       selector.each_pair do |key, value|
         if value.is_a?(Hash)
           value.each do |item|
             if item[0].to_s == "$not".freeze
               item = item[1]
-              return false if matcher(self, key, item).matches?(item)
+              return false if matcher(self, key, item)._matches?(item)
             else
-              return false unless matcher(self, key, Hash[*item]).matches?(Hash[*item])
+              return false unless matcher(self, key, Hash[*item])._matches?(Hash[*item])
             end
           end
         else
-          return false unless matcher(self, key, value).matches?(value)
+          return false unless matcher(self, key, value)._matches?(value)
         end
       end
       true
@@ -144,7 +146,7 @@ module Mongoid
       # @since 2.2.1
       def extract_attribute(document, key)
         if (key_string = key.to_s) =~ /.+\..+/
-          key_string.split('.').inject(document.as_document) do |_attribs, _key|
+          key_string.split('.').inject(document.send(:as_attributes)) do |_attribs, _key|
             if _attribs.is_a?(::Array)
               if _key =~ /\A\d+\z/ && _attribs.none? {|doc| doc.is_a?(Hash)}
                 _attribs.try(:[], _key.to_i)
@@ -156,7 +158,11 @@ module Mongoid
             end
           end
         else
-          document.attributes[key_string]
+          if document.is_a?(Hash)
+            document[key_string]
+          else
+            document.attributes[key_string]
+          end
         end
       end
     end