mongo 2.4.0.rc0 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ae8d6c4e2881b28ba15899b6f928e5f050ad5b
-  data.tar.gz: 7addb2834adeaaaf441891f34f58660faeead9d9
+  metadata.gz: 0fceb612725957e97b29a1b35a376821d685dea7
+  data.tar.gz: 3f1ee5867327a164aa2bff5e00a517387df406e0
 SHA512:
-  metadata.gz: ad67bd7b0d541f6f97645004c983bd73183001fcd5ece022d3294d81ebaa8bb693bf96c3da944fbfdddde4064bfb23aa2503b82766326258dac53ebdafab4e36
-  data.tar.gz: 0d2a4a97d7a2b9ba1e8d40ccc19685336cf75c405558fae2db8e19e3b850ca7f4eb3e7cf81a6507fc2f35c2104e7604659e6e3afac3348ef67525806533ebcae
+  metadata.gz: 70a87aadb4c5f8a31582dfada8c8810a4a71d8c7b59fd4fda010f2d680a8d555a2401e190e37d37106f268d40019e67926a7cb48ae33f5937d90b5227e9b29af
+  data.tar.gz: c6d42e01149a0140f59494999d98e69a3f7df8480fc5fac6054d518fca9d80fa58278e3529a8b9e7274ef069080d4e5f07cf1aae72e3119c90527465268b01b1

data.tar.gz.sig

@@ -1,2 +1 @@
-"d��"'�̑��(�w�0K_�u�4��1*�^���	�@�?�ȣ��h���r����@]=t�E��Z
�a`��;-�稓C=p��\떃�4�r�x�7+QIy\B
-�=.WX��E�:J4z�bc�x\=��jp)��y�s���ڬW)e �|wBos�ͬ���G-Xx��AOfj�`巪Z�`���z{���Wl�P"��J���͏˷P�HHO�2��ftz�h��,g�\hc
+,��J�|)�@��0�Lzu�](�dAC���y��Cϭ�"d��qg�)�/���ً*5��;H{U|�\�7�$P��s0��������d{
�d{x���M�>��RT/I��c�B�ǵ��e��I�A�	�
�3Mk�p�e��	��}l���p�������O�Ȭ:��q�Z�0��7^D��ZrȦZq�=������S�����cB�,��<Q��^���UFhHF�Bf�ݩ�L{Ʃ-qQQ���m �+�]

data/lib/mongo/bulk_write/validatable.rb

@@ -40,7 +40,9 @@ module Mongo
       def validate(name, document)
         validate_operation(name)
         validate_document(name, document)
-        @has_collation = true if document.respond_to?(:keys) && document[:collation]
+        if document.respond_to?(:keys) && (document[:collation] || document[Operation::COLLATION])
+          @has_collation = true
+        end
       end
 
       private

data/lib/mongo/client.rb

@@ -55,8 +55,14 @@ module Mongo
       :socket_timeout,
       :ssl,
       :ssl_ca_cert,
+      :ssl_ca_cert_string,
+      :ssl_ca_cert_object,
       :ssl_cert,
+      :ssl_cert_string,
+      :ssl_cert_object,
       :ssl_key,
+      :ssk_key_string,
+      :ssl_key_object,
       :ssl_key_pass_phrase,
       :ssl_verify,
       :truncate_logs,
@@ -167,16 +173,37 @@ module Mongo
     #   connect to. Servers not in this replica set will be ignored.
     # @option options [ true, false ] :ssl Whether to use SSL.
     # @option options [ String ] :ssl_cert The certificate file used to identify
-    #   the connection against MongoDB.
+    #   the connection against MongoDB. This option, if present, takes precedence
+    #   over the values of :ssl_cert_string and :ssl_cert_object
+    # @option options [ String ] :ssl_cert_string A string containing the PEM-encoded
+    #   certificate used to identify the connection against MongoDB. This option, if present,
+    #   takes precedence over the value of :ssl_cert_object
+    # @option options [ OpenSSL::X509::Certificate ] :ssl_cert_object The OpenSSL::X509::Certificate
+    #   used to identify the connection against MongoDB
     # @option options [ String ] :ssl_key The private keyfile used to identify the
     #   connection against MongoDB. Note that even if the key is stored in the same
-    #   file as the certificate, both need to be explicitly specified.
+    #   file as the certificate, both need to be explicitly specified. This option,
+    #   if present, takes precedence over the values of :ssl_key_string and :ssl_key_object
+    # @option options [ String ] :ssl_key_string A string containing the PEM-encoded private key
+    #   used to identify the connection against MongoDB. This parameter, if present,
+    #   takes precedence over the value of option :ssl_key_object
+    # @option options [ OpenSSL::PKey ] :ssl_key_object The private key used to identify the
+    #   connection against MongoDB
     # @option options [ String ] :ssl_key_pass_phrase A passphrase for the private key.
     # @option options [ true, false ] :ssl_verify Whether or not to do peer certification
     #   validation.
     # @option options [ String ] :ssl_ca_cert The file containing a set of concatenated
     #   certification authority certifications used to validate certs passed from the
-    #   other end of the connection. Required for :ssl_verify.
+    #   other end of the connection. One of :ssl_ca_cert, :ssl_ca_cert_string or
+    #   :ssl_ca_cert_object (in order of priority) is required for :ssl_verify.
+    # @option options [ String ] :ssl_ca_cert_string A string containing a set of concatenated
+    #   certification authority certifications used to validate certs passed from the
+    #   other end of the connection. One of :ssl_ca_cert, :ssl_ca_cert_string or
+    #   :ssl_ca_cert_object (in order of priority) is required for :ssl_verify.
+    # @option options [ Array<OpenSSL::X509::Certificate> ] :ssl_ca_cert_object An array of OpenSSL::X509::Certificate
+    #   reprenting the certification authority certifications used to validate certs passed from the
+    #   other end of the connection. One of :ssl_ca_cert, :ssl_ca_cert_string or
+    #   :ssl_ca_cert_object (in order of priority) is required for :ssl_verify.
     # @option options [ Float ] :socket_timeout The timeout, in seconds, to
     #   execute operations on a socket.
     # @option options [ String ] :user The user name.

data/lib/mongo/cluster/app_metadata.rb

@@ -36,6 +36,11 @@ module Mongo
       # @ since 2.4.0
       MAX_APP_NAME_SIZE = 128.freeze
 
+      # The driver name.
+      #
+      # @ since 2.4.0
+      DRIVER_NAME = 'mongo-ruby-driver'
+
       # Instantiate the new AppMetadata object.
       #
       # @api private
@@ -101,7 +106,7 @@ module Mongo
 
       def driver_doc
         {
-          name: :'mongo-ruby-driver',
+          name: DRIVER_NAME,
           version: Mongo::VERSION
         }
       end
@@ -116,7 +121,7 @@ module Mongo
 
       def type
         (RbConfig::CONFIG && RbConfig::CONFIG['host_os']) ?
-          RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase.to_sym : :unknown
+          RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase : 'unknown'
       end
 
       def name

data/lib/mongo/collection.rb

@@ -172,7 +172,9 @@ module Mongo
       operation = { :create => name }.merge(options)
       operation.delete(:write)
       server = next_primary
-      raise Error::UnsupportedCollation.new if options[:collation] && !server.features.collation_enabled?
+      if (options[:collation] || options[Operation::COLLATION]) && !server.features.collation_enabled?
+        raise Error::UnsupportedCollation.new
+      end
       Operation::Commands::Create.new({
                                         selector: operation,
                                         db_name: database.name,

data/lib/mongo/collection/view.rb

@@ -178,7 +178,9 @@ module Mongo
       end
 
       def validate_collation!(server, opts)
-        raise Error::UnsupportedCollation.new if opts[:collation] && !server.features.collation_enabled?
+        if (opts[:collation] || opts[Operation::COLLATION]) && !server.features.collation_enabled?
+          raise Error::UnsupportedCollation.new
+        end
       end
 
       def view; self; end

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

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

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

@@ -96,15 +96,30 @@ module Mongo
           def find_command
             document = BSON::Document.new('find' => collection.name, 'filter' => filter)
             command = Options::Mapper.transform_documents(convert_flags(options), MAPPINGS, document)
-            convert_negative_limit(command)
+            convert_limit_and_batch_size(command)
+            command
           end
 
-          def convert_negative_limit(command)
-            if command[:limit] && command[:limit] < 0
-              command['limit'] = command['limit'].abs
+          def convert_limit_and_batch_size(command)
+            if command[:limit] && command[:limit] < 0 &&
+                command[:batchSize] && command[:batchSize] < 0
+
+              command[:limit] = command[:limit].abs
+              command[:batchSize] = command[:limit].abs
               command[:singleBatch] = true
+
+            else
+              [:limit, :batchSize].each do |opt|
+                if command[opt]
+                  if command[opt] < 0
+                    command[opt] = command[opt].abs
+                    command[:singleBatch] = true
+                  elsif command[opt] == 0
+                    command.delete(opt)
+                  end
+                end
+              end
             end
-            command
           end
 
           def convert_flags(options)

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

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

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

@@ -211,7 +211,12 @@ module Mongo
           server = next_primary
           validate_collation!(server, opts)
           delete_doc = { Operation::Q => filter, Operation::LIMIT => value }
-          delete_doc[:collation] = opts[:collation] if opts[:collation]
+          # 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
           write_with_retry do
             Operation::Write::Delete.new(
               :delete => delete_doc,
@@ -229,7 +234,12 @@ module Mongo
                          Operation::U => spec,
                          Operation::MULTI => multi,
                          Operation::UPSERT => !!opts[:upsert] }
-          update_doc[:collation] = opts[:collation] if opts[:collation]
+          # 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
           write_with_retry do
             Operation::Write::Update.new(
               :update => update_doc,

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -25,7 +25,8 @@ module Mongo
         # @return [ Cursor ] cursor The cursor.
         attr_reader :cursor
 
-        def_delegators :@cursor, :batch_size, :collection_name, :database, :view
+        def_delegators :@cursor, :collection_name, :database, :view
+        def_delegators :view, :batch_size
 
         # Create the new builder.
         #
@@ -55,7 +56,7 @@ module Mongo
 
         def get_more_command
           command = { :getMore => cursor.id, :collection => collection_name }
-          command[:batchSize] = batch_size if batch_size
+          command[:batchSize] = batch_size.abs if batch_size && batch_size != 0
           # If the max_await_time_ms option is set, then we set maxTimeMS on
           # the get more command.
           if view.respond_to?(:max_await_time_ms)

data/lib/mongo/error/closed_stream.rb

@@ -15,7 +15,7 @@
 module Mongo
   class Error
 
-    # Raised if the GridFS::Stream object is closed and an operation is attempted.
+    # Raised if the Grid::FSBucket::Stream object is closed and an operation is attempted.
     #
     # @since 2.1.0
     class ClosedStream < Error

data/lib/mongo/error/invalid_server_preference.rb

@@ -46,7 +46,7 @@ module Mongo
       # @example Instantiate the exception.
       #   Mongo::Error::InvalidServerPreference.new
       #
-      # @param [ String ] name The preference name.
+      # @param [ String ] message The error message.
       #
       # @since 2.0.0
       def initialize(message)

data/lib/mongo/index/view.rb

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

data/lib/mongo/operation/write/bulk/mergable.rb

@@ -55,7 +55,7 @@ module Mongo
           #
           # @since 2.0.0
           def aggregate_write_concern_errors(count)
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
+            @replies.each_with_index.reduce(nil) do |errors, (reply, _)|
               if write_concern_errors = reply.documents.first[Error::WRITE_CONCERN_ERRORS]
                 (errors || []) << write_concern_errors.reduce(nil) do |errs, wce|
                     wce.merge!('index' => count + wce['index'])

data/lib/mongo/operation/write/create_index.rb

@@ -59,7 +59,7 @@ module Mongo
         end
 
         def message(server)
-          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents)
+          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents, validating_keys: false)
         end
       end
     end

data/lib/mongo/operation/write/delete.rb

@@ -61,7 +61,7 @@ module Mongo
         end
 
         def has_collation?
-          delete[:collation]
+          delete[:collation] || delete[Operation::COLLATION]
         end
 
         def message(server)

data/lib/mongo/operation/write/update.rb

@@ -64,7 +64,7 @@ module Mongo
         end
 
         def has_collation?
-          update[:collation]
+          update[:collation] || update[Operation::COLLATION]
         end
 
         def message(server)

data/lib/mongo/protocol/delete.rb

@@ -46,6 +46,7 @@ module Mongo
         @selector = selector
         @flags = options[:flags] || []
         @upconverter = Upconverter.new(collection, selector, options)
+        super
       end
 
       # Return the event payload for monitoring.
@@ -65,10 +66,12 @@ module Mongo
         }
       end
 
-      private
+      protected
 
       attr_reader :upconverter
 
+      private
+
       # The operation code required to specify a Delete message.
       # @return [Fixnum] the operation code.
       def op_code

data/lib/mongo/protocol/get_more.rb

@@ -42,6 +42,7 @@ module Mongo
         @number_to_return = number_to_return
         @cursor_id = cursor_id
         @upconverter = Upconverter.new(collection, cursor_id, number_to_return)
+        super
       end
 
       # Return the event payload for monitoring.
@@ -73,10 +74,12 @@ module Mongo
         true
       end
 
-      private
+      protected
 
       attr_reader :upconverter
 
+      private
+
       # The operation code required to specify a GetMore message.
       # @return [Fixnum] the operation code.
       def op_code

data/lib/mongo/protocol/insert.rb

@@ -54,6 +54,8 @@ module Mongo
         @documents = documents
         @flags = options[:flags] || []
         @upconverter = Upconverter.new(collection, documents, options)
+        @options = options
+        super
       end
 
       # Return the event payload for monitoring.
@@ -73,14 +75,16 @@ module Mongo
         }
       end
 
+      protected
+
+      attr_reader :upconverter
+
       private
 
       def validating_keys?
-        true
+        @options.fetch(:validating_keys, true)
       end
 
-      attr_reader :upconverter
-
       # The operation code required to specify an Insert message.
       # @return [Fixnum] the operation code.
       def op_code

data/lib/mongo/protocol/kill_cursors.rb

@@ -36,6 +36,7 @@ module Mongo
         @cursor_ids = cursor_ids
         @id_count   = @cursor_ids.size
         @upconverter = Upconverter.new(collection, cursor_ids)
+        super
       end
 
       # Return the event payload for monitoring.
@@ -55,10 +56,12 @@ module Mongo
         }
       end
 
-      private
+      protected
 
       attr_reader :upconverter
 
+      private
+
       # The operation code required to specify +KillCursors+ message.
       # @return [Fixnum] the operation code.
       def op_code

data/lib/mongo/protocol/message.rb

@@ -77,6 +77,10 @@ module Mongo
       # @return [Fixnum] The request id for this message
       attr_reader :request_id
 
+      def initialize(*args) # :nodoc:
+        @request_id = nil
+      end
+
       # The default for messages is not to require a reply after sending a
       # message to the server.
       #
@@ -110,7 +114,7 @@ module Mongo
       #
       # @return [ Message ] Instance of a Message class
       def self.deserialize(io, max_message_size = MAX_MESSAGE_SIZE, expected_response_to = nil)
-        length, request_id, response_to, op_code = deserialize_header(BSON::ByteBuffer.new(io.read(16)))
+        length, _request_id, response_to, _op_code = deserialize_header(BSON::ByteBuffer.new(io.read(16)))
 
         # Protection from potential DOS man-in-the-middle attacks. See
         # DRIVERS-276.

data/lib/mongo/protocol/query.rb

@@ -67,6 +67,7 @@ module Mongo
         @skip = options[:skip]  || 0
         @flags = options[:flags] || []
         @upconverter = Upconverter.new(collection, selector, options, flags)
+        super
       end
 
       # Return the event payload for monitoring.
@@ -98,10 +99,12 @@ module Mongo
         true
       end
 
-      private
+      protected
 
       attr_reader :upconverter
 
+      private
+
       # The operation code required to specify a Query message.
       # @return [Fixnum] the operation code.
       def op_code
@@ -252,7 +255,7 @@ module Mongo
         #
         # @since 2.1.0
         def command_name
-          command? ? filter.keys.first : FIND
+          (filter[:$query] || !command?) ? FIND : filter.keys.first
         end
 
         private
@@ -261,9 +264,13 @@ module Mongo
           collection == Database::COMMAND
         end
 
+        def query_filter
+          filter[:$query] || filter
+        end
+
         def op_command
           document = BSON::Document.new
-          filter.each do |field, value|
+          query_filter.each do |field, value|
             document.store(field.to_s, value)
           end
           document
@@ -272,7 +279,7 @@ module Mongo
         def find_command
           document = BSON::Document.new
           document.store(FIND, collection)
-          document.store(FILTER, filter[:$query] ? filter[:$query] : filter)
+          document.store(FILTER, query_filter)
           OPTION_MAPPINGS.each do |legacy, option|
             document.store(option, options[legacy]) unless options[legacy].nil?
           end