mongoid 9.0.11 → 9.1.1

data/lib/mongoid/validatable/uniqueness.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Validatable
-
     # Validates whether or not a field is unique against the documents in the
     # database.
     #
@@ -42,6 +40,7 @@ module Mongoid
         with_query(document) do
           attrib, val = to_validate(document, attribute, value)
           return unless validation_required?(document, attrib)
+
           if document.embedded?
             validate_embedded(document, attrib, val)
           else
@@ -64,7 +63,7 @@ module Mongoid
       # @param [ Object ] value The value of the object.
       def add_error(document, attribute, value)
         document.errors.add(
-          attribute, :taken, **options.except(:case_sensitive, :scope).merge(value: value)
+          attribute, :taken, **options.except(:case_sensitive, :scope), value: value
         )
       end
 
@@ -129,15 +128,13 @@ module Mongoid
         field = document.database_field_name(attribute)
 
         if value && localized?(document, field)
-          conditions = (value || {}).inject([]) { |acc, (k,v)| acc << { "#{field}.#{k}" => filter(v) }}
-          selector = { "$or" => conditions }
+          conditions = (value || {}).inject([]) { |acc, (k, v)| acc << { "#{field}.#{k}" => filter(v) } }
+          selector = { '$or' => conditions }
         else
           selector = { field => filter(value) }
         end
 
-        if document.persisted? && !document.embedded?
-          selector.merge!(_id: { "$ne" => document._id })
-        end
+        selector.merge!(_id: { '$ne' => document._id }) if document.persisted? && !document.embedded?
         selector
       end
 
@@ -152,7 +149,7 @@ module Mongoid
       #
       # @return [ Object | Regexp ] The value, filtered or not.
       def filter(value)
-        !case_sensitive? && value ? /\A#{Regexp.escape(value.to_s)}\z/i : value
+        (!case_sensitive? && value) ? /\A#{Regexp.escape(value.to_s)}\z/i : value
       end
 
       # Scope the criteria to the scope options provided.
@@ -200,7 +197,7 @@ module Mongoid
       # @return [ true | false ] If the scope reference has changed.
       def scope_value_changed?(document)
         Array.wrap(options[:scope]).any? do |item|
-          document.send("attribute_changed?", item.to_s)
+          document.send(:attribute_changed?, item.to_s)
         end
       end
 
@@ -240,6 +237,7 @@ module Mongoid
       # @param [ Object ] value The value.
       def validate_embedded(document, attribute, value)
         return if skip_validation?(document)
+
         relation = document._parent.send(document.association_name)
         criteria = create_criteria(relation, document, attribute, value)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
@@ -266,9 +264,9 @@ module Mongoid
         criteria = create_criteria(klass, document, attribute, value)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 
-        if criteria.read(mode: :primary).exists?
-          add_error(document, attribute, value)
-        end
+        return unless criteria.read(mode: :primary).exists?
+
+        add_error(document, attribute, value)
       end
 
       # Are we required to validate the document?
@@ -282,7 +280,7 @@ module Mongoid
       # @return [ true | false ] If we need to validate.
       def validation_required?(document, attribute)
         document.new_record? ||
-          document.send("attribute_changed?", attribute.to_s) ||
+          document.send(:attribute_changed?, attribute.to_s) ||
           scope_value_changed?(document)
       end
 

data/lib/mongoid/validatable.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "mongoid/validatable/macros"
-require "mongoid/validatable/localizable"
-require "mongoid/validatable/associated"
-require "mongoid/validatable/format"
-require "mongoid/validatable/length"
-require "mongoid/validatable/numericality"
-require "mongoid/validatable/queryable"
-require "mongoid/validatable/presence"
-require "mongoid/validatable/uniqueness"
+require 'mongoid/validatable/macros'
+require 'mongoid/validatable/localizable'
+require 'mongoid/validatable/associated'
+require 'mongoid/validatable/format'
+require 'mongoid/validatable/length'
+require 'mongoid/validatable/numericality'
+require 'mongoid/validatable/queryable'
+require 'mongoid/validatable/presence'
+require 'mongoid/validatable/uniqueness'
 
 module Mongoid
-
   # This module provides additional validations that ActiveModel does not
   # provide: validates_associated and validates_uniqueness_of.
   module Validatable
@@ -58,7 +56,7 @@ module Mongoid
     #
     # @return [ true | false ] If we are validating.
     def performing_validations?(options = {})
-      options[:validate].nil? ? true : options[:validate]
+      options[:validate].nil? || options[:validate]
     end
 
     # Overrides the default ActiveModel behavior since we need to handle
@@ -97,7 +95,7 @@ module Mongoid
     #
     # @return [ true | false ] True if valid, false if not.
     def valid?(context = nil)
-      super context ? context : (new_record? ? :create : :update)
+      super(context || (new_record? ? :create : :update))
     end
 
     # Used to prevent infinite loops in associated validations.
@@ -121,7 +119,6 @@ module Mongoid
     end
 
     module ClassMethods
-
       # Adds an associated validator for the association if the validate option
       # was not provided or set to true.
       #
@@ -130,9 +127,9 @@ module Mongoid
       #
       # @param [ Mongoid::Association::Relatable ] association The association metadata.
       def validates_relation(association)
-        if association.validate?
-          validates_associated(association.name)
-        end
+        return unless association.validate?
+
+        validates_associated(association.name)
       end
 
       # Add validation with the supplied validators for the provided fields
@@ -151,9 +148,7 @@ module Mongoid
         if args.first == PresenceValidator
           args.last[:attributes].each do |name|
             association = relations[name.to_s]
-            if association && association.autosave?
-              Association::Referenced::AutoSave.define_autosave!(association)
-            end
+            Association::Referenced::AutoSave.define_autosave!(association) if association && association.autosave?
           end
         end
         super

data/lib/mongoid/version.rb

@@ -5,5 +5,5 @@ module Mongoid
   #
   # Note that this file is automatically updated via `rake candidate:create`.
   # Manual changes to this file will be overwritten by that rake task.
-  VERSION = '9.0.11'
+  VERSION = '9.1.1'
 end

data/lib/mongoid/warnings.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
-
   # Encapsulates behavior around logging and caching warnings so they are only
   # logged once.
   #
   # @api private
   module Warnings
-
     class << self
-
       # Define a warning message method for the given id.
       #
       # @param [ Symbol ] id The warning identifier.
@@ -20,19 +16,22 @@ module Mongoid
       def warning(id, message)
         singleton_class.class_eval do
           define_method("warn_#{id}") do
-            unless instance_variable_get("@#{id}")
-              Mongoid.logger.warn(message)
-              instance_variable_set("@#{id}", true)
-            end
+            return if instance_variable_get("@#{id}")
+
+            Mongoid.logger.warn(message)
+            instance_variable_set("@#{id}", true)
           end
         end
       end
     end
 
     warning :geo_haystack_deprecated, 'The geoHaystack type is deprecated.'
-    warning :symbol_type_deprecated, 'The BSON Symbol type is deprecated by MongoDB. Please use String or StringifiedSymbol field types instead of the Symbol field type.'
-    warning :legacy_readonly, 'The readonly! method will only mark the document readonly when the legacy_readonly feature flag is switched off.'
-    warning :mutable_ids, 'Ignoring updates to immutable attribute `_id`. Please set Mongoid::Config.immutable_ids to true and update your code so that `_id` is never updated.'
+    warning :symbol_type_deprecated,
+            'The BSON Symbol type is deprecated by MongoDB. Please use String or StringifiedSymbol field types instead of the Symbol field type.'
+    warning :legacy_readonly,
+            'The readonly! method will only mark the document readonly when the legacy_readonly feature flag is switched off.'
+    warning :mutable_ids,
+            'Ignoring updates to immutable attribute `_id`. Please set Mongoid::Config.immutable_ids to true and update your code so that `_id` is never updated.'
     warning :reparenting_via_nested_attributes, 'Reparenting documents via nested attributes is insecure and is deprecated. Set Mongoid.allow_reparenting_via_nested_attributes to false and update your code to avoid reparenting documents via nested attributes.'
     warning :autosave_saves_unchanged_documents, "Autosave associations are currently configured to save documents even if they haven't changed. " \
                                                  'This legacy behavior is deprecated. Set Mongoid.autosave_saves_unchanged_documents to false to ' \

data/lib/mongoid.rb

@@ -1,43 +1,40 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "forwardable"
-require "time"
-require "set"
+require 'forwardable'
+require 'time'
+require 'set'
 
-require "active_support"
-require "active_support/core_ext"
-require "active_support/json"
-require "active_support/inflector"
-require "active_support/time_with_zone"
-require "active_model"
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_support/json'
+require 'active_support/inflector'
+require 'active_support/time_with_zone'
+require 'active_model'
 
 require 'concurrent-ruby'
 
-require "mongo"
-require "mongo/active_support"
-
-require "mongoid/version"
-require "mongoid/deprecable"
-require "mongoid/config"
-require "mongoid/persistence_context"
-require "mongoid/loadable"
-require "mongoid/loggable"
-require "mongoid/clients"
-require "mongoid/document"
-require "mongoid/tasks/database"
-require "mongoid/tasks/encryption"
-require "mongoid/warnings"
-require "mongoid/utils"
+require 'mongo'
+require 'mongo/active_support'
+
+require 'mongoid/version'
+require 'mongoid/deprecable'
+require 'mongoid/config'
+require 'mongoid/persistence_context'
+require 'mongoid/loadable'
+require 'mongoid/loggable'
+require 'mongoid/clients'
+require 'mongoid/document'
+require 'mongoid/tasks/database'
+require 'mongoid/tasks/encryption'
+require 'mongoid/warnings'
+require 'mongoid/utils'
 
 # If we are using Rails then we will include the Mongoid railtie.
 # This configures initializers required to integrate Mongoid with Rails.
-if defined?(Rails)
-  require "mongoid/railtie"
-end
+require 'mongoid/railtie' if defined?(Rails)
 
 # Add English locale config to load path by default.
-I18n.load_path << File.join(File.dirname(__FILE__), "config", "locales", "en.yml")
+I18n.load_path << File.join(File.dirname(__FILE__), 'config', 'locales', 'en.yml')
 
 # Top-level module for project.
 module Mongoid
@@ -48,10 +45,10 @@ module Mongoid
   extend Clients::Sessions::ClassMethods
 
   # A string added to the platform details of Ruby driver client handshake documents.
-  PLATFORM_DETAILS = "mongoid-#{VERSION}".freeze
+  PLATFORM_DETAILS = "mongoid-#{VERSION}"
 
   # The minimum MongoDB version supported.
-  MONGODB_VERSION = "2.6.0"
+  MONGODB_VERSION = '2.6.0'
 
   # Sets the Mongoid configuration options. Best used by passing a block.
   #
@@ -77,7 +74,7 @@ module Mongoid
   def configure(&block)
     return Config unless block_given?
 
-    block.arity == 0 ? Config.instance_exec(&block) : yield(Config)
+    (block.arity == 0) ? Config.instance_exec(&block) : yield(Config)
   end
 
   # Convenience method for getting the default client.
@@ -125,7 +122,7 @@ module Mongoid
   #
   # @example Delegate the configuration methods.
   #   Mongoid.database = Mongo::Connection.new.db("test")
-  def_delegators Config, *(Config.public_instance_methods(false) - [ :logger=, :logger ])
+  def_delegators Config, *(Config.public_instance_methods(false) - %i[logger= logger])
 
   # Define persistence context that is used when a transaction method is called
   # on Mongoid module.
@@ -148,7 +145,6 @@ module Mongoid
   #
   # @api private
   module GlobalDiscriminatorKeyAssignment
-
     # This class is used for obtaining the method definition location for
     # Mongoid methods.
     class InvalidFieldHost

data/lib/rails/generators/mongoid/config/config_generator.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'rails/generators/mongoid_generator'
 
 module Mongoid
   module Generators
-
     # Generator class for Mongoid configuration files.
     class ConfigGenerator < Rails::Generators::Base
-      desc "Creates Mongoid configuration files"
+      desc 'Creates Mongoid configuration files'
 
       argument :database_name, type: :string, optional: true
 
@@ -16,7 +14,7 @@ module Mongoid
       #
       # @return [ String ] The path.
       def self.source_root
-        @_mongoid_source_root ||= File.expand_path("../templates", __FILE__)
+        @_mongoid_source_root ||= File.expand_path('templates', __dir__)
       end
 
       # Returns the underscored name of the Rails application.

data/lib/rails/generators/mongoid/config/templates/mongoid.rb

@@ -1,6 +1,5 @@
-# rubocop:todo all
 Mongoid.configure do
-  target_version = "<%= Mongoid::VERSION[/^\d+\.\d+/] %>"
+  target_version = "<%= Mongoid::VERSION[/^\d+.\d+/] %>"
 
   # Load Mongoid behavior defaults. This automatically sets
   # features flags (refer to documentation)
@@ -9,16 +8,16 @@ Mongoid.configure do
   # It is recommended to use config/mongoid.yml for most Mongoid-related
   # configuration, whenever possible, but if you prefer, you can set
   # configuration values here, instead:
-  # 
+  #
   #   config.log_level = :debug
   #
   # Note that the settings in config/mongoid.yml always take precedence,
   # whatever else is set here.
 end
- 
+
 # Enable Mongo driver query cache for Rack
 # Rails.application.config.middleware.use(Mongo::QueryCache::Middleware)
- 
+
 # Enable Mongo driver query cache for ActiveJob
 # ActiveSupport.on_load(:active_job) do
 #   include Mongo::QueryCache::Middleware::ActiveJob

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -135,7 +135,7 @@ development:
   driver_options:
     # When this flag is off, an aggregation done on a view will be executed over
     # the documents included in that view, instead of all documents in the
-    # collection. When this flag is on, the view fiter is ignored.
+    # collection. When this flag is on, the view filter is ignored.
     # broken_view_aggregate: true
 
     # When this flag is set to false, the view options will be correctly
@@ -143,7 +143,7 @@ development:
     # broken_view_options: true
 
     # When this flag is set to true, the update and replace methods will
-    # validate the paramters and raise an error if they are invalid.
+    # validate the parameters and raise an error if they are invalid.
     # validate_update_replace: false
 
 

data/lib/rails/generators/mongoid/model/model_generator.rb

@@ -1,26 +1,23 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "rails/generators/mongoid_generator"
+require 'rails/generators/mongoid_generator'
 
 module Mongoid
   module Generators
-
     # Generator class for Mongoid model files.
     class ModelGenerator < Base
-
-      desc "Creates a Mongoid model"
-      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+      desc 'Creates a Mongoid model'
+      argument :attributes, type: :array, default: [], banner: 'field:type field:type'
 
       check_class_collision
 
       class_option :timestamps, type: :boolean, default: true
-      class_option :parent,     type: :string, desc: "The parent class for the generated model"
+      class_option :parent,     type: :string, desc: 'The parent class for the generated model'
       class_option :collection, type: :string, desc: "The collection for storing model's documents"
 
       # Creates a model file from a template.
       def create_model_file
-        template "model.rb.tt", File.join("app/models", class_path, "#{file_name}.rb")
+        template 'model.rb.tt', File.join('app/models', class_path, "#{file_name}.rb")
       end
 
       hook_for :test_framework

data/lib/rails/generators/mongoid_generator.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "rails/generators/named_base"
-require "rails/generators/active_model"
+require 'rails/generators/named_base'
+require 'rails/generators/active_model'
 
 module Mongoid
   module Generators
-
     # Base generator class for adding Mongoid to Rails applications.
     class Base < ::Rails::Generators::NamedBase
-
       # Returns the path to the templates directory.
       #
       # @return [ String ] The path.
@@ -23,18 +20,17 @@ end
 
 module Rails
   module Generators
-
     # Extension to Rails' GeneratedAttribute class.
     class GeneratedAttribute
-
       # Returns the Mongoid attribute type value for a given
       # input class type.
       #
       # @return [ String ] The type value.
       def type_class
-        return "Time" if type == :datetime
-        return "String" if type == :text
-        return "Mongoid::Boolean" if type == :boolean
+        return 'Time' if type == :datetime
+        return 'String' if type == :text
+        return 'Mongoid::Boolean' if type == :boolean
+
         type.to_s.camelcase
       end
     end

data/lib/rails/mongoid.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Rails
-
   # Mongoid utilities for Rails
   module Mongoid
     extend self
@@ -16,7 +14,7 @@ module Rails
     #
     # @param [ Application ] app The rails application.
     def load_models(app)
-      ::Mongoid.load_models(app.config.paths["app/models"].expanded)
+      ::Mongoid.load_models(app.config.paths['app/models'].expanded)
     end
 
     # Conditionally calls `Rails::Mongoid.load_models(app)` if the

data/spec/integration/active_job_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 begin
@@ -21,7 +20,7 @@ begin
 
     before do
       ActiveJob::Serializers.add_serializers(
-        [::Mongoid::Railties::ActiveJobSerializers::BsonObjectIdSerializer]
+        [ Mongoid::Railties::ActiveJobSerializers::BsonObjectIdSerializer ]
       )
     end