mongoid 6.0.3 → 6.1.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33269ca75497a708d73b6f7964d3a21ba26e3f08
-  data.tar.gz: a06dbbe583a3793aeafdc1fb3787de5d984ceb66
+  metadata.gz: cd1c5f3e10aa8f29d9a04da6580f7b2bd22b67e1
+  data.tar.gz: 0244eacd65adceb037276b870846e0a5fca9407a
 SHA512:
-  metadata.gz: 6743d2621d3de8dab702c7cca8d7085616fb77988e397c75a8addfa17d0b968e0a7798cd0782e3cd32ddf7b49cec8190efa70aa5af7e292ad9387cf63dea39ae
-  data.tar.gz: 162e448773b63c2687c4f00a8d673068e2805448b8c3f6542b32c68fbb6617c2f4fdd25b3fcc52ffebca3e31bccdbb9b6a38c67aafdf06e343355ffa636b3b11
+  metadata.gz: 28d80be687ea4b751298f72401eb18a45a3350c362cd78d83bd2a7fe6f51be41259dabec2ba856c752747b071dd4c18b41661325d7ba6f9e015a29557eb641f9
+  data.tar.gz: 22091327a5876754cba1a2cfaea2362e07abbf9e5613ac1a272637f06e379ca9d72878379ceb52e0bc2687baf5e007b27bb1569112c6545abc1e29682bc031ef

data.tar.gz.sig

@@ -1,2 +1,3 @@
-�p����O-�\XZ����M�+����p����0vur�,9��N�EZId����a��A
������
-fTmʟ���.%�w;vY�L`,���ښmp���^�L'V���R�}�< �Y-5�ܓ-jb��I���gͩ�L�[l�!�09Ȏ{
+V����
J���R���Q���b#��YĐ�3�Z=խ7��>�Zh3����� Wt���F63�@�$>�"(bh�5��n)SW�j���� B()�_�
+�����8XOGi�7w���_[��݁�Ҟ��H��pļ\	D�0��৔@�WU=������j.���
+�3�������U%��h�:w2A���R����(٘0�PbK����:Q4( ���)Q����T�ݧ~�F��:�[�U��=@:�<̯�1�.�

data/lib/config/locales/en.yml

@@ -76,6 +76,12 @@ en:
           resolution: "For access to the collection that the embedded document is
             in, use %{klass}#_root.collection, or do not attempt to persist an
             embedded document without a parent set."
+        in_memory_collation_not_supported:
+          message: "A collation option cannot be applied when querying documents in-memory."
+          summary: "The query being run against documents in memory has a collation option set.
+            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_option:
           message: "Invalid configuration option: %{name}."
           summary: "A invalid configuration option was provided in your
@@ -134,9 +140,18 @@ en:
             \_\_min: 1\n
             \_\_max: 1\n
             \_\_bits: 26\n
+            \_\_key: 26\n
             \_\_bucket_size : 1\n
+            \_\_sphere_version : 1\n
+            \_\_text_version : 1\n
+            \_\_version : 1\n
             \_\_weights: { content: 1, title: 2 }\n
             \_\_expire_after_seconds: number_of_seconds\n
+            \_\_partial_filter_expression\n
+            \_\_storage_engine\n
+            \_\_language_override\n
+            \_\_default_language\n
+            \_\_collation\n
             Valid types are: 1, -1, '2d', '2dsphere', 'geoHaystack', 'text', 'hashed'\n\n
             Example:\n
             \_\_class Band\n

data/lib/mongoid.rb

@@ -36,6 +36,11 @@ module Mongoid
   extend Loggable
   extend self
 
+  # A string added to the platform details of Ruby driver client handshake documents.
+  #
+  # @since 6.1.0
+  PLATFORM_DETAILS = "mongoid-#{VERSION}".freeze
+
   # The minimum MongoDB version supported.
   MONGODB_VERSION = "2.4.0"
 

data/lib/mongoid/clients.rb

@@ -33,7 +33,7 @@ module Mongoid
       #
       # @since 3.0.0
       def default
-        clients[:default] ||= Clients::Factory.default
+        with_name(:default)
       end
 
       # Disconnect all active clients.
@@ -61,7 +61,11 @@ module Mongoid
       #
       # @since 3.0.0
       def with_name(name)
-        clients[name.to_sym] ||= Clients::Factory.create(name)
+        name_as_symbol = name.to_sym
+        return clients[name_as_symbol] if clients[name_as_symbol]
+        CREATE_LOCK.synchronize do
+          clients[name_as_symbol] ||= Clients::Factory.create(name)
+        end
       end
 
       def set(name, client)
@@ -71,6 +75,10 @@ module Mongoid
       def clients
         @clients ||= {}
       end
+
+      private
+
+      CREATE_LOCK = Mutex.new
     end
   end
 end

data/lib/mongoid/clients/factory.rb

@@ -71,6 +71,8 @@ module Mongoid
       def options(configuration)
         config = configuration.dup
         options = config.delete(:options) || {}
+        options[:platform] = PLATFORM_DETAILS
+        options[:app_name] = Mongoid::Config.app_name if Mongoid::Config.app_name
         options.reject{ |k, v| k == :hosts }.to_hash.symbolize_keys!
       end
     end

data/lib/mongoid/config.rb

@@ -26,6 +26,7 @@ module Mongoid
     option :use_utc, default: false
     option :log_level, default: :info
     option :belongs_to_required_by_default, default: true
+    option :app_name, default: nil
 
     # Has Mongoid been configured? This is checking that at least a valid
     # client config exists.

data/lib/mongoid/contextual/map_reduce.rb

@@ -32,12 +32,13 @@ module Mongoid
       #
       # @since 3.0.0
       def each
+        validate_out!
         if block_given?
-          documents.each do |doc|
+          @map_reduce.each do |doc|
             yield doc
           end
         else
-          to_enum
+          @map_reduce.to_enum
         end
       end
 
@@ -64,7 +65,7 @@ module Mongoid
       #
       # @since 3.0.0
       def finalize(function)
-        command[:finalize] = function
+        @map_reduce = @map_reduce.finalize(function)
         self
       end
 
@@ -79,10 +80,9 @@ module Mongoid
       #
       # @since 3.0.0
       def initialize(collection, criteria, map, reduce)
-        @collection, @criteria = collection, criteria
-        command[:mapreduce] = collection.name.to_s
-        command[:map], command[:reduce] = map, reduce
-        apply_criteria_options
+        @collection = collection
+        @criteria = criteria
+        @map_reduce = @criteria.view.map_reduce(map, reduce)
       end
 
       # Get the number of documents that were input into the map/reduce.
@@ -106,7 +106,7 @@ module Mongoid
       #
       # @since 3.0.0
       def js_mode
-        command[:jsMode] = true
+        @map_reduce = @map_reduce.js_mode(true)
         self
       end
 
@@ -134,7 +134,7 @@ module Mongoid
         normalized.update_values do |value|
           value.is_a?(::Symbol) ? value.to_s : value
         end
-        command[:out] = normalized
+        @map_reduce = @map_reduce.out(normalized)
         self
       end
 
@@ -159,8 +159,12 @@ module Mongoid
       #
       # @since 3.0.0
       def raw
-        results
+        validate_out!
+        cmd = command
+        opts = { read: cmd.delete(:read).options } if cmd[:read]
+        @map_reduce.database.command(cmd, opts || {}).first
       end
+      alias :results :raw
 
       # Execute the map/reduce, returning the raw output.
       # Useful when you don't care about map/reduce's ouptut.
@@ -196,7 +200,7 @@ module Mongoid
       #
       # @since 3.0.0
       def scope(object)
-        command[:scope] = object
+        @map_reduce = @map_reduce.scope(object)
         self
       end
 
@@ -232,113 +236,14 @@ module Mongoid
 }
       end
 
-      private
-
-      # Apply criteria specific options - query, sort, limit.
-      #
-      # @api private
-      #
-      # @example Apply the criteria options
-      #   map_reduce.apply_criteria_options
-      #
-      # @return [ nil ] Nothing.
-      #
-      # @since 3.0.0
-      def apply_criteria_options
-        command[:query] = criteria.selector
-        if sort = criteria.options[:sort]
-          command[:sort] = sort
-        end
-        if limit = criteria.options[:limit]
-          command[:limit] = limit
-        end
+      def command
+        @map_reduce.send(:map_reduce_spec)[:selector]
       end
 
-      # Get the result documents from the map/reduce. If the output was inline
-      # then we grab them from the results key. If the output was a temp
-      # collection then we need to execute a find on that collection.
-      #
-      # @api private
-      #
-      # @example Get the documents.
-      #   map_reduce.documents
-      #
-      # @return [ Array, Cursor ] The documents.
-      #
-      # @since 3.0.0
-      def documents
-        return results["results"] if results.has_key?("results")
-        view = output_database[output_collection].find
-        view.no_cursor_timeout if criteria.options[:timeout] == false
-        view
-      end
-
-      # Get the database that the map/reduce results were stored in.
-      #
-      # @api private
-      #
-      # @example Get the output database.
-      #   map_reduce.output_database
-      #
-      # @return [ Mongo::Database ] The output database.
-      #
-      # @since 6.0.0
-      def output_database
-        if db = command[:out].fetch(:db, command[:out]['db'])
-          client.with(database: db).database
-        else
-          client.database
-        end
-      end
-
-      # Get the collection that the map/reduce results were stored in.
-      #
-      # @api private
-      #
-      # @example Get the output collection.
-      #   map_reduce.output_collection
-      #
-      # @return [ Symbol, String ] The output collection.
-      #
-      # @since 3.0.0
-      def output_collection
-        command[:out].values.first
-      end
-
-      # Execute the map/reduce command and get the results.
-      #
-      # @api private
-      #
-      # @example Get the results.
-      #   map_reduce.results
-      #
-      # @return [ Hash ] The results of the command.
-      #
-      # @since 3.0.0
-      def results
-        raise Errors::NoMapReduceOutput.new(command) unless command[:out]
-        @results ||= __client__.command(command,__client__.options).first
-      end
+      private
 
-      # Get the client with the proper consistency.
-      #
-      # @api private
-      #
-      # @note We can use eventual if the output is set to inline.
-      #
-      # @example Get the client.
-      #   map_reduce.__client__
-      #
-      # @return [ Mongo::Client ] The client with consistency set.
-      #
-      # @since 3.0.15
-      def __client__
-        if command[:out][:inline] != 1
-          # @todo: close
-          client.with(read: { mode: :primary })
-        else
-          client
-        end
+      def validate_out!
+        raise Errors::NoMapReduceOutput.new({}) unless @map_reduce.out
       end
     end
   end

data/lib/mongoid/contextual/memory.rb

@@ -373,6 +373,7 @@ module Mongoid
       #
       # @since 3.0.0
       def apply_options
+        raise Errors::InMemoryCollationNotSupported.new if criteria.options[:collation]
         skip(criteria.options[:skip]).limit(criteria.options[:limit])
       end
 

data/lib/mongoid/contextual/mongo.rb

@@ -18,7 +18,19 @@ module Mongoid
       # Options constant.
       #
       # @since 5.0.0
-      OPTIONS = [ :hint, :limit, :skip, :sort, :batch_size, :max_scan, :max_time_ms, :snapshot, :comment, :read ].freeze
+      OPTIONS = [ :hint,
+                  :limit,
+                  :skip,
+                  :sort,
+                  :batch_size,
+                  :max_scan,
+                  :max_time_ms,
+                  :snapshot,
+                  :comment,
+                  :read,
+                  :cursor_type,
+                  :collation
+                ].freeze
 
       # @attribute [r] view The Mongo collection view.
       attr_reader :view
@@ -68,9 +80,7 @@ module Mongoid
       #
       # @since 3.0.0
       def delete
-        self.count.tap do
-          view.delete_many
-        end
+        view.delete_many.deleted_count
       end
       alias :delete_all :delete
 
@@ -83,11 +93,10 @@ module Mongoid
       #
       # @since 3.0.0
       def destroy
-        destroyed = self.count
-        each do |doc|
+        each.inject(0) do |count, doc|
           doc.destroy
+          count += 1
         end
-        destroyed
       end
       alias :destroy_all :destroy
 
@@ -568,12 +577,6 @@ module Mongoid
         if criteria.options[:timeout] == false
           @view = view.no_cursor_timeout
         end
-        if criteria.options[:cursor_type]
-          # @todo: update to use #cursor_type method on view when driver 2.3 is released.
-          # See RUBY-1080
-          @view = view.clone
-          @view.options.merge!(cursor_type: criteria.options[:cursor_type])
-        end
       end
 
       # Apply an option.

data/lib/mongoid/criteria/queryable/extensions/boolean.rb

@@ -21,7 +21,7 @@ module Mongoid
             # @since 1.0.0
             def evolve(object)
               __evolve__(object) do |obj|
-                obj.to_s =~ (/(true|t|yes|y|1|1.0)$/i) ? true : false
+                obj.to_s =~ (/\A(true|t|yes|y|on|1|1.0)\z/i) ? true : false
               end
             end
           end

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

@@ -324,6 +324,20 @@ module Mongoid
           clone.tap { |query| query.options.store(:cursor_type, type) }
         end
 
+        # Set the collation.
+        #
+        # @example Set the collation.
+        #   optional.collation(locale: 'fr', strength: 2)
+        #
+        # @param [ Hash ] collation_doc The document describing the collation to use.
+        #
+        # @return [ Optional ] The cloned optional.
+        #
+        # @since 6.1.0
+        def collation(collation_doc)
+          clone.tap { |query| query.options.store(:collation, collation_doc) }
+        end
+
         private
 
         # Add a single sort option.

data/lib/mongoid/errors.rb

@@ -5,6 +5,7 @@ require "mongoid/errors/callback"
 require "mongoid/errors/document_not_destroyed"
 require "mongoid/errors/document_not_found"
 require "mongoid/errors/eager_load"
+require "mongoid/errors/in_memory_collation_not_supported"
 require "mongoid/errors/invalid_collection"
 require "mongoid/errors/invalid_config_option"
 require "mongoid/errors/invalid_field"

data/lib/mongoid/errors/in_memory_collation_not_supported.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when attempting to do a query with a
+    # collation on documents in memory.
+    class InMemoryCollationNotSupported < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the new unsupported collation error.
+      #   InMemoryCollationNotSupported.new
+      #
+      # @since 6.1.0
+      def initialize
+        super(compose_message("in_memory_collation_not_supported"))
+      end
+    end
+  end
+end

data/lib/mongoid/errors/mongoid_error.rb

@@ -19,7 +19,7 @@ module Mongoid
       # @return [ String ] The composed message.
       #
       # @since 3.0.0
-      def compose_message(key, attributes)
+      def compose_message(key, attributes = {})
         @problem = translate_problem(key, attributes)
         @summary = translate_summary(key, attributes)
         @resolution = translate_resolution(key, attributes)