mongo 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cf62fc9f77f84668c204be16c29ecf86f6217a
-  data.tar.gz: dfc97cdbd591e0fd9f539dd8bef21fb46af49829
+  metadata.gz: 091537e3e22eeeced33e7b6f0f325176421c0815
+  data.tar.gz: 1e20931d726c885a783019e6bd3302633f8871e3
 SHA512:
-  metadata.gz: 937f66f51858557875fc829be722fff81d104c1d4c1cc4522335bcaca7937d5026cee53cbe6a682bb9c649a523ddf213c4a5de1dd29005530c74a8a392538fbe
-  data.tar.gz: b38fbd21f331920971e2fd466147d21d0a9fa866079b57c9618c6aca908ebc20123f6bab467116bb18ac76e432703a74e80d256ce90c58a91ea25e0a6e8901b7
+  metadata.gz: 15eff6d3df999006130abf1d31e90723004abbb621bfa1d3c8df011fb21809191b9b68aed94c124255cf9977a5d74fe784e2083b17130fa14f61c10e9bbb28f0
+  data.tar.gz: 9b59120fcd633bfad9a612f7bb9ad641259348683f0598bfa0a41e73b6d05d65c4363e888debac942141b2eec6ba991a712c7bd23a7e4909c56124c8c0ff7b4d

data/bin/test.rb

@@ -7,9 +7,33 @@ require 'mongo'
 # include the mongo namespace
 include Mongo
 
-client = Mongo::Client.new("mongodb://localhost:27017/?ssl=true&sslVerify=false")
+#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
 
-client
+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/lib/mongo/collection/view/iterable.rb

@@ -56,6 +56,7 @@ module Mongo
         def close_query
           @cursor.send(:kill_cursors) if @cursor && !@cursor.closed?
         end
+        alias :kill_cursors :close_query
 
         private
 

data/lib/mongo/dbref.rb

@@ -84,7 +84,7 @@ module Mongo
     # @return [ String ] The raw BSON.
     #
     # @since 2.1.0
-    def to_bson(buffer = BSON::ByteBuffer.new)
+    def to_bson(buffer = BSON::ByteBuffer.new, validating_keys = nil)
       as_json.to_bson(buffer)
     end
 

data/lib/mongo/grid/file/chunk.rb

@@ -135,7 +135,7 @@ module Mongo
         # @return [ String ] The raw BSON data.
         #
         # @since 2.0.0
-        def to_bson(buffer = BSON::ByteBuffer.new)
+        def to_bson(buffer = BSON::ByteBuffer.new, validating_keys = nil)
           document.to_bson(buffer)
         end
 

data/lib/mongo/grid/file/info.rb

@@ -198,9 +198,9 @@ module Mongo
         # @return [ String ] The raw BSON data.
         #
         # @since 2.0.0
-        def to_bson(encoded = ''.force_encoding(BSON::BINARY))
+        def to_bson(buffer = BSON::ByteBuffer.new, validating_keys = nil)
           document[:md5] ||= @client_md5.hexdigest
-          document.to_bson(encoded)
+          document.to_bson(buffer)
         end
 
         # Get the upload date.

data/lib/mongo/server/connection.rb

@@ -56,7 +56,7 @@ module Mongo
       #
       # @since 2.0.0
       def connect!
-        unless socket
+        unless socket && socket.connectable?
           @socket = address.socket(timeout, ssl_options)
           socket.connect!
           authenticate!

data/lib/mongo/socket/ssl.rb

@@ -99,6 +99,18 @@ module Mongo
         end
       end
 
+      # This socket can only be used if the ssl socket (@socket) has been created.
+      #
+      # @example Is the socket connectable?
+      #   socket.connectable?
+      #
+      # @return [ true, false ] If the socket is connectable.
+      #
+      # @since 2.2.5
+      def connectable?
+        !!@socket
+      end
+
       private
 
       def create_context(options)

data/lib/mongo/socket/tcp.rb

@@ -64,6 +64,18 @@ module Mongo
         @host, @port, @timeout = host, port, timeout
         super(family)
       end
+
+      # This object does not wrap another socket so it's always connectable.
+      #
+      # @example Is the socket connectable?
+      #   socket.connectable?
+      #
+      # @return [ true, false ] If the socket is connectable.
+      #
+      # @since 2.2.5
+      def connectable?
+        true
+      end
     end
   end
 end

data/lib/mongo/socket/unix.rb

@@ -55,6 +55,18 @@ module Mongo
         @socket = ::UNIXSocket.new(path)
         set_socket_options(@socket)
       end
+
+      # This socket can only be used if the unix socket (@socket) has been created.
+      #
+      # @example Is the socket connectable?
+      #   socket.connectable?
+      #
+      # @return [ true, false ] If the socket is connectable.
+      #
+      # @since 2.2.5
+      def connectable?
+        !!@socket
+      end
     end
   end
 end

data/lib/mongo/version.rb

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

data/mongo.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.files             += %w[mongo.gemspec LICENSE README.md CONTRIBUTING.md Rakefile]
   s.test_files        = Dir.glob('spec/**/*')
 
+  s.executables       = ['mongo_console']
   s.require_paths     = ['lib']
   s.has_rdoc          = 'yard'
   s.bindir            = 'bin'

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -121,6 +121,28 @@ describe Mongo::Collection::View::Aggregation do
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
+
+    context 'when the initial response has no results but an active cursor', if: find_command_enabled? do
+
+      let(:documents) do
+        [
+            { city: 'a'*6000000 },
+            { city: 'b'*6000000 }
+        ]
+      end
+
+      let(:options) do
+        { :use_cursor => true }
+      end
+
+      let(:pipeline) do
+        [{ '$sample' => { 'size' => 2 } }]
+      end
+
+      it 'iterates over the result documents' do
+        expect(aggregation.to_a.size).to eq(2)
+      end
+    end
   end
 
   describe '#initialize' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
   wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -50,7 +50,8 @@ dependencies:
         version: '4.0'
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
-executables: []
+executables:
+- mongo_console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -577,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB