mongo 2.1.2 → 2.2.0.rc0

data/spec/mongo/server/description/features_spec.rb

@@ -56,6 +56,31 @@ describe Mongo::Server::Description::Features do
     end
   end
 
+  describe '#find_command_enabled?' do
+
+    context 'when the wire range includes 4' do
+
+      let(:features) do
+        described_class.new(0..4)
+      end
+
+      it 'returns true' do
+        expect(features).to be_find_command_enabled
+      end
+    end
+
+    context 'when the wire range does not include 4' do
+
+      let(:features) do
+        described_class.new(0..2)
+      end
+
+      it 'returns false' do
+        expect(features).to_not be_find_command_enabled
+      end
+    end
+  end
+
   describe '#list_collections_enabled?' do
 
     context 'when the wire range includes 3' do

data/spec/mongo/write_concern_spec.rb

@@ -0,0 +1,126 @@
+require 'spec_helper'
+
+describe Mongo::WriteConcern do
+
+  describe '#get' do
+
+    context 'when no options are set' do
+
+      let(:options) do
+        { }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+    end
+
+    context 'when w is 0' do
+
+      context 'when no other options are provided' do
+
+        let(:options) do
+          { w: 0 }
+        end
+
+        it 'returns an Unacknowledged write concern object' do
+          expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Unacknowledged)
+        end
+      end
+
+      context 'when j is also provided' do
+
+        context 'when j is false' do
+
+          let(:options) do
+            { w: 0, j: false }
+          end
+
+          it 'returns an Unacknowledged write concern object' do
+            expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Unacknowledged)
+          end
+        end
+
+        context 'when j is true' do
+
+          let(:options) do
+            { w: 0, j: true }
+          end
+
+          it 'raises an exception' do
+            expect {
+              Mongo::WriteConcern.get(options)
+            }.to raise_error(Mongo::Error::InvalidWriteConcern)
+          end
+        end
+
+        context 'when fsync is true' do
+
+          let(:options) do
+            { w: 0, fsync: true }
+          end
+
+          it 'raises an exception' do
+            expect {
+              Mongo::WriteConcern.get(options)
+            }.to raise_error(Mongo::Error::InvalidWriteConcern)
+          end
+        end
+      end
+
+      context 'when wtimeout is also provided' do
+
+        let(:options) do
+          { w: 0, wimteout: 100 }
+        end
+
+        it 'returns an Unacknowledged write concern object' do
+          expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Unacknowledged)
+        end
+      end
+    end
+
+    context 'when w is less than 0' do
+
+      let(:options) do
+        { w: -1 }
+      end
+
+      it 'raises an exception' do
+        expect {
+          Mongo::WriteConcern.get(options)
+        }.to raise_error(Mongo::Error::InvalidWriteConcern)
+      end
+    end
+
+    context 'when w is greater than 0' do
+
+      let(:options) do
+        { w: 2, journal: true }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+
+      it 'sets the options' do
+        expect(Mongo::WriteConcern.get(options).options).to eq(options)
+      end
+    end
+
+    context 'when w is a string' do
+
+      let(:options) do
+        { w: 'majority', journal: true }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+
+      it 'sets the options' do
+        expect(Mongo::WriteConcern.get(options).options).to eq(options)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,22 +1,3 @@
-if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.2'
-  require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-
-  SimpleCov.start do
-    # report groups
-    add_group 'Wire Protocol', 'lib/mongo/protocol'
-    # filters
-    add_filter 'tasks'
-    add_filter 'spec'
-    add_filter 'bin'
-  end
-end
-
 TEST_SET = 'ruby-driver-rs'
 COVERAGE_MIN = 90
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
@@ -138,6 +119,15 @@ def single_seed?
   ADDRESSES.size == 1
 end
 
+# For instances where behaviour is different on different versions, we need to
+# determine in the specs if we are 3.2 or higher.
+#
+# @since 2.0.0
+def find_command_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  $find_command_enabled ||= $mongo_client.cluster.servers.first.features.find_command_enabled?
+end
+
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 2.6 or higher.
 #

data/spec/support/command_monitoring.rb

@@ -227,6 +227,12 @@ module Mongo
       # @return [ Array<Expectation> ] The expectations.
       attr_reader :expectations
 
+      # @return [ String ] The server version to ignore if greater.
+      attr_reader :ignore_if_server_version_greater_than
+
+      # @return [ String ] The server version to ignore if lower.
+      attr_reader :ignore_if_server_version_less_than
+
       # Create the new test.
       #
       # @example Create the test.
@@ -239,6 +245,8 @@ module Mongo
       def initialize(data, test)
         @data = data
         @description = test['description']
+        @ignore_if_server_version_greater_than = test['ignore_if_server_version_greater_than']
+        @ignore_if_server_version_less_than = test['ignore_if_server_version_less_than']
         @operation = Mongo::CRUD::Operation.get(test['operation'])
         @expectations = test['expectations'].map{ |e| Expectation.new(e) }
       end

data/spec/support/command_monitoring/find.yml

@@ -38,10 +38,10 @@ tests:
     description: "A successful find event with options"
     operation:
       name: "find"
+      read_preference: { mode: "primaryPreferred" }
       arguments:
         filter: { _id: { $gt: 1 } }
         sort: { _id: 1 }
-        limit: 2
         skip: 2
         modifiers:
           $comment: "test"
@@ -50,7 +50,6 @@ tests:
           $maxScan: 5000
           $maxTimeMS: 6000
           $min: { _id: 0 }
-          $readPreference: { mode: "secondaryPreferred" }
           $returnKey: false
           $showDiskLoc: false
           $snapshot: false
@@ -61,7 +60,6 @@ tests:
             find: *collection_name
             filter: { _id:  { $gt: 1 } }
             sort: { _id: 1 }
-            limit: 2
             skip: 2
             comment: "test"
             hint: { _id: 1 }
@@ -69,7 +67,6 @@ tests:
             maxScan: 5000
             maxTimeMS: 6000
             min: { _id: 0 }
-            readPreference: { mode: "secondaryPreferred" }
             returnKey: false
             showRecordId: false
             snapshot: false
@@ -137,6 +134,7 @@ tests:
           command_name: "getMore"
   -
     description: "A successful find event with a getmore and killcursors"
+    ignore_if_server_version_greater_than: "3.0"
     operation:
       name: "find"
       arguments:
@@ -200,6 +198,57 @@ tests:
             cursorsUnknown:
               - { $numberLong: "42" }
           command_name: "killCursors"
+  -
+    description: "A successful find event with a getmore and the server kills the cursor"
+    ignore_if_server_version_less_than: "3.1"
+    operation:
+      name: "find"
+      arguments:
+        filter: { _id: { $gte: 1 }}
+        sort: { _id: 1 }
+        batchSize: 3
+        limit: 4
+    expectations:
+      -
+        command_started_event:
+          command:
+            find: *collection_name
+            filter: { _id: { $gte : 1 }}
+            sort: { _id: 1 }
+            batchSize: 3
+            limit: 4
+          command_name: "find"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "42" }
+              ns: *namespace
+              firstBatch:
+                - { _id: 1, x: 11 }
+                - { _id: 2, x: 22 }
+                - { _id: 3, x: 33 }
+          command_name: "find"
+      -
+        command_started_event:
+          command:
+            getMore: { $numberLong: "42" }
+            collection: *collection_name
+            batchSize: 3
+          command_name: "getMore"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "0" }
+              ns: *namespace
+              nextBatch:
+                - { _id: 4, x: 44 }
+          command_name: "getMore"
   -
     description: "A failed find event"
     operation:

data/spec/support/matchers.rb

@@ -26,7 +26,7 @@ end
 
 RSpec::Matchers.define :be_bson do |hash|
   match do |actual|
-    actual == hash.to_bson
+    actual == hash.to_bson.to_s
   end
 end
 

data/spec/support/shared/protocol.rb

@@ -1,28 +1,28 @@
 shared_examples 'message with a header' do
   describe 'header' do
     describe 'length' do
-      let(:field) { bytes[0..3] }
+      let(:field) { bytes.to_s[0..3] }
       it 'serializes the length' do
-        expect(field).to be_int32(bytes.size)
+        expect(field).to be_int32(bytes.length)
       end
     end
 
     describe 'request id' do
-      let(:field) { bytes[4..7] }
+      let(:field) { bytes.to_s[4..7] }
       it 'serializes the request id' do
         expect(field).to be_int32(message.request_id)
       end
     end
 
     describe 'response to' do
-      let(:field) { bytes[8..11] }
+      let(:field) { bytes.to_s[8..11] }
       it 'serializes the response to' do
         expect(field).to be_int32(0)
       end
     end
 
     describe 'op code' do
-      let(:field) { bytes[12..15] }
+      let(:field) { bytes.to_s[12..15] }
       it 'serializes the op code' do
         expect(field).to be_int32(opcode)
       end

data/spec/support/travis.rb

@@ -4,7 +4,7 @@ if (ENV['CI'] == 'travis')
   client = Mongo::Client.new(['127.0.0.1:27017'])
   while starting
     begin
-      client.command(Mongo::Server::Monitor::STATUS)
+      client.command(Mongo::Server::Monitor::Connection::ISMASTER)
       break
     rescue Mongo::Error::OperationFailure => e
       sleep(2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0.rc0
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -40,14 +40,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.rc0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.rc0
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
 executables: []
@@ -59,6 +59,7 @@ files:
 - README.md
 - Rakefile
 - bin/mongo_console
+- lib/csasl/csasl.bundle
 - lib/mongo.rb
 - lib/mongo/address.rb
 - lib/mongo/address/ipv4.rb
@@ -94,6 +95,13 @@ files:
 - lib/mongo/collection.rb
 - lib/mongo/collection/view.rb
 - lib/mongo/collection/view/aggregation.rb
+- lib/mongo/collection/view/builder.rb
+- lib/mongo/collection/view/builder/aggregation.rb
+- lib/mongo/collection/view/builder/find_command.rb
+- lib/mongo/collection/view/builder/flags.rb
+- lib/mongo/collection/view/builder/map_reduce.rb
+- lib/mongo/collection/view/builder/modifiers.rb
+- lib/mongo/collection/view/builder/op_query.rb
 - lib/mongo/collection/view/explainable.rb
 - lib/mongo/collection/view/immutable.rb
 - lib/mongo/collection/view/iterable.rb
@@ -101,6 +109,11 @@ files:
 - lib/mongo/collection/view/readable.rb
 - lib/mongo/collection/view/writable.rb
 - lib/mongo/cursor.rb
+- lib/mongo/cursor/builder.rb
+- lib/mongo/cursor/builder/get_more_command.rb
+- lib/mongo/cursor/builder/kill_cursors_command.rb
+- lib/mongo/cursor/builder/op_get_more.rb
+- lib/mongo/cursor/builder/op_kill_cursors.rb
 - lib/mongo/database.rb
 - lib/mongo/database/view.rb
 - lib/mongo/dbref.rb
@@ -122,6 +135,7 @@ files:
 - lib/mongo/error/invalid_signature.rb
 - lib/mongo/error/invalid_update_document.rb
 - lib/mongo/error/invalid_uri.rb
+- lib/mongo/error/invalid_write_concern.rb
 - lib/mongo/error/max_bson_size.rb
 - lib/mongo/error/max_message_size.rb
 - lib/mongo/error/missing_file_chunk.rb
@@ -169,6 +183,10 @@ files:
 - lib/mongo/operation/commands/collections_info.rb
 - lib/mongo/operation/commands/collections_info/result.rb
 - lib/mongo/operation/commands/command.rb
+- lib/mongo/operation/commands/find.rb
+- lib/mongo/operation/commands/find/result.rb
+- lib/mongo/operation/commands/get_more.rb
+- lib/mongo/operation/commands/get_more/result.rb
 - lib/mongo/operation/commands/indexes.rb
 - lib/mongo/operation/commands/list_collections.rb
 - lib/mongo/operation/commands/list_collections/result.rb
@@ -184,6 +202,7 @@ files:
 - lib/mongo/operation/executable.rb
 - lib/mongo/operation/kill_cursors.rb
 - lib/mongo/operation/limited.rb
+- lib/mongo/operation/object_id_generator.rb
 - lib/mongo/operation/read.rb
 - lib/mongo/operation/read/get_more.rb
 - lib/mongo/operation/read/query.rb
@@ -297,6 +316,10 @@ files:
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb
+- spec/mongo/collection/view/builder/find_command_spec.rb
+- spec/mongo/collection/view/builder/flags_spec.rb
+- spec/mongo/collection/view/builder/modifiers_spec.rb
+- spec/mongo/collection/view/builder/op_query_spec.rb
 - spec/mongo/collection/view/explainable_spec.rb
 - spec/mongo/collection/view/immutable_spec.rb
 - spec/mongo/collection/view/map_reduce_spec.rb
@@ -307,6 +330,8 @@ files:
 - spec/mongo/command_monitoring_spec.rb
 - spec/mongo/connection_string_spec.rb
 - spec/mongo/crud_spec.rb
+- spec/mongo/cursor/builder/get_more_command_spec.rb
+- spec/mongo/cursor/builder/op_get_more_spec.rb
 - spec/mongo/cursor_spec.rb
 - spec/mongo/database_spec.rb
 - spec/mongo/dbref_spec.rb
@@ -328,7 +353,7 @@ files:
 - spec/mongo/monitoring/event/command_succeeded_spec.rb
 - spec/mongo/monitoring/event/secure_spec.rb
 - spec/mongo/monitoring_spec.rb
-- spec/mongo/operation/aggregate/result_spec.rb
+- spec/mongo/operation/commands/aggregate/result_spec.rb
 - spec/mongo/operation/commands/aggregate_spec.rb
 - spec/mongo/operation/commands/collections_info_spec.rb
 - spec/mongo/operation/commands/command_spec.rb
@@ -388,6 +413,7 @@ files:
 - spec/mongo/uri_spec.rb
 - spec/mongo/write_concern/acknowledged_spec.rb
 - spec/mongo/write_concern/unacknowledged_spec.rb
+- spec/mongo/write_concern_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
 - spec/support/certificates/ca.pem
@@ -537,12 +563,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: mongo
-rubygems_version: 2.4.8
+rubyforge_project: 
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -571,6 +597,10 @@ test_files:
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb
+- spec/mongo/collection/view/builder/find_command_spec.rb
+- spec/mongo/collection/view/builder/flags_spec.rb
+- spec/mongo/collection/view/builder/modifiers_spec.rb
+- spec/mongo/collection/view/builder/op_query_spec.rb
 - spec/mongo/collection/view/explainable_spec.rb
 - spec/mongo/collection/view/immutable_spec.rb
 - spec/mongo/collection/view/map_reduce_spec.rb
@@ -581,6 +611,8 @@ test_files:
 - spec/mongo/command_monitoring_spec.rb
 - spec/mongo/connection_string_spec.rb
 - spec/mongo/crud_spec.rb
+- spec/mongo/cursor/builder/get_more_command_spec.rb
+- spec/mongo/cursor/builder/op_get_more_spec.rb
 - spec/mongo/cursor_spec.rb
 - spec/mongo/database_spec.rb
 - spec/mongo/dbref_spec.rb
@@ -602,7 +634,7 @@ test_files:
 - spec/mongo/monitoring/event/command_succeeded_spec.rb
 - spec/mongo/monitoring/event/secure_spec.rb
 - spec/mongo/monitoring_spec.rb
-- spec/mongo/operation/aggregate/result_spec.rb
+- spec/mongo/operation/commands/aggregate/result_spec.rb
 - spec/mongo/operation/commands/aggregate_spec.rb
 - spec/mongo/operation/commands/collections_info_spec.rb
 - spec/mongo/operation/commands/command_spec.rb
@@ -662,6 +694,7 @@ test_files:
 - spec/mongo/uri_spec.rb
 - spec/mongo/write_concern/acknowledged_spec.rb
 - spec/mongo/write_concern/unacknowledged_spec.rb
+- spec/mongo/write_concern_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
 - spec/support/certificates/ca.pem