mongo 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5dc91c26dc7d6d0a6c9f50e39c6d7b53130d08e75611d9f2a81162ed5a53e2
-  data.tar.gz: ceb6c12c3e4a7e5b9552fa8501b8faa6835ce110a6f32e6df8e8c65f53599b76
+  metadata.gz: d8e500892649b1d8d1817ec229c1d56d97837e252452654af04e995d1416082a
+  data.tar.gz: 5fa8c7ca6caa84c0c81ed9f8ab3cd6566f579fc10ac28f510628f2de790040c7
 SHA512:
-  metadata.gz: 94c8eeb0c0afa60bd77ad0fc8139bfa818e9b3d1ac1d7e1656d92cf91e50d0481d3e9bb275bd3f5143b540036e5acc314e573e79c5891ad85003b05eadfc695e
-  data.tar.gz: 94e7a7f089b67ec901c8182f96d9a020ba67143b5e0823d3c39f0fa7dfa8cc7e0132a40df65a64c2c308b2d255316dbac4e20180b70bbeaa5680b3ef55e6f70e
+  metadata.gz: 725de14593b44d0bf8b370f53a5e18a8f5d033efddd2e05096ec561b69f51b01b70394d3c8ebab1e89dbb7ecbb7784dbb161376d1194130ae6d016afd39344ae
+  data.tar.gz: 989ee85302acac376637d777e1c83cff4e7fa5d932fc62d489b3192d0b7336875fe831a0742d9953892108d2cb86c5b825f84d73a1779c0149fef2ffbb04aa05

data.tar.gz.sig

@@ -1 +1,3 @@
-���.,�1��[+��>4��v�1��8�9+*�7{R�'���E�R�@�ج�����t$����52eh��?��j�G!��E��:�x��47Dr]��&�=Ϗl›�-�m:e����Y��+����$���S�l%@|L���BB�/��1�3^Ε��a'�N�'azn۝�@����Oy�[��ԫ�c�,��&<��2�'���
�3�]цY=�����ӌa6	�e��H`����
Np4�����q�ו��Y9��
+���6Ș�����>in{��M�(����Jʐ4���E�tm}W�BA8�������y��z���W�S��^<~6���&%q�`��M��(����<�7��Kݰxj�����d�\����f���f�f��EML�|3�tK�DЂ9�J<3-�,���<�Q��!E�g>L>��8Yf95��֙<i��l�gu������m�x[=�f�
+��;�|klr�؁�n
+v�a����gn���0�O�I�S���r�PowVo`�

data/lib/mongo.rb

@@ -42,3 +42,4 @@ require 'mongo/socket'
 require 'mongo/uri'
 require 'mongo/version'
 require 'mongo/write_concern'
+require 'mongo/lint'

data/lib/mongo/address.rb

@@ -142,7 +142,7 @@ module Mongo
     # @param [ Float ] socket_timeout The socket timeout.
     # @param [ Hash ] ssl_options SSL options.
     #
-    # @return [ Pool::Socket::SSL, Pool::Socket::TCP, Pool::Socket::Unix ] The socket.
+    # @return [ Mongo::Socket::SSL, Mongo::Socket::TCP, Mongo::Socket::Unix ] The socket.
     #
     # @since 2.0.0
     def socket(socket_timeout, ssl_options = {})

data/lib/mongo/address/ipv4.rb

@@ -80,7 +80,7 @@ module Mongo
       # @param [ Float ] socket_timeout The socket timeout.
       # @param [ Hash ] ssl_options SSL options.
       #
-      # @return [ Pool::Socket::SSL, Pool::Socket::TCP ] The socket.
+      # @return [ Mongo::Socket::SSL, Mongo::Socket::TCP ] The socket.
       #
       # @since 2.0.0
       def socket(socket_timeout, ssl_options = {})

data/lib/mongo/address/ipv6.rb

@@ -96,7 +96,7 @@ module Mongo
       # @param [ Float ] socket_timeout The socket timeout.
       # @param [ Hash ] ssl_options SSL options.
       #
-      # @return [ Pool::Socket::SSL, Pool::Socket::TCP ] The socket.
+      # @return [ Mongo::Socket::SSL, Mongo::Socket::TCP ] The socket.
       #
       # @since 2.0.0
       def socket(socket_timeout, ssl_options = {})

data/lib/mongo/address/unix.rb

@@ -65,7 +65,7 @@ module Mongo
       # @param [ Float ] socket_timeout The socket timeout.
       # @param [ Hash ] ssl_options SSL options - ignored.
       #
-      # @return [ Pool::Socket::Unix ] The socket.
+      # @return [ Mongo::Socket::Unix ] The socket.
       #
       # @since 2.0.0
       def socket(socket_timeout, ssl_options = {})

data/lib/mongo/client.rb

@@ -193,7 +193,7 @@ module Mongo
     #   supports 'zlib'.
     # @option options [ Hash ] :read The read preference options. The hash
     #   may have the following items:
-    #   - *:read* -- read preference specified as a symbol; valid values are
+    #   - *:mode* -- read preference specified as a symbol; valid values are
     #     *:primary*, *:primary_preferred*, *:secondary*, *:secondary_preferred*
     #     and *:nearest*.
     #   - *:tag_sets* -- an array of hashes.
@@ -219,18 +219,18 @@ module Mongo
     # @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
+    # @option options [ true, false ] :ssl_verify Whether to do peer certificate
     #   validation.
-    # @option options [ String ] :ssl_ca_cert The file containing a set of concatenated
-    #   certification authority certifications used to validate certs passed from the
+    # @option options [ String ] :ssl_ca_cert The file containing concatenated
+    #   certificate authority certificates 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 [ String ] :ssl_ca_cert_string A string containing a set of concatenated
-    #   certification authority certifications used to validate certs passed from the
+    # @option options [ String ] :ssl_ca_cert_string A string containing concatenated
+    #   certificate authority certificates 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 representing the certification authority certifications used
+    #   OpenSSL::X509::Certificate representing the certificate authority certificates 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
@@ -261,6 +261,7 @@ module Mongo
     #
     # @since 2.0.0
     def initialize(addresses_or_uri, options = Options::Redacted.new)
+      Mongo::Lint.validate_underscore_read_preference(options[:read])
       if addresses_or_uri.is_a?(::String)
         create_from_uri(addresses_or_uri, validate_options!(options))
       else
@@ -301,6 +302,12 @@ module Mongo
     #   client.read_preference
     #
     # @return [ BSON::Document ] The user-defined read preference.
+    #   The document may have the following fields:
+    #   - *:read* -- read preference specified as a symbol; valid values are
+    #     *:primary*, *:primary_preferred*, *:secondary*, *:secondary_preferred*
+    #     and *:nearest*.
+    #   - *:tag_sets* -- an array of hashes.
+    #   - *:local_threshold*.
     #
     # @since 2.0.0
     def read_preference

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

@@ -68,7 +68,15 @@ module Mongo
           end
 
           def read_pref_formatted
-            @read_formatted ||= ServerSelector.get(read).to_mongos if read
+            @read_formatted ||= begin
+              if read
+                read_pref = ServerSelector.get(read).to_mongos
+                Mongo::Lint.validate_camel_case_read_preference(read_pref)
+                read_pref
+              else
+                nil
+              end
+            end
           end
 
           def special_filter

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

@@ -139,6 +139,7 @@ module Mongo
           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
+          Mongo::Lint.validate_underscore_read_preference(opts[:read])
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           with_session(opts) do |session|
@@ -203,6 +204,7 @@ module Mongo
           cmd = { count: collection.name }
           cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
+          Mongo::Lint.validate_underscore_read_preference(opts[:read])
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           with_session(opts) do |session|
@@ -240,6 +242,7 @@ module Mongo
                   :query => filter }
           cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
+          Mongo::Lint.validate_underscore_read_preference(opts[:read])
           read_pref = opts[:read] || read_preference
           selector = ServerSelector.get(read_pref || server_selector)
           with_session(opts) do |session|
@@ -537,11 +540,13 @@ module Mongo
         end
 
         def read_preference
-          if options[:session] && options[:session].in_transaction?
-            options[:session].send(:txn_read_pref) || collection.client.read_preference
+          rp = if options[:session] && options[:session].in_transaction?
+            options[:session].txn_read_preference || collection.client.read_preference
           else
             @read_preference ||= (options[:read] || collection.read_preference)
           end
+          Mongo::Lint.validate_underscore_read_preference(rp)
+          rp
         end
 
         def server_selector

data/lib/mongo/database.rb

@@ -153,7 +153,8 @@ module Mongo
     #
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
-      txn_read_pref = opts[:session] && opts[:session].in_transaction? && opts[:session].txn_read_pref
+      txn_read_pref = opts[:session] && opts[:session].in_transaction? && opts[:session].txn_read_preference
+      Mongo::Lint.validate_underscore_read_preference(txn_read_pref)
       preference = ServerSelector.get(txn_read_pref || opts[:read] || ServerSelector::PRIMARY)
       server = preference.select_server(cluster)
 

data/lib/mongo/error.rb

@@ -151,6 +151,7 @@ require 'mongo/error/invalid_update_document'
 require 'mongo/error/invalid_uri'
 require 'mongo/error/invalid_write_concern'
 require 'mongo/error/insufficient_iteration_count'
+require 'mongo/error/lint_error'
 require 'mongo/error/max_bson_size'
 require 'mongo/error/max_message_size'
 require 'mongo/error/mismatched_domain'

data/lib/mongo/error/lint_error.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2018 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # Raised when the driver is used incorrectly.
+    #
+    # Normally the driver passes certain data to the server and lets the
+    # server return an error if the data is invalid. This makes it possible
+    # for the server to add functionality in the future and for older
+    # driver versions to support such functionality transparently, but
+    # also complicates debugging.
+    #
+    # Setting the environment variable MONGO_RUBY_DRIVER_LINT to 1, true
+    # or yes will make the driver perform additional checks on data it passes
+    # to the server, to flag failures sooner. This exception is raised on
+    # such failures.
+    #
+    # @since 2.7.0
+    class LintError < Error
+    end
+  end
+end

data/lib/mongo/lint.rb

@@ -0,0 +1,45 @@
+module Mongo
+  # @api private
+  module Lint
+    def validate_underscore_read_preference(read_pref)
+      return unless enabled?
+      if read_pref
+        validate_underscore_read_preference_mode(read_pref[:mode] || read_pref['mode'])
+      end
+    end
+    module_function :validate_underscore_read_preference
+
+    def validate_underscore_read_preference_mode(mode)
+      return unless enabled?
+      if mode
+        unless %w(primary primary_preferred secondary secondary_preferred nearest).include?(mode.to_s)
+          raise Error::LintError, "Invalid read preference mode: #{mode}"
+        end
+      end
+    end
+    module_function :validate_underscore_read_preference_mode
+
+    def validate_camel_case_read_preference(read_pref)
+      return unless enabled?
+      if read_pref
+        validate_camel_case_read_preference_mode(read_pref[:mode] || read_pref['mode'])
+      end
+    end
+    module_function :validate_camel_case_read_preference
+
+    def validate_camel_case_read_preference_mode(mode)
+      return unless enabled?
+      if mode
+        unless %w(primary primaryPreferred secondary secondaryPreferred nearest).include?(mode.to_s)
+          raise Error::LintError, "Invalid read preference mode: #{mode}"
+        end
+      end
+    end
+    module_function :validate_camel_case_read_preference_mode
+
+    def enabled?
+      ENV['MONGO_RUBY_DRIVER_LINT'] && %w(1 yes true).include?(ENV['MONGO_RUBY_DRIVER_LINT'].downcase)
+    end
+    module_function :enabled?
+  end
+end

data/lib/mongo/operation/shared/read_preference_supported.rb

@@ -30,8 +30,9 @@ module Mongo
 
       def update_selector_for_read_pref(sel, server)
         if read && server.mongos? && read_pref = read.to_mongos
+          Mongo::Lint.validate_camel_case_read_preference(read_pref)
           sel = sel[:$query] ? sel : {:$query => sel}
-          sel.merge(:$readPreference => read_pref)
+          sel = sel.merge(:$readPreference => read_pref)
         else
           sel
         end

data/lib/mongo/operation/shared/sessions_supported.rb

@@ -24,8 +24,6 @@ module Mongo
 
       ZERO_TIMESTAMP = BSON::Timestamp.new(0, 0)
 
-      READ_PREFERENCE = '$readPreference'.freeze
-
       READ_COMMANDS = [
         :aggregate,
         :collStats,
@@ -101,8 +99,8 @@ module Mongo
         session.suppress_read_write_concern!(selector)
       end
 
-      def validate_read_pref!(selector)
-        session.validate_read_pref!(selector) if read_command?(selector)
+      def validate_read_preference!(selector)
+        session.validate_read_preference!(selector) if read_command?(selector)
       end
 
       def update_session_state!
@@ -113,7 +111,7 @@ module Mongo
         sel = selector(server)
         add_write_concern!(sel)
         sel[Protocol::Msg::DATABASE_IDENTIFIER] = db_name
-        sel[READ_PREFERENCE] = read.to_doc if read
+        sel['$readPreference'] = read.to_doc if read
 
         if server.features.sessions_enabled?
           apply_cluster_time!(sel, server)
@@ -125,7 +123,7 @@ module Mongo
             apply_autocommit!(sel)
             apply_txn_opts!(sel)
             suppress_read_write_concern!(sel)
-            validate_read_pref!(sel)
+            validate_read_preference!(sel)
             update_session_state!
             apply_txn_num!(sel)
           end
@@ -138,7 +136,7 @@ module Mongo
           apply_autocommit!(sel)
           apply_txn_opts!(sel)
           suppress_read_write_concern!(sel)
-          validate_read_pref!(sel)
+          validate_read_preference!(sel)
           update_session_state!
           apply_txn_num!(sel)
         end

data/lib/mongo/protocol/query.rb

@@ -301,6 +301,7 @@ module Mongo
           OPTION_MAPPINGS.each do |legacy, option|
             document.store(option, options[legacy]) unless options[legacy].nil?
           end
+          Mongo::Lint.validate_camel_case_read_preference(filter['readPreference'])
           SPECIAL_FIELD_MAPPINGS.each do |special, normal|
             document.store(normal, filter[special]) unless filter[special].nil?
           end

data/lib/mongo/server.rb

@@ -201,7 +201,7 @@ module Mongo
     # @example Get the connection pool for the server.
     #   server.pool
     #
-    # @return [ Mongo::Pool ] The connection pool.
+    # @return [ Mongo::Server::ConnectionPool ] The connection pool.
     #
     # @since 2.0.0
     def pool

data/lib/mongo/server/connection_pool.rb

@@ -47,7 +47,7 @@ module Mongo
       # @example Check a connection out from the pool.
       #   pool.checkout
       #
-      # @return [ Mongo::Pool::Connection ] The checked out connection.
+      # @return [ Mongo::Server::Connection ] The checked out connection.
       #
       # @since 2.0.0
       def checkout
@@ -120,14 +120,14 @@ module Mongo
 
       class << self
 
-        # Get a connection pool for the provided server.
+        # Creates a new connection pool for the provided server.
         #
-        # @example Get a connection pool.
-        #   Mongo::Pool.get(server)
+        # @example Create a new connection pool.
+        #   Mongo::Server::ConnectionPool.get(server)
         #
         # @param [ Mongo::Server ] server The server.
         #
-        # @return [ Mongo::Pool ] The connection pool.
+        # @return [ Mongo::Server::ConnectionPool ] The connection pool.
         #
         # @since 2.0.0
         def get(server)

data/lib/mongo/server/connection_pool/queue.rb

@@ -53,7 +53,7 @@ module Mongo
         # @example Dequeue a connection.
         #   queue.dequeue
         #
-        # @return [ Mongo::Pool::Connection ] The next connection.
+        # @return [ Mongo::Server::Connection ] The next connection.
         #
         # @since 2.0.0
         def dequeue
@@ -82,7 +82,7 @@ module Mongo
         # @example Enqueue a connection.
         #   queue.enqueue(connection)
         #
-        # @param [ Mongo::Pool::Connection ] connection The connection.
+        # @param [ Mongo::Server::Connection ] connection The connection.
         #
         # @since 2.0.0
         def enqueue(connection)
@@ -96,7 +96,7 @@ module Mongo
         # the initial size of the queue.
         #
         # @example Create the queue.
-        #   Mongo::Pool::Queue.new(max_pool_size: 5) { Connection.new }
+        #   Mongo::Server::ConnectionPool::Queue.new(max_pool_size: 5) { Connection.new }
         #
         # @param [ Hash ] options The options.
         #
@@ -124,7 +124,7 @@ module Mongo
         #
         # @since 2.0.0
         def inspect
-          "#<Mongo::Pool::Queue:0x#{object_id} min_size=#{min_size} max_size=#{max_size} " +
+          "#<Mongo::Server::ConnectionPool::Queue:0x#{object_id} min_size=#{min_size} max_size=#{max_size} " +
             "wait_timeout=#{wait_timeout} current_size=#{queue.size}>"
         end
 

data/lib/mongo/server_selector.rb

@@ -71,6 +71,7 @@ module Mongo
     # @since 2.0.0
     def get(preference = {})
       return preference if PREFERENCES.values.include?(preference.class)
+      Mongo::Lint.validate_underscore_read_preference(preference)
       PREFERENCES.fetch((preference[:mode] || :primary).to_sym).new(preference)
     end
   end

data/lib/mongo/session.rb

@@ -110,9 +110,16 @@ module Mongo
     # @param [ Client ] client The client through which this session is created.
     # @param [ Hash ] options The options for this session.
     #
+    # @option options [ Hash ] :read_preference The read preference options hash,
+    #   with the following optional keys:
+    #   - *:mode* -- the read preference as a string or symbol; valid values are
+    #     *:primary*, *:primary_preferred*, *:secondary*, *:secondary_preferred*
+    #     and *:nearest*.
+    #
     # @since 2.5.0
     def initialize(server_session, client, options = {})
       @server_session = server_session
+      options = options.dup
 
       # Because the read preference will need to be inserted into a command as a string, we convert
       # it from a symbol immediately upon receiving it.
@@ -121,7 +128,7 @@ module Mongo
       end
 
       @client = client.use(:admin)
-      @options = options.dup.freeze
+      @options = options.freeze
       @cluster_time = nil
       @state = NO_TRANSACTION_STATE
     end
@@ -232,7 +239,13 @@ module Mongo
     def add_txn_opts!(command, read)
       command.tap do |c|
         # The read preference should be added for all read operations.
-        c['$readPreference'] = txn_read_pref if read && txn_read_pref
+        if read && txn_read_pref = txn_read_preference
+          Mongo::Lint.validate_underscore_read_preference(txn_read_pref)
+          txn_read_pref = txn_read_pref.dup
+          txn_read_pref[:mode] = txn_read_pref[:mode].to_s.gsub(/(_\w)/) { |match| match[1].upcase }
+          Mongo::Lint.validate_camel_case_read_preference(txn_read_pref)
+          c['$readPreference'] = txn_read_pref
+        end
 
         # The read concern should be added to any command that starts a transaction.
         if starting_transaction? && txn_read_concern
@@ -277,14 +290,14 @@ module Mongo
     # Ensure that the read preference of a command primary.
     #
     # @example
-    #   session.validate_read_pref!(command)
+    #   session.validate_read_preference!(command)
     #
     # @raise [ Mongo::Error::InvalidTransactionOperation ] If the read preference of the command is
     # not primary.
     #
     # @since 2.6.0
-    def validate_read_pref!(command)
-      return unless in_transaction? && non_primary_readpref?(command)
+    def validate_read_preference!(command)
+      return unless in_transaction? && non_primary_read_preference_mode?(command)
 
       raise Mongo::Error::InvalidTransactionOperation.new(
         Mongo::Error::InvalidTransactionOperation::INVALID_READ_PREFERENCE)
@@ -452,14 +465,29 @@ module Mongo
 
     # Start a new transaction.
     #
-    # Note that the transaction will not be started on the server until an operation is performed
-    # after start_transaction is called.
+    # Note that the transaction will not be started on the server until an
+    # operation is performed after start_transaction is called.
     #
     # @example Start a new transaction
     #   session.start_transaction(options)
     #
-    # @raise [ InvalidTransactionOperation ] If a transaction is already in progress or if the
-    #   write concern is unacknowledged.
+    # @param [ Hash ] options The options for the transaction being started.
+    #
+    # @option options [ Hash ] read_concern The read concern options hash, with the following
+    #   optional keys:
+    #   - *:level* -- the read preference level as a symbol; valid values are *:local*, *:majority*,
+    #   and *:snapshot*
+    #   - *:after_cluster_time* -- the cluster time BSON::Document or hash specifying which cluster
+    #   time reads should occur after
+    # @option options [ Hash ] :write_concern The write concern options. Can be :w =>
+    #   Integer|String, :fsync => Boolean, :j => Boolean.
+    # @option options [ Hash ] :read The read preference options. The hash may have the following
+    #   items:
+    #   - *:mode* -- read preference specified as a symbol; the only valid value is
+    #     *:primary*.
+    #
+    # @raise [ InvalidTransactionOperation ] If a transaction is already in
+    # progress or if the write concern is unacknowledged.
     #
     # @since 2.6.0
     def start_transaction(options = nil)
@@ -594,18 +622,21 @@ module Mongo
       within_states?(STARTING_TRANSACTION_STATE, TRANSACTION_IN_PROGRESS_STATE)
     end
 
-    # Get the read preference document the session will use in the currently active transaction.
+    # Get the read preference the session will use in the currently
+    # active transaction.
+    #
+    # This is a driver style hash with underscore keys.
     #
     # @example Get the transaction's read preference
-    #   session.txn_read_pref
+    #   session.txn_read_preference
     #
-    # @return [ Hash ] The read preference document of the transaction.
+    # @return [ Hash ] The read preference of the transaction.
     #
     # @since 2.6.0
-    def txn_read_pref
-      rp = (txn_options && txn_options[:read_preference] && txn_options[:read_preference].dup) ||
-        (@client.read_preference && @client.read_preference.dup)
-      rp[:mode] = rp[:mode].to_s if rp
+    def txn_read_preference
+      rp = txn_options && txn_options[:read_preference] ||
+        @client.read_preference
+      Mongo::Lint.validate_underscore_read_preference(rp)
       rp
     end
 
@@ -639,7 +670,7 @@ module Mongo
         (@client.write_concern && @client.write_concern.options)
     end
 
-    def non_primary_readpref?(command)
+    def non_primary_read_preference_mode?(command)
       return false unless command['$readPreference']
 
       mode = command['$readPreference']['mode'] || command['$readPreference'][:mode]