mongo 2.0.6 → 2.1.0

data/spec/support/connection_string_tests/valid-host_identifiers.yml

@@ -0,0 +1,121 @@
+tests:
+    -
+        description: "Single IPv4 host without port"
+        uri: "mongodb://127.0.0.1"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ipv4"
+                host: "127.0.0.1"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Single IPv4 host with port"
+        uri: "mongodb://127.0.0.1:27018"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ipv4"
+                host: "127.0.0.1"
+                port: 27018
+        auth: ~
+        options: ~
+    -
+        description: "Single IP literal host without port"
+        uri: "mongodb://[::1]"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ip_literal"
+                host: "::1"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Single IP literal host with port"
+        uri: "mongodb://[::1]:27019"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ip_literal"
+                host: "::1"
+                port: 27019
+        auth: ~
+        options: ~
+    -
+        description: "Single hostname without port"
+        uri: "mongodb://example.com"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Single hostname with port"
+        uri: "mongodb://example.com:27020"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: 27020
+        auth: ~
+        options: ~
+    -
+        description: "Single hostname (resembling IPv4) without port"
+        uri: "mongodb://256.0.0.1"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "256.0.0.1"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple hosts (mixed formats)"
+        uri: "mongodb://127.0.0.1,[::1]:27018,example.com:27019"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ipv4"
+                host: "127.0.0.1"
+                port: ~
+            -
+                type: "ip_literal"
+                host: "::1"
+                port: 27018
+            -
+                type: "hostname"
+                host: "example.com"
+                port: 27019
+        auth: ~
+        options: ~
+    -
+        description: "UTF-8 hosts"
+        uri: "mongodb://bücher.example.com,umläut.example.com/"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "bücher.example.com"
+                port: ~
+            -
+                type: "hostname"
+                host: "umläut.example.com"
+                port: ~
+        auth: ~
+        options: ~

data/spec/support/connection_string_tests/valid-options.yml

@@ -0,0 +1,30 @@
+tests:
+    -
+        description: "Option names are normalized to lowercase"
+        uri: "mongodb://alice:secret@example.com/admin?AUTHMechanism=MONGODB-CR"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth:
+            username: "alice"
+            password: "secret"
+            db: "admin"
+        options:
+            authmechanism: "MONGODB-CR"
+    -
+        description: "Option key and value (escaped null bytes)"
+        uri: "mongodb://example.com/?replicaSet=my%00rs"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options:
+            replicaset: "my\0rs"

data/spec/support/connection_string_tests/valid-unix_socket-absolute.yml

@@ -0,0 +1,197 @@
+tests:
+    -
+        description: "Unix domain socket (absolute path with trailing slash)"
+        uri: "mongodb://%2Ftmp%2Fmongodb-27017.sock/"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket (absolute path without trailing slash)"
+        uri: "mongodb://%2Ftmp%2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket (absolute path with spaces in path)"
+        uri: "mongodb://%2Ftmp%2F %2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/ /mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple Unix domain sockets (absolute paths)"
+        uri: "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27018.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple hosts (absolute path and ipv4)"
+        uri: "mongodb://127.0.0.1:27017,%2Ftmp%2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ipv4"
+                host: "127.0.0.1"
+                port: 27017
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple hosts (absolute path and hostname resembling relative path)"
+        uri: "mongodb://mongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27018.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket with auth database (absolute path)"
+        uri: "mongodb://alice:foo@%2Ftmp%2Fmongodb-27017.sock/admin"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+        auth:
+            username: "alice"
+            password: "foo"
+            db: "admin"
+        options: ~
+    -
+        description: "Unix domain socket with path resembling socket file (absolute path with trailing slash)"
+        uri: "mongodb://%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock/"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/path.to.sock/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket with path resembling socket file (absolute path without trailing slash)"
+        uri: "mongodb://%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/path.to.sock/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket with path resembling socket file and auth (absolute path)"
+        uri: "mongodb://bob:bar@%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock/admin"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/path.to.sock/mongodb-27017.sock"
+                port: ~
+        auth:
+            username: "bob"
+            password: "bar"
+            db: "admin"
+        options: ~
+    -
+        description: "Multiple Unix domain sockets and auth DB resembling a socket (absolute path)"
+        uri: "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27018.sock"
+                port: ~
+        auth:
+            username: ~
+            password: ~
+            db: "admin.sock"
+        options: ~
+    -
+        description: "Multiple Unix domain sockets with auth DB resembling a path (absolute path)"
+        uri: "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin.shoe"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27018.sock"
+                port: ~
+        auth:
+            username: ~
+            password: ~
+            db: "admin.shoe"
+        options: ~
+    -
+        description: "Multiple Unix domain sockets with auth and query string (absolute path)"
+        uri: "mongodb://bob:bar@%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin?w=1"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27018.sock"
+                port: ~
+        auth:
+            username: "bob"
+            password: "bar"
+            db: "admin"
+        options:
+            w: 1

data/spec/support/connection_string_tests/valid-unix_socket-relative.yml

@@ -0,0 +1,213 @@
+tests:
+    -
+        description: "Unix domain socket (relative path with trailing slash)"
+        uri: "mongodb://rel%2Fmongodb-27017.sock/"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket (relative path without trailing slash)"
+        uri: "mongodb://rel%2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket (relative path with spaces)"
+        uri: "mongodb://rel%2F %2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/ /mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple Unix domain sockets (relative paths)"
+        uri: "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "rel/mongodb-27018.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple Unix domain sockets (relative and absolute paths)"
+        uri: "mongodb://rel%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "/tmp/mongodb-27018.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple hosts (relative path and ipv4)"
+        uri: "mongodb://127.0.0.1:27017,rel%2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ipv4"
+                host: "127.0.0.1"
+                port: 27017
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Multiple hosts (relative path and hostname resembling relative path)"
+        uri: "mongodb://mongodb-27017.sock,rel%2Fmongodb-27018.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "rel/mongodb-27018.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket with auth database (relative path)"
+        uri: "mongodb://alice:foo@rel%2Fmongodb-27017.sock/admin"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+        auth:
+            username: "alice"
+            password: "foo"
+            db: "admin"
+        options: ~
+    -
+        description: "Unix domain socket with path resembling socket file (relative path with trailing slash)"
+        uri: "mongodb://rel%2Fpath.to.sock%2Fmongodb-27017.sock/"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/path.to.sock/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket with path resembling socket file (relative path without trailing slash)"
+        uri: "mongodb://rel%2Fpath.to.sock%2Fmongodb-27017.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/path.to.sock/mongodb-27017.sock"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Unix domain socket with path resembling socket file and auth (relative path)"
+        uri: "mongodb://bob:bar@rel%2Fpath.to.sock%2Fmongodb-27017.sock/admin"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/path.to.sock/mongodb-27017.sock"
+                port: ~
+        auth:
+            username: "bob"
+            password: "bar"
+            db: "admin"
+        options: ~
+    -
+        description: "Multiple Unix domain sockets and auth DB resembling a socket (relative path)"
+        uri: "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin.sock"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "rel/mongodb-27018.sock"
+                port: ~
+        auth:
+            username: ~
+            password: ~
+            db: "admin.sock"
+        options: ~
+    -
+        description: "Multiple Unix domain sockets with auth DB resembling a path (relative path)"
+        uri: "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin.shoe"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "rel/mongodb-27018.sock"
+                port: ~
+        auth:
+            username: ~
+            password: ~
+            db: "admin.shoe"
+        options: ~
+    -
+        description: "Multiple Unix domain sockets with auth and query string (relative path)"
+        uri: "mongodb://bob:bar@rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin?w=1"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "unix"
+                host: "rel/mongodb-27017.sock"
+                port: ~
+            -
+                type: "unix"
+                host: "rel/mongodb-27018.sock"
+                port: ~
+        auth:
+            username: "bob"
+            password: "bar"
+            db: "admin"
+        options:
+            w: 1

data/spec/support/connection_string_tests/valid-warnings.yml

@@ -0,0 +1,55 @@
+tests:
+    -
+        description: "Unrecognized option keys are ignored"
+        uri: "mongodb://example.com/?foo=bar"
+        valid: true
+        warning: true
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options: ~
+#
+# A Mongo::Client doesn't validate option values when initialized so the uri doesn't either.
+#    -
+#        description: "Unsupported option values are ignored"
+#        uri: "mongodb://example.com/?fsync=ifPossible"
+#        valid: true
+#        warning: true
+#        hosts:
+#            -
+#                type: "hostname"
+#                host: "example.com"
+#                port: ~
+#        auth: ~
+#        options: ~
+#    -
+        description: "Repeated option keys"
+        uri: "mongodb://example.com/?replicaSet=test&replicaSet=test"
+        valid: true
+        warning: true
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options:
+            replicaset: "test"
+#
+# Change this test in the future if there is a deprecated option in driver 2.0
+#    -
+#        description: "Deprecated (or unknown) options are ignored if replacement exists"
+#        uri: "mongodb://example.com/?wtimeout=5&wtimeoutMS=10"
+#        valid: true
+#        warning: true
+#        hosts:
+#            -
+#                type: "hostname"
+#                host: "example.com"
+#                port: ~
+#        auth: ~
+#        options:
+#            wtimeoutms: 10

data/spec/support/crud/read.rb

@@ -27,7 +27,7 @@ module Mongo
         # @since 2.0.0
         ARGUMENT_MAP = { :sort => 'sort',
                          :skip => 'skip',
-                         :batch_size => 'batch_size',
+                         :batch_size => 'batchSize',
                          :limit => 'limit'
                        }
 
@@ -37,7 +37,7 @@ module Mongo
         #
         # @since 2.0.0
         attr_reader :name
-  
+
         # Instantiate the operation.
         #
         # @return [ Hash ] spec The operation spec.
@@ -91,34 +91,33 @@ module Mongo
         end
 
         private
-  
+
         def count(collection)
-          view = collection.find(filter)
           options = ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
             opts.merge!(key => arguments[value]) if arguments[value]
             opts
           end
-          view.count(options)
+          collection.count(filter, options)
         end
-  
+
         def aggregate(collection)
-          collection.find.tap do |view|
-            view = view.batch_size(batch_size) if batch_size
-          end.aggregate(pipeline).to_a
+          collection.aggregate(pipeline, options).to_a
         end
-  
+
         def distinct(collection)
-          collection.find(filter).distinct(field_name)
+          collection.distinct(field_name, filter, options)
         end
-  
+
         def find(collection)
-          view = collection.find(filter)
-          ARGUMENT_MAP.each do |key, value|
-            view = view.send(key, arguments[value]) if arguments[value]
+          collection.find(filter, options.merge(modifiers: BSON::Document.new(modifiers) || {})).to_a
+        end
+
+        def options
+          ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
+            arguments[value] ? opts.merge!(key => arguments[value]) : opts
           end
-          view.to_a
         end
-  
+
         def batch_size
           arguments['batchSize']
         end
@@ -126,11 +125,15 @@ module Mongo
         def filter
           arguments['filter']
         end
-  
+
         def pipeline
           arguments['pipeline']
         end
 
+        def modifiers
+          arguments['modifiers']
+        end
+
         def field_name
           arguments['fieldName']
         end
@@ -141,4 +144,4 @@ module Mongo
       end
     end
   end
-end
+end