mongo 2.3.1 → 2.4.0.rc0

data/spec/mongo/server_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Mongo::Server do
 
   let(:cluster) do
-    double('cluster')
+    double('cluster').tap do |cl|
+      allow(cl).to receive(:app_metadata).and_return(app_metadata)
+    end
   end
 
   let(:listeners) do

data/spec/mongo/uri_spec.rb

@@ -538,6 +538,52 @@ describe Mongo::URI do
       end
     end
 
+    context 'read preference max staleness option provided' do
+
+      let(:options) do
+        'readPreference=Secondary&maxStalenessMS=120000'
+      end
+
+      let(:read) do
+        Mongo::Options::Redacted.new(mode: :secondary, :max_staleness => 120)
+      end
+
+      it 'sets the read preference max staleness in seconds' do
+        expect(uri.uri_options[:read]).to eq(read)
+      end
+
+      it 'sets the options on a client created with the uri' do
+        expect(Mongo::Client.new(string).options[:read]).to eq(read)
+      end
+
+      context 'when the read preference and max staleness combination is invalid' do
+
+        context 'when max staleness is combined with read preference mode primary' do
+
+          let(:options) do
+            'readPreference=primary&maxStalenessMS=120000'
+          end
+
+          it 'raises an exception when read preference is accessed on the client' do
+            expect {
+              Mongo::Client.new(string).read_preference
+            }.to raise_exception(Mongo::Error::InvalidServerPreference)
+          end
+        end
+
+        context 'when the max staleness value is not at least twice heartbeat frequency' do
+
+          let(:options) do
+            'readPreference=secondary&maxStalenessMS=1'
+          end
+
+          it 'does not raise an exception until the read preference is used' do
+            expect(Mongo::Client.new(string).read_preference).to be_a(Mongo::ServerSelector::Secondary)
+          end
+        end
+      end
+    end
+
     context 'replica set option provided' do
       let(:rs_name) { TEST_SET }
       let(:options) { "replicaSet=#{rs_name}" }
@@ -850,5 +896,13 @@ describe Mongo::URI do
         end
       end
     end
+
+    context 'when an app name option is provided' do
+      let(:options) { "appname=reports" }
+
+      it 'sets the app name on the client' do
+        expect(Mongo::Client.new(string).options[:app_name]).to eq(:reports)
+      end
+    end
   end
 end

data/spec/mongo/write_concern_spec.rb

@@ -15,6 +15,24 @@ describe Mongo::WriteConcern do
       end
     end
 
+    context 'when the value is a WriteConcern object' do
+
+      let(:value) do
+        Mongo::WriteConcern.get({})
+      end
+
+      it 'returns the object' do
+        expect(Mongo::WriteConcern.get(value)).to be(value)
+      end
+    end
+
+    context 'when the value is nil' do
+
+      it 'returns nil' do
+        expect(Mongo::WriteConcern.get(nil)).to be(nil)
+      end
+    end
+
     context 'when w is 0' do
 
       context 'when no other options are provided' do

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/support/sdam/**/*.yml")
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/rtt/*.yml")
 SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
+MAX_STALENESS_TESTS = Dir.glob("#{CURRENT_PATH}/support/max_staleness/**/*.yml")
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/support/crud_tests/**/*.yml")
 COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/support/command_monitoring/**/*.yml")
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/support/connection_string_tests/*.yml")
@@ -119,6 +120,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.4 or higher.
+#
+# @since 2.4.0
+def collation_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  $collation_enabled ||= $mongo_client.cluster.servers.first.features.collation_enabled?
+end
+
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 3.2 or higher.
 #

data/spec/support/authorization.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 MongoDB, Inc.
+# Copyright (C) 2009-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -249,5 +249,12 @@ module Authorization
     context.let(:default_address) do
       authorized_client.cluster.next_primary.address
     end
+
+    # Get a default app metadata.
+    #
+    # @since 2.4.0
+    context.let(:app_metadata) do
+      authorized_client.cluster.app_metadata
+    end
   end
 end

data/spec/support/crud.rb

@@ -169,6 +169,21 @@ module Mongo
         !write_command_enabled && @operation.requires_2_6?(collection)
       end
 
+      # Whether this operation requires a certain server version to be run.
+      #
+      # @example Determine whether this operation requires a certain server feature.
+      #   operation.feature_enabled?(collection)
+      #
+      # @param [ Collection ] collection The collection the operation
+      #   should be executed on.
+      #
+      # @return [ true, false ] Whether this operation requires a certain server version.
+      #
+      # @since 2.4.0
+      def feature_enabled?(collection)
+        @operation.feature_enabled?(collection)
+      end
+
       private
 
       def outcome_collection_data

data/spec/support/crud/read.rb

@@ -28,19 +28,10 @@ module Mongo
         ARGUMENT_MAP = { :sort => 'sort',
                          :skip => 'skip',
                          :batch_size => 'batchSize',
-                         :limit => 'limit'
+                         :limit => 'limit',
+                         :collation => 'collation'
                        }
 
-        # Map of read preference mode names to their equivalent Ruby-formatted symbols.
-        #
-        # @since 2.4.0
-        READ_PREFERENCE_MAP = { 'primary' => :primary,
-                                'secondary' => :secondary,
-                                'primaryPreferred' => :primary_preferred,
-                                'secondaryPreferred' => :secondary_preferred,
-                                'nearest' => :nearest
-                              }
-
         # The operation name.
         #
         # @return [ String ] name The operation name.
@@ -100,6 +91,26 @@ module Mongo
           name == 'aggregate' && pipeline.find {|op| op.keys.include?('$out') }
         end
 
+        # Whether this operation requires a certain server version to be run.
+        #
+        # @example Determine whether this operation requires a certain server feature.
+        #   operation.feature_enabled?(collection)
+        #
+        # @param [ Collection ] collection The collection the operation
+        #   should be executed on.
+        #
+        # @return [ true, false ] Whether this operation requires a certain server version.
+        #
+        # @since 2.4.0
+        def feature_enabled?(collection)
+          if collation
+            return $mongo_client.cluster.servers.first.features.collation_enabled?
+          elsif requires_2_6?(collection)
+            return $mongo_client.cluster.servers.first.features.write_command_enabled?
+          end
+          true
+        end
+
         private
 
         def count(collection)
@@ -119,8 +130,7 @@ module Mongo
         end
 
         def find(collection)
-          opts = modifiers ? options.merge(modifiers: BSON::Document.new(modifiers)) : options
-          (read_preference ? collection.with(read: read_preference) : collection).find(filter, opts).to_a
+          collection.find(filter, options.merge(modifiers: BSON::Document.new(modifiers) || {})).to_a
         end
 
         def options
@@ -129,6 +139,10 @@ module Mongo
           end
         end
 
+        def collation
+          arguments['collation']
+        end
+
         def batch_size
           arguments['batchSize']
         end
@@ -152,12 +166,6 @@ module Mongo
         def arguments
           @spec['arguments']
         end
-
-        def read_preference
-          if @spec['read_preference'] && @spec['read_preference']['mode']
-            { mode: READ_PREFERENCE_MAP[@spec['read_preference']['mode']] }
-          end
-        end
       end
     end
   end

data/spec/support/crud/write.rb

@@ -47,7 +47,8 @@ module Mongo
                         :return_document => 'returnDocument',
                         :upsert => 'upsert',
                         :ordered => 'ordered',
-                        :write_concern => 'writeConcern'
+                        :write_concern => 'writeConcern',
+                        :collation => 'collation'
                        }
 
         # Operations that need a check if results on < 2.6 will match.
@@ -113,6 +114,26 @@ module Mongo
           REQUIRES_2_6.include?(name) && upsert
         end
 
+        # Whether this operation requires a certain server version to be run.
+        #
+        # @example Determine whether this operation requires a certain server feature.
+        #   operation.feature_enabled?(collection)
+        #
+        # @param [ Collection ] collection The collection the operation
+        #   should be executed on.
+        #
+        # @return [ true, false ] Whether this operation requires a certain server version.
+        #
+        # @since 2.4.0
+        def feature_enabled?(collection)
+          if collation
+            return $mongo_client.cluster.servers.first.features.collation_enabled?
+          elsif requires_2_6?(collection)
+            return $mongo_client.cluster.servers.first.features.write_command_enabled?
+          end
+          true
+        end
+
         private
 
         def bulk_write(collection)
@@ -120,12 +141,12 @@ module Mongo
         end
 
         def delete_many(collection)
-          result = collection.delete_many(filter)
+          result = collection.delete_many(filter, options)
           { 'deletedCount' => result.deleted_count }
         end
 
         def delete_one(collection)
-          result = collection.delete_one(filter)
+          result = collection.delete_one(filter, options)
           { 'deletedCount' => result.deleted_count }
         end
 
@@ -178,6 +199,10 @@ module Mongo
           end
         end
 
+        def collation
+          arguments['collation']
+        end
+
         def replacement
           arguments['replacement']
         end

data/spec/support/crud_tests/read/aggregate.yml

@@ -2,6 +2,7 @@ data:
     - {_id: 1, x: 11}
     - {_id: 2, x: 22}
     - {_id: 3, x: 33}
+    - {_id: 4, x: 'ping'}
 
 tests:
     -
@@ -12,7 +13,7 @@ tests:
                 pipeline:
                     - $sort: {x: 1}
                     - $match: 
-                        _id: {$gt: 1}
+                        _id: {$gt: 1, $lt: 4}
                 batchSize: 2
 
         outcome:
@@ -27,7 +28,7 @@ tests:
                 pipeline: 
                     - $sort: {x: 1}
                     - $match:
-                        _id: {$gt: 1}
+                        _id: {$gt: 1, $lt: 4}
                     - $out: "other_test_collection"
                 batchSize: 2
 
@@ -40,4 +41,15 @@ tests:
                 data:
                     - {_id: 2, x: 22}
                     - {_id: 3, x: 33}
-  
+    -
+        description: "Aggregate with collation"
+        operation:
+            name: aggregate
+            arguments:
+                pipeline:
+                    - $match:
+                        x: 'PING'
+                collation: { locale: 'en_US', strength: 2 }
+        outcome:
+            result:
+                - {_id: 4, x: 'ping'}

data/spec/support/crud_tests/read/count.yml

@@ -2,6 +2,7 @@ data:
     - {_id: 1, x: 11}
     - {_id: 2, x: 22}
     - {_id: 3, x: 33}
+    - {_id: 4, x: 'PING'}
 
 tests:
     -
@@ -12,14 +13,14 @@ tests:
                 filter: { }
 
         outcome:
-            result: 3
+            result: 4
     -
         description: "Count with a filter"
         operation:
             name: count
             arguments:
                 filter: 
-                    _id: {$gt: 1}
+                    _id: {$gt: 1, $lt: 4}
 
         outcome:
             result: 2
@@ -33,5 +34,15 @@ tests:
                 limit: 3
 
         outcome:
-            result: 2
+            result: 3
+    -
+        description: "Count with collation"
+        operation:
+            name: count
+            arguments:
+                filter: { x: 'ping' }
+                collation: { locale: 'en_US', strength: 2 }
+
+        outcome:
+            result: 1
   

data/spec/support/crud_tests/read/distinct.yml

@@ -2,6 +2,8 @@ data:
     - {_id: 1, x: 11}
     - {_id: 2, x: 22}
     - {_id: 3, x: 33}
+    - {_id: 4, string: 'PING'}
+    - {_id: 5, string: 'ping'}
 
 tests:
     -
@@ -30,4 +32,14 @@ tests:
             result: 
                 - 22
                 - 33
-  
+    -
+        description: "Distinct with a collation"
+        operation:
+            name: distinct
+            arguments:
+                fieldName: "string"
+                collation: { locale: 'en_US', strength: 2 }
+
+        outcome:
+            result:
+                - 'PING'

data/spec/support/crud_tests/read/find.yml

@@ -4,6 +4,7 @@ data:
     - {_id: 3, x: 33}
     - {_id: 4, x: 44}
     - {_id: 5, x: 55}
+    - {_id: 6, x: 'ping'}
 
 tests:
     -
@@ -23,7 +24,7 @@ tests:
             name: "find"
             arguments:
                 filter: 
-                    _id: {$gt: 2}
+                    _id: {$gt: 2, $lt: 6}
                 sort: {_id: 1}
                 skip: 2
                 limit: 2
@@ -47,4 +48,13 @@ tests:
                 - {_id: 2, x: 22}
                 - {_id: 3, x: 33}
                 - {_id: 4, x: 44}
-  
+    -
+        description: "Find with a collation"
+        operation:
+            name: "find"
+            arguments:
+                filter: {x: 'PING'}
+                collation: { locale: 'en_US', strength: 2 }
+        outcome:
+            result:
+                - {_id: 6, x: 'ping'}