mongoid 7.1.10 → 7.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b8d31638cfb3ff2cf789177ed38778cc7ed9281b2f90eb6790a53c4e817557
-  data.tar.gz: e4fccff34a4cc008ce1af7681cc6a5179960ab3dca7c8dada85ddbcef33d102d
+  metadata.gz: 17a1a3273952d5a0d0eb20c5a9864eaccec98bcb9b07647450a8fc86795a46c9
+  data.tar.gz: a992b0cea4ac0ddc46e622b405dae7e0d1eab46ff800655d4fa21b39a7b88561
 SHA512:
-  metadata.gz: 1f9474eaa39877c8087d8f681a964a43943193ef43ec6e5fed05c349e9add56235e10b3959615213157514f7224e63157f90a96720bc993d15f0d2ea2112a7c3
-  data.tar.gz: 74db9f1912c3d4029c671f72f4856984f0a0520e3d1492f2ce8b1b9ce40cfd4efc2fe89923ac695c9644913533ca63e76842a993196cfb48b5c81c715e983d5c
+  metadata.gz: 3ac4c55216f2ee6e351afcadab0800c42fc39306b9d7e60dc31ddbeb3bc3a314e7b79961fa785b34ee267bf7d07343a4cb0ac787a9457ad9498783b6baaa5fa5
+  data.tar.gz: 0c4f99da1d7845b4736fe7cfb5000067462c7c91c20fb5af1ac351f4eb8562212d3a21e958e1f239b59f1bfde5a57f9f621bf18e260560622a388f5f6f657a25

data/lib/config/locales/en.yml

@@ -77,6 +77,12 @@ en:
             different collections so a simple id lookup is not sufficient enough."
           resolution: "Don't attempt to perform this action and have patience,
             maybe this will be supported in the future."
+        empty_config_file:
+          message: "Empty configuration file: %{path}."
+          summary: "Your mongoid.yml configuration file appears to be empty."
+          resolution: "Ensure your configuration file contains the correct contents.
+            Please consult the following page with respect to Mongoid's configuration:
+            https://docs.mongodb.com/mongoid/current/reference/configuration/"
         invalid_collection:
           message: "Access to the collection for %{klass} is not allowed."
           summary: "%{klass}.collection was called, and %{klass} is an embedded
@@ -91,6 +97,13 @@ en:
             A collation option is only supported if the query is executed on a MongoDB server
             with version >= 3.4."
           resolution: "Remove the collation option from the query."
+        invalid_config_file:
+          message: "Invalid configuration file: %{path}."
+          summary: "Your mongoid.yml configuration file does not contain the
+            correct file structure."
+          resolution: "Ensure your configuration file contains the correct contents.
+            Please consult the following page with respect to Mongoid's configuration:
+            https://docs.mongodb.com/mongoid/current/reference/configuration/"
         invalid_config_option:
           message: "Invalid configuration option: %{name}."
           summary: "A invalid configuration option was provided in your

data/lib/mongoid/config/environment.rb

@@ -52,7 +52,15 @@ module Mongoid
       # @api private
       def load_yaml(path, environment = nil)
         env = environment ? environment.to_s : env_name
-        YAML.load(ERB.new(File.new(path).read).result)[env]
+        contents = File.new(path).read
+        if contents.empty?
+          raise Mongoid::Errors::EmptyConfigFile.new(path)
+        end
+        data = YAML.load(ERB.new(contents).result)
+        unless data.is_a?(Hash)
+          raise Mongoid::Errors::InvalidConfigFile.new(path)
+        end
+        data[env]
       end
     end
   end

data/lib/mongoid/contextual/atomic.rb

@@ -173,13 +173,18 @@ module Mongoid
       # @example Unset the field on the matches.
       #   context.unset(:name)
       #
-      # @param [ String, Symbol, Array ] args The name of the fields.
+      # @param [ String | Symbol | Array<String|Symbol> | Hash ] args
+      #   The name(s) of the field(s) to unset.
+      #   If a Hash is specified, its keys will be used irrespective of what
+      #   each key's value is, even if the value is nil or false.
       #
       # @return [ nil ] Nil.
       #
       # @since 3.0.0
       def unset(*args)
-        fields = args.__find_args__.collect { |f| [database_field_name(f), true] }
+        fields = args.map { |a| a.is_a?(Hash) ? a.keys : a }
+                     .__find_args__
+                     .map { |f| [database_field_name(f), true] }
         view.update_many("$unset" => Hash[fields])
       end
 

data/lib/mongoid/contextual/none.rb

@@ -112,6 +112,9 @@ module Mongoid
         entries.length
       end
       alias :size :length
+
+      alias :find_first :first
+      alias :one :first
     end
   end
 end

data/lib/mongoid/criteria/queryable/selectable.rb

@@ -585,7 +585,7 @@ module Mongoid
               end
               _mongoid_expand_keys(new_s).each do |k, v|
                 k = k.to_s
-                if c.selector[k] || k[0] == ?$
+                if c.selector[k] || k.start_with?('$')
                   c = c.send(:__multi__, [{'$nor' => [{k => v}]}], '$and')
                 else
                   if v.is_a?(Hash)
@@ -874,7 +874,7 @@ module Mongoid
           clone.tap do |query|
             criterion.each do |field, value|
               field_s = field.to_s
-              if field_s[0] == ?$
+              if field_s.start_with?('$')
                 # Query expression-level operator, like $and or $where
                 query.add_operator_expression(field_s, value)
               else

data/lib/mongoid/criteria/queryable/storable.rb

@@ -38,7 +38,7 @@ module Mongoid
             raise ArgumentError, "Field must be a string: #{field}"
           end
 
-          if field[0] == ?$
+          if field.start_with?('$')
             raise ArgumentError, "Field cannot be an operator (i.e. begin with $): #{field}"
           end
 
@@ -48,7 +48,7 @@ module Mongoid
             if value.is_a?(Hash) && selector[field].is_a?(Hash) &&
               value.keys.all? { |key|
                 key_s = key.to_s
-                key_s[0] == ?$ && !selector[field].key?(key_s)
+                key_s.start_with?('$') && !selector[field].key?(key_s)
               }
             then
               # Multiple operators can be combined on the same field by
@@ -185,7 +185,7 @@ module Mongoid
             raise ArgumentError, "Operator must be a string: #{operator}"
           end
 
-          unless operator[0] == ?$
+          unless operator.start_with?('$')
             raise ArgumentError, "Operator must begin with $: #{operator}"
           end
 
@@ -220,7 +220,7 @@ module Mongoid
             raise ArgumentError, "Field must be a string: #{field}"
           end
 
-          if field[0] == ?$
+          if field.start_with?('$')
             add_operator_expression(field, value)
           else
             add_field_expression(field, value)

data/lib/mongoid/document.rb

@@ -194,8 +194,8 @@ module Mongoid
     #
     # @param [ Hash ] options The options.
     #
-    # @option options [ true, false ] :compact Whether to include fields with
-    #   nil values in the json document.
+    # @option options [ true, false ] :compact (Deprecated) Whether to include fields
+    #   with nil values in the json document.
     #
     # @return [ Hash ] The document as json.
     #
@@ -203,6 +203,7 @@ module Mongoid
     def as_json(options = nil)
       rv = super
       if options && options[:compact]
+        Mongoid.logger.warn('#as_json :compact option is deprecated. Please call #compact on the returned Hash object instead.')
         rv = rv.compact
       end
       rv

data/lib/mongoid/errors/empty_config_file.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mongoid
+  module Errors
+
+    # This error is raised when an empty configuration file is attempted to be
+    # loaded.
+    class EmptyConfigFile < MongoidError
+
+      # Create the new error.
+      #
+      # @param [ String ] path The path of the config file used.
+      #
+      # @api private
+      def initialize(path)
+        super(
+          compose_message(
+            "empty_config_file",
+            { path: path }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_config_file.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mongoid
+  module Errors
+
+    # This error is raised when a bad configuration file is attempted to be
+    # loaded.
+    class InvalidConfigFile < MongoidError
+
+      # Create the new error.
+      #
+      # @param [ String ] path The path of the config file used.
+      #
+      # @api private
+      def initialize(path)
+        super(
+          compose_message(
+            "invalid_config_file",
+            { path: path }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors.rb

@@ -8,8 +8,10 @@ require "mongoid/errors/criteria_argument_required"
 require "mongoid/errors/document_not_destroyed"
 require "mongoid/errors/document_not_found"
 require "mongoid/errors/eager_load"
+require "mongoid/errors/empty_config_file"
 require "mongoid/errors/in_memory_collation_not_supported"
 require "mongoid/errors/invalid_collection"
+require "mongoid/errors/invalid_config_file"
 require "mongoid/errors/invalid_config_option"
 require "mongoid/errors/invalid_dependent_strategy"
 require "mongoid/errors/invalid_field"

data/lib/mongoid/persistence_context.rb

@@ -237,7 +237,9 @@ module Mongoid
       # @since 6.0.0
       def clear(object, cluster = nil, original_context = nil)
         if context = get(object)
-          context.client.close unless (context.cluster.equal?(cluster) || cluster.nil?)
+          unless cluster.nil? || context.cluster.equal?(cluster)
+            context.client.close
+          end
         end
       ensure
         Thread.current["[mongoid][#{object.object_id}]:context"] = original_context

data/lib/mongoid/tasks/database.rb

@@ -123,7 +123,7 @@ module Mongoid
           next if model.shard_config.nil?
 
           if model.embedded? && !model.cyclic?
-            logger.warn("MONGOID: #{model} has shard config but is emdedded")
+            logger.warn("MONGOID: #{model} has shard config but is embedded")
             next
           end
 

data/lib/mongoid/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.1.10"
+  VERSION = "7.1.11"
 end

data/spec/app/models/mop.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+# This class is used for embedded matcher testing.
+class Mop
+  include Mongoid::Document
+
+  # The dynamic attributes are used so that the tests can use various
+  # field names as makes sense for the particular operator.
+  include Mongoid::Attributes::Dynamic
+
+  # We need some fields of specific types because the query conditions are
+  # transformed differently based on the type of field being queried.
+  field :int_field, type: Integer
+  field :array_field, type: Array
+  field :date_field, type: Date
+  field :time_field, type: Time
+  field :datetime_field, type: DateTime
+  field :big_decimal_field, type: BigDecimal
+  field :decimal128_field, type: BSON::Decimal128
+  field :symbol_field, type: Symbol
+  field :bson_symbol_field, type: BSON::Symbol::Raw
+  field :regexp_field, type: Regexp
+  field :bson_regexp_field, type: BSON::Regexp::Raw
+end
+

data/spec/integration/contextual/empty_spec.rb

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Contextual classes when dealing with empty result set' do
+  shared_examples 'behave as expected' do
+    context '#exists?' do
+      it 'is false' do
+        context.exists?.should be false
+      end
+    end
+
+    context '#count' do
+      it 'is 0' do
+        context.count.should == 0
+      end
+    end
+
+    context '#length' do
+      it 'is 0' do
+        context.length.should == 0
+      end
+    end
+
+    # #estimated_count only exists for Mongo
+
+    context '#distinct' do
+      it 'is empty array' do
+        context.distinct(:foo).should == []
+      end
+    end
+
+    context '#each' do
+      context 'with block' do
+        it 'does not invoke the block' do
+          called = false
+          context.each do
+            called = true
+          end
+          called.should be false
+        end
+      end
+
+      context 'without block' do
+        it 'returns Enumerable' do
+          context.each.should be_a(Enumerable)
+        end
+
+        it 'returns empty Enumerable' do
+          context.each.to_a.should == []
+        end
+      end
+    end
+
+    context '#map' do
+      context 'with block' do
+        it 'does not invoke the block' do
+          called = false
+          context.map do
+            called = true
+          end
+          called.should be false
+        end
+      end
+
+      context 'without block' do
+        it 'returns empty array' do
+          skip 'MONGOID-5148'
+
+          context.map(:field).should == []
+        end
+      end
+    end
+
+    context '#first' do
+      it 'is nil' do
+        context.first.should be nil
+      end
+    end
+
+    context '#find_first' do
+      it 'is nil' do
+        context.find_first.should be nil
+      end
+    end
+
+    context '#one' do
+      it 'is nil' do
+        context.one.should be nil
+      end
+    end
+
+    context '#last' do
+      it 'is nil' do
+        context.last.should be nil
+      end
+    end
+  end
+
+  let(:context) do
+    context_cls.new(criteria)
+  end
+
+  before do
+    # Create an object of the same class used in the Criteria instance
+    # to verify we are using the Contextual classes.
+    Mop.create!
+  end
+
+  context 'Mongo' do
+    let(:context_cls) { Mongoid::Contextual::Mongo }
+
+    let(:criteria) do
+      Mop.and(Mop.where(a: 1), Mop.where(a: 2))
+    end
+
+    include_examples 'behave as expected'
+  end
+
+  context 'Memory' do
+    let(:context_cls) { Mongoid::Contextual::Memory }
+
+    let(:criteria) do
+      Mop.all.tap do |criteria|
+        criteria.documents = []
+      end
+    end
+
+    include_examples 'behave as expected'
+  end
+
+  context 'None' do
+    let(:context_cls) { Mongoid::Contextual::None }
+
+    let(:criteria) do
+      Mop.none
+    end
+
+    include_examples 'behave as expected'
+  end
+end

data/spec/mongoid/clients/factory_spec.rb

@@ -65,6 +65,17 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
+          context 'not JRuby' do
+            # Run this test on JRuby when driver 2.16.0 is released -
+            # see RUBY-2771.
+            fails_on_jruby
+
+            it 'does not produce driver warnings' do
+              Mongo::Logger.logger.should_not receive(:warn)
+              client
+            end
+          end
+
           let(:cluster_addresses) do
             cluster.addresses.map(&:to_s)
           end