mongo 2.1.0.beta → 2.1.0.rc0

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.rb

@@ -53,7 +53,9 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(file)
-        @spec = YAML.load(ERB.new(File.new(file).read).result)
+        file = File.new(file)
+        @spec = YAML.load(ERB.new(file.read).result)
+        file.close
         @description = File.basename(file)
         @data = @spec['data']
         @crud_tests = @spec['tests']

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,7 +91,7 @@ module Mongo
         end
 
         private
-  
+
         def count(collection)
           options = ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
             opts.merge!(key => arguments[value]) if arguments[value]
@@ -99,17 +99,17 @@ module Mongo
           end
           collection.count(filter, options)
         end
-  
+
         def aggregate(collection)
           collection.aggregate(pipeline, options).to_a
         end
-  
+
         def distinct(collection)
           collection.distinct(field_name, filter, options)
         end
-  
+
         def find(collection)
-          collection.find(filter, options).to_a
+          collection.find(filter, options.merge(modifiers: BSON::Document.new(modifiers) || {})).to_a
         end
 
         def options
@@ -117,7 +117,7 @@ module Mongo
             arguments[value] ? opts.merge!(key => arguments[value]) : opts
           end
         end
-  
+
         def batch_size
           arguments['batchSize']
         end
@@ -125,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
@@ -140,4 +144,4 @@ module Mongo
       end
     end
   end
-end
+end

data/spec/support/crud/write.rb

@@ -21,7 +21,7 @@ module Mongo
       #
       # @since 2.0.0
       class Write
-  
+
         # Map of CRUD operation names to method names.
         #
         # @since 2.0.0
@@ -34,7 +34,8 @@ module Mongo
                        'updateOne' => :update_one,
                        'findOneAndDelete' => :find_one_and_delete,
                        'findOneAndReplace' => :find_one_and_replace,
-                       'findOneAndUpdate' => :find_one_and_update
+                       'findOneAndUpdate' => :find_one_and_update,
+                       'bulkWrite' => :bulk_write
                      }
 
         # Map of operation options to method names.
@@ -44,7 +45,9 @@ module Mongo
                         :sort => 'sort',
                         :projection => 'projection',
                         :return_document => 'returnDocument',
-                        :upsert => 'upsert'
+                        :upsert => 'upsert',
+                        :ordered => 'ordered',
+                        :write_concern => 'writeConcern'
                        }
 
         # Operations that need a check if results on < 2.6 will match.
@@ -54,7 +57,7 @@ module Mongo
                         'updateMany',
                         'updateOne',
                         'replaceOne']
-  
+
         # The operation name.
         #
         # @return [ String ] name The operation name.
@@ -109,9 +112,13 @@ module Mongo
         def requires_2_6?(collection)
           REQUIRES_2_6.include?(name) && upsert
         end
-  
+
         private
-  
+
+        def bulk_write(collection)
+          collection.bulk_write(requests, options)
+        end
+
         def delete_many(collection)
           result = collection.delete_many(filter)
           { 'deletedCount' => result.deleted_count }
@@ -123,7 +130,7 @@ module Mongo
         end
 
         def insert_many(collection)
-          result = collection.insert_many(documents)
+          result = collection.insert_many(documents, options)
           { 'insertedIds' => result.inserted_ids }
         end
 
@@ -167,7 +174,7 @@ module Mongo
 
         def options
           ARGUMENT_MAP.reduce({}) do |opts, (key, value)|
-            arguments[value] ? opts.merge!(key => send(key)) : opts
+            arguments.key?(value) ? opts.merge!(key => send(key)) : opts
           end
         end
 
@@ -191,10 +198,30 @@ module Mongo
           arguments['document']
         end
 
+        def write_concern
+          arguments['writeConcern']
+        end
+
+        def ordered
+          arguments['ordered']
+        end
+
         def filter
           arguments['filter']
         end
 
+        def requests
+          arguments['requests'].map do |request|
+            case request.keys.first
+            when 'insertOne' then
+              { insert_one: request['insertOne']['document'] }
+            when 'updateOne' then
+              update = request['updateOne']
+              { update_one: { filter: update['filter'], update: update['update'] }}
+            end
+          end
+        end
+
         def upsert
           arguments['upsert']
         end
@@ -213,4 +240,4 @@ module Mongo
       end
     end
   end
-end
+end