mongo 2.1.0.beta → 2.1.0.rc0

data/spec/support/command_monitoring/insertOne.yml

@@ -0,0 +1,51 @@
+data:
+  - { _id: 1, x: 11 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful insert one"
+    operation:
+      name: "insertOne"
+      arguments:
+        document: { _id: 2, x: 22 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 2, x: 22 }
+            ordered: true
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "insert"
+  -
+    description: "A successful insert one command with write errors"
+    operation:
+      name: "insertOne"
+      arguments:
+        document: { _id: 1, x: 11 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 1, x: 11 }
+            ordered: true
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "insert"

data/spec/support/command_monitoring/updateMany.yml

@@ -0,0 +1,67 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful update many"
+    operation:
+      name: "updateMany"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+        update:
+          $inc: { x: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            ordered: true
+            updates:
+              -
+                q: { _id: { $gt: 1 }}
+                u: { $inc: { x: 1 }}
+                multi: true
+                upsert: false
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 2 }
+          command_name: "update"
+  -
+    description: "A successful update many command with write errors"
+    operation:
+      name: "updateMany"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+        update:
+          $nothing: { x: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            ordered: true
+            updates:
+              -
+                q: { _id: { $gt: 1 }}
+                u: { $nothing: { x: 1 }}
+                multi: true
+                upsert: false
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "update"

data/spec/support/command_monitoring/updateOne.yml

@@ -0,0 +1,95 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful update one"
+    operation:
+      name: "updateOne"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+        update:
+          $inc: { x: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            ordered: true
+            updates:
+              -
+                q: { _id: { $gt: 1 }}
+                u: { $inc: { x: 1 }}
+                multi: false
+                upsert: false
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "update"
+  -
+    description: "A successful update one with upsert when the upserted id is not an object id"
+    operation:
+      name: "updateOne"
+      arguments:
+        filter:
+          _id: 4
+        update:
+          $inc: { x: 1 }
+        upsert: true
+    expectations:
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            ordered: true
+            updates:
+              -
+                q: { _id: 4 }
+                u: { $inc: { x: 1 } }
+                multi: false
+                upsert: true
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1, upserted: [{ index: 0, _id: 4 }] }
+          command_name: "update"
+  -
+    description: "A successful update one command with write errors"
+    operation:
+      name: "updateOne"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+        update:
+          $nothing: { x: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            ordered: true
+            updates:
+              -
+                q: { _id: { $gt: 1 }}
+                u: { $nothing: { x: 1 }}
+                multi: false
+                upsert: false
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "update"

data/spec/support/connection_string.rb

@@ -0,0 +1,228 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+RSpec::Matchers.define :have_hosts do |test|
+
+  match do |client|
+
+    def find_server(client, host)
+      client.cluster.instance_variable_get(:@servers).detect do |s|
+        s.address.host == host.host
+      end
+    end
+
+    def match_host?(server, host)
+      server.address.host == host.host
+    end
+
+    def match_port?(server, host)
+      server.address.port == host.port || !host.port
+    end
+
+    def match_address_family?(server, host)
+      address_family(server) == host.address_family
+    end
+
+    def address_family(server)
+      server.address.socket(2)
+      server.address.instance_variable_get(:@resolver).class
+    end
+
+    test.hosts.all? do |host|
+      server = find_server(client, host)
+      match_host?(server, host) &&
+          match_port?(server, host) if server #&&
+          #match_address_family?(server, host) if server
+    end
+
+    failure_message do |client|
+      "With URI: #{test.uri_string}\n" +
+          "Expected that test hosts: #{test.hosts} would match " +
+          "client hosts: #{client.cluster.instance_variable_get(:@servers)}"
+    end
+  end
+end
+
+RSpec::Matchers.define :match_auth do |test|
+
+  def match_database?(client, auth)
+    client.options[:database] == auth.database || !auth.database
+  end
+
+  def match_password?(client, auth)
+    client.options[:password] == auth.password ||
+      client.options[:password].nil? && auth.password == ''
+  end
+
+  match do |client|
+    auth = test.auth
+    return true unless auth
+    client.options[:user] == auth.username &&
+      match_password?(client, auth) &&
+        match_database?(client, auth)
+  end
+
+  failure_message do |client|
+    "With URI: #{test.uri_string}\n" +
+        "Expected that test auth: #{test.auth} would match client auth: #{client.options}"
+  end
+end
+
+RSpec::Matchers.define :match_options do |test|
+
+  match do |client|
+    options = test.options
+    return true unless options
+    options.match?(client.options)
+  end
+
+  failure_message do |client|
+    "With URI: #{test.uri_string}\n" +
+      "Expected that test options: #{test.options.options} would match client options: #{client.options}"
+  end
+end
+
+module Mongo
+  module ConnectionString
+
+    class Spec
+
+      attr_reader :description
+
+      # Instantiate the new spec.
+      #
+      # @example Create the spec.
+      #   Spec.new(file)
+      #
+      # @param [ String ] file The name of the file.
+      #
+      # @since 2.0.0
+      def initialize(file)
+        file = File.new(file)
+        @spec = YAML.load(ERB.new(file.read).result)
+        file.close
+        @description = File.basename(file)
+      end
+
+      def tests
+        @tests ||= @spec['tests'].collect do |spec|
+          Test.new(spec)
+        end
+      end
+    end
+
+    class Test
+
+      attr_reader :description
+      attr_reader :uri_string
+
+      def initialize(spec)
+        @spec = spec
+        @description = @spec['description']
+        @uri_string = @spec['uri']
+      end
+
+      def valid?
+        @spec['valid']
+      end
+
+      def warn?
+        @spec['warning']
+      end
+
+      def hosts
+        @hosts ||= @spec['hosts'].collect do |host|
+          Host.new(host)
+        end
+      end
+
+      def options
+        @options ||= Options.new(@spec['options']) if @spec['options']
+      end
+
+      def client
+        @client ||= Mongo::Client.new(@spec['uri'])
+      end
+
+      def uri
+        @uri ||= Mongo::URI.new(@spec['uri'])
+      end
+
+      def auth
+        @auth ||= Auth.new(@spec['auth']) if @spec['auth']
+      end
+    end
+
+    class Host
+
+      MAPPING = {
+          'ipv4' => Mongo::Address::IPv4,
+          'ipv6' => Mongo::Address::IPv6,
+          'unix' => Mongo::Address::Unix
+      }
+
+      attr_reader :host
+      attr_reader :port
+
+      def initialize(spec)
+        @spec = spec
+        @host = @spec['host']
+        @port = @spec['port']
+      end
+
+      def address_family
+        MAPPING[@spec['type']]
+      end
+    end
+
+    class Auth
+
+      attr_reader :username
+      attr_reader :password
+      attr_reader :database
+
+      def initialize(spec)
+        @spec = spec
+        @username = @spec['username']
+        @password = @spec['password']
+        @database = @spec['db']
+      end
+
+      def to_s
+        "username: #{username}, password: #{password}, database: #{database}"
+      end
+    end
+
+    class Options
+
+      MAPPINGS = {
+          'replicaset' => :replica_set,
+          'authmechanism' => :auth_mech
+      }
+
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
+      end
+
+      def match?(opts)
+        @options.keys.all? do |k|
+          opts[MAPPINGS[k]] == @options[k] ||
+              Mongo::URI::AUTH_MECH_MAP[@options[k]] == opts[MAPPINGS[k]]
+        end
+      end
+    end
+  end
+end

data/spec/support/connection_string_tests/invalid-uris.yml

@@ -0,0 +1,193 @@
+tests:
+    -
+        description: "Empty string"
+        uri: ""
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid scheme"
+        uri: "mongo://localhost:27017"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Missing host"
+        uri: "mongodb://"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Double colon in host identifier"
+        uri: "mongodb://localhost::27017"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Double colon in host identifier and trailing slash"
+        uri: "mongodb://localhost::27017/"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Double colon in host identifier with missing host and port"
+        uri: "mongodb://::"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Double colon in host identifier with missing port"
+        uri: "mongodb://localhost,localhost::"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Double colon in host identifier and second host"
+        uri: "mongodb://localhost::27017,abc"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (negative number) with hostname"
+        uri: "mongodb://localhost:-1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (zero) with hostname"
+        uri: "mongodb://localhost:0/"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (positive number) with hostname"
+        uri: "mongodb://localhost:65536"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (positive number) with hostname and trailing slash"
+        uri: "mongodb://localhost:65536/"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (non-numeric string) with hostname"
+        uri: "mongodb://localhost:foo"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (negative number) with IP literal"
+        uri: "mongodb://[::1]:-1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (zero) with IP literal"
+        uri: "mongodb://[::1]:0/"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (positive number) with IP literal"
+        uri: "mongodb://[::1]:65536"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (positive number) with IP literal and trailing slash"
+        uri: "mongodb://[::1]:65536/"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Invalid port (non-numeric string) with IP literal"
+        uri: "mongodb://[::1]:foo"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Missing delimiting slash between hosts and options"
+        uri: "mongodb://example.com?w=1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Incomplete key value pair for option"
+        uri: "mongodb://example.com/?w"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Username with password containing an unescaped colon"
+        uri: "mongodb://alice:foo:bar@127.0.0.1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Username containing an unescaped at-sign"
+        uri: "mongodb://alice@@127.0.0.1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Username with password containing an unescaped at-sign"
+        uri: "mongodb://alice@foo:bar@127.0.0.1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Host with unescaped slash"
+        uri: "mongodb:///tmp/mongodb-27017.sock/"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~