mongo 2.1.0.rc0 → 2.1.0

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

@@ -24,8 +24,18 @@ module Mongo
         extend Forwardable
         include Enumerable
         include Immutable
-        include Iterable
         include Loggable
+        include Retryable
+
+        # The inline option.
+        #
+        # @since 2.1.0
+        INLINE = 'inline'.freeze
+
+        # Reroute message.
+        #
+        # @since 2.1.0
+        REROUTE = 'Rerouting the MapReduce operation to the primary server.'.freeze
 
         # @return [ View ] view The collection view.
         attr_reader :view
@@ -42,6 +52,31 @@ module Mongo
         # Delegate necessary operations to the collection.
         def_delegators :collection, :database
 
+        # Iterate through documents returned by the map/reduce.
+        #
+        # @example Iterate through the result of the map/reduce.
+        #   map_reduce.each do |document|
+        #     p document
+        #   end
+        #
+        # @return [ Enumerator ] The enumerator.
+        #
+        # @since 2.0.0
+        #
+        # @yieldparam [ Hash ] Each matching document.
+        def each
+          @cursor = nil
+          write_with_retry do
+            server = read.select_server(cluster)
+            result = send_initial_query(server)
+            @cursor = Cursor.new(view, result, server)
+          end
+          @cursor.each do |doc|
+            yield doc
+          end if block_given?
+          @cursor.to_enum
+        end
+
         # Set or get the finalize function for the operation.
         #
         # @example Set the finalize function.
@@ -148,7 +183,7 @@ module Mongo
         private
 
         def inline?
-          out.nil? || out == { inline: 1 } || out == { 'inline' => 1 }
+          out.nil? || out == { inline: 1 } || out == { INLINE => 1 }
         end
 
         def map_reduce_spec
@@ -182,13 +217,12 @@ module Mongo
         end
 
         def secondary_ok?
-          out.respond_to?(:keys) &&
-              out.keys.first.to_s.downcase == 'inline'
+          out.respond_to?(:keys) && out.keys.first.to_s.downcase == INLINE
         end
 
         def send_initial_query(server)
           unless valid_server?(server)
-            log_warn('Rerouting the MapReduce operation to the primary server.')
+            log_warn(REROUTE)
             server = cluster.next_primary
           end
           result = initial_query_op.execute(server.context)

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

@@ -25,17 +25,17 @@ module Mongo
         #
         # @since 2.0.0
         SPECIAL_FIELDS = {
-            :sort => :$orderby,
-            :hint => :$hint,
-            :comment => :$comment,
-            :snapshot => :$snapshot,
-            :max_scan => :$maxScan,
-            :max_value => :$max,
-            :min_value => :$min,
-            :max_time_ms => :$maxTimeMS,
-            :return_key => :$returnKey,
-            :show_disk_loc => :$showDiskLoc,
-            :explain => :$explain
+          :sort => :$orderby,
+          :hint => :$hint,
+          :comment => :$comment,
+          :snapshot => :$snapshot,
+          :max_scan => :$maxScan,
+          :max_value => :$max,
+          :min_value => :$min,
+          :max_time_ms => :$maxTimeMS,
+          :return_key => :$returnKey,
+          :show_disk_loc => :$showDiskLoc,
+          :explain => :$explain
         }.freeze
 
         # Options to cursor flags mapping.
@@ -92,7 +92,7 @@ module Mongo
         #
         # @since 2.0.0
         def batch_size(batch_size = nil)
-          configure(__method__, batch_size)
+          configure(:batch_size, batch_size)
         end
 
         # Associate a comment with the query.
@@ -110,7 +110,7 @@ module Mongo
         #
         # @since 2.0.0
         def comment(comment = nil)
-          configure_modifier(__method__, comment)
+          configure_modifier(:comment, comment)
         end
 
         # Get a count of matching documents in the collection.
@@ -137,7 +137,9 @@ module Mongo
           cmd[:hint] = options[:hint] if options[:hint]
           cmd[:limit] = options[:limit] if options[:limit]
           cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
-          database.command(cmd, options).n
+          read_with_retry do
+            database.command(cmd, options).n
+          end
         end
 
         # Get a list of distinct values for a specific field.
@@ -160,7 +162,9 @@ module Mongo
                   :key => field_name.to_s,
                   :query => selector }
           cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
-          database.command(cmd, options).first['values']
+          read_with_retry do
+            database.command(cmd, options).first['values']
+          end
         end
 
         # The index that MongoDB will be forced to use for the query.
@@ -174,7 +178,7 @@ module Mongo
         #
         # @since 2.0.0
         def hint(hint = nil)
-          configure_modifier(__method__, hint)
+          configure_modifier(:hint, hint)
         end
 
         # The max number of docs to return from the query.
@@ -188,7 +192,7 @@ module Mongo
         #
         # @since 2.0.0
         def limit(limit = nil)
-          configure(__method__, limit)
+          configure(:limit, limit)
         end
 
         # Execute a map/reduce operation on the collection view.
@@ -218,7 +222,7 @@ module Mongo
         #
         # @since 2.0.0
         def max_scan(value = nil)
-          configure_modifier(__method__, value)
+          configure_modifier(:max_scan, value)
         end
 
         # Set the maximum value to search.
@@ -232,7 +236,7 @@ module Mongo
         #
         # @since 2.1.0
         def max_value(value = nil)
-          configure_modifier(__method__, value)
+          configure_modifier(:max_value, value)
         end
 
         # Set the minimum value to search.
@@ -246,7 +250,7 @@ module Mongo
         #
         # @since 2.1.0
         def min_value(value = nil)
-          configure_modifier(__method__, value)
+          configure_modifier(:min_value, value)
         end
 
         # The server normally times out idle cursors after an inactivity period
@@ -259,7 +263,7 @@ module Mongo
         #
         # @since 2.0.0
         def no_cursor_timeout
-          configure_flag(__method__)
+          configure_flag(:no_cursor_timeout)
         end
 
         # The fields to include or exclude from each doc in the result set.
@@ -278,7 +282,7 @@ module Mongo
         # @since 2.0.0
         def projection(document = nil)
           validate_doc!(document) if document
-          configure(__method__, document)
+          configure(:projection, document)
         end
 
         # The read preference to use for the query.
@@ -294,7 +298,8 @@ module Mongo
         # @since 2.0.0
         def read(value = nil)
           return default_read if value.nil?
-          configure(__method__, value.is_a?(Hash) ? ServerSelector.get(value) : value)
+          selector = value.is_a?(Hash) ? ServerSelector.get(client.options.merge(value)) : value
+          configure(:read, selector)
         end
 
         # Set whether to return only the indexed field or fields.
@@ -308,7 +313,7 @@ module Mongo
         #
         # @since 2.1.0
         def return_key(value = nil)
-          configure_modifier(__method__, value)
+          configure_modifier(:return_key, value)
         end
 
         # Set whether the disk location should be shown for each document.
@@ -323,7 +328,7 @@ module Mongo
         #
         # @since 2.0.0
         def show_disk_loc(value = nil)
-          configure_modifier(__method__, value)
+          configure_modifier(:show_disk_loc, value)
         end
 
         # The number of docs to skip before returning results.
@@ -338,7 +343,7 @@ module Mongo
         #
         # @since 2.0.0
         def skip(number = nil)
-          configure(__method__, number)
+          configure(:skip, number)
         end
 
         # Set the snapshot value for the view.
@@ -353,7 +358,7 @@ module Mongo
         #
         # @since 2.0.0
         def snapshot(value = nil)
-          configure_modifier(__method__, value)
+          configure_modifier(:snapshot, value)
         end
 
         # The key and direction pairs by which the result set will be sorted.
@@ -368,7 +373,7 @@ module Mongo
         #
         # @since 2.0.0
         def sort(spec = nil)
-          configure_modifier(__method__, spec)
+          configure_modifier(:sort, spec)
         end
 
         # “meta” operators that let you modify the output or behavior of a query.
@@ -383,7 +388,7 @@ module Mongo
         # @since 2.1.0
         def modifiers(doc = nil)
           return @modifiers if doc.nil?
-          new(options.merge(__method__ => doc))
+          new(options.merge(:modifiers => doc))
         end
 
         # A cumulative time limit in milliseconds for processing operations on a cursor.
@@ -397,7 +402,7 @@ module Mongo
         #
         # @since 2.1.0
         def max_time_ms(max = nil)
-          configure_modifier(__method__, max)
+          configure_modifier(:max_time_ms, max)
         end
 
         private

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

@@ -35,7 +35,9 @@ module Mongo
           cmd[:fields] = projection if projection
           cmd[:sort] = sort if sort
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
-          database.command(cmd).first['value']
+          write_with_retry do
+            database.command(cmd).first['value']
+          end
         end
 
         # Finds a single document and replaces it.
@@ -81,8 +83,10 @@ module Mongo
           cmd[:new] = !!(opts[:return_document] && opts[:return_document] == :after)
           cmd[:upsert] = opts[:upsert] if opts[:upsert]
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
-          value = database.command(cmd).first['value']
-          value unless value.nil? || value.empty?
+          write_with_retry do
+            value = database.command(cmd).first['value']
+            value unless value.nil? || value.empty?
+          end
         end
 
         # Remove documents from the collection.
@@ -166,24 +170,28 @@ module Mongo
         private
 
         def remove(value)
-          Operation::Write::Delete.new(
-            :delete => { q: selector, limit: value },
-            :db_name => collection.database.name,
-            :coll_name => collection.name,
-            :write_concern => collection.write_concern
-          ).execute(next_primary.context)
+          write_with_retry do
+            Operation::Write::Delete.new(
+              :delete => { Operation::Q => selector, Operation::LIMIT => value },
+              :db_name => collection.database.name,
+              :coll_name => collection.name,
+              :write_concern => collection.write_concern
+            ).execute(next_primary.context)
+          end
         end
 
         def update(spec, multi, opts)
-          Operation::Write::Update.new(
-            :update => { q: selector,
-                         u: spec,
-                         multi: multi,
-                         upsert: !!opts[:upsert] },
-            :db_name => collection.database.name,
-            :coll_name => collection.name,
-            :write_concern => collection.write_concern
-          ).execute(next_primary.context)
+          write_with_retry do
+            Operation::Write::Update.new(
+              :update => { Operation::Q => selector,
+                           Operation::U => spec,
+                           Operation::MULTI => multi,
+                           Operation::UPSERT => !!opts[:upsert] },
+              :db_name => collection.database.name,
+              :coll_name => collection.name,
+              :write_concern => collection.write_concern
+            ).execute(next_primary.context)
+          end
         end
       end
     end

data/lib/mongo/database.rb

@@ -36,7 +36,17 @@ module Mongo
     # The default database options.
     #
     # @since 2.0.0
-    DEFAULT_OPTIONS = { :database => ADMIN }.freeze
+    DEFAULT_OPTIONS = Options::Redacted.new(:database => ADMIN).freeze
+
+    # Database name field constant.
+    #
+    # @since 2.1.0
+    NAME = 'name'.freeze
+
+    # Databases constant.
+    #
+    # @since 2.1.0
+    DATABASES = 'databases'.freeze
 
     # The name of the collection that holds all the collection names.
     #
@@ -138,7 +148,7 @@ module Mongo
     #
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
-      preference = opts[:read] ? ServerSelector.get(opts[:read].merge(options)) : read_preference
+      preference = opts[:read] ? ServerSelector.get(client.options.merge(opts[:read])) : read_preference
       server = preference.select_server(cluster)
       Operation::Command.new({
         :selector => operation,

data/lib/mongo/database/view.rb

@@ -51,9 +51,10 @@ module Mongo
       def collection_names(options = {})
         @batch_size = options[:batch_size]
         server = next_primary
+        @limit = -1 if server.features.list_collections_enabled?
         collections_info(server).collect do |info|
-          server.context.features.list_collections_enabled? ?
-            info['name'] : info['name'].sub("#{@database.name}.", '')
+          server.features.list_collections_enabled? ?
+            info[Database::NAME] : info[Database::NAME].sub("#{@database.name}.", '')
         end
       end
 
@@ -80,7 +81,7 @@ module Mongo
       def initialize(database)
         @database = database
         @batch_size =  nil
-        @limit = -1
+        @limit = nil
         @collection = @database[Database::COMMAND]
       end
 

data/lib/mongo/dbref.rb

@@ -53,8 +53,8 @@ module Mongo
     #
     # @since 2.1.0
     def as_json(*args)
-      document = { '$ref' => collection, '$id' => id }
-      document.merge!('$db' => database) if database
+      document = { COLLECTION => collection, ID => id }
+      document.merge!(DATABASE => database) if database
       document
     end
 
@@ -101,8 +101,8 @@ module Mongo
       # @since 2.0.0
       def from_bson(bson)
         decoded = super
-        if ref = decoded['$ref']
-          decoded = DBRef.new(ref, decoded['$id'], decoded['$db'])
+        if ref = decoded[COLLECTION]
+          decoded = DBRef.new(ref, decoded[ID], decoded[DATABASE])
         end
         decoded
       end

data/lib/mongo/grid/fs_bucket.rb

@@ -19,6 +19,7 @@ module Mongo
     #
     # @since 2.0.0
     class FSBucket
+      extend Forwardable
 
       # The default root prefix.
       #
@@ -55,6 +56,12 @@ module Mongo
       # @since 2.1.0
       attr_reader :options
 
+      # Get client from the database.
+      #
+      # @since 2.1.0
+      def_delegators :database,
+                     :client
+
       # Find files collection documents matching a given selector.
       #
       # @example Find files collection documents by a filename.
@@ -395,7 +402,7 @@ module Mongo
       # @since 2.1.0
       def read_preference
         @read_preference ||= @options[:read] ?
-            ServerSelector.get((@options[:read] || {}).merge(database.options)) :
+            ServerSelector.get(Options::Redacted.new((@options[:read] || {}).merge(client.options))) :
             database.read_preference
       end
 

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

@@ -134,7 +134,7 @@ module Mongo
           # @since 2.1.0
           def read_preference
             @read_preference ||= @options[:read] ?
-                ServerSelector.get((@options[:read] || {}).merge(fs.options)) :
+                ServerSelector.get(Options::Redacted.new((@options[:read] || {}).merge(fs.options))) :
                 fs.read_preference
           end