mongo 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18d9f304edd2e651c1dfde03646f780951e4d068
-  data.tar.gz: d7bc0adaa7a4dc5eb8f319caafb1a98fd1357233
+  metadata.gz: 9112b76649bf922ef773b7a9018ad8b46de12760
+  data.tar.gz: d152ad097652a5c4ec4351f9c86a58de77c44977
 SHA512:
-  metadata.gz: 83e651334a083f7acb5e11c9c7cb650a8ce13ab3f7fb10ee4a839e05d7d2edca3adcdb3aeae3b795771b3c8b370772471565a0812cbdf30754c8a50b7e5c217a
-  data.tar.gz: 34db7e14619cc5b08235fff572034a19c282c982439f6feb7d3769ed5c402b05c60029309fc877d3505e8df6de31baee0519b4ebd6e36bfdeae926807f9e146b
+  metadata.gz: dbdc8eeb2763a4ce969c20323188997bdc37e7f8b1f0b54fe8ef4288141ec3a43bd61f1e3f8d89b46bae2c8ae875068bc583e3b17eff1631319da2342c283c86
+  data.tar.gz: 6ca6c80afad5e7882d5c31f5a6c2446a01fb5ed46c1de13f5d8df6dd78d47636ce9253522150dcbf7844f768a07f56670a15bcb264e5c4a9c03475437f302c22

data/lib/mongo/collection.rb

@@ -291,7 +291,7 @@ module Mongo
     #
     # @since 2.1.0
     def count(filter = nil, options = {})
-      View.new(self, filter || {}).count(options)
+      View.new(self, filter || {}, options).count(options)
     end
 
     # Get a list of distinct values for a specific field.
@@ -311,7 +311,7 @@ module Mongo
     #
     # @since 2.1.0
     def distinct(field_name, filter = nil, options = {})
-      View.new(self, filter || {}).distinct(field_name, options)
+      View.new(self, filter || {}, options).distinct(field_name, options)
     end
 
     # Get a view of all indexes for this collection. Can be iterated or has
@@ -418,7 +418,7 @@ module Mongo
     #
     # @since 2.1.0
     def delete_one(filter = nil, options = {})
-      find(filter).delete_one(options)
+      find(filter, options).delete_one(options)
     end
 
     # Remove documents from the collection.
@@ -435,7 +435,7 @@ module Mongo
     #
     # @since 2.1.0
     def delete_many(filter = nil, options = {})
-      find(filter).delete_many(options)
+      find(filter, options).delete_many(options)
     end
 
     # Execute a parallel scan on the collection view.
@@ -479,7 +479,7 @@ module Mongo
     #
     # @since 2.1.0
     def replace_one(filter, replacement, options = {})
-      find(filter).replace_one(replacement, options)
+      find(filter, options).replace_one(replacement, options)
     end
 
     # Update documents in the collection.
@@ -501,7 +501,7 @@ module Mongo
     #
     # @since 2.1.0
     def update_many(filter, update, options = {})
-      find(filter).update_many(update, options)
+      find(filter, options).update_many(update, options)
     end
 
     # Update a single document in the collection.
@@ -523,7 +523,7 @@ module Mongo
     #
     # @since 2.1.0
     def update_one(filter, update, options = {})
-      find(filter).update_one(update, options)
+      find(filter, options).update_one(update, options)
     end
 
     # Finds a single document in the database via findAndModify and deletes

data/lib/mongo/collection/view.rb

@@ -177,8 +177,15 @@ module Mongo
         View.new(collection, filter, options)
       end
 
-      def validate_collation!(server, opts)
-        if (opts[:collation] || opts[Operation::COLLATION]) && !server.features.collation_enabled?
+      def apply_collation!(doc, server, opts = {})
+        if coll = opts[:collation] || opts['collation'] || collation
+          validate_collation!(server, coll)
+          doc[:collation] = coll
+        end
+      end
+
+      def validate_collation!(server, coll)
+        if coll &&!server.features.collation_enabled?
           raise Error::UnsupportedCollation.new
         end
       end

data/lib/mongo/collection/view/aggregation.rb

@@ -73,7 +73,7 @@ module Mongo
         def initialize(view, pipeline, options = {})
           @view = view
           @pipeline = pipeline.dup
-          @options = options.dup
+          @options = BSON::Document.new(options).freeze
         end
 
         # Get the explain plan for the aggregation.
@@ -120,7 +120,7 @@ module Mongo
         end
 
         def validate_collation!(server)
-          if (@options[:collation] || @options[Operation::COLLATION]) && !server.features.collation_enabled?
+          if options[:collation] && !server.features.collation_enabled?
             raise Error::UnsupportedCollation.new
           end
         end

data/lib/mongo/collection/view/builder/map_reduce.rb

@@ -80,7 +80,7 @@ module Mongo
           def command_specification
             {
               selector: find_command,
-              db_name: database.name,
+              db_name: query_database,
               read: read
             }
           end
@@ -94,7 +94,7 @@ module Mongo
           #
           # @since 2.2.0
           def query_specification
-            { selector: {}, options: {}, db_name: database.name, coll_name: query_collection }
+            { selector: {}, options: {}, db_name: query_database, coll_name: query_collection }
           end
 
           # Get the specification to pass to the map/reduce operation.
@@ -116,6 +116,8 @@ module Mongo
 
           private
 
+          OUT_ACTIONS = [ :replace, :merge, :reduce ].freeze
+
           def write?(spec)
             if out = spec[:selector][:out]
               out.is_a?(String) ||
@@ -141,8 +143,14 @@ module Mongo
             command
           end
 
+          def query_database
+            options[:out].respond_to?(:keys) && options[:out][:db] ? options[:out][:db] : database.name
+          end
+
           def query_collection
-            options[:out].respond_to?(:keys) ? options[:out].values.first : options[:out]
+            if options[:out].respond_to?(:keys)
+              options[:out][OUT_ACTIONS.find { |action| options[:out][action] }]
+            end || options[:out]
           end
         end
       end

data/lib/mongo/collection/view/iterable.rb

@@ -77,7 +77,7 @@ module Mongo
         end
 
         def send_initial_query(server)
-          validate_collation!(server, options)
+          validate_collation!(server, collation)
           initial_query_op(server).execute(server)
         end
       end

data/lib/mongo/collection/view/map_reduce.rb

@@ -107,7 +107,7 @@ module Mongo
           @view = view
           @map = map.freeze
           @reduce = reduce.freeze
-          @options = options.freeze
+          @options = BSON::Document.new(options).freeze
         end
 
         # Set or get the jsMode flag for the operation.
@@ -237,7 +237,7 @@ module Mongo
         end
 
         def validate_collation!(server)
-          if (options[:collation] || options[Operation::COLLATION]) && !server.features.collation_enabled?
+          if (view.options[:collation] || options[:collation]) && !server.features.collation_enabled?
             raise Error::UnsupportedCollation.new
           end
         end

data/lib/mongo/collection/view/readable.rb

@@ -112,31 +112,30 @@ module Mongo
         # @example Get the number of documents in the collection.
         #   collection_view.count
         #
-        # @param [ Hash ] options Options for the count command.
+        # @param [ Hash ] opts Options for the count command.
         #
-        # @option options :skip [ Integer ] The number of documents to skip.
-        # @option options :hint [ Hash ] Override default index selection and force
+        # @option opts :skip [ Integer ] The number of documents to skip.
+        # @option opts :hint [ Hash ] Override default index selection and force
         #   MongoDB to use a specific index for the query.
-        # @option options :limit [ Integer ] Max number of docs to return.
-        # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
+        # @option opts :limit [ Integer ] Max number of docs to return.
+        # @option opts :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
-        # @option options [ Hash ] :read The read preference options.
-        # @option options [ Hash ] :collation The collation to use.
+        # @option opts [ Hash ] :read The read preference options.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ Integer ] The document count.
         #
         # @since 2.0.0
-        def count(options = {})
+        def count(opts = {})
           cmd = { :count => collection.name, :query => filter }
-          cmd[:skip] = options[:skip] if options[:skip]
-          cmd[:hint] = options[:hint] if options[:hint]
-          cmd[:limit] = options[:limit] if options[:limit]
-          cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
+          cmd[:skip] = opts[:skip] if opts[:skip]
+          cmd[:hint] = opts[:hint] if opts[:hint]
+          cmd[:limit] = opts[:limit] if opts[:limit]
+          cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
-          preference = ServerSelector.get(options[:read] || read_preference)
+          preference = ServerSelector.get(opts[:read] || read)
           server = preference.select_server(cluster)
-          validate_collation!(server, options)
-          cmd[:collation] = options[:collation] if options[:collation]
+          apply_collation!(cmd, server, opts)
           read_with_retry do
             Operation::Commands::Command.new({
                                                :selector => cmd,
@@ -154,26 +153,25 @@ module Mongo
         #   collection_view.distinct('name')
         #
         # @param [ String, Symbol ] field_name The name of the field.
-        # @param [ Hash ] options Options for the distinct command.
+        # @param [ Hash ] opts Options for the distinct command.
         #
-        # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
+        # @option opts :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
-        # @option options [ Hash ] :read The read preference options.
-        # @option options [ Hash ] :collation The collation to use.
+        # @option opts [ Hash ] :read The read preference options.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ Array<Object> ] The list of distinct values.
         #
         # @since 2.0.0
-        def distinct(field_name, options={})
+        def distinct(field_name, opts = {})
           cmd = { :distinct => collection.name,
                   :key => field_name.to_s,
                   :query => filter }
-          cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
+          cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
-          preference = ServerSelector.get(options[:read] || read_preference)
+          preference = ServerSelector.get(opts[:read] || read)
           server = preference.select_server(cluster)
-          validate_collation!(server, options)
-          cmd[:collation] = options[:collation] if options[:collation]
+          apply_collation!(cmd, server, opts)
           read_with_retry do
             Operation::Commands::Command.new({
                                                :selector => cmd,
@@ -455,8 +453,12 @@ module Mongo
 
         private
 
+        def collation(doc = nil)
+          configure(:collation, doc)
+        end
+
         def default_read
-          options[:read] || read_preference
+          options[:read] || collection.read_preference
         end
 
         def parallel_scan(cursor_count, options = {})

data/lib/mongo/collection/view/writable.rb

@@ -27,10 +27,14 @@ module Mongo
         # @example Find one document and delete it.
         #   view.find_one_and_delete
         #
+        # @param [ Hash ] opts The options.
+        #
+        # @option opts [ Hash ] :collation The collation to use.
+        #
         # @return [ BSON::Document, nil ] The document, if found.
         #
         # @since 2.0.0
-        def find_one_and_delete
+        def find_one_and_delete(opts = {})
           cmd = { :findandmodify => collection.name, :query => filter, :remove => true }
           cmd[:fields] = projection if projection
           cmd[:sort] = sort if sort
@@ -38,8 +42,7 @@ module Mongo
           cmd[:writeConcern] = write_concern.options if write_concern
 
           server = next_primary
-          validate_collation!(server, options)
-          cmd[:collation] = options[:collation] if options[:collation]
+          apply_collation!(cmd, server, opts)
 
           write_with_retry do
             Operation::Commands::Command.new({
@@ -66,6 +69,7 @@ module Mongo
         #   not to skip document level validation.
         # @option options [ Hash ] :write_concern The write concern options.
         #   Defaults to the collection's write concern.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ BSON::Document ] The document.
         #
@@ -88,6 +92,7 @@ module Mongo
         #   not to skip document level validation.
         # @option opts [ Hash ] :write_concern The write concern options.
         #   Defaults to the collection's write concern.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ BSON::Document ] The document.
         #
@@ -104,9 +109,8 @@ module Mongo
           cmd[:writeConcern] = write_concern.options if write_concern
 
           server = next_primary
-          validate_collation!(server, options)
-          cmd[:collation] = options[:collation] if options[:collation]
-          
+          apply_collation!(cmd, server, opts)
+
           value = write_with_retry do
             Operation::Commands::Command.new({
                                               :selector => cmd,
@@ -207,16 +211,10 @@ module Mongo
 
         private
 
-        def remove(value, opts)
-          server = next_primary
-          validate_collation!(server, opts)
+        def remove(value, opts = {})
           delete_doc = { Operation::Q => filter, Operation::LIMIT => value }
-          # We must extract the collation at the String key as well so that if w == 0,
-          # an error can be raised later when an OpCode is used.
-          # Otherwise, the collation will silently not be sent.
-          if collation = opts[:collation] || opts[Operation::COLLATION]
-            delete_doc[:collation] = collation
-          end
+          server = next_primary
+          apply_collation!(delete_doc, server, opts)
           write_with_retry do
             Operation::Write::Delete.new(
               :delete => delete_doc,
@@ -228,18 +226,12 @@ module Mongo
         end
 
         def update(spec, multi, opts)
-          server = next_primary
-          validate_collation!(server, opts)
           update_doc = { Operation::Q => filter,
                          Operation::U => spec,
                          Operation::MULTI => multi,
                          Operation::UPSERT => !!opts[:upsert] }
-          # We must extract the collation at the String key as well so that if w == 0,
-          # an error can be raised later when an OpCode is used.
-          # Otherwise, the collation will silently not be sent.
-          if collation = opts[:collation] || opts[Operation::COLLATION]
-            update_doc[:collation] = collation
-          end
+          server = next_primary
+          apply_collation!(update_doc, server, opts)
           write_with_retry do
             Operation::Write::Update.new(
               :update => update_doc,

data/lib/mongo/index/view.rb

@@ -271,7 +271,8 @@ module Mongo
       end
 
       def validate_collation!(model, server)
-        if (model[:collation] || model[Operation::COLLATION]) && !server.features.collation_enabled?
+        if (model[:collation] || model[Operation::COLLATION]) &&
+            !server.features.collation_enabled?
           raise Error::UnsupportedCollation.new
         end
       end

data/lib/mongo/uri.rb

@@ -168,10 +168,11 @@ module Mongo
     #
     # @since 2.0.0
     AUTH_MECH_MAP = {
-      'PLAIN'       => :plain,
-      'MONGODB-CR'  => :mongodb_cr,
-      'GSSAPI'      => :gssapi,
-      'SCRAM-SHA-1' => :scram
+      'PLAIN'        => :plain,
+      'MONGODB-CR'   => :mongodb_cr,
+      'GSSAPI'       => :gssapi,
+      'MONGODB-X509' => :mongodb_x509,
+      'SCRAM-SHA-1'  => :scram
     }.freeze
 
     # Options that are allowed to appear more than once in the uri.

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.4.1'.freeze
 end

data/mongo.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.has_rdoc          = 'yard'
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '~> 4.2.0'
+  s.add_dependency 'bson', '>=4.2.1', '<5.0.0'
 end

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -189,7 +189,7 @@ describe Mongo::Collection::View::Aggregation do
     end
 
     it 'sets the options' do
-      expect(aggregation.options).to eq(options)
+      expect(aggregation.options).to eq(BSON::Document.new(options))
     end
 
     it 'dups the options' do
@@ -213,23 +213,41 @@ describe Mongo::Collection::View::Aggregation do
         [{ "$match" => { "name" => "BANG" } }]
       end
 
-      let(:options) do
-        { collation: { locale: 'en_US', strength: 2 } }
-      end
-
       let(:result) do
         aggregation.explain['$cursor']['queryPlanner']['collation']['locale']
       end
 
       context 'when the server selected supports collations', if: collation_enabled? do
 
-        it 'applies the collation' do
-          expect(result).to eq('en_US')
+        context 'when the collation key is a String' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'applies the collation' do
+            expect(result).to eq('en_US')
+          end
+        end
+
+        context 'when the collation key is a Symbol' do
+
+          let(:options) do
+            { collation: { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'applies the collation' do
+            expect(result).to eq('en_US')
+          end
         end
       end
 
       context 'when the server selected does not support collations', unless: collation_enabled? do
 
+        let(:options) do
+          { collation: { locale: 'en_US', strength: 2 } }
+        end
+
         it 'raises an exception' do
           expect {
             result