mongo 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df545157946c4036f58eb215212390c7ee6468c2
-  data.tar.gz: feef5fae4e44d03d423ab47d79f6b164f90d0a36
+  metadata.gz: 82e2963414b68a630d0784e70921c1d44775934e
+  data.tar.gz: db5398568a322af951e6b7ce3dfe7a22ddb8eb42
 SHA512:
-  metadata.gz: 765b04848c2b7d821bc1dd1c9e23c56e95b1bdad9bdff7a332bcd2d96a3dff1bbe6c0227b751b07a459688107e0511d5ff0394fd09a266297b3c487f2a4b6bf3
-  data.tar.gz: c45d06e8676ca91af22d72435e1fdea026dab940fb9e9b6f038b7ed5b0e5c6025e8b29a7aa5bb0cf5251ea1e59c90edcf95a8a5c60c69ac4e836736f6b57b402
+  metadata.gz: 108c89ec2a1e2849fc76a9d71b50307fd3fa6eca10389572a675d5065a700c0a48308e594f48cde6bb901f748387e0dae845ebd281afc6d96970024563cfb7a5
+  data.tar.gz: 47be1ace716e50c8020cc53599a9fd82e7c9f88ace2dfdd5d157a086f65002ae51d524a424e483795c9db6e7465a4ab04b79089315f140844f44d86f74a610e7

data/bin/mongo_console

@@ -1,11 +1,26 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'pry'
-require 'mongo'
 
+require 'mongo'
 # include the mongo namespace
 include Mongo
 
-Pry.config.prompt_name = 'mongo'
-Pry.start
+begin
+  require 'pry'
+rescue LoadError
+end
+
+begin
+  require 'irb'
+rescue LoadError
+end
+
+if defined?(Pry)
+  Pry.config.prompt_name = 'mongo'
+  Pry.start
+elsif defined?(IRB)
+  IRB.start
+else
+  abort 'LoadError: mongo_console requires Pry or IRB'
+end

data/lib/mongo/server/connectable.rb

@@ -86,8 +86,8 @@ module Mongo
 
       def ensure_connected
         ensure_same_process!
-        connect!
         begin
+          connect!
           result = yield socket
           success = true
           result

data/lib/mongo/server/connection.rb

@@ -63,9 +63,6 @@ module Mongo
           authenticate!
         end
         true
-      rescue Mongo::Auth::Unauthorized => e
-        disconnect!
-        raise e
       end
 
       # Disconnect the connection.

data/lib/mongo/version.rb

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

data/mongo.gemspec

@@ -31,5 +31,4 @@ Gem::Specification.new do |s|
   s.bindir            = 'bin'
 
   s.add_dependency 'bson', '~> 4.0'
-  s.add_dependency 'pry'
 end

data/spec/mongo/auth/user/view_spec.rb

@@ -145,7 +145,7 @@ describe Mongo::Auth::User::View do
         described_class.new(unauthorized_client.database)
       end
 
-      it 'raises an OperationFailure' do
+      it 'raises an OperationFailure', if: auth_enabled? do
         expect{
           view.info('emily')
         }.to raise_exception(Mongo::Error::OperationFailure)

data/spec/mongo/database_spec.rb

@@ -322,7 +322,7 @@ describe Mongo::Database do
     end
   end
 
-  describe '#fs' do
+  describe '#fs', unless: sharded? do
 
     let(:database) do
       described_class.new(authorized_client, TEST_DB)
@@ -340,21 +340,18 @@ describe Mongo::Database do
           Mongo::Grid::File.new('Hello!', :filename => 'test.txt')
         end
 
-        before do
-          fs.insert_one(file)
-        end
-
         after do
           fs.files_collection.delete_many
           fs.chunks_collection.delete_many
         end
 
         let(:from_db) do
-          fs.find_one(:filename => 'test.txt')
+          fs.insert_one(file)
+          fs.find({ filename: 'test.txt' }, limit: 1).first
         end
 
         it 'returns the assembled file from the db' do
-          expect(from_db.filename).to eq(file.info.filename)
+          expect(from_db['filename']).to eq(file.info.filename)
         end
       end
     end

data/spec/mongo/server/connection_pool_spec.rb

@@ -192,4 +192,32 @@ describe Mongo::Server::ConnectionPool do
       end
     end
   end
+
+  context 'when the connection does not finish authenticating before the thread is killed' do
+
+    let(:server) do
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
+    end
+
+    let!(:pool) do
+      described_class.get(server)
+    end
+
+    let(:options) do
+      { user: ROOT_USER.name, password: ROOT_USER.password }.merge(TEST_OPTIONS).merge(max_pool_size: 1)
+    end
+
+    before do
+     t = Thread.new {
+        # Kill the thread when it's authenticating
+        allow(Mongo::Auth).to receive(:get) { t.kill }
+        pool.with_connection { |c| c.send(:ensure_connected) { |socket| socket } }
+      }
+      t.join
+    end
+
+    it 'disconnects the socket' do
+      expect(pool.checkout.send(:socket)).to be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
   wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -48,20 +48,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
 executables:
@@ -74,7 +60,6 @@ files:
 - README.md
 - Rakefile
 - bin/mongo_console
-- bin/test.rb
 - lib/csasl/csasl.bundle
 - lib/mongo.rb
 - lib/mongo/address.rb
@@ -567,11 +552,9 @@ files:
 - spec/support/server_selection/selection/Single/read/SecondaryPreferred.yml
 - spec/support/server_selection/selection/Unknown/read/SecondaryPreferred.yml
 - spec/support/server_selection_rtt.rb
-- spec/support/shared/cursor.rb
 - spec/support/shared/operation.rb
 - spec/support/shared/protocol.rb
 - spec/support/shared/server_selector.rb
-- spec/support/shared/socket.rb
 - spec/support/travis.rb
 homepage: http://www.mongodb.org
 licenses:
@@ -593,7 +576,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -855,10 +838,8 @@ test_files:
 - spec/support/server_selection/selection/Unknown/read/SecondaryPreferred.yml
 - spec/support/server_selection.rb
 - spec/support/server_selection_rtt.rb
-- spec/support/shared/cursor.rb
 - spec/support/shared/operation.rb
 - spec/support/shared/protocol.rb
 - spec/support/shared/server_selector.rb
-- spec/support/shared/socket.rb
 - spec/support/travis.rb
 has_rdoc: yard

data/bin/test.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'pry'
-require 'mongo'
-
-# include the mongo namespace
-include Mongo
-
-#gem 'mongo', '2.2.4' # this version raises "Cursor not found"
-# gem 'mongo', '2.1.2' # this version works
-
-#require 'uri'
-#require 'mongo'
-
-#binding.pry
-puts "-" * 50
-puts "Mongo Driver version: #{Mongo::VERSION}"
-puts "-" * 50
-
-uri = "mongodb://emily:qWQ6wfYfM5v7FGFf@aws-us-east-1-portal.14.dblayer.com:11118,aws-us-east-1-portal.13.dblayer.com:11141/tests?ssl=true"
-#uri = "mongodb://localhost:2323,localhost:2324"
-c = Mongo::Client.new(uri, ssl: true, ssl_verify: false, max_pool_size: 10)
-#c = Mongo::Client.new(uri)
-
-# c = Mongo::Client.new(["server:3000", "server:3001", "server:3002"],
-#                        :ssl => true,
-#                        :ssl_cert => "/Users/emily/ssl-certificates/client.pem",
-#                        :ssl_key => "/Users/emily/ssl-certificates/client.pem",
-#                        :ssl_ca_cert =>  "/Users/emily/ssl-certificates/ca.pem",
-#                        :max_pool_size => 20)
-
-binding.pry
-
-c['samplecol'].drop
-c['samplecol'].insert_many(50.times.map { |i| { someval: i } })
-
-10.times.map { Thread.start { c['samplecol'].find({}).batch_size(10).to_a } }.map(&:join)
-

data/spec/support/shared/cursor.rb

@@ -1,38 +0,0 @@
-shared_context 'shared cursor' do
-
-  let(:client) do
-    double('client').tap do |client|
-      allow(client).to receive(:mongos?).and_return(false)
-      allow(client).to receive(:execute).and_return(*get_mores)
-    end
-  end
-
-  let(:db) { Mongo::Database.new(client, TEST_DB) }
-  let(:collection) do
-    db[TEST_COLL].tap do |collection|
-      allow(collection).to receive(:full_namespace) do
-        "#{db.name}.#{collection.name}"
-      end
-      allow(collection).to receive(:client) { client }
-    end
-  end
-
-  let(:view_options) { {} }
-  let(:view) { Mongo::View::Collection.new(collection, {}, view_options) }
-
-  let(:nonzero) { 1 }
-  let(:b) { proc { |d| d } }
-
-  let(:response) { make_response(1, 3) }
-
-  def make_response(cursor_id = 0, nreturned = 5)
-    double('response').tap do |response|
-      allow(response).to receive(:documents) { (0...nreturned).to_a }
-      allow(response).to receive(:cursor_id) { cursor_id }
-    end
-  end
-
-  def get_mores
-    [ make_response ]
-  end
-end

data/spec/support/shared/socket.rb

@@ -1,82 +0,0 @@
-shared_examples 'shared socket behavior' do
-
-  describe '#read' do
-    before { allow(socket).to receive(:read).and_return(Object.new) }
-
-    context 'when an exception occurs in Socket#read' do
-      before do
-        allow(object).to receive(:alive?).and_return(true)
-        object.connect
-      end
-
-      it 'raises a Mongo::SocketTimeoutError for Errno::ETIMEDOUT' do
-        allow_any_instance_of(::Socket).to receive(:read) do
-          raise Errno::ETIMEDOUT
-        end
-        expect { object.read(4096) }.to raise_error(Mongo::SocketTimeoutError)
-      end
-
-      it 'raises a Mongo::SocketError for IOError' do
-        allow_any_instance_of(::Socket).to receive(:read) { raise IOError }
-        expect { object.read(4096) }.to raise_error(Mongo::SocketError)
-      end
-
-      it 'raises a Mongo::SocketError for SystemCallError' do
-        allow_any_instance_of(::Socket).to receive(:read) do
-          raise SystemCallError, 'Oh god. Everything is ruined.'
-        end
-        expect { object.read(4096) }.to raise_error(Mongo::SocketError)
-      end
-
-      it 'raises a Mongo::SocketError for OpenSSL::SSL::SSLError' do
-        allow_any_instance_of(::Socket).to receive(:read) do
-          raise OpenSSL::SSL::SSLError
-        end
-        expect { object.read(4096) }.to raise_error(Mongo::SocketError)
-      end
-    end
-  end
-
-  describe '#write' do
-    let(:payload) { Object.new }
-
-    before { allow(socket).to receive(:write).and_return(1024) }
-
-    context 'when an exception occurs in Socket#write' do
-      before do
-        allow(object).to receive(:alive?).and_return(true)
-        object.connect
-      end
-
-      it 'raises a Mongo::SocketTimeoutError for Errno::ETIMEDOUT' do
-        allow_any_instance_of(::Socket).to receive(:write) do
-          raise Errno::ETIMEDOUT
-        end
-
-        expect do
-          object.write(payload)
-        end.to raise_error(Mongo::SocketTimeoutError)
-      end
-
-      it 'raises a Mongo::SocketError for IOError' do
-        allow_any_instance_of(::Socket).to receive(:write) { raise IOError }
-        expect { object.write(payload) }.to raise_error(Mongo::SocketError)
-      end
-
-      it 'raises a Mongo::SocketError for SystemCallError' do
-        allow_any_instance_of(::Socket).to receive(:write) do
-          raise SystemCallError, 'Oh god. Everything is ruined.'
-        end
-        expect { object.write(payload) }.to raise_error(Mongo::SocketError)
-      end
-
-      it 'raises a Mongo::SocketError for OpenSSL::SSL::SSLError' do
-        allow_any_instance_of(::Socket).to receive(:write) do
-          raise OpenSSL::SSL::SSLError
-        end
-        expect { object.write(payload) }.to raise_error(Mongo::SocketError)
-      end
-    end
-  end
-
-end