Merge pull request #643 from estolfo/RUBY-951-uri

RUBY-951 Ensure that driver conforms to Connection String specification

Author: estolfo

lib/mongo/error.rb

@@ -80,7 +80,6 @@ class Error < StandardError
 require 'mongo/error/invalid_signature'
 require 'mongo/error/invalid_update_document'
 require 'mongo/error/invalid_uri'
-require 'mongo/error/invalid_uri_option'
 require 'mongo/error/max_bson_size'
 require 'mongo/error/max_message_size'
 require 'mongo/error/multi_index_drop'

lib/mongo/error/invalid_uri_option.rb

@@ -27,6 +27,7 @@ module Mongo
   #
   # @since 2.0.0
   class URI
+    include Loggable
 
     # Scheme Regex: non-capturing, matches scheme.
     #
@@ -69,7 +70,7 @@ class URI
     # @since 2.0.0
     DATABASE = %r{(?:/([^/\.\ "*<>:\|\?]*))?}.freeze
 
-    # Option Regex: notably only matches the ampersand separator and does
+    # Option Regex: only matches the ampersand separator and does
     # not allow for semicolon to be used to separate options.
     #
     # @since 2.0.0
@@ -123,7 +124,8 @@ class URI
     #
     # @since 2.0.0
     def initialize(string)
-      @match = string.match(URI)
+      @string = string
+      @match = @string.match(URI)
       raise Error::InvalidURI.new(string) unless @match
     end
 
@@ -210,8 +212,13 @@ def options
       parsed_options.split('&').reduce({}) do |options, option|
         key, value = option.split('=')
         strategy = OPTION_MAP[key]
-        raise Error::InvalidURIOption.new(key) if strategy.nil?
-        add_option(strategy, value, options)
+        if strategy.nil?
+          log_warn([
+                       "Unsupported URI option '#{key}' on URI '#{@string}'. It will be ignored."
+                   ])
+        else
+          add_option(strategy, value, options)
+        end
         options
       end
     end
@@ -243,7 +250,7 @@ def self.option(uri_key, name, extra = {})
 
     # Write Options
     option 'w', :w, :group => :write
-    option 'j', :j, :group => :write
+    option 'journal', :j, :group => :write
     option 'fsync', :fsync, :group => :write
     option 'wtimeoutMS', :timeout, :group => :write
 

lib/mongo/uri.rb

@@ -129,11 +129,11 @@
   describe '#database' do
     let(:servers)  { 'localhost' }
     let(:string) { "#{scheme}#{servers}/#{db}" }
-    let(:db)     { TEST_DB }
+    let(:db)     { 'auth-db' }
 
     context 'database provided' do
       it 'returns the database name' do
-        expect(uri.database).to eq(TEST_DB)
+        expect(uri.database).to eq(db)
       end
     end
   end
@@ -171,7 +171,7 @@
       end
 
       context 'journal' do
-        let(:options) { 'j=true' }
+        let(:options) { 'journal=true' }
         let(:concern) { { :j => true } }
 
         it 'sets the write concern options' do
@@ -248,7 +248,7 @@
       end
     end
 
-    context 'read preferece tags provided' do
+    context 'read preference tags provided' do
 
       context 'single read preference tag set' do
         let(:options) do
@@ -505,12 +505,28 @@
 
     context 'when an invalid option is provided' do
 
-      let(:options) { 'iDontKnow=10' }
+      let(:options) { 'invalidOption=10' }
 
-      it 'raises an exception' do
-        expect {
-          uri.options
-        }.to raise_error(Mongo::Error::InvalidURIOption)
+      let(:uri_options) do
+        uri.options
+      end
+
+      it 'does not raise an exception' do
+        expect(uri_options).to be_empty
+      end
+
+      context 'when an invalid option is combined with valid options' do
+
+        let(:options) { 'invalidOption=10&waitQueueTimeoutMS=500&ssl=true' }
+
+        it 'does not raise an exception' do
+          expect(uri_options).not_to be_empty
+        end
+
+        it 'sets the valid options' do
+          expect(uri_options[:wait_queue_timeout]).to eq(0.5)
+          expect(uri_options[:ssl]).to be true
+        end
       end
     end
   end