mongo 2.6.4 → 2.7.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042b22f1dc8232079d3ac87870ad7176d8e91e001c3fa8c1f7134d32e834d074
-  data.tar.gz: 6be04c908daec1c1f9c7e7b528befb335439d0cd4827ffc1159d293068b43277
+  metadata.gz: b7c12fb78c9acf2bb934f41c5f724627aef8fb8ee758dd6ee394d098b8fe5ce3
+  data.tar.gz: b05bae23e4773266626615c124e0a92647f8ed949f8214bff71386767cc13f1f
 SHA512:
-  metadata.gz: a13035c0dfde9d2b489d0123854b354e5e0dcee4c7971ae34f6c2697b4fe711a719c2b2418ac133de2871b110bdb7d263a1fde6797d43694d22a21d7a9f5f1c1
-  data.tar.gz: c9b11b4938014595764da0617839a663af50856e810923544a636afadfe1707d7d25048c4eca3b16fce89d368952479a05b6383a716019637dc950b43ee431b5
+  metadata.gz: 2ab4a9894e2be7e20656f0cbeab3ba2a7385f51afb25c95586467b91327f65f9a4d3b2f943c7fca5902e6c8126291fb47847712c66b7848c369635ab6ca8dc9a
+  data.tar.gz: c2e12778e9a09268815a58b75e0e8eb58c2eee35ae4f3e6fbc1a622ec8b0d38a45e3ad710f0b2ba601601470d45c35c4dc36bb881ba6216e5e8a6263f44a6b54

data/LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright (C) 2009-2018 MongoDB, Inc.
+   Copyright (C) 2009-2019 MongoDB, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -66,7 +66,7 @@ Full release notes and release history are available [here](https://github.com/m
 License
 -----
 
- Copyright (C) 2009-2018 MongoDB, Inc.
+ Copyright (C) 2009-2019 MongoDB, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/Rakefile

@@ -22,10 +22,17 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   #t.rspec_opts = "--profile 5" if ENV['CI']
 end
 
-task :default => :spec
+task :default => ['spec:prepare', :spec]
 
 namespace :spec do
-  task :ci => [:spec]
+  task :prepare do
+    $: << File.join(File.dirname(__FILE__), 'spec')
+
+    require 'support/spec_setup'
+    SpecSetup.new.run
+  end
+
+  task :ci => ['spec:prepare', :spec]
 end
 
 namespace :release do
@@ -36,15 +43,7 @@ namespace :release do
   end
 end
 
-task :release => ['release:check_private_key', 'release:do'] do
-  puts "Releasing #{Mongo::VERSION}"
-
-  system "git tag -a #{Mongo::VERSION} -m 'Tagging release: #{Mongo::VERSION}'"
-  system "git push --tags"
-  system "gem build mongo.gemspec"
-  system "gem push mongo-#{Mongo::VERSION}.gem"
-  system "rm mongo-#{Mongo::VERSION}.gem"
-end
+task :release => ['release:check_private_key', 'release:do']
 
 desc "Generate all documentation"
 task :docs => 'docs:yard'

data/lib/mongo.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
 require 'forwardable'
 require 'bson'
 require 'openssl'
+require 'mongo/id'
 require 'mongo/bson'
+require 'mongo/semaphore'
 require 'mongo/options'
 require 'mongo/loggable'
 require 'mongo/monitoring'

data/lib/mongo/active_support.rb

@@ -0,0 +1,17 @@
+# Copyright (C) 2019 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.
+
+# Require this file if using the Ruby drver with ActiveSupport.
+
+require "bson/active_support"

data/lib/mongo/address.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -39,6 +39,39 @@ module Mongo
     # @since 2.1.0
     LOCALHOST = 'localhost'.freeze
 
+    # Initialize the address.
+    #
+    # @example Initialize the address with a DNS entry and port.
+    #   Mongo::Address.new("app.example.com:27017")
+    #
+    # @example Initialize the address with a DNS entry and no port.
+    #   Mongo::Address.new("app.example.com")
+    #
+    # @example Initialize the address with an IPV4 address and port.
+    #   Mongo::Address.new("127.0.0.1:27017")
+    #
+    # @example Initialize the address with an IPV4 address and no port.
+    #   Mongo::Address.new("127.0.0.1")
+    #
+    # @example Initialize the address with an IPV6 address and port.
+    #   Mongo::Address.new("[::1]:27017")
+    #
+    # @example Initialize the address with an IPV6 address and no port.
+    #   Mongo::Address.new("[::1]")
+    #
+    # @example Initialize the address with a unix socket.
+    #   Mongo::Address.new("/path/to/socket.sock")
+    #
+    # @param [ String ] seed The provided address.
+    # @param [ Hash ] options The address options.
+    #
+    # @since 2.0.0
+    def initialize(seed, options = {})
+      @seed = seed
+      @host, @port = parse_host_port
+      @options = options
+    end
+
     # @return [ String ] seed The seed address.
     attr_reader :seed
 
@@ -89,39 +122,6 @@ module Mongo
       [ host, port ].hash
     end
 
-    # Initialize the address.
-    #
-    # @example Initialize the address with a DNS entry and port.
-    #   Mongo::Address.new("app.example.com:27017")
-    #
-    # @example Initialize the address with a DNS entry and no port.
-    #   Mongo::Address.new("app.example.com")
-    #
-    # @example Initialize the address with an IPV4 address and port.
-    #   Mongo::Address.new("127.0.0.1:27017")
-    #
-    # @example Initialize the address with an IPV4 address and no port.
-    #   Mongo::Address.new("127.0.0.1")
-    #
-    # @example Initialize the address with an IPV6 address and port.
-    #   Mongo::Address.new("[::1]:27017")
-    #
-    # @example Initialize the address with an IPV6 address and no port.
-    #   Mongo::Address.new("[::1]")
-    #
-    # @example Initialize the address with a unix socket.
-    #   Mongo::Address.new("/path/to/socket.sock")
-    #
-    # @param [ String ] seed The provided address.
-    # @param [ Hash ] options The address options.
-    #
-    # @since 2.0.0
-    def initialize(seed, options = {})
-      @seed = seed
-      @host, @port = parse_host_port
-      @options = options
-    end
-
     # Get a pretty printed address inspection.
     #
     # @example Get the address inspection.
@@ -136,6 +136,12 @@ module Mongo
 
     # Get a socket for the provided address, given the options.
     #
+    # The address the socket connects to is determined by the algorithm described in the
+    # #intialize_resolver! documentation. Each time this method is called, #initialize_resolver!
+    # will be called, meaning that a new hostname lookup will occur. This is done so that any
+    # changes to which addresses the hostname resolves to will be picked up even if a socket has
+    # been connected to it before.
+    #
     # @example Get a socket.
     #   address.socket(5, :ssl => true)
     #
@@ -146,8 +152,7 @@ module Mongo
     #
     # @since 2.0.0
     def socket(socket_timeout, ssl_options = {})
-      @resolver ||= initialize_resolver!(ssl_options)
-      @resolver.socket(socket_timeout, ssl_options)
+      create_resolver(ssl_options).socket(socket_timeout, ssl_options)
     end
 
     # Get the address as a string.
@@ -186,15 +191,18 @@ module Mongo
       @connect_timeout ||= @options[:connect_timeout] || Server::CONNECT_TIMEOUT
     end
 
-    def initialize_resolver!(ssl_options)
+    # To determine which address the socket will connect to, the driver will attempt to connect to
+    # each IP address returned by Socket::getaddrinfo in sequence. Once a successful connection is
+    # made, a resolver with that IP address specified is returned. If no successful connection is
+    # made, the error made by the last connection attempt is raised.
+    def create_resolver(ssl_options)
       return Unix.new(seed.downcase) if seed.downcase =~ Unix::MATCH
 
       family = (host == LOCALHOST) ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
       error = nil
       ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).each do |info|
         begin
-          _host = (host == LOCALHOST) ? info[3] : host
-          res = FAMILY_MAP[info[4]].new(_host, port, host)
+          res = FAMILY_MAP[info[4]].new(info[3], port, host)
           res.socket(connect_timeout, ssl_options).connect!(connect_timeout).close
           return res
         rescue IOError, SystemCallError, Error::SocketTimeoutError, Error::SocketError => e

data/lib/mongo/address/ipv4.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/address/ipv6.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/address/unix.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/auth.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ require 'mongo/auth/stringprep'
 
 module Mongo
 
-  # This namespace contains all authentication related behaviour.
+  # This namespace contains all authentication related behavior.
   #
   # @since 2.0.0
   module Auth
@@ -67,12 +67,7 @@ module Mongo
     def get(user)
       mechanism = user.mechanism
       raise InvalidMechanism.new(mechanism) if !SOURCES.has_key?(mechanism)
-      case SOURCES[mechanism]
-      when SCRAM
-        SOURCES[mechanism].new(user, mechanism)
-      else
-        SOURCES[mechanism].new(user)
-      end
+      SOURCES[mechanism].new(user)
     end
 
     # Raised when trying to get an invalid authorization mechanism.

data/lib/mongo/auth/cr.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB Inc.
+# Copyright (C) 2014-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ require 'mongo/auth/cr/conversation'
 module Mongo
   module Auth
 
-    # Defines behaviour for MongoDB-CR authentication.
+    # Defines behavior for MongoDB-CR authentication.
     #
     # @since 2.0.0
     # @deprecated MONGODB-CR authentication mechanism is deprecated

data/lib/mongo/auth/cr/conversation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB Inc.
+# Copyright (C) 2014-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ module Mongo
   module Auth
     class CR
 
-      # Defines behaviour around a single MONGODB-CR conversation between the
+      # Defines behavior around a single MONGODB-CR conversation between the
       # client and server.
       #
       # @since 2.0.0
@@ -64,7 +64,7 @@ module Mongo
             selector[Protocol::Msg::DATABASE_IDENTIFIER] = user.auth_source
             cluster_time = connection.mongos? && connection.cluster_time
             selector[Operation::CLUSTER_TIME] = cluster_time if cluster_time
-            Protocol::Msg.new([:none], {}, selector)
+            Protocol::Msg.new([], {}, selector)
           else
             Protocol::Query.new(
               user.auth_source,
@@ -105,7 +105,7 @@ module Mongo
             selector = Auth::GET_NONCE.merge(Protocol::Msg::DATABASE_IDENTIFIER => user.auth_source)
             cluster_time = connection.mongos? && connection.cluster_time
             selector[Operation::CLUSTER_TIME] = cluster_time if cluster_time
-            Protocol::Msg.new([:none], {}, selector)
+            Protocol::Msg.new([], {}, selector)
           else
             Protocol::Query.new(
               user.auth_source,

data/lib/mongo/auth/ldap.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB Inc.
+# Copyright (C) 2014-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ require 'mongo/auth/ldap/conversation'
 module Mongo
   module Auth
 
-    # Defines behaviour for LDAP Proxy authentication.
+    # Defines behavior for LDAP Proxy authentication.
     #
     # @since 2.0.0
     class LDAP

data/lib/mongo/auth/ldap/conversation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB Inc.
+# Copyright (C) 2014-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ module Mongo
   module Auth
     class LDAP
 
-      # Defines behaviour around a single PLAIN conversation between the
+      # Defines behavior around a single PLAIN conversation between the
       # client and server.
       #
       # @since 2.0.0
@@ -67,7 +67,7 @@ module Mongo
             selector[Protocol::Msg::DATABASE_IDENTIFIER] = Auth::EXTERNAL
             cluster_time = connection.mongos? && connection.cluster_time
             selector[Operation::CLUSTER_TIME] = cluster_time if cluster_time
-            Protocol::Msg.new([:none], {}, selector)
+            Protocol::Msg.new([], {}, selector)
           else
             Protocol::Query.new(
               Auth::EXTERNAL,

data/lib/mongo/auth/roles.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/auth/scram.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB Inc.
+# Copyright (C) 2014-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ require 'mongo/auth/scram/conversation'
 module Mongo
   module Auth
 
-    # Defines behaviour for SCRAM authentication.
+    # Defines behavior for SCRAM authentication.
     #
     # @since 2.0.0
     class SCRAM

data/lib/mongo/auth/scram/conversation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB Inc.
+# Copyright (C) 2014-2019 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ module Mongo
   module Auth
     class SCRAM
 
-      # Defines behaviour around a single SCRAM-SHA-1 conversation between the
+      # Defines behavior around a single SCRAM-SHA-1 conversation between the
       # client and server.
       #
       # @since 2.0.0
@@ -125,7 +125,7 @@ module Mongo
             selector[Protocol::Msg::DATABASE_IDENTIFIER] = user.auth_source
             cluster_time = connection.mongos? && connection.cluster_time
             selector[Operation::CLUSTER_TIME] = cluster_time if cluster_time
-            Protocol::Msg.new([:none], {}, selector)
+            Protocol::Msg.new([], {}, selector)
           else
             Protocol::Query.new(
               user.auth_source,
@@ -156,7 +156,7 @@ module Mongo
             selector[Protocol::Msg::DATABASE_IDENTIFIER] = user.auth_source
             cluster_time = connection.mongos? && connection.cluster_time
             selector[Operation::CLUSTER_TIME] = cluster_time if cluster_time
-            Protocol::Msg.new([:none], {}, selector)
+            Protocol::Msg.new([], {}, selector)
           else
             Protocol::Query.new(
               user.auth_source,
@@ -184,7 +184,7 @@ module Mongo
             selector[Protocol::Msg::DATABASE_IDENTIFIER] = user.auth_source
             cluster_time = connection.mongos? && connection.cluster_time
             selector[Operation::CLUSTER_TIME] = cluster_time if cluster_time
-            Protocol::Msg.new([:none], {}, selector)
+            Protocol::Msg.new([], {}, selector)
           else
             Protocol::Query.new(
               user.auth_source,

data/lib/mongo/auth/stringprep.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/auth/stringprep/profiles/sasl.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018 MongoDB, Inc.
+# Copyright (C) 2018-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.