mongo 2.0.4 → 2.0.5

data/spec/mongo/operation/write/update_user_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Mongo::Operation::Write::UpdateUser do
+
+  describe '#execute' do
+
+    let(:user) do
+      Mongo::Auth::User.new(
+          user: 'durran',
+          password: 'password',
+          roles: [ Mongo::Auth::Roles::READ_WRITE ]
+      )
+    end
+
+    let(:user_updated) do
+      Mongo::Auth::User.new(
+          user: 'durran',
+          password: '123',
+          roles: [ Mongo::Auth::Roles::READ ]
+      )
+    end
+
+    let(:operation) do
+      described_class.new(user: user_updated, db_name: TEST_DB)
+    end
+
+    before do
+      root_authorized_client.database.users.create(user)
+    end
+
+    after do
+      root_authorized_client.database.users.remove('durran')
+    end
+
+    context 'when user update was successful' do
+
+      let!(:response) do
+        operation.execute(root_authorized_primary.context)
+      end
+
+      it 'updates the user in the database' do
+        expect(response).to be_successful
+      end
+    end
+  end
+end

data/spec/mongo/server/connection_pool/queue_spec.rb

@@ -77,6 +77,10 @@ describe Mongo::Server::ConnectionPool::Queue do
       it 'creates the queue with the minimum connections' do
         expect(queue.size).to eq(2)
       end
+
+      it 'does not use the same objects in the queue' do
+        expect(queue.dequeue).to_not equal(queue.dequeue)
+      end
     end
 
     context 'when no min size is provided' do

data/spec/mongo/socket/ssl_spec.rb

@@ -5,7 +5,7 @@ describe Mongo::Socket::SSL do
   describe '#connect!', if: running_ssl? do
 
     let(:socket) do
-      described_class.new(*DEFAULT_ADDRESS.split(":"), 5, Socket::PF_INET, options)
+      described_class.new(*DEFAULT_ADDRESS.split(":"), DEFAULT_ADDRESS.split(":")[0], 5, Socket::PF_INET, options)
     end
 
     context 'when a certificate is provided' do
@@ -43,5 +43,25 @@ describe Mongo::Socket::SSL do
         }.to raise_error
       end
     end
+
+    context 'when a CA certificate is provided', if: running_ssl? && testing_locally? do
+
+      let(:options) do
+        {
+            :ssl => true,
+            :ssl_cert => CLIENT_PEM,
+            :ssl_key => CLIENT_PEM,
+            :ssl_ca_cert => CA_PEM
+        }
+      end
+
+      before do
+        socket.connect!
+      end
+
+      it 'connects to the server' do
+        expect(socket).to be_alive
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -146,6 +146,10 @@ def list_command_enabled?
   $list_command_enabled ||= $mongo_client.cluster.servers.first.features.list_indexes_enabled?
 end
 
+def testing_locally?
+  !(ENV['CI'] || ENV['JENKINS_HOME'])
+end
+
 def running_ssl?
   SSL
 end

data/spec/support/authorization.rb

@@ -53,7 +53,8 @@ SSL = ENV['SSL_ENABLED'] == 'true'
 # Options for test suite clients.
 #
 # @since 2.0.3
-TEST_OPTIONS = { max_pool_size: 1,
+TEST_OPTIONS = { connect: CONNECT,
+                 max_pool_size: 1,
                  write: WRITE_CONCERN,
                  ssl: SSL }
 
@@ -77,7 +78,8 @@ ROOT_USER = Mongo::Auth::User.new(
     Mongo::Auth::Roles::USER_ADMIN_ANY_DATABASE,
     Mongo::Auth::Roles::DATABASE_ADMIN_ANY_DATABASE,
     Mongo::Auth::Roles::READ_WRITE_ANY_DATABASE,
-    Mongo::Auth::Roles::HOST_MANAGER
+    Mongo::Auth::Roles::HOST_MANAGER,
+    Mongo::Auth::Roles::CLUSTER_ADMIN
   ]
 )
 
@@ -105,8 +107,8 @@ TEST_USER = Mongo::Auth::User.new(
 # @since 2.0.
 TEST_READ_WRITE_USER = Mongo::Auth::User.new(
   database: TEST_DB,
-  user: 'test-user',
-  password: 'password',
+  user: TEST_USER.name,
+  password: TEST_USER.password,
   roles: [ Mongo::Auth::Roles::READ_WRITE, Mongo::Auth::Roles::DATABASE_ADMIN ]
 )
 

data/spec/support/shared/operation.rb

@@ -58,6 +58,18 @@ shared_context 'operation' do
       allow(cxt).to receive(:slave_ok?) { false }
     end
   end
+  let(:secondary_context_slave) do
+    double('secondary_context').tap do |cxt|
+      allow(cxt).to receive(:with_connection).and_yield(connection)
+      allow(cxt).to receive(:server) { secondary_server }
+      allow(cxt).to receive(:mongos?) { false }
+      allow(cxt).to receive(:features) { features_2_6 }
+      allow(cxt).to receive(:secondary?) { true }
+      allow(cxt).to receive(:primary?) { false }
+      allow(cxt).to receive(:standalone?) { false }
+      allow(cxt).to receive(:slave_ok?) { true }
+    end
+  end
   let(:primary_context_2_4_version) do
     double('primary_context').tap do |cxt|
       allow(cxt).to receive(:with_connection).and_yield(connection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -183,6 +183,7 @@ files:
 - lib/mongo/operation/write/command/insert.rb
 - lib/mongo/operation/write/command/remove_user.rb
 - lib/mongo/operation/write/command/update.rb
+- lib/mongo/operation/write/command/update_user.rb
 - lib/mongo/operation/write/command/writable.rb
 - lib/mongo/operation/write/create_index.rb
 - lib/mongo/operation/write/create_user.rb
@@ -195,6 +196,7 @@ files:
 - lib/mongo/operation/write/remove_user.rb
 - lib/mongo/operation/write/update.rb
 - lib/mongo/operation/write/update/result.rb
+- lib/mongo/operation/write/update_user.rb
 - lib/mongo/options.rb
 - lib/mongo/options/mapper.rb
 - lib/mongo/protocol.rb
@@ -289,6 +291,7 @@ files:
 - spec/mongo/operation/read/get_more_spec.rb
 - spec/mongo/operation/read/indexes_spec.rb
 - spec/mongo/operation/read/query_spec.rb
+- spec/mongo/operation/read_preferrable_spec.rb
 - spec/mongo/operation/result_spec.rb
 - spec/mongo/operation/specifiable_spec.rb
 - spec/mongo/operation/write/bulk/bulk_delete_spec.rb
@@ -305,6 +308,7 @@ files:
 - spec/mongo/operation/write/remove_user_spec.rb
 - spec/mongo/operation/write/response_spec.rb
 - spec/mongo/operation/write/update_spec.rb
+- spec/mongo/operation/write/update_user_spec.rb
 - spec/mongo/protocol/delete_spec.rb
 - spec/mongo/protocol/get_more_spec.rb
 - spec/mongo/protocol/insert_spec.rb
@@ -457,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongo
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -511,6 +515,7 @@ test_files:
 - spec/mongo/operation/read/get_more_spec.rb
 - spec/mongo/operation/read/indexes_spec.rb
 - spec/mongo/operation/read/query_spec.rb
+- spec/mongo/operation/read_preferrable_spec.rb
 - spec/mongo/operation/result_spec.rb
 - spec/mongo/operation/specifiable_spec.rb
 - spec/mongo/operation/write/bulk/bulk_delete_spec.rb
@@ -527,6 +532,7 @@ test_files:
 - spec/mongo/operation/write/remove_user_spec.rb
 - spec/mongo/operation/write/response_spec.rb
 - spec/mongo/operation/write/update_spec.rb
+- spec/mongo/operation/write/update_user_spec.rb
 - spec/mongo/protocol/delete_spec.rb
 - spec/mongo/protocol/get_more_spec.rb
 - spec/mongo/protocol/insert_spec.rb