mongo 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38363c98850f8cb9f7ef56552faf0b6bbaf88e6
-  data.tar.gz: 9bb3295506cf0fdd420a7232283982145824cb11
+  metadata.gz: 009aca6194505e854c2e8ce72b50826c76b81942
+  data.tar.gz: ec9fa507bafe9c3f79ce430bee77bee9fa6452c3
 SHA512:
-  metadata.gz: 391cb75664da5c1d1f24a8b61b59703b2767c60c221c601342bf2597096af1a828b1eaec2402e91e5e512e251f64534a31dcc73103062cc111f6247137953edf
-  data.tar.gz: fe3b98b0be277225dbe52ca0a39a8bc3e31e80eff077041bf87d7327d9adfba697a8ed6b8333637dd5c6b887b7599b893b15ebfbf347af90cfdcae97582682c1
+  metadata.gz: ac666b6d3593018bf29f22a212bcf36a1b0dff88e9aee3e439c3f599bff14c90b8e2507355b10cc40e4426a7135313fa161d78fdc853ac4c094acfa9122d2c2c
+  data.tar.gz: 0ff89ae3bc0661a5a39e067a0c96d7a044b291333f314dd6dbd89e8bb7c6d2f4f95ba894785d784acc8126f66896b0505900d56b39c77c5e1a4ac66f8f43f0ca

data/lib/mongo/address.rb

@@ -148,7 +148,7 @@ module Mongo
       error = nil
       ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).detect do |info|
         begin
-          return FAMILY_MAP[info[4]].new(info[3], port).tap do |res|
+          return FAMILY_MAP[info[4]].new(info[3], port, host).tap do |res|
             res.socket(timeout, ssl_options).connect!
           end
         rescue IOError, SystemCallError => e

data/lib/mongo/address/ipv4.rb

@@ -21,9 +21,12 @@ module Mongo
     # @since 2.0.0
     class IPv4
 
-      # @return [ String ] host The original host name.
+      # @return [ String ] host The host.
       attr_reader :host
 
+      # @return [ String ] host_name The original host name.
+      attr_reader :host_name
+
       # @return [ Integer ] port The port.
       attr_reader :port
 
@@ -52,15 +55,16 @@ module Mongo
       # Initialize the IPv4 resolver.
       #
       # @example Initialize the resolver.
-      #   IPv4.new("127.0.0.1", 27017, "127.0.0.1:28011")
+      #   IPv4.new("127.0.0.1", 27017, 'localhost')
       #
       # @param [ String ] host The host.
       # @param [ Integer ] port The port.
       #
       # @since 2.0.0
-      def initialize(host, port)
+      def initialize(host, port, host_name=nil)
         @host = host
         @port = port
+        @host_name = host_name
       end
 
       # Get a socket for the provided address type, given the options.
@@ -76,7 +80,7 @@ module Mongo
       # @since 2.0.0
       def socket(timeout, ssl_options = {})
         unless ssl_options.empty?
-          Socket::SSL.new(host, port, timeout, Socket::PF_INET, ssl_options)
+          Socket::SSL.new(host, port, host_name, timeout, Socket::PF_INET, ssl_options)
         else
           Socket::TCP.new(host, port, timeout, Socket::PF_INET)
         end

data/lib/mongo/address/ipv6.rb

@@ -21,9 +21,12 @@ module Mongo
     # @since 2.0.0
     class IPv6
 
-      # @return [ String ] host The original host name.
+      # @return [ String ] host The host.
       attr_reader :host
 
+      # @return [ String ] host_name The original host name.
+      attr_reader :host_name
+
       # @return [ Integer ] port The port.
       attr_reader :port
 
@@ -52,15 +55,16 @@ module Mongo
       # Initialize the IPv6 resolver.
       #
       # @example Initialize the resolver.
-      #   IPv6.new("::1", 28011, "[::1]:28011")
+      #   IPv6.new("::1", 28011, 'localhost')
       #
       # @param [ String ] host The host.
       # @param [ Integer ] port The port.
       #
       # @since 2.0.0
-      def initialize(host, port)
+      def initialize(host, port, host_name=nil)
         @host = host
         @port = port
+        @host_name = host_name
       end
 
       # Get a socket for the provided address type, given the options.
@@ -76,7 +80,7 @@ module Mongo
       # @since 2.0.0
       def socket(timeout, ssl_options = {})
         unless ssl_options.empty?
-          Socket::SSL.new(host, port, timeout, Socket::PF_INET6, ssl_options)
+          Socket::SSL.new(host, port, host_name, timeout, Socket::PF_INET6, ssl_options)
         else
           Socket::TCP.new(host, port, timeout, Socket::PF_INET6)
         end

data/lib/mongo/address/unix.rb

@@ -20,7 +20,7 @@ module Mongo
     # @since 2.0.0
     class Unix
 
-      # @return [ String ] host The original host name.
+      # @return [ String ] host The host.
       attr_reader :host
 
       # @return [ nil ] port Will always be nil.
@@ -53,7 +53,7 @@ module Mongo
       # @param [ String ] host The host.
       #
       # @since 2.0.0
-      def initialize(host)
+      def initialize(host, port=nil, host_name=nil)
         @host = host
       end
 

data/lib/mongo/auth/user/view.rb

@@ -88,7 +88,11 @@ module Mongo
         #
         # @since 2.0.0
         def update(user_or_name, options = {})
-
+          user = generate(user_or_name, options)
+          Operation::Write::UpdateUser.new(
+              user: user,
+              db_name: database.name
+          ).execute(next_primary.context)
         end
 
         private

data/lib/mongo/bulk_write/bulk_writable.rb

@@ -85,6 +85,11 @@ module Mongo
 
       private
 
+      def valid_doc?(doc)
+        doc.respond_to?(:keys) ||
+          doc.respond_to?(:document)
+      end
+
       def write_concern
         @write_concern ||= WriteConcern.get(@options[:write_concern]) ||
                             @collection.write_concern

data/lib/mongo/bulk_write/deletable.rb

@@ -22,10 +22,6 @@ module Mongo
 
       private
 
-      def valid_doc?(doc)
-        doc.respond_to?(:keys)
-      end
-
       def validate_delete_op!(type, d)
         raise Error::InvalidBulkOperation.new(type, d) unless valid_doc?(d)
       end

data/lib/mongo/bulk_write/insertable.rb

@@ -22,10 +22,6 @@ module Mongo
 
       private
 
-      def valid_doc?(doc)
-        doc.respond_to?(:keys)
-      end
-
       def validate_insert_ops!(type, inserts)
         if inserts.empty?
           raise Error::InvalidBulkOperation.new(type, inserts)

data/lib/mongo/client.rb

@@ -111,8 +111,10 @@ module Mongo
     #   seconds, in the connection pool for a connection to be checked in.
     # @option options [ Float ] :connect_timeout The timeout, in seconds, to
     #   attempt a connection.
-    # @option options [ Symbol ] :read The read preference options. :mode can
-    #   be one of :secondary, :secondary_preferred, :primary,
+    # @option options [ Hash ] :read The read preference options. They consist of a
+    #   mode specified as a symbol, an array of hashes known as tag_sets,
+    #   and two timing options: local_threshold and server_selection_timeout.
+    #   :mode can be one of :secondary, :secondary_preferred, :primary,
     #   :primary_preferred, :nearest.
     # @option options [ Array<Hash, String> ] :roles The list of roles for the
     #   user.
@@ -221,6 +223,32 @@ module Mongo
       @write_concern ||= WriteConcern.get(options[:write])
     end
 
+    # Get the names of all databases.
+    #
+    # @example Get the database names.
+    #   client.database_names
+    #
+    # @return [ Array<String> ] The names of the databases.
+    #
+    # @since 2.0.5
+    def database_names
+      list_databases.collect{ |info| info['name'] }
+    end
+
+    # Get info for each database.
+    #
+    # @example Get the info for each database.
+    #   client.list_databases
+    #
+    # @return [ Array<Hash> ] The info for each database.
+    #
+    # @since 2.0.5
+    def list_databases
+      use(Database::ADMIN).command(
+        listDatabases: 1
+      ).first['databases']
+    end
+
     private
 
     def create_from_addresses(addresses, opts = {})

data/lib/mongo/collection/view/aggregation.rb

@@ -69,16 +69,29 @@ module Mongo
           @options = options.dup
         end
 
+        # Get the explain plan for the aggregation.
+        #
+        # @example Get the explain plan for the aggregation.
+        #   aggregation.explain
+        #
+        # @return [ Hash ] The explain plan.
+        #
+        # @since 2.0.0
+        def explain
+          self.class.new(view, pipeline, options.merge(explain_options)).first
+        end
+
         private
 
         def aggregate_spec
-          { :selector => {
+          { :db_name => database.name,
+            :read => read,
+            :selector => {
               :aggregate => collection.name,
               :pipeline => pipeline,
               :cursor => view.batch_size ? { :batchSize => view.batch_size } : {}
-            }.merge!(options),
-            :db_name => database.name,
-            :options => view.options }
+            }.merge!(options)
+          }
         end
 
         def explain_options

data/lib/mongo/collection/view/map_reduce.rb

@@ -120,7 +120,7 @@ module Mongo
         #
         # @param [ Hash ] object The scope object.
         #
-        # @return [ MapReduce, Hash ] The new MapReduce operation or thevalue
+        # @return [ MapReduce, Hash ] The new MapReduce operation or the value
         #   of the scope.
         #
         # @since 2.0.0
@@ -128,15 +128,32 @@ module Mongo
           configure(:scope, object)
         end
 
+        # Whether to include the timing information in the result.
+        #
+        # @example Set the verbose value.
+        #   map_reduce.verbose(false)
+        #
+        # @param [ true, false ] value Whether to include timing information
+        #   in the result.
+        #
+        # @return [ MapReduce, Hash ] The new MapReduce operation or the value
+        #   of the verbose option.
+        #
+        # @since 2.0.5
+        def verbose(value = nil)
+          configure(:verbose, value)
+        end
+
         private
 
         def inline?
-          out.nil? || out == { inline: 1 }
+          out.nil? || out == { inline: 1 } || out == { 'inline' => 1 }
         end
 
         def map_reduce_spec
           {
             :db_name => database.name,
+            :read => read,
             :selector => {
               :mapreduce => collection.name,
               :map => map,

data/lib/mongo/database.rb

@@ -102,6 +102,18 @@ module Mongo
       View.new(self).collection_names(options)
     end
 
+    # Get info on all the collections in the database.
+    #
+    # @example Get info on each collection.
+    #   database.list_collections
+    #
+    # @return [ Array<Hash> ] Info for each collection in the database.
+    #
+    # @since 2.0.5
+    def list_collections
+      View.new(self).list_collections
+    end
+
     # Get all the collections that belong to this database.
     #
     # @example Get all the collections.

data/lib/mongo/database/view.rb

@@ -57,6 +57,18 @@ module Mongo
         end
       end
 
+      # Get info on all the collections in the database.
+      #
+      # @example Get info on each collection.
+      #   database.list_collections
+      #
+      # @return [ Array<Hash> ] Info for each collection in the database.
+      #
+      # @since 2.0.5
+      def list_collections
+        collections_info(next_primary)
+      end
+
       # Create the new database view.
       #
       # @example Create the new database view.

data/lib/mongo/grid/fs.rb

@@ -75,12 +75,12 @@ module Mongo
       # @since 2.0.0
       def insert_one(file)
         files_collection.insert_one(file.metadata)
-        result = chunks_collection.insert_many(file.chunks)
-        if write_concern.get_last_error
-          validate_md5!(file)
-        else
-          result
+        inserts = file.chunks.reduce([]) do |ops, chunk|
+          ops << { :insert_one => chunk }
         end
+        result = chunks_collection.bulk_write(inserts, ordered: true)
+        validate_md5!(file) if write_concern.get_last_error
+        file.id
       end
 
       # Create the GridFS.

data/lib/mongo/loggable.rb

@@ -45,9 +45,11 @@ module Mongo
       rescue Exception => e
         raise e
       ensure
-        runtime = ("%.4fms" % (1000 * (Time.now.to_f - started.to_f)))
-        operations.each do |operation|
-          Logger.send(level, prefix, log_inspect(operation), runtime)
+        if Logger.allow?(level)
+          runtime = format("%.4fms", (Time.now.to_f - started.to_f) * 1000.0)
+          operations.each do |operation|
+            Logger.log(level, prefix, log_inspect(operation), runtime)
+          end
         end
       end
     end

data/lib/mongo/logger.rb

@@ -34,7 +34,7 @@ module Mongo
       #
       # @since 2.0.0
       def debug(prefix, message, runtime)
-        logger.debug("#{prefix} | #{message} | runtime: #{runtime}")
+        self.log(:debug, prefix, message, runtime)
       end
 
       # Log a error level message.
@@ -48,7 +48,7 @@ module Mongo
       #
       # @since 2.0.0
       def error(prefix, message, runtime)
-        logger.error("#{prefix} | #{message} | runtime: #{runtime}")
+        self.log(:error, prefix, message, runtime)
       end
 
       # Log a fatal level message.
@@ -62,7 +62,7 @@ module Mongo
       #
       # @since 2.0.0
       def fatal(prefix, message, runtime)
-        logger.fatal("#{prefix} | #{message} | runtime: #{runtime}")
+        self.log(:fatal, prefix, message, runtime)
       end
 
       # Log a info level message.
@@ -76,7 +76,7 @@ module Mongo
       #
       # @since 2.0.0
       def info(prefix, message, runtime)
-        logger.info("#{prefix} | #{message} | runtime: #{runtime}")
+        self.log(:info, prefix, message, runtime)
       end
 
       # Log a warn level message.
@@ -90,7 +90,7 @@ module Mongo
       #
       # @since 2.0.0
       def warn(prefix, message, runtime)
-        logger.warn("#{prefix} | #{message} | runtime: #{runtime}")
+        self.log(:warn, prefix, message, runtime)
       end
 
       # Get the wrapped logger. If none was set will return a default debug
@@ -120,6 +120,22 @@ module Mongo
         @logger = other
       end
 
+      def log(level, prefix, message, runtime)
+        logger.send(level, format("%s | %s | runtime: %s".freeze, prefix, message, runtime))
+      end
+
+      def allow?(level)
+        logger.send(:"#{level}?")
+      end
+
+      def level
+        logger.level
+      end
+
+      def level=(level)
+        logger.level = level
+      end
+
       private
 
       def default_logger

data/lib/mongo/operation/aggregate.rb

@@ -43,6 +43,7 @@ module Mongo
       include Executable
       include Specifiable
       include Limited
+      include ReadPreferrable
 
       # The need primary error message.
       #
@@ -62,7 +63,7 @@ module Mongo
       #
       # @since 2.0.0
       def execute(context)
-        unless context.standalone? || context.mongos? || context.primary? || secondary_ok?
+        unless valid_context?(context)
           raise Error::NeedPrimaryServer.new(ERROR_MESSAGE)
         end
         execute_message(context)
@@ -76,24 +77,30 @@ module Mongo
         end
       end
 
-      # Whether this operation can be executed on a replica set secondary server.
-      # The aggregate operation may not be executed on a secondary if the user has specified
-      # an output collection to which the results will be written.
-      #
-      # @return [ true, false ] Whether the operation can be executed on a secondary.
-      #
-      # @since 2.0.0
+      def valid_context?(context)
+        context.standalone? || context.mongos? || context.primary? || secondary_ok?
+      end
+
       def secondary_ok?
         selector[:pipeline].none? { |op| op.key?('$out') || op.key?(:$out) }
       end
 
-      def filter(context)
+      def query_coll
+        Database::COMMAND
+      end
+
+      def filter_selector(context)
         return selector if context.features.write_command_enabled?
         selector.reject{ |option, value| option.to_s == 'cursor' }
       end
 
-      def message(context)
-        Protocol::Query.new(db_name, Database::COMMAND, filter(context), options)
+      def update_selector(context)
+        if context.mongos? && read_pref = read.to_mongos
+          sel = selector[:$query] ? filter_selector(context) : { :$query => filter_selector(context) }
+          sel.merge(:$readPreference => read_pref)
+        else
+          filter_selector(context)
+        end
       end
     end
   end