mongo 2.9.0.rc1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7be78062f748710dc54cb80b22913e719ffdd5c066f09390ae701cbc4d5b817
-  data.tar.gz: 64fd81ea9461edf3d4211ea32ad2958cd64a2584d84e9a8d3492e22c4332109e
+  metadata.gz: dd46b61214fcac244d0cbec169da07133ded518cc61f6da7f93ae38005326efc
+  data.tar.gz: b9fde5cb3b1060705a04cdbf6656f0b30f183acc341b6c9ae2e74322675bf358
 SHA512:
-  metadata.gz: 8b2e95fc24ce7bea503e60e3c94066010945df1ba3822395fd34a2c8daa27df75cfbae4b4808133dd59663d65bbecdcb68511a46316aa3b3b840efdc3f34519c
-  data.tar.gz: ce9ebadaeabfb7bd01f662fae6b4a06bb9d35d19cc866af4dab0549a5011120df08a5353b3ca56fa8b3f4408a3b6e06736f0662ca65e2c55a552dea636db93c1
+  metadata.gz: 897c70fc6cdb9d4a839c7cce246c3ff588ccae10b574ab8da7cd62f91860fb792b4ab74a6cc317dd9d80c03384d38d843dcc9119bb6ce71b35cb87d271eed30f
+  data.tar.gz: 849350864e0f5d29dcc9f1c2b5b623e0fd0ec61d028a8270a980ebe1e2cb0a764706f984d63f2206794d0fefca5610dd0f9edcec734faece59b0a8e32f4e7d38

data/CONTRIBUTING.md

@@ -1,64 +1,50 @@
-## Contributing to the MongoDB Ruby Driver
+# Contributing to the MongoDB Ruby Driver
 
 Thank you for your interest in contributing to the MongoDB Ruby driver.
 
-We are building this software together and strongly encourage contributions
-from the community that are within the guidelines set forth below.
+We are building this software together and appreciate and encourage
+contributions from the community.
 
-Bug Fixes and New Features
---------------------------
+JIRA Tickets
+------------
 
-Before starting to write code, look for existing [tickets]
-(https://jira.mongodb.org/browse/RUBY) or [create one]
-(https://jira.mongodb.org/secure/CreateIssue!default.jspa) 
-for your bug, issue, or feature request. This helps the community
-avoid working on something that might not be of interest or which
-has already been addressed.
+The Ruby driver team uses MongoDB JIRA to schedule and track work.
+To report a problem with the driver, please [create a new
+issue](https://jira.mongodb.org/secure/CreateIssue!default.jspa) in the Ruby
+JIRA project. A ticket is appreciated, though not necessary, when submitting
+a pull request.
+
+Please consult [JIRA issues](https://jira.mongodb.org/browse/RUBY)
+for existing known issues in the driver.
 
 Environment
 -----------
 
-We highly suggest using [RVM](https://rvm.io/) or [rbenv]
-(https://github.com/sstephenson/rbenv) to set up Ruby development and
-testing environments. In this way, moving between and testing code for
-alternate Ruby versions (besides the one possibly included with your 
-system) is simple. This practice is essential for ensuring the quality
-of the driver.
-
-Pull Requests
--------------
-
-Pull requests should be made against the master (development)
-branch and include relevant tests, if applicable. The driver follows
-the Git-Flow branching model where the traditional master branch is
-known as release and the master (default) branch is considered under
-development.
+We recommend using [rbenv](https://github.com/sstephenson/rbenv) to set up
+the Ruby development and testing environments, though other tools like
+[RVM](https://rvm.io/) will also work. The driver currently supports
+MRI 1.9.3-2.6 and JRuby 9.1-9.2.
 
-Tests should pass under all Ruby interpreters which the MongoDB Ruby 
-driver currently supports (1.8.7, 1.9.3, JRuby 1.6.x and 1.7.x) and will be 
-automatically tested.
+A MongoDB cluster is required to run the tests. Setup procedures and
+recommendations for various clusters, as well as how to configure the
+driver's test suite, are covered in the [spec
+readme](https://github.com/mongodb/mongo-ruby-driver/blob/master/spec/README.md).
 
-The results of pull request testing will be appended to the request.
-If any tests do not pass, or relavant tests are not included the pull
-request will not be considered.
+The driver is tested on [Evergreen](https://github.com/evergreen-ci/evergreen),
+MongoDB's in house continuous integration platform. After a pull request
+is created, one of the Ruby driver team engineers will schedule continous
+integration builds on Evergreen.
 
-Clusters and Replica Sets
--------------------------
-
-If your bug fix or enhancement deals with Cluster or Replica Set
-code, please run all relevant tests for those code subsets before
-issuing the request.
-
-* `rake test:sharded_cluster` for sharded clusters
-* `rake test:replica_set` for replica sets
+Pull Requests
+-------------
 
-Cluster and Replica Set testing is currently **not** automatically
-performed so it is important they are run in a thorough fashion under
-all supported interpreters before a pull request is made.
+Pull requests should be made against the master (development) branch and
+include relevant tests, if applicable. The Ruby driver team will backport
+the changes to the stable branches, if needed.
 
 Talk To Us
 ----------
 
-We love to hear from you. If you want to work on something or have
-questions / complaints please reach out to us by creating a [question]
-(https://jira.mongodb.org/secure/CreateIssue.jspa?pid=10005&issuetype=6).
+We would love to hear from you. If you want to work on something or have
+questions please reach out to us by creating a [question](https://jira.mongodb.org/secure/CreateIssue.jspa?pid=10005&issuetype=6)
+in JIRA.

data/lib/mongo/server.rb

@@ -263,6 +263,8 @@ module Mongo
         'GHOST'
       when other?
         'OTHER'
+      when mongos?
+        'MONGOS'
       when unknown?
         'UNKNOWN'
       else

data/lib/mongo/uri.rb

@@ -378,13 +378,8 @@ module Mongo
           raise_invalid_error!("Value for option #{key} contains the key/value delimiter (=): #{value}")
         end
         key = ::URI.decode(key)
-        strategy = URI_OPTION_MAP[key.downcase]
-        if strategy.nil?
-          log_warn("Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored.")
-        else
-          value = ::URI.decode(value)
-          add_uri_option(key, strategy, value, uri_options)
-        end
+        value = ::URI.decode(value)
+        add_uri_option(key, value, uri_options)
         uri_options
       end
     end
@@ -527,6 +522,7 @@ module Mongo
     uri_option 'appname', :app_name
     uri_option 'compressors', :compressors, :type => :array
     uri_option 'readconcernlevel', :level, group: :read_concern
+    uri_option 'retryreads', :retry_reads, :type => :retry_reads
     uri_option 'retrywrites', :retry_writes, :type => :retry_writes
     uri_option 'zlibcompressionlevel', :zlib_compression_level, :type => :zlib_compression_level
 
@@ -592,10 +588,15 @@ module Mongo
     #   Merges the option into the target.
     #
     # @param key [String] URI option name.
-    # @param strategy [Symbol] The strategy for this option.
     # @param value [String] The value of the option.
     # @param uri_options [Hash] The base option target.
-    def add_uri_option(key, strategy, value, uri_options)
+    def add_uri_option(key, value, uri_options)
+      strategy = URI_OPTION_MAP[key.downcase]
+      if strategy.nil?
+        log_warn("Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored.")
+        return
+      end
+
       target = select_target(uri_options, strategy[:group])
       value = apply_transform(key, value, strategy[:type])
       merge_uri_option(target, value, strategy[:name])
@@ -785,6 +786,16 @@ module Mongo
       inverse_bool('tlsAllowInvalidHostnames', value)
     end
 
+    # Parses the retryReads value.
+    #
+    # @param value [ String ] The retryReads value.
+    #
+    # @return [ true | false | nil ] The boolean value parsed out, otherwise nil (and a warning
+    #   will be logged).
+    def retry_reads(value)
+      convert_bool('retryReads', value)
+    end
+
     # Parses the retryWrites value.
     #
     # @param value [ String ] The retryWrites value.

data/lib/mongo/uri/srv_protocol.rb

@@ -170,8 +170,7 @@ module Mongo
           raise Error::InvalidTXTRecord.new(INVALID_OPTS_VALUE_DELIM) unless opt.index(URI_OPTS_VALUE_DELIM)
           key, value = opt.split(URI_OPTS_VALUE_DELIM)
           raise Error::InvalidTXTRecord.new(INVALID_TXT_RECORD_OPTION) unless VALID_TXT_OPTIONS.include?(key.downcase)
-          strategy = URI_OPTION_MAP[key.downcase]
-          add_uri_option(key, strategy, value, txt_options)
+          add_uri_option(key, value, txt_options)
           txt_options
         end
       end

data/lib/mongo/version.rb

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

data/spec/mongo/server_spec.rb

@@ -380,5 +380,19 @@ describe Mongo::Server do
         expect(server.summary).not_to include('replica_set')
       end
     end
+
+    context 'server is a mongos' do
+      let(:server) do
+        make_server(:mongos)
+      end
+
+      before do
+        expect(server).to be_mongos
+      end
+
+      it 'specifies the server is a mongos' do
+        expect(server.summary).to match(/MONGOS/)
+      end
+    end
   end
 end

data/spec/support/cluster_config.rb

@@ -55,7 +55,11 @@ class ClusterConfig
     if server_version >= '3.4' && !mongos?
       fcv
     else
-      short_server_version
+      if short_server_version == '4.1'
+        '4.2'
+      else
+        short_server_version
+      end
     end
   end
 

data/spec/support/common_shortcuts.rb

@@ -46,18 +46,23 @@ module CommonShortcuts
       tags = options[:tags] || {}
       average_round_trip_time = options[:average_round_trip_time] || 0
 
-      ismaster = {
-        'ismaster' => mode == :primary,
-        'secondary' => mode == :secondary,
-        'arbiterOnly' => mode == :arbiter,
-        'isreplicaset' => mode == :ghost,
-        'hidden' => mode == :other,
-        'tags' => tags,
-        'ok' => 1,
-        'minWireVersion' => 2, 'maxWireVersion' => 8,
-      }
-      if [:primary, :secondary, :arbiter, :other].include?(mode)
-        ismaster['setName'] = 'mongodb_set'
+      if mode == :unknown
+        ismaster = {}
+      else
+        ismaster = {
+          'ismaster' => mode == :primary,
+          'secondary' => mode == :secondary,
+          'arbiterOnly' => mode == :arbiter,
+          'isreplicaset' => mode == :ghost,
+          'hidden' => mode == :other,
+          'msg' => mode == :mongos ? 'isdbgrid' : nil,
+          'tags' => tags,
+          'ok' => 1,
+          'minWireVersion' => 2, 'maxWireVersion' => 8,
+        }
+        if [:primary, :secondary, :arbiter, :other].include?(mode)
+          ismaster['setName'] = 'mongodb_set'
+        end
       end
 
       listeners = Mongo::Event::Listeners.new

data/spec/support/utils.rb

@@ -26,19 +26,10 @@ module Utils
   # Converts camel case clientOptions, as used in spec tests,
   # to Ruby driver underscore options.
   def convert_client_options(spec_test_options)
-    spec_test_options.reduce({}) do |opts, kv|
-      case kv.first
-      when 'readConcernLevel'
-        kv = [:read_concern, { 'level' => kv.last }]
-      when 'readPreference'
-        kv = [:read, { 'mode' => kv.last }]
-      when 'w'
-        kv = [:write, { w: kv.last }]
-      else
-        kv[0] = underscore(kv[0])
-      end
-
-      opts.tap { |o| o[kv.first] = kv.last }
+    uri = Mongo::URI.new('mongodb://localhost')
+    spec_test_options.reduce({}) do |opts, (name, value)|
+      uri.send(:add_uri_option, name, value.to_s, opts)
+      opts
     end
   end
   module_function :convert_client_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.9.0.rc1
+  version: 2.9.0
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -1088,9 +1088,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: