mongo 2.2.7 → 2.3.0

data/lib/mongo/grid/fs_bucket.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -100,11 +100,14 @@ module Mongo
       # @return [ Grid::File ] The file.
       #
       # @since 2.0.0
+      #
+      # @deprecated Please use #find instead with a limit of -1.
+      #   Will be removed in version 3.0.
       def find_one(selector = nil)
         file_info = files_collection.find(selector).first
         return nil unless file_info
         chunks = chunks_collection.find(:files_id => file_info[:_id]).sort(:n => 1)
-        Grid::File.new(chunks.to_a, file_info)
+        Grid::File.new(chunks.to_a, Options::Mapper.transform(file_info, Grid::File::Info::MAPPINGS.invert))
       end
 
       # Insert a single file into the GridFS.
@@ -117,6 +120,9 @@ module Mongo
       # @return [ BSON::ObjectId ] The file id.
       #
       # @since 2.0.0
+      #
+      # @deprecated Please use #upload_from_stream or #open_upload_stream instead.
+      #   Will be removed in version 3.0.
       def insert_one(file)
         @indexes ||= ensure_indexes!
         chunks_collection.insert_many(file.chunks)
@@ -331,6 +337,7 @@ module Mongo
       # @param [ String ] filename The filename of the file to upload.
       # @param [ Hash ] opts The options for the write stream.
       #
+      # @option opts [ Object ] :file_id An optional unique file id. An ObjectId is generated otherwise.
       # @option opts [ Integer ] :chunk_size Override the default chunk size.
       # @option opts [ Hash ] :write The write concern.
       # @option opts [ Hash ] :metadata User data for the 'metadata' field of the files
@@ -360,12 +367,13 @@ module Mongo
       # document for the filename in the files collection.
       #
       # @example Upload a file to the GridFS bucket.
-      #   fs.upload_from_stream('a-file.txt')
+      #   fs.upload_from_stream('a-file.txt', file)
       #
       # @param [ String ] filename The filename of the file to upload.
       # @param [ IO ] io The source io stream to upload from.
       # @param [ Hash ] opts The options for the write stream.
       #
+      # @option opts [ Object ] :file_id An optional unique file id. An ObjectId is generated otherwise.
       # @option opts [ Integer ] :chunk_size Override the default chunk size.
       # @option opts [ Hash ] :write The write concern.
       # @option opts [ Hash ] :metadata User data for the 'metadata' field of the files
@@ -401,9 +409,7 @@ module Mongo
       #
       # @since 2.1.0
       def read_preference
-        @read_preference ||= @options[:read] ?
-            ServerSelector.get(Options::Redacted.new((@options[:read] || {}).merge(client.options))) :
-            database.read_preference
+        @read_preference ||= ServerSelector.get(@options[:read] || database.read_preference)
       end
 
       # Get the write concern.

data/lib/mongo/grid/stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/grid/stream/read.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -133,9 +133,7 @@ module Mongo
           #
           # @since 2.1.0
           def read_preference
-            @read_preference ||= @options[:read] ?
-                ServerSelector.get(Options::Redacted.new((@options[:read] || {}).merge(fs.options))) :
-                fs.read_preference
+            @read_preference ||= ServerSelector.get(@options[:read] || fs.read_preference)
           end
 
           # Get the files collection file information document for the file being read.

data/lib/mongo/grid/stream/write.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ module Mongo
           # @since 2.1.0
           attr_reader :fs
 
-          # @return [ BSON::ObjectId ] file_id The id of the file being uploaded.
+          # @return [ Object ] file_id The id of the file being uploaded.
           #
           # @since 2.1.0
           attr_reader :file_id
@@ -50,6 +50,7 @@ module Mongo
           # @param [ FSBucket ] fs The GridFS bucket object.
           # @param [ Hash ] options The write stream options.
           #
+          # @option opts [ Object ] :file_id The file id. An ObjectId is generated otherwise.
           # @option opts [ Integer ] :chunk_size Override the default chunk size.
           # @option opts [ Hash ] :write The write concern.
           # @option opts [ Hash ] :metadata User data for the 'metadata' field of the files collection document.
@@ -63,7 +64,7 @@ module Mongo
             @fs = fs
             @length = 0
             @n = 0
-            @file_id = BSON::ObjectId.new
+            @file_id = options[:file_id] || BSON::ObjectId.new
             @options = options
             @filename = @options[:filename]
             @open = true

data/lib/mongo/index.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/index/view.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,6 +51,7 @@ module Mongo
         :bucket_size => :bucketSize,
         :default_language => :default_language,
         :expire_after => :expireAfterSeconds,
+        :expire_after_seconds => :expireAfterSeconds,
         :key => :key,
         :language_override => :language_override,
         :max => :max,
@@ -150,7 +151,7 @@ module Mongo
           indexes: normalize_models(models.flatten),
           db_name: database.name,
           coll_name: collection.name,
-        ).execute(next_primary.context)
+        ).execute(next_primary)
       end
 
       # Convenience method for getting index information by a specific name or
@@ -216,7 +217,7 @@ module Mongo
           db_name: database.name,
           coll_name: collection.name,
           index_name: name
-        ).execute(next_primary.context)
+        ).execute(next_primary)
       end
 
       def index_name(spec)
@@ -249,7 +250,7 @@ module Mongo
       end
 
       def send_initial_query(server)
-        initial_query_op.execute(server.context)
+        initial_query_op.execute(server)
       end
 
       def with_generated_names(models)

data/lib/mongo/loggable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/logger.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/monitoring.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 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/operation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/aggregate.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,17 +43,17 @@ module Mongo
 
         private
 
-        def filter_selector(context)
-          return selector if context.features.write_command_enabled?
+        def filter_selector(server)
+          return selector if server.features.write_command_enabled?
           selector.reject{ |option, value| option.to_s == 'cursor' }
         end
 
-        def update_selector(context)
-          if context.mongos? && read_pref = read.to_mongos
-            sel = selector[:$query] ? filter_selector(context) : { :$query => filter_selector(context) }
+        def update_selector(server)
+          if server.mongos? && read_pref = read.to_mongos
+            sel = selector[:$query] ? filter_selector(server) : { :$query => filter_selector(server) }
             sel.merge(:$readPreference => read_pref)
           else
-            filter_selector(context)
+            filter_selector(server)
           end
         end
       end

data/lib/mongo/operation/commands/aggregate/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/collections_info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,20 +37,21 @@ module Mongo
         include Executable
 
         # Execute the operation.
-        # The context gets a connection on which the operation
-        # is sent in the block.
         #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
+        # @example Execute the operation.
+        #   operation.execute(server)
+        #
+        # @param [ Mongo::Server ] server The server to send this operation to.
         #
         # @return [ Result ] The operation response, if there is one.
         #
         # @since 2.0.0
-        def execute(context)
-          if context.features.list_collections_enabled?
-            ListCollections.new(spec).execute(context)
+        def execute(server)
+          if server.features.list_collections_enabled?
+            ListCollections.new(spec).execute(server)
           else
-            context.with_connection do |connection|
-              Result.new(connection.dispatch([ message(context) ])).validate!
+            server.with_connection do |connection|
+              Result.new(connection.dispatch([ message(server) ])).validate!
             end
           end
         end

data/lib/mongo/operation/commands/collections_info/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/command.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/indexes.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,27 +35,28 @@ module Mongo
         include ReadPreference
 
         # Execute the operation.
-        # The context gets a connection on which the operation
-        # is sent in the block.
         #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
+        # @example Execute the operation.
+        #   operation.execute(server)
+        #
+        # @param [ Mongo::Server ] server The server to send this operation to.
         #
         # @return [ Result ] The indexes operation response.
         #
         # @since 2.0.0
-        def execute(context)
-          if context.features.list_indexes_enabled?
-            ListIndexes.new(spec).execute(context)
+        def execute(server)
+          if server.features.list_indexes_enabled?
+            ListIndexes.new(spec).execute(server)
           else
-            execute_message(context)
+            execute_message(server)
           end
         end
 
         private
 
-        def execute_message(context)
-          context.with_connection do |connection|
-            Result.new(connection.dispatch([ message(context) ]))
+        def execute_message(server)
+          server.with_connection do |connection|
+            Result.new(connection.dispatch([ message(server) ]))
           end
         end
 

data/lib/mongo/operation/commands/list_collections.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/list_collections/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/list_indexes.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/list_indexes/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/map_reduce.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/map_reduce/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/commands/user_query.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,20 +34,21 @@ module Mongo
         include Specifiable
 
         # Execute the operation.
-        # The context gets a connection on which the operation
-        # is sent in the block.
         #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
+        # @example Execute the operation.
+        #   operation.execute(server)
+        #
+        # @param [ Mongo::Server ] server The server to send this operation to.
         #
         # @return [ Result ] The operation response, if there is one.
         #
         # @since 2.1.0
-        def execute(context)
-          if context.features.users_info_enabled?
-            UsersInfo.new(spec).execute(context).validate!
+        def execute(server)
+          if server.features.users_info_enabled?
+            UsersInfo.new(spec).execute(server).validate!
           else
-            context.with_connection do |connection|
-              Result.new(connection.dispatch([ message(context) ])).validate!
+            server.with_connection do |connection|
+              Result.new(connection.dispatch([ message(server) ])).validate!
             end
           end
         end
@@ -62,7 +63,7 @@ module Mongo
           Auth::User::COLLECTION
         end
 
-        def message(context)
+        def message(server)
           Protocol::Query.new(db_name, query_coll, selector, options)
         end
       end

data/lib/mongo/operation/commands/users_info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ module Mongo
           { :usersInfo => user_name }
         end
 
-        def message(context)
+        def message(server)
           Protocol::Query.new(db_name, query_coll, selector, options)
         end
       end

data/lib/mongo/operation/commands/users_info/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/operation/executable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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,18 +22,19 @@ module Mongo
     module Executable
 
       # Execute the operation.
-      # The context gets a connection on which the operation
-      # is sent in the block.
       #
-      # @param [ Mongo::Server::Context ] context The context for this operation.
+      # @example Execute the operation.
+      #   operation.execute(server)
+      #
+      # @param [ Mongo::Server ] server The server to send this operation to.
       #
       # @return [ Result ] The operation response, if there is one.
       #
       # @since 2.0.0
-      def execute(context)
-        context.with_connection do |connection|
+      def execute(server)
+        server.with_connection do |connection|
           result_class = self.class.const_defined?(:Result, false) ? self.class::Result : Result
-          result_class.new(connection.dispatch([ message(context) ], operation_id)).validate!
+          result_class.new(connection.dispatch([ message(server) ], operation_id)).validate!
         end
       end
     end