RUBY-1021 Initialize options to Redacted and update uri parser

Author: estolfo

lib/mongo.rb

@@ -15,6 +15,7 @@
 require 'forwardable'
 require 'bson'
 require 'openssl'
+require 'mongo/options'
 require 'mongo/loggable'
 require 'mongo/monitoring'
 require 'mongo/logger'
@@ -32,7 +33,6 @@
 require 'mongo/dbref'
 require 'mongo/grid'
 require 'mongo/index'
-require 'mongo/options'
 require 'mongo/protocol'
 require 'mongo/server'
 require 'mongo/server_selector'

lib/mongo/client.rb

@@ -153,7 +153,7 @@ def hash
     #   logs at the default 250 characters.
     #
     # @since 2.0.0
-    def initialize(addresses_or_uri, options = {})
+    def initialize(addresses_or_uri, options = Options::Redacted.new)
       @monitoring = Monitoring.new(options)
       if addresses_or_uri.is_a?(::String)
         create_from_uri(addresses_or_uri, options)
@@ -215,7 +215,7 @@ def use(name)
     # @return [ Mongo::Client ] A new client instance.
     #
     # @since 2.0.0
-    def with(new_options = {})
+    def with(new_options = Options::Redacted.new)
       clone.tap do |client|
         opts = Options::Redacted.new(new_options) || Options::Redacted.new
         client.options.update(opts)
@@ -291,13 +291,13 @@ def list_databases
 
     private
 
-    def create_from_addresses(addresses, opts = {})
+    def create_from_addresses(addresses, opts = Options::Redacted.new)
       @options = Options::Redacted.new(Database::DEFAULT_OPTIONS.merge(opts)).freeze
       @cluster = Cluster.new(addresses, @monitoring, options)
       @database = Database.new(self, options[:database], options)
     end
 
-    def create_from_uri(connection_string, opts = {})
+    def create_from_uri(connection_string, opts = Options::Redacted.new)
       uri = URI.new(connection_string, opts)
       @options = Options::Redacted.new(Database::DEFAULT_OPTIONS.merge(uri.client_options.merge(opts))).freeze
       @cluster = Cluster.new(uri.servers, @monitoring, options)

lib/mongo/cluster.rb

@@ -88,7 +88,7 @@ def add(host)
     # @param [ Hash ] options The options.
     #
     # @since 2.0.0
-    def initialize(seeds, monitoring, options = {})
+    def initialize(seeds, monitoring, options = Options::Redacted.new)
       @addresses = []
       @servers = []
       @monitoring = monitoring
@@ -125,7 +125,7 @@ def inspect
     #
     # @since 2.0.0
     def next_primary
-      ServerSelector.get(Options::Redacted.new({ mode: :primary }.merge(options))).select_server(self)
+      ServerSelector.get(ServerSelector::PRIMARY.merge(options)).select_server(self)
     end
 
     # Elect a primary server from the description that has just changed to a

lib/mongo/collection/view/readable.rb

@@ -298,7 +298,7 @@ def projection(document = nil)
         # @since 2.0.0
         def read(value = nil)
           return default_read if value.nil?
-          selector = value.is_a?(Hash) ? ServerSelector.get(Options::Redacted.new(value.merge(client.options))) : value
+          selector = value.is_a?(Hash) ? ServerSelector.get(client.options.merge(value)) : value
           configure(:read, selector)
         end
 

lib/mongo/database.rb

@@ -36,7 +36,7 @@ class Database
     # The default database options.
     #
     # @since 2.0.0
-    DEFAULT_OPTIONS = { :database => ADMIN }.freeze
+    DEFAULT_OPTIONS = Options::Redacted.new(:database => ADMIN).freeze
 
     # Database name field constant.
     #
@@ -148,7 +148,7 @@ def collections
     #
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
-      preference = opts[:read] ? ServerSelector.get(Options::Redacted.new(opts[:read].merge(options))) : read_preference
+      preference = opts[:read] ? ServerSelector.get(client.options.merge(opts[:read])) : read_preference
       server = preference.select_server(cluster)
       Operation::Command.new({
         :selector => operation,

lib/mongo/grid/fs_bucket.rb

@@ -19,6 +19,7 @@ module Grid
     #
     # @since 2.0.0
     class FSBucket
+      extend Forwardable
 
       # The default root prefix.
       #
@@ -55,6 +56,10 @@ class FSBucket
       # @since 2.1.0
       attr_reader :options
 
+      # Get client from the database.
+      def_delegators :database,
+                     :client
+
       # Find files collection documents matching a given selector.
       #
       # @example Find files collection documents by a filename.
@@ -395,7 +400,7 @@ def upload_from_stream(filename, io, opts = {})
       # @since 2.1.0
       def read_preference
         @read_preference ||= @options[:read] ?
-            ServerSelector.get(Options::Redacted.new((@options[:read] || {}).merge(database.options))) :
+            ServerSelector.get(client.options.merge(@options[:read] || {})) :
             database.read_preference
       end
 

lib/mongo/options/redacted.rb

@@ -38,7 +38,7 @@ class Redacted < BSON::Document
       #
       # @since 2.1.0
       def inspect
-        redacted_string(__method__)
+        redacted_string(:inspect)
       end
 
       # Get a string representation of the options.
@@ -47,7 +47,7 @@ def inspect
       #
       # @since 2.1.0
       def to_s
-        redacted_string(__method__)
+        redacted_string(:to_s)
       end
 
       # Whether these options contain a given key.
@@ -63,6 +63,7 @@ def to_s
       def has_key?(key)
         super(convert_key(key))
       end
+      alias_method :key?, :has_key?
 
       private
 

lib/mongo/server_selector.rb

@@ -38,6 +38,11 @@ module ServerSelector
     # @since 2.0.0
     SERVER_SELECTION_TIMEOUT = 30.freeze
 
+    # Primary read preference.
+    #
+    # @since 2.1.0
+    PRIMARY = Options::Redacted.new(mode: :primary)
+
     # Hash lookup for the selector classes based off the symbols
     #   provided in configuration.
     #

lib/mongo/uri.rb

@@ -268,7 +268,7 @@ def split_creds_hosts(string)
 
     def parse_db_opts!(string)
       auth_db, d, uri_opts = string.partition(URI_OPTS_DELIM)
-      @uri_options = parse_uri_options!(uri_opts)
+      @uri_options = Options::Redacted.new(parse_uri_options!(uri_opts))
       @database = parse_database!(auth_db)
     end
 

spec/mongo/uri_spec.rb

@@ -365,7 +365,7 @@
 
       context 'numerical w value' do
         let(:options) { 'w=1' }
-        let(:concern) { { :w => 1 } }
+        let(:concern) { Mongo::Options::Redacted.new(:w => 1)}
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -374,7 +374,7 @@
 
       context 'w=majority' do
         let(:options) { 'w=majority' }
-        let(:concern) { { :w => :majority } }
+        let(:concern) { Mongo::Options::Redacted.new(:w => :majority) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -383,7 +383,7 @@
 
       context 'journal' do
         let(:options) { 'journal=true' }
-        let(:concern) { { :j => true } }
+        let(:concern) { Mongo::Options::Redacted.new(:j => true) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -392,7 +392,7 @@
 
       context 'fsync' do
         let(:options) { 'fsync=true' }
-        let(:concern) { { :fsync => true } }
+        let(:concern) { Mongo::Options::Redacted.new(:fsync => true) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -402,7 +402,7 @@
       context 'wtimeoutMS' do
         let(:timeout) { 1234 }
         let(:options) { "w=2&wtimeoutMS=#{timeout}" }
-        let(:concern) { { :w => 2, :timeout => timeout } }
+        let(:concern) { Mongo::Options::Redacted.new(:w => 2, :timeout => timeout) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -415,7 +415,7 @@
 
       context 'primary' do
         let(:mode) { 'primary' }
-        let(:read) { { :mode => :primary } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :primary) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -424,7 +424,7 @@
 
       context 'primaryPreferred' do
         let(:mode) { 'primaryPreferred' }
-        let(:read) { { :mode => :primary_preferred } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :primary_preferred) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -433,7 +433,7 @@
 
       context 'secondary' do
         let(:mode) { 'secondary' }
-        let(:read) { { :mode => :secondary } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :secondary) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -442,7 +442,7 @@
 
       context 'secondaryPreferred' do
         let(:mode) { 'secondaryPreferred' }
-        let(:read) { { :mode => :secondary_preferred } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :secondary_preferred) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -451,7 +451,7 @@
 
       context 'nearest' do
         let(:mode) { 'nearest' }
-        let(:read) { { :mode => :nearest } }
+        let(:read) { Mongo::Options::Redacted.new(:mode => :nearest) }
 
         it 'sets the read preference' do
           expect(uri.uri_options[:read]).to eq(read)
@@ -467,7 +467,7 @@
         end
 
         let(:read) do
-          { :tag_sets => [{ :dc => 'ny', :rack => '1' }] }
+          Mongo::Options::Redacted.new(:tag_sets => [{ 'dc' => 'ny', 'rack' => '1' }])
         end
 
         it 'sets the read preference tag set' do
@@ -481,7 +481,7 @@
         end
 
         let(:read) do
-          { :tag_sets => [{ :dc => 'ny' }, { :dc => 'bos' }] }
+          Mongo::Options::Redacted.new(:tag_sets => [{ 'dc' => 'ny' }, { 'dc' => 'bos' }])
         end
 
         it 'sets the read preference tag sets' do
@@ -536,7 +536,7 @@
 
       context 'regular db' do
         let(:source) { 'foo' }
-        let(:auth) { { :source => 'foo' } }
+        let(:auth) { Mongo::Options::Redacted.new(:source => 'foo') }
 
         it 'sets the auth source to the database' do
           expect(uri.uri_options[:auth]).to eq(auth)
@@ -545,7 +545,7 @@
 
       context '$external' do
         let(:source) { '$external' }
-        let(:auth) { { :source => :external } }
+        let(:auth) { Mongo::Options::Redacted.new(:source => :external) }
 
         it 'sets the auth source to :external' do
           expect(uri.uri_options[:auth]).to eq(auth)
@@ -562,7 +562,7 @@
 
         let(:service_name) { 'foo' }
         let(:auth) do
-          { auth_mech_properties: { service_name: service_name } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { service_name: service_name })
         end
 
         it 'sets the auth mechanism properties' do
@@ -577,7 +577,7 @@
 
         let(:canonicalize_host_name) { 'true' }
         let(:auth) do
-          { auth_mech_properties: { canonicalize_host_name: true } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { canonicalize_host_name: true })
         end
 
         it 'sets the auth mechanism properties' do
@@ -592,7 +592,7 @@
 
         let(:service_realm) { 'dumdum' }
         let(:auth) do
-          { auth_mech_properties: { service_realm: service_realm } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { service_realm: service_realm })
         end
 
         it 'sets the auth mechanism properties' do
@@ -612,9 +612,9 @@
         let(:service_realm) { 'dumdum' }
 
         let(:auth) do
-          { auth_mech_properties: { service_name: service_name,
-                                    canonicalize_host_name: true,
-                                    service_realm: service_realm } }
+          Mongo::Options::Redacted.new(auth_mech_properties: { service_name: service_name,
+                                                               canonicalize_host_name: true,
+                                                               service_realm: service_realm })
         end
 
         it 'sets the auth mechanism properties' do