mongoid 7.0.13 → 7.1.0.rc0

data/lib/mongoid/config.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "mongoid/config/environment"
 require "mongoid/config/options"
 require "mongoid/config/validators"
 
 module Mongoid
 
-  # This module defines all the configuration options for Mongoid, including the
-  # database connections.
+  # This module defines all the configuration options for Mongoid, including
+  # the database connections.
   module Config
     extend self
     extend Options
@@ -24,7 +26,18 @@ module Mongoid
     option :duplicate_fields_exception, default: false
     option :use_activesupport_time_zone, default: true
     option :use_utc, default: false
+    option :join_contexts, default: false
+
+    # The log level.
+    #
+    # It must be set prior to referencing clients or Mongo.logger,
+    # changes to this option are not be propagated to any clients and
+    # loggers that already exist.
+    #
+    # Additionally, only when the clients are configured via the
+    # configuration file is the log level given by this option honored.
     option :log_level, default: :info
+
     option :belongs_to_required_by_default, default: true
     option :app_name, default: nil
     option :background_indexing, default: false

data/lib/mongoid/config/environment.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Config
 

data/lib/mongoid/config/options.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Config
 
@@ -20,7 +22,7 @@ module Mongoid
       # Define a configuration option with a default.
       #
       # @example Define the option.
-      #   Options.option(:logger, :default => Logger.new($stdout, :warn))
+      #   Options.option(:logger, :default => Logger.new(STDERR, :warn))
       #
       # @param [ Symbol ] name The name of the configuration option.
       # @param [ Hash ] options Extras for the option.
@@ -31,19 +33,19 @@ module Mongoid
       def option(name, options = {})
         defaults[name] = settings[name] = options[:default]
 
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{name}
-            settings[#{name.inspect}]
+        class_eval do
+          define_method(name) do
+            settings[name]
           end
 
-          def #{name}=(value)
-            settings[#{name.inspect}] = value
+          define_method("#{name}=") do |value|
+            settings[name] = value
           end
 
-          def #{name}?
-            #{name}
+          define_method("#{name}?") do
+            !!send(name)
           end
-        RUBY
+        end
       end
 
       # Reset the configuration options to the defaults.
@@ -79,9 +81,12 @@ module Mongoid
       #
       # @since 5.1.0
       def log_level
-        if settings[:log_level]
-          level = settings[:log_level].upcase.to_s
-          "Logger::#{level}".constantize
+        if level = settings[:log_level]
+          unless level.is_a?(Integer)
+            level = level.upcase.to_s
+            level = "Logger::#{level}".constantize
+          end
+          level
         end
       end
     end

data/lib/mongoid/config/validators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "mongoid/config/validators/option"
 require "mongoid/config/validators/client"

data/lib/mongoid/config/validators/client.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Config
     module Validators

data/lib/mongoid/config/validators/option.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Config
     module Validators

data/lib/mongoid/contextual.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "mongoid/contextual/queryable"
 require "mongoid/contextual/mongo"
 require "mongoid/contextual/memory"

data/lib/mongoid/contextual/aggregable/memory.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     module Aggregable
-      # Contains behaviour for aggregating values in memory.
+      # Contains behavior for aggregating values in memory.
       module Memory
 
         # Get the average value of the provided field.

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     module Aggregable
-      # Contains behaviour for aggregating values in Mongo.
+      # Contains behavior for aggregating values in Mongo.
       module Mongo
 
         # Get all the aggregate values for the provided field.

data/lib/mongoid/contextual/atomic.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     module Atomic
@@ -17,6 +19,20 @@ module Mongoid
         view.update_many("$addToSet" => collect_operations(adds))
       end
 
+      # Perform an atomic $addToSet/$each on the matching documents.
+      #
+      # @example Add the value to the set.
+      #   context.add_each_to_set(members: ["Dave", "Bill"], genres: ["Electro", "Disco"])
+      #
+      # @param [ Hash ] adds The operations.
+      #
+      # @return [ nil ] Nil.
+      #
+      # @since 7.0.0
+      def add_each_to_set(adds)
+        view.update_many("$addToSet" => collect_each_operations(adds))
+      end
+
       # Perform an atomic $bit operation on the matching documents.
       #
       # @example Perform the bitwise op.
@@ -117,10 +133,7 @@ module Mongoid
       #
       # @since 3.0.0
       def push_all(pushes)
-        push_each_updates = collect_operations(pushes).each.inject({}) do |ops, (field, elements)|
-          ops.merge!(field => { '$each' => elements })
-        end
-        view.update_many("$push" => push_each_updates)
+        view.update_many("$push" => collect_each_operations(pushes))
       end
 
       # Perform an atomic $rename of fields on the matching documents.
@@ -173,9 +186,14 @@ module Mongoid
       private
 
       def collect_operations(ops)
-        ops.inject({}) do |operations, (field, value)|
+        ops.each_with_object({}) do |(field, value), operations|
           operations[database_field_name(field)] = value.mongoize
-          operations
+        end
+      end
+
+      def collect_each_operations(ops)
+        ops.each_with_object({}) do |(field, value), operations|
+          operations[database_field_name(field)] = { "$each" => Array.wrap(value).mongoize }
         end
       end
     end

data/lib/mongoid/contextual/command.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     module Command

data/lib/mongoid/contextual/geo_near.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     class GeoNear
@@ -264,4 +266,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/contextual/map_reduce.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     class MapReduce

data/lib/mongoid/contextual/memory.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "mongoid/contextual/aggregable/memory"
 require "mongoid/association/eager_loadable"
 
@@ -165,9 +167,9 @@ module Mongoid
       # @return [ Enumerator ] The enumerator.
       #
       # @since 7.0.0
-      def inc(*args)
+      def inc(incs)
         each do |document|
-          document.inc *args
+          document.inc(incs)
         end
       end
 

data/lib/mongoid/contextual/mongo.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "mongoid/contextual/atomic"
 require "mongoid/contextual/aggregable/mongo"
 require "mongoid/contextual/command"
@@ -300,6 +302,8 @@ module Mongoid
       #
       # @return [ GeoNear ] The GeoNear command.
       #
+      # @deprecated
+      #
       # @since 3.1.0
       def geo_near(coordinates)
         GeoNear.new(collection, criteria, coordinates)

data/lib/mongoid/contextual/none.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     class None

data/lib/mongoid/contextual/queryable.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   module Contextual
     module Queryable

data/lib/mongoid/copyable.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
 
-  # This module contains the behaviour of Mongoid's clone/dup of documents.
+  # This module contains the behavior of Mongoid's clone/dup of documents.
   module Copyable
     extend ActiveSupport::Concern
 

data/lib/mongoid/criteria.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "mongoid/criteria/findable"
 require "mongoid/criteria/includable"
 require "mongoid/criteria/inspectable"
@@ -435,13 +437,7 @@ module Mongoid
     #
     # @since 3.1.0
     def for_js(javascript, scope = {})
-      code = if scope.empty?
-        # CodeWithScope is not supported for $where as of MongoDB 4.4
-        BSON::Code.new(javascript)
-      else
-        BSON::CodeWithScope.new(javascript, scope)
-      end
-      js_query(code)
+      js_query(BSON::CodeWithScope.new(javascript, scope))
     end
 
     private

data/lib/mongoid/criteria/findable.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   class Criteria
     module Findable
@@ -105,7 +107,15 @@ module Mongoid
       #
       # @since 3.0.0
       def from_database(ids)
-        (ids.size > 1 ? any_in(id: ids) : where(id: ids.first)).entries
+        from_database_selector(ids).entries
+      end
+
+      private def from_database_selector(ids)
+        if ids.size > 1
+          any_in(_id: ids)
+        else
+          where(_id: ids.first)
+        end
       end
 
       # Convert all the ids to their proper types.

data/lib/mongoid/criteria/includable.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   class Criteria
 
     # Module providing functionality for parsing (nested) inclusion definitions.
     module Includable
 
-      # Eager loads all the provided relations. Will load all the documents
+      # Eager loads all the provided associations. Will load all the documents
       # into the identity map whose ids match based on the extra query for the
       # ids.
       #
-      # @note This will work for embedded relations that reference another
+      # @note This will work for embedded associations that reference another
       #   collection via belongs_to as well.
       #
       # @note Eager loading brings all the documents into memory, so there is a
@@ -17,10 +19,10 @@ module Mongoid
       #   eager loading becomes slower around 100k documents, but this will
       #   naturally depend on the specific application.
       #
-      # @example Eager load the provided relations.
+      # @example Eager load the provided associations.
       #   Person.includes(:posts, :game)
       #
-      # @param [ Array<Symbol>, Array<Hash> ] relations The names of the relations to eager
+      # @param [ Array<Symbol>, Array<Hash> ] relations The names of the associations to eager
       #   load.
       #
       # @return [ Criteria ] The cloned criteria.
@@ -65,9 +67,9 @@ module Mongoid
       #   criteria.add_inclusion(Person, :posts)
       #
       # @param [ Class, String, Symbol ] _klass The class or string/symbol of the class name.
-      # @param [ Symbol ] association The relation.
+      # @param [ Symbol ] association The association.
       #
-      # @raise [ Errors::InvalidIncludes ] If no relation is found.
+      # @raise [ Errors::InvalidIncludes ] If no association is found.
       #
       # @since 5.1.0
       def add_inclusion(_klass, association)

data/lib/mongoid/criteria/inspectable.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   class Criteria
     module Inspectable

data/lib/mongoid/criteria/marshalable.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   class Criteria
     module Marshalable

data/lib/mongoid/criteria/modifiable.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   class Criteria
     module Modifiable
@@ -72,8 +74,7 @@ module Mongoid
       # @since 5.1.0
       def create_with(attrs = {})
         tap do
-          @create_attrs ||= {}
-          @create_attrs.update(attrs)
+          (@create_attrs ||= {}).merge!(attrs)
         end
       end
 

data/lib/mongoid/criteria/options.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 module Mongoid
   class Criteria