mongo 2.1.0.beta → 2.1.0.rc0

data/spec/mongo/server_selector_spec.rb

@@ -6,66 +6,125 @@ describe Mongo::ServerSelector do
 
   describe '.get' do
 
-    let(:read_pref) do
-      described_class.get({ :mode => name })
+    let(:selector) do
+      described_class.get(:mode => name, :tag_sets => tag_sets)
     end
 
-    let(:name) { :secondary }
-    let(:tag_sets) { [{ 'test' => 'tag' }] }
-
     context 'when the mode is primary' do
-      let(:name) { :primary }
+
+      let(:name) do
+        :primary
+      end
 
       it 'returns a read preference of class Primary' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Primary)
+        expect(selector).to be_a(Mongo::ServerSelector::Primary)
       end
     end
 
     context 'when the mode is primary_preferred' do
-      let(:name) { :primary_preferred }
+      let(:name) do
+        :primary_preferred
+      end
 
       it 'returns a read preference of class PrimaryPreferred' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::PrimaryPreferred)
+        expect(selector).to be_a(Mongo::ServerSelector::PrimaryPreferred)
       end
     end
 
     context 'when the mode is secondary' do
-      let(:name) { :secondary }
+      let(:name) do
+        :secondary
+      end
 
       it 'returns a read preference of class Secondary' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Secondary)
+        expect(selector).to be_a(Mongo::ServerSelector::Secondary)
       end
     end
 
     context 'when the mode is secondary_preferred' do
-      let(:name) { :secondary_preferred }
+      let(:name) do
+        :secondary_preferred
+      end
 
       it 'returns a read preference of class SecondaryPreferred' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::SecondaryPreferred)
+        expect(selector).to be_a(Mongo::ServerSelector::SecondaryPreferred)
       end
     end
 
     context 'when the mode is nearest' do
-      let(:name) { :nearest }
+      let(:name) do
+        :nearest
+      end
 
       it 'returns a read preference of class Nearest' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Nearest)
+        expect(selector).to be_a(Mongo::ServerSelector::Nearest)
       end
     end
 
     context 'when a mode is not provided' do
-      let(:read_pref) { described_class.get }
+      let(:selector) { described_class.get }
 
       it 'returns a read preference of class Primary' do
-        expect(read_pref).to be_a(Mongo::ServerSelector::Primary)
+        expect(selector).to be_a(Mongo::ServerSelector::Primary)
       end
     end
 
-    context 'when tag sets provided' do
-      let(:read_pref) { described_class.get(:mode => name, :tag_sets => tag_sets) }
+    context 'when tag sets are provided' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary, :tag_sets => tag_sets)
+      end
+
+      let(:tag_sets) do
+        [{ 'test' => 'tag' }]
+      end
 
       it 'sets tag sets on the read preference object' do
-        expect(read_pref.tag_sets).to eq(tag_sets)
+        expect(selector.tag_sets).to eq(tag_sets)
+      end
+    end
+
+    context 'when server_selection_timeout is specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary, :server_selection_timeout => 1)
+      end
+
+      it 'sets server selection timeout on the read preference object' do
+        expect(selector.server_selection_timeout).to eq(1)
+      end
+    end
+
+    context 'when server_selection_timeout is not specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary)
+      end
+
+      it 'sets server selection timeout to the default' do
+        expect(selector.server_selection_timeout).to eq(Mongo::ServerSelector::SERVER_SELECTION_TIMEOUT)
+      end
+    end
+
+    context 'when local_threshold is specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary, :local_threshold => 0.010)
+      end
+
+      it 'sets local_threshold on the read preference object' do
+        expect(selector.local_threshold).to eq(0.010)
+      end
+    end
+
+    context 'when local_threshold is not specified' do
+
+      let(:selector) do
+        described_class.get(:mode => :secondary)
+      end
+
+      it 'sets local threshold to the default' do
+        expect(selector.local_threshold).to eq(Mongo::ServerSelector::LOCAL_THRESHOLD)
       end
     end
   end
@@ -74,7 +133,9 @@ describe Mongo::ServerSelector do
 
     context 'when #select returns a list of nils' do
 
-      let(:servers) { [ server(:primary) ] }
+      let(:servers) do
+        [ server(:primary) ]
+      end
 
       let(:cluster) do
         double('cluster').tap do |c|
@@ -86,7 +147,7 @@ describe Mongo::ServerSelector do
       end
 
       let(:read_pref) do
-        described_class.get({ mode: :primary }, server_selection_timeout: 1).tap do |pref|
+        described_class.get(mode: :primary, server_selection_timeout: 0.1).tap do |pref|
           allow(pref).to receive(:select).and_return([ nil, nil ])
         end
       end
@@ -103,7 +164,9 @@ describe Mongo::ServerSelector do
 
     context 'when cluster#servers is empty' do
 
-      let(:servers) { [] }
+      let(:servers) do
+        []
+      end
 
       let(:cluster) do
         double('cluster').tap do |c|
@@ -115,7 +178,7 @@ describe Mongo::ServerSelector do
       end
 
       let(:read_pref) do
-        described_class.get({ mode: :primary }, server_selection_timeout: 1)
+        described_class.get(mode: :primary, server_selection_timeout: 0.1)
       end
 
       it 'raises a NoServerAvailable error' do

data/spec/mongo/socket/unix_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Mongo::Socket::Unix do
+
+  let(:socket) do
+    described_class.new("/tmp/mongodb-27017.sock", 5)
+  end
+
+  describe '#connect!' do
+
+    before do
+      socket.connect!
+    end
+
+    after do
+      socket.close
+    end
+
+    it 'connects to the server' do
+      expect(socket).to be_alive
+    end
+  end
+
+  describe '#alive?' do
+
+    context 'when the socket is connected' do
+
+      before do
+        socket.connect!
+      end
+
+      after do
+        socket.close
+      end
+
+      it 'returns true' do
+        expect(socket).to be_alive
+      end
+    end
+
+    context 'when the socket is not connected' do
+
+      before do
+        socket.close
+      end
+
+      it 'raises error' do
+        expect { socket.alive? }.to raise_error(IOError)
+      end
+    end
+  end
+end

data/spec/mongo/uri_spec.rb

@@ -4,6 +4,217 @@ describe Mongo::URI do
   let(:scheme) { 'mongodb://' }
   let(:uri) { described_class.new(string) }
 
+describe 'invalid uris' do
+
+    context 'string is not uri' do
+
+      let(:string) { 'tyler' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'empty string' do
+
+      let(:string) { '' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongo://localhost:27017' do
+
+      let(:string) { 'mongo://localhost:27017' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://' do
+
+      let(:string) { 'mongodb://' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost::27017' do
+
+      let(:string) { 'mongodb://localhost::27017' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost::27017/' do
+
+      let(:string) { 'mongodb://localhost::27017/' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://::' do
+
+      let(:string) { 'mongodb://::' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost,localhost::' do
+
+      let(:string) { 'mongodb://localhost,localhost::' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost::27017,abc' do
+
+      let(:string) { 'mongodb://localhost::27017,abc' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost:-1' do
+
+      let(:string) { 'mongodb://localhost:-1' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost:0/' do
+
+      let(:string) { 'mongodb://localhost:0/' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost:65536' do
+
+      let(:string) { 'mongodb://localhost:65536' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://localhost:foo' do
+
+      let(:string) { 'mongodb://localhost:foo' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://[::1]:-1' do
+
+      let(:string) { 'mongodb://[::1]:-1' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://[::1]:0/' do
+
+      let(:string) { 'mongodb://[::1]:0/' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://[::1]:65536' do
+
+      let(:string) { 'mongodb://[::1]:65536' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://[::1]:65536/' do
+
+      let(:string) { 'mongodb://[::1]:65536/' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://[::1]:foo' do
+
+      let(:string) { 'mongodb://[::1]:foo' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://example.com?w=1' do
+
+      let(:string) { 'mongodb://example.com?w=1' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://example.com/?w' do
+
+      let(:string) { 'mongodb://example.com/?w' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://alice:foo:bar@127.0.0.1' do
+
+      let(:string) { 'mongodb://alice:foo:bar@127.0.0.1' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://alice@@127.0.0.1' do
+
+      let(:string) { 'mongodb://alice@@127.0.0.1' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+    context 'mongodb://alice@foo:bar@127.0.0.1' do
+
+      let(:string) { 'mongodb://alice@foo:bar@127.0.0.1' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+
+  end
+
   describe '#initialize' do
     context 'string is not uri' do
       let(:string) { 'tyler' }
@@ -49,7 +260,7 @@ describe Mongo::URI do
     end
 
     context 'unix socket server' do
-      let(:servers) { '/tmp/mongodb-27017.sock' }
+      let(:servers) { '%2Ftmp%2Fmongodb-27017.sock' }
 
       it 'returns an array with the parsed server' do
         expect(uri.servers).to eq([servers])
@@ -138,7 +349,7 @@ describe Mongo::URI do
     end
   end
 
-  describe '#options' do
+  describe '#uri_options' do
     let(:servers)  { 'localhost' }
     let(:string) { "#{scheme}#{servers}/?#{options}" }
 
@@ -146,7 +357,7 @@ describe Mongo::URI do
       let(:string) { "#{scheme}#{servers}" }
 
       it 'returns an empty hash' do
-        expect(uri.options).to be_empty
+        expect(uri.uri_options).to be_empty
       end
     end
 
@@ -157,7 +368,7 @@ describe Mongo::URI do
         let(:concern) { { :w => 1 } }
 
         it 'sets the write concern options' do
-          expect(uri.options[:write]).to eq(concern)
+          expect(uri.uri_options[:write]).to eq(concern)
         end
       end
 
@@ -166,7 +377,7 @@ describe Mongo::URI do
         let(:concern) { { :w => :majority } }
 
         it 'sets the write concern options' do
-          expect(uri.options[:write]).to eq(concern)
+          expect(uri.uri_options[:write]).to eq(concern)
         end
       end
 
@@ -175,7 +386,7 @@ describe Mongo::URI do
         let(:concern) { { :j => true } }
 
         it 'sets the write concern options' do
-          expect(uri.options[:write]).to eq(concern)
+          expect(uri.uri_options[:write]).to eq(concern)
         end
       end
 
@@ -184,7 +395,7 @@ describe Mongo::URI do
         let(:concern) { { :fsync => true } }
 
         it 'sets the write concern options' do
-          expect(uri.options[:write]).to eq(concern)
+          expect(uri.uri_options[:write]).to eq(concern)
         end
       end
 
@@ -194,7 +405,7 @@ describe Mongo::URI do
         let(:concern) { { :w => 2, :timeout => timeout } }
 
         it 'sets the write concern options' do
-          expect(uri.options[:write]).to eq(concern)
+          expect(uri.uri_options[:write]).to eq(concern)
         end
       end
     end
@@ -207,7 +418,7 @@ describe Mongo::URI do
         let(:read) { { :mode => :primary } }
 
         it 'sets the read preference' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
 
@@ -216,7 +427,7 @@ describe Mongo::URI do
         let(:read) { { :mode => :primary_preferred } }
 
         it 'sets the read preference' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
 
@@ -225,7 +436,7 @@ describe Mongo::URI do
         let(:read) { { :mode => :secondary } }
 
         it 'sets the read preference' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
 
@@ -234,7 +445,7 @@ describe Mongo::URI do
         let(:read) { { :mode => :secondary_preferred } }
 
         it 'sets the read preference' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
 
@@ -243,7 +454,7 @@ describe Mongo::URI do
         let(:read) { { :mode => :nearest } }
 
         it 'sets the read preference' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
     end
@@ -260,7 +471,7 @@ describe Mongo::URI do
         end
 
         it 'sets the read preference tag set' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
 
@@ -274,7 +485,7 @@ describe Mongo::URI do
         end
 
         it 'sets the read preference tag sets' do
-          expect(uri.options[:read]).to eq(read)
+          expect(uri.uri_options[:read]).to eq(read)
         end
       end
     end
@@ -284,7 +495,7 @@ describe Mongo::URI do
       let(:options) { "replicaSet=#{rs_name}" }
 
       it 'sets the replica set option' do
-        expect(uri.options[:replica_set]).to eq(rs_name)
+        expect(uri.uri_options[:replica_set]).to eq(rs_name)
       end
     end
 
@@ -293,28 +504,29 @@ describe Mongo::URI do
 
       context 'plain' do
         let(:mechanism) { 'PLAIN' }
-        let(:auth) { { :mechanism => :plain } }
+        let(:expected) { :plain }
 
         it 'sets the auth mechanism to :plain' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
       end
 
       context 'mongodb-cr' do
         let(:mechanism) { 'MONGODB-CR' }
-        let(:auth) { { :mechanism => :mongodb_cr } }
+        let(:expected) { :mongodb_cr }
 
         it 'sets the auth mechanism to :mongodb_cr' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
       end
 
       context 'gssapi' do
         let(:mechanism) { 'GSSAPI' }
-        let(:auth) { { :mechanism => :gssapi } }
+        let(:expected) { :gssapi }
+
 
         it 'sets the auth mechanism to :gssapi' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth_mech]).to eq(expected)
         end
       end
     end
@@ -327,7 +539,7 @@ describe Mongo::URI do
         let(:auth) { { :source => 'foo' } }
 
         it 'sets the auth source to the database' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth]).to eq(auth)
         end
       end
 
@@ -336,7 +548,7 @@ describe Mongo::URI do
         let(:auth) { { :source => :external } }
 
         it 'sets the auth source to :external' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth]).to eq(auth)
         end
       end
     end
@@ -354,7 +566,7 @@ describe Mongo::URI do
         end
 
         it 'sets the auth mechanism properties' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth]).to eq(auth)
         end
       end
 
@@ -369,7 +581,7 @@ describe Mongo::URI do
         end
 
         it 'sets the auth mechanism properties' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth]).to eq(auth)
         end
       end
 
@@ -384,7 +596,7 @@ describe Mongo::URI do
         end
 
         it 'sets the auth mechanism properties' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth]).to eq(auth)
         end
       end
 
@@ -406,7 +618,7 @@ describe Mongo::URI do
         end
 
         it 'sets the auth mechanism properties' do
-          expect(uri.options[:auth]).to eq(auth)
+          expect(uri.uri_options[:auth]).to eq(auth)
         end
       end
     end
@@ -415,7 +627,7 @@ describe Mongo::URI do
       let(:options) { "connectTimeoutMS=4567" }
 
       it 'sets the the connect timeout' do
-        expect(uri.options[:connect_timeout]).to eq(4.567)
+        expect(uri.uri_options[:connect_timeout]).to eq(4.567)
       end
     end
 
@@ -423,7 +635,7 @@ describe Mongo::URI do
       let(:options) { "socketTimeoutMS=8910" }
 
       it 'sets the socket timeout' do
-        expect(uri.options[:socket_timeout]).to eq(8.910)
+        expect(uri.uri_options[:socket_timeout]).to eq(8.910)
       end
     end
 
@@ -432,7 +644,7 @@ describe Mongo::URI do
       let(:options) { "serverSelectionTimeoutMS=3561" }
 
       it 'sets the the connect timeout' do
-        expect(uri.options[:server_selection_timeout]).to eq(3.561)
+        expect(uri.uri_options[:server_selection_timeout]).to eq(3.561)
       end
     end
 
@@ -441,7 +653,7 @@ describe Mongo::URI do
       let(:options) { "localThresholdMS=3561" }
 
       it 'sets the the connect timeout' do
-        expect(uri.options[:local_threshold]).to eq(3.561)
+        expect(uri.uri_options[:local_threshold]).to eq(3.561)
       end
     end
 
@@ -451,7 +663,7 @@ describe Mongo::URI do
       let(:options) { "maxPoolSize=#{max_pool_size}" }
 
       it 'sets the max pool size option' do
-        expect(uri.options[:max_pool_size]).to eq(max_pool_size)
+        expect(uri.uri_options[:max_pool_size]).to eq(max_pool_size)
       end
     end
 
@@ -461,7 +673,7 @@ describe Mongo::URI do
       let(:options) { "minPoolSize=#{min_pool_size}" }
 
       it 'sets the min pool size option' do
-        expect(uri.options[:min_pool_size]).to eq(min_pool_size)
+        expect(uri.uri_options[:min_pool_size]).to eq(min_pool_size)
       end
     end
 
@@ -471,7 +683,7 @@ describe Mongo::URI do
       let(:options) { "waitQueueTimeoutMS=#{wait_queue_timeout}" }
 
       it 'sets the wait queue timeout option' do
-        expect(uri.options[:wait_queue_timeout]).to eq(0.5)
+        expect(uri.uri_options[:wait_queue_timeout]).to eq(0.5)
       end
     end
 
@@ -482,7 +694,7 @@ describe Mongo::URI do
         let(:ssl) { true }
 
         it 'sets the ssl option to true' do
-          expect(uri.options[:ssl]).to be true
+          expect(uri.uri_options[:ssl]).to be true
         end
       end
 
@@ -490,7 +702,7 @@ describe Mongo::URI do
         let(:ssl) { false }
 
         it 'sets the ssl option to false' do
-          expect(uri.options[:ssl]).to be false
+          expect(uri.uri_options[:ssl]).to be false
         end
       end
     end
@@ -499,7 +711,7 @@ describe Mongo::URI do
       let(:options) { 'w=1&ssl=true' }
 
       it 'do not overshadow top level options' do
-        expect(uri.options).not_to be_empty
+        expect(uri.uri_options).not_to be_empty
       end
     end
 
@@ -508,7 +720,7 @@ describe Mongo::URI do
       let(:options) { 'invalidOption=10' }
 
       let(:uri_options) do
-        uri.options
+        uri.uri_options
       end
 
       it 'does not raise an exception' do