mongo 2.4.0.rc0 → 2.4.0.rc1

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
 CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
 CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
 CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
+CLIENT_KEY_PEM = "#{SSL_CERTS_DIR}/client_key.pem"
+CLIENT_CERT_PEM = "#{SSL_CERTS_DIR}/client_cert.pem"
+CLIENT_KEY_ENCRYPTED_PEM = "#{SSL_CERTS_DIR}/client_key_encrypted.pem"
+CLIENT_KEY_PASSPHRASE = "passphrase"
 
 require 'mongo'
 

data/spec/support/authorization.rb

@@ -51,8 +51,8 @@ SSL = ENV['SSL_ENABLED'] == 'true'
 SSL_OPTIONS = {
                   ssl: SSL,
                   ssl_verify: false,
-                  ssl_cert:  CLIENT_PEM,
-                  ssl_key:  CLIENT_PEM
+                  ssl_cert:  CLIENT_CERT_PEM,
+                  ssl_key:  CLIENT_KEY_PEM
                 }
 
 # Base test options.
@@ -61,7 +61,7 @@ SSL_OPTIONS = {
 BASE_OPTIONS = {
                   max_pool_size: 1,
                   write: WRITE_CONCERN,
-                  heartbeat_frequency: 5,
+                  heartbeat_frequency: 20,
                   max_read_retries: 5
                }
 

data/spec/support/certificates/client_cert.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdjCCAt+gAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMCVVMx
+ETAPBgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MQ4wDAYD
+VQQKDAUxMEdlbjEPMA0GA1UECwwGS2VybmVsMRowGAYDVQQDDBFNeSBDZXJ0IEF1
+dGhvcml0eTEbMBkGCSqGSIb3DQEJARYMcm9vdEBsYXphcnVzMB4XDTEzMDgyMzE0
+NTUzMloXDTQxMDEwNzE0NTUzMlowbjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5l
+dyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MQ4wDAYDVQQKDAUxMEdlbjET
+MBEGA1UECwwKa2VybmVsdXNlcjEPMA0GA1UEAwwGY2xpZW50MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhZC1Is9XopnnqfAzUqcnP2VuYO/9M8DjC7b
+qcE1WID24umHKITj0JtoYFEOQoTYb+g0zBiXedON2C8jESVvaXo4u4yyKemRvnmM
+zBtWmJjTgyrF+ZyGDCwkDlxGO6mVRGzF4HydA64NI5lJpEjdDjWi5bSLhr3AyM7V
+rMQ2855fFwAjjVOhQxujYZY2gE01ULWLaTE5tGOLlllc0eqS6+v6GzVkRLP286ad
+STpZ5eHCy5i+KbMi3TOX11BP28JYZBi1jDxrLSH2vY3l0tqNef6ngHWoFbnueX8B
+MR3l5xV2U2X2/vCTfSA9zP+byrJQLBs6adXmcM+svn5cM8RupwIDAQABo3sweTAJ
+BgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0
+aWZpY2F0ZTAdBgNVHQ4EFgQUSovuIkLm+GJMhjiNxXiVmMEQBXwwHwYDVR0jBBgw
+FoAUB0EZOp9+xbciTre81d/k/Am4ZBYwDQYJKoZIhvcNAQEFBQADgYEAExOo8N54
+xrHghcwn5gQoRJMd8f9egWkzH/N24EnK2a2q2/Wl+KZQu6GnQBTkL424IX81BGDb
+r/Ce3aHKC38DLi8ZHjJuHi2HaOM3R6hbk9GIQXPaiCFZJ9Q1HGontcDGF7rzh8jh
+9I9DErz6jZDVhoPfUaXJ4JLwZtA3YW+FJBg=
+-----END CERTIFICATE-----

data/spec/support/certificates/client_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6FkLUiz1eimee
+p8DNSpyc/ZW5g7/0zwOMLtupwTVYgPbi6YcohOPQm2hgUQ5ChNhv6DTMGJd5043Y
+LyMRJW9peji7jLIp6ZG+eYzMG1aYmNODKsX5nIYMLCQOXEY7qZVEbMXgfJ0Drg0j
+mUmkSN0ONaLltIuGvcDIztWsxDbznl8XACONU6FDG6NhljaATTVQtYtpMTm0Y4uW
+WVzR6pLr6/obNWREs/bzpp1JOlnl4cLLmL4psyLdM5fXUE/bwlhkGLWMPGstIfa9
+jeXS2o15/qeAdagVue55fwExHeXnFXZTZfb+8JN9ID3M/5vKslAsGzpp1eZwz6y+
+flwzxG6nAgMBAAECggEBALYw92urjAFVFxCiA8W7aEzYhtAkaztft4R3mD/C19z4
+H0CZDeig+3+RuIactY5xDIu8WHz/EseHVlg0BmxSL5ugu4z8uq8IbNaFoVFw7r7m
+2ieRKFY0ZpXiXcbllynw5iEhMjeRKhWhQmH5Qb2kTTINV5j4xKa+f9Lblx7Y2Uh4
+tsaOtlMwb98D2/KYJdTv5Nj1nyuSqRVhECsd00Cb6JUBGQBx8Ja0wFy9gEygq6kU
+w3s1XNOSnYNEo4FaVZwp5KZyCyBENcKpNUq4nXt/7ncEfVYdJck0Li3wN4Jr2J9S
+eHqRzh8QkHxc1Ro8ktcXaUSs9kFuwvVvb4rcGUpOMWkCgYEA9xxp8yDtFVgzMtc/
+vS8xgM1Wj4SrgKKYhE2wS05BJh/41oFMzfH1FpZ1GCM983r4QgYWoT71XsBgiOMC
+yN2p2IbV4V44bMGKJqaVMkB91CVCUWI6piaCQb/1CJTwaXE7zPim6dlUSxxBBnRn
+LP50NTscRLFcCZELD3Yl7jR8XFUCgYEAwMfkNFmGtBKAwlHZ3Y3XOwPWg+jCll7s
+9nhv8TU2IB9pcCRGqyOT7k1YymvYkDT2Je4JUPWEBs4cW7yD61LrQ8w8+DrE9dGo
+czzGPyjOAANSX0asG74UjkNIQThmyEOltVHIxYMaSqowjHRSPdA+R4Od9EdcDdfS
+q5SfSVFxmwsCgYBtl1thqUOcCL7EGHQ7KdfxgJ+YDMWmyfWMD4xVCYKZLurD7xop
+59nDR7zslIygE/RQC7Uzk+FsQTNO4ibVAIGX9syaI5gwm3DyjURzwehMEq4ju8W4
+9DEmicRZJvysNrzHvasA4RKiMQihnTQ43yyYgvuZd3MTBxF5rPNLfll89QKBgQC9
+SsmiOZIR+OUjaTmS2bbQBNm7Fm8TNcxZyzKn1wb5jb57VbNqUfnskVgxEqpIFyjn
+X48YRqtH/1RLI5UpGXdXUBFB8Hr7oM1VsgQ7ejakPp7AXOWcLA2FDz3AhMAvvnTU
+0KRihHPpgqk/EOy8M2Ej2XHcrcEO+q+quLmbRXRWtwKBgHacQiwci/2J+v0e9i52
+re/2AJHKP5MwNHFe1e01iNc5EEN0G+/Ut8XW19DWf6bsxqie0ChC+xN8TUst8alT
+F+tXTsHHmt/lRcjTROjT5XVuoqjtU2Q0QeVeGLgvObso+fZy3ZNeQuSJjWukdMZ3
+57rGT6p0OuM8qbrTzpv3JMrm
+-----END PRIVATE KEY-----

data/spec/support/certificates/client_key_encrypted.pem

@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,10EC04AAF2B5AC93
+
+o8wl+xljXAiT+wCc0trCSaQ+0vktQXCXDQj2x/pEMwS5+GxhPaQmpQjtc2gsjher
+PGu5rSG0eqIGROv530ZbtdWdMeRRbiDfcVrbjr2hg9MdasV4/7llVCNnZx2NuuuU
+0ToH6a1JtnnPLqocdJfwJu/w+AMpJBCR9im+L4QeVJ0My4nS9VzL214ioxfmKtiS
+/DPRm9NQxIRbOFzPLT4Wp2kaGyq6z4MyW7I16MEIjxNfg7MoojkOosp2ru7QEO5N
+CjlsInC3kJjSimRh479Ba5rnFLY6ekwRkFzbzPNnPz1Mbpv86Btqx8dNERfOGRMd
+JLjLSWbeO6nZmRIBuItChVfpbiVV+3eQvQHIsTFN/pD0hbDmI0FQ8TiEwxe4dNGu
+LGgQwI9BIVT9ZDTahe0182Cb7WS1KA7VrixRV3zm2NSgrP8D9yH6/BlogdRtjCc4
+ktGjZJtqojEAdeYM7qofGhZjq50Pwy2EAyV0UXGwg3MblrobanAq6mezmPRDPFzb
+iEHLK9N5xqddcl8dIhd5vk84MI7Ih7kc7E3MdbRAyWrSPRk+eFqy6Bfuz6JSrHMO
+6Beyfz6dzU5XUCo/feh6qmDEA5COuP1JHE8UhSC8s/wRk94qZdLz2jIglPSJ2Zm7
+VrP1vHIU8rghO4JWE2K3HPAASBacYhfoW6Po+vmxeRttAao9xhFBhM+OjUszh+1w
+YSkv6TXpHZTfE0ai2Sm1yYuB5FuCco1ehPGFLf+a9dSv5xT+3qAqM9pkbYDPDSyS
+RAfSiy/cIzjIfk/a/2A7F56b/clZV3V/DRfgCMdcCHSrjJ/DXmg7s5pCqNh3Y2RM
+Izyb7XAWXQh+VrvrLSFolY6CFTAYq2bnqkMIel1t/MusF8P2Cpf+1YFQOz/KhtqS
+S51JZw4wA8Hq/LOOsmB1BzPl63Yu8rj+hCMN8yEodY1yOwrLX1c6/c+4A6U8JioL
+dya58byVF5Fov+moO5PgkD5QsuHDZpkdQeWjZXtK9ZoG6HG5godFip6hxIrV8LTl
+Fy9TEURPPYfM9Kt3zucL1KOljBu268tBfezqwPLpFVYuIDSUdTHdCBIRJvJwBfrU
+9gZXFik0ZgP2WSlGJbrUTGfCv7EcdPfDS3h6dPfh8Z33Kr9g+yKp2Gxm6ynQi2EU
+T86tMUFaeIZ5VD14ruihlQyazPePYa95FUoVWRnnoxXrCEGo3PU2sL5vXOjr1zr3
+dnZheTNH7UW+O4nLwpZ8WI+IYqIOh6s5Aj9ZQpuPfhgFOOqqwrEbCh88W6q5Qz82
+J2U9ok/RWTgc433tW4xKoN10p6IdF/MxMrPSV+LdVnYf1HBl5I1A/iZRHxdXkJpZ
+KcQ6VAQylmPGHHacxWodn2R9aFxy/LoSDSzivhxE+CDF6Ggr+DwyWPa6dHLP9S0n
+H9PfOPQLIu2uigpQc4GJoAZOljNaYDee/IekJ+vR6vzg09Uc1YDIVWfGmNJpYuVr
+rz383c+sGC3RX2cPyxuzENLo1tGYvjH0Rfvzjfkvali2Tfk3kjha0GhTw7CH7U3L
+5rb5GQj16tDX/Oqa2DluESH3tzDJ7Rgdwda0Dk3iceVEsSHArt6TOz/qa+Ycm/EC
+-----END RSA PRIVATE KEY-----

data/spec/support/crud.rb

@@ -23,11 +23,18 @@
 # @since 2.0.0
 RSpec::Matchers.define :match_collection_data do |test|
 
-  match do |actual|
+  match do
     test.compare_collection_data
   end
 end
 
+RSpec::Matchers.define :match_operation_result do |test|
+
+  match do |actual|
+    test.compare_operation_result(actual)
+  end
+end
+
 require 'support/crud/read'
 require 'support/crud/write'
 
@@ -59,6 +66,31 @@ module Mongo
         @description = File.basename(file)
         @data = @spec['data']
         @crud_tests = @spec['tests']
+        @min_server_version = @spec['minServerVersion']
+        @max_server_version = @spec['maxServerVersion']
+      end
+
+
+      # Whether the test can be run on a given server version.
+      #
+      # @example Can the test run on this server version?
+      #   spec.server_version_satisfied?(client)
+      #
+      # @param [ Mongo::Client ] client The client to check.
+      #
+      # @return [ true, false ] Whether the test can be run on the given
+      #   server version.
+      #
+      # @since 2.4.0
+      def server_version_satisfied?(client)
+        case @min_server_version
+          when '2.6'
+            client.cluster.servers.first.features.write_command_enabled?
+          when '3.4'
+            client.cluster.servers.first.features.collation_enabled?
+          else
+            true
+        end
       end
 
       # Get a list of CRUDTests for each test definition.
@@ -146,6 +178,8 @@ module Mongo
       def compare_collection_data
         if actual_collection_data.nil?
           outcome_collection_data.nil?
+        elsif actual_collection_data.empty?
+          outcome_collection_data.empty?
         else
           actual_collection_data.all? do |doc|
             outcome_collection_data.include?(doc)
@@ -153,41 +187,52 @@ module Mongo
         end
       end
 
-      # Whether this test requires server version >= 2.6 for its results to match
-      # the expected results.
+      # Compare the actual operation result to the expected operation result.
       #
-      # @example If this test requires >= 2.6.
-      #   test.requires_2_6?(collection)
+      # @example Compare the existing and expected operation results.
+      #   test.compare_operation_result(actual_results)
       #
-      # @param [ true, false ] If write commands are enabled on the server.
-      # @param [ Collection ] The collection the test is run on.
+      # @params [ Object ] actual The actual test results.
       #
-      # @return [ true, false ] Whether the test requires server >= 2.6.
+      # @return [ true, false ] The result of comparing the expected and actual operation result.
       #
-      # @since 2.0.0
-      def requires_2_6?(write_command_enabled, collection)
-        !write_command_enabled && @operation.requires_2_6?(collection)
+      # @since 2.4.0
+      def compare_operation_result(actual)
+        if actual.is_a?(Array)
+          actual.empty? || @outcome['result'].each_with_index do |expected, i|
+            compare_result(expected, actual[i])
+          end
+        else
+          compare_result(@outcome['result'], actual)
+        end
       end
 
-      # Whether this operation requires a certain server version to be run.
+      # The expected data in the collection as an outcome after running this test.
       #
-      # @example Determine whether this operation requires a certain server feature.
-      #   operation.feature_enabled?(collection)
+      # @example Get the outcome collection data
+      #   test.outcome_collection_data
       #
-      # @param [ Collection ] collection The collection the operation
-      #   should be executed on.
-      #
-      # @return [ true, false ] Whether this operation requires a certain server version.
+      # @return [ Array<Hash> ] The list of documents expected to be in the collection
+      #   after running this test.
       #
       # @since 2.4.0
-      def feature_enabled?(collection)
-        @operation.feature_enabled?(collection)
+      def outcome_collection_data
+        @outcome['collection']['data'] if @outcome['collection']
       end
 
       private
 
-      def outcome_collection_data
-        @outcome['collection']['data'] if @outcome['collection']
+      def compare_result(expected, actual)
+        case expected
+          when nil
+            actual.nil?
+          when Hash
+            actual.each do |k, v|
+              expected[k] == v
+            end
+          when Integer
+            expected == actual
+        end
       end
 
       def actual_collection_data

data/spec/support/crud/read.rb

@@ -32,6 +32,16 @@ module Mongo
                          :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.
@@ -76,41 +86,6 @@ module Mongo
               pipeline.find {|op| op.keys.include?('$out') })
         end
 
-        # Whether the operation requires server version >= 2.6 for its results to
-        # match expected results.
-        #
-        # @example Whether the operation requires >= 2.6 for its results to match.
-        #   operation.requires_2_6?(collection)
-        #
-        # @param [ Collection ] collection The collection the operation is executed on.
-        #
-        # @return [ true, false ] If the operation requires 2.6 for its results to match.
-        #
-        # @since 2.0.0
-        def requires_2_6?(collection)
-          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)
@@ -130,7 +105,8 @@ module Mongo
         end
 
         def find(collection)
-          collection.find(filter, options.merge(modifiers: BSON::Document.new(modifiers) || {})).to_a
+          opts = modifiers ? options.merge(modifiers: BSON::Document.new(modifiers)) : options
+          (read_preference ? collection.with(read: read_preference) : collection).find(filter, opts).to_a
         end
 
         def options
@@ -166,6 +142,12 @@ 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

@@ -51,14 +51,6 @@ module Mongo
                         :collation => 'collation'
                        }
 
-        # Operations that need a check if results on < 2.6 will match.
-        #
-        # @since 2.0.0
-        REQUIRES_2_6 = ['findOneAndReplace',
-                        'updateMany',
-                        'updateOne',
-                        'replaceOne']
-
         # The operation name.
         #
         # @return [ String ] name The operation name.
@@ -98,42 +90,6 @@ module Mongo
           send(OPERATIONS[name], collection)
         end
 
-        # Whether this operation requires >= 2.6 to be tested.
-        #
-        # @example Determine whether this operation requires >= 2.6.
-        #   operation.requires_2_6?(collection)
-        #
-        # @param [ Collection ] collection The collection the operation
-        #   should be executed on.
-        #
-        # @return [ true, false ] Whether this operation requires 2.6
-        #   to be tested.
-        #
-        # @since 2.0.0
-        def requires_2_6?(collection)
-          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)

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

@@ -0,0 +1,17 @@
+data:
+    - {_id: 1, x: 'ping'}
+minServerVersion: '3.4'
+
+tests:
+    -
+        description: "Aggregate with collation"
+        operation:
+            name: aggregate
+            arguments:
+                pipeline:
+                    - $match:
+                        x: 'PING'
+                collation: { locale: 'en_US', strength: 2 } # https://docs.mongodb.com/master/reference/collation/#collation-document
+        outcome:
+            result:
+                - {_id: 1, x: 'ping'}

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

@@ -0,0 +1,28 @@
+data:
+    - {_id: 1, x: 11}
+    - {_id: 2, x: 22}
+    - {_id: 3, x: 33}
+minServerVersion: '2.6'
+
+tests:
+    -
+        description: "Aggregate with $out"
+        operation:
+            name: aggregate
+            arguments:
+                pipeline:
+                    - $sort: {x: 1}
+                    - $match:
+                        _id: {$gt: 1}
+                    - $out: "other_test_collection"
+                batchSize: 2
+
+        outcome:
+            result:
+                - {_id: 2, x: 22}
+                - {_id: 3, x: 33}
+            collection:
+                name: "other_test_collection"
+                data:
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}

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

@@ -2,7 +2,6 @@ data:
     - {_id: 1, x: 11}
     - {_id: 2, x: 22}
     - {_id: 3, x: 33}
-    - {_id: 4, x: 'ping'}
 
 tests:
     -
@@ -13,43 +12,10 @@ tests:
                 pipeline:
                     - $sort: {x: 1}
                     - $match: 
-                        _id: {$gt: 1, $lt: 4}
+                        _id: {$gt: 1}
                 batchSize: 2
 
         outcome:
             result:
                 - {_id: 2, x: 22}
                 - {_id: 3, x: 33}
-    -
-        description: "Aggregate with $out"
-        operation:
-            name: aggregate
-            arguments:
-                pipeline: 
-                    - $sort: {x: 1}
-                    - $match:
-                        _id: {$gt: 1, $lt: 4}
-                    - $out: "other_test_collection"
-                batchSize: 2
-
-        outcome:
-            result:
-                - {_id: 2, x: 22}
-                - {_id: 3, x: 33}
-            collection:
-                name: "other_test_collection"
-                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'}