mongo 2.4.0 → 2.4.1

data/spec/mongo/collection_spec.rb

@@ -538,62 +538,71 @@ describe Mongo::Collection do
       described_class.new(database, :specs)
     end
 
-    before do
-      collection.create
-    end
+    context 'when the collection exists' do
+      before do
+        collection.create
+      end
 
-    context 'when the collection does not have a write concern set' do
+      context 'when the collection does not have a write concern set' do
 
-      let!(:response) do
-        collection.drop
-      end
+        let!(:response) do
+          collection.drop
+        end
 
-      it 'executes the command' do
-        expect(response).to be_successful
-      end
+        it 'executes the command' do
+          expect(response).to be_successful
+        end
 
-      it 'drops the collection from the database' do
-        expect(database.collection_names).to_not include('specs')
-      end
+        it 'drops the collection from the database' do
+          expect(database.collection_names).to_not include('specs')
+        end
 
-      context 'when the collection does not exist' do
+        context 'when the collection does not exist' do
 
-        it 'does not raise an error' do
-          expect(database['non-existent-coll'].drop).to be(false)
+          it 'does not raise an error' do
+            expect(database['non-existent-coll'].drop).to be(false)
+          end
         end
       end
-    end
 
-    context 'when the collection has a write concern' do
+      context 'when the collection has a write concern' do
 
-      let(:write_options) do
-        {
-          write: { w: WRITE_CONCERN[:w] + 1}
-        }
-      end
+        let(:write_options) do
+          {
+            write: { w: WRITE_CONCERN[:w] + 1}
+          }
+        end
 
-      let(:collection_with_write_options) do
-        collection.with(write_options)
-      end
+        let(:collection_with_write_options) do
+          collection.with(write_options)
+        end
 
-      after do
-        collection.drop
-      end
+        after do
+          collection.drop
+        end
+
+        context 'when the server supports write concern on the drop command', if: collation_enabled? do
 
-      context 'when the server supports write concern on the drop command', if: collation_enabled? do
+          it 'applies the write concern' do
+            expect{
+              collection_with_write_options.drop
+            }.to raise_exception(Mongo::Error::OperationFailure)
+          end
+        end
+
+        context 'when the server does not support write concern on the drop command', unless: collation_enabled? do
 
-        it 'applies the write concern' do
-          expect{
-            collection_with_write_options.drop
-          }.to raise_exception(Mongo::Error::OperationFailure)
+          it 'does not apply the write concern' do
+            expect(collection_with_write_options.drop).to be_successful
+          end
         end
       end
+    end
 
-      context 'when the server does not support write concern on the drop command', unless: collation_enabled? do
+    context 'when the collection does not exist' do
 
-        it 'does not apply the write concern' do
-          expect(collection_with_write_options.drop).to be_successful
-        end
+      it 'returns false' do
+        expect(collection.drop).to be(false)
       end
     end
   end
@@ -1158,7 +1167,7 @@ describe Mongo::Collection do
       end
 
       it 'sets the options on the Aggregation object' do
-        expect(authorized_collection.aggregate([], options).options).to eq(options)
+        expect(authorized_collection.aggregate([], options).options).to eq(BSON::Document.new(options))
       end
 
       context 'when collation is provided' do

data/spec/mongo/sdam_spec.rb

@@ -10,9 +10,12 @@ describe 'Server Discovery and Monitoring' do
     context(spec.description) do
 
       before(:all) do
-        Mongo::Client.new(spec.uri_string).tap do |client|
-          @client = client.with(connect_timeout: 0.1, heartbeat_frequency: 100)
-        end.close
+        @client = Mongo::Client.new([])
+        @client.send(:create_from_uri, spec.uri_string)
+        client_options = @client.instance_variable_get(:@options)
+        @client.instance_variable_set(:@options, client_options.merge(heartbeat_frequency: 100, connect_timeout: 0.1))
+        @client.cluster.instance_variable_set(:@options, client_options.merge(heartbeat_frequency: 100, connect_timeout: 0.1))
+        @client.cluster.instance_variable_get(:@servers).each { |s| s.disconnect!; s.unknown!; }
       end
 
       after(:all) do
@@ -26,13 +29,17 @@ describe 'Server Discovery and Monitoring' do
           before(:all) do
             phase.responses.each do |response|
               server = find_server(@client, response.address)
-              server ||= Mongo::Server.new(
-                  Mongo::Address.new(response.address),
-                  @client.cluster,
-                  @client.instance_variable_get(:@monitoring),
-                  @client.cluster.send(:event_listeners),
-                  @client.cluster.options
-              )
+              unless server
+                server = Mongo::Server.new(
+                    Mongo::Address.new(response.address),
+                    @client.cluster,
+                    @client.instance_variable_get(:@monitoring),
+                    @client.cluster.send(:event_listeners),
+                    @client.cluster.options
+                )
+                server.disconnect!
+                server.unknown!
+              end
               monitor = server.instance_variable_get(:@monitor)
               description = monitor.inspector.run(server.description, response.ismaster, 0.5)
               monitor.instance_variable_set(:@description, description)

data/spec/mongo/uri_spec.rb

@@ -667,6 +667,31 @@ describe Mongo::URI do
           expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
         end
       end
+
+      context 'mongodb-x509' do
+        let(:mechanism) { 'MONGODB-X509' }
+        let(:expected) { :mongodb_x509 }
+
+        it 'sets the auth mechanism to :mongodb_x509' do
+          expect(uri.uri_options[:auth_mech]).to eq(expected)
+        end
+
+        it 'sets the options on a client created with the uri' do
+          expect(Mongo::Client.new(string).options[:auth_mech]).to eq(expected)
+        end
+
+        it 'is case-insensitive' do
+          expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+        end
+
+        context 'when a username is not provided' do
+
+          it 'recognizes the mechanism with no username' do
+            expect(Mongo::Client.new(string.downcase).options[:auth_mech]).to eq(expected)
+            expect(Mongo::Client.new(string.downcase).options[:user]).to be_nil
+          end
+        end
+      end
     end
 
     context 'auth source provided' do

data/spec/spec_helper.rb

@@ -192,7 +192,11 @@ end
 # @since 2.2.0
 def auth_enabled?
   $mongo_client ||= initialize_scanned_client!
-  begin; $mongo_client.use(:admin).command(getCmdLineOpts: 1); rescue; return true; end
+  begin
+    $mongo_client.use(:admin).command(getCmdLineOpts: 1).first["argv"].include?("--auth")
+  rescue
+    return true
+  end
   false
 end
 

data/spec/support/sdam/rs/primary_mismatched_me.yml

@@ -18,7 +18,7 @@
             },
             "responses": [
                 [
-                    "lhost:27017",
+                    "localhost:27017",
                      {
                          "me": "a:27017",
                          "hosts": [
@@ -33,5 +33,5 @@
             ]
         }
     ],
-    "uri": "mongodb://lhost:27017/?replicaSet=rs"
+    "uri": "mongodb://localhost:27017/?replicaSet=rs"
 }

data/spec/support/sdam/rs/secondary_mismatched_me.yml

@@ -18,7 +18,7 @@
             },
             "responses": [
                 [
-                    "lhost:27017",
+                    "localhost:27017",
                      {
                          "me": "a:27017",
                          "hosts": [
@@ -33,5 +33,5 @@
             ]
         }
     ],
-    "uri": "mongodb://lhost:27017/?replicaSet=rs"
+    "uri": "mongodb://localhost:27017/?replicaSet=rs"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -14,7 +14,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE1MTIwNzE1MTcyNloXDTE2MTIwNjE1MTcyNlowQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE2MTIyMDEzMzc1N1oXDTE3MTIyMDEzMzc1N1owQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
   bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
@@ -25,29 +25,35 @@ cert_chain:
   u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
   BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
   QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAL/5shZXBvCGGJcJqXyD2CJieOOH4EGUt/UKvSZ58lMz
-  QkW5aKG22GJbXesMq+dMm/+gzUB2ea9TzttBEE5ZM/eNvoxyf7yNUcFyLQ365S6P
-  rtQOj1Ms7ud5ffrhZJn1o7ayfY2ljQU0xLI2Yoyzl9XJq8U0TztS6Vk5wYIoLwUX
-  NWGRSbETPJyR4mtUEbgI5A+N7pakJPUKKK1zXzADflsx51jjP5rZJJltnoVsBBgN
-  EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
-  wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
+  KoZIhvcNAQEFBQADggEBABls+be8yTD61iZd+lMwdTu5hx9xVWiNssI/MuNfuZzo
+  W7g7AUDrMXELJN9NwNFSFJw4vsAlfzl5sB2G3oCLef93vH4NwrTV4v5FIAk7mq8t
+  VLxoMWt6uUTo4t957Nvd8Amuukum1AZx6n3IjxpI3UhoFd7JrJNfvPYkyrwcu6Ur
+  xk02yzVtV1mZbklvKKIelCALBeuWkIMcmJXMbjn759OOm2YbrJpEsY79W9zLdgZf
+  JORAC0isugdrjOh+7HDizWC+9xpvSdKSuNso9bVKO3czaBeR+i+IA43wWeUliq95
+  5mp49lUwPrMEh694iPac5m+oxYlcU5U+sUyArQXg+lk=
   -----END CERTIFICATE-----
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
 executables:
@@ -665,7 +671,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB