mongo 1.8.3 → 1.8.4.rc0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9292e4cac6a44329fb7c7940421fe07ff8e787bd
-  data.tar.gz: 14a5d525f6fd6cefe6694576e02d841d2882994b
-SHA512:
-  metadata.gz: b58e0adafd2a3b6522a74c87c8aaae7ea7ae2968fc8fa83b1fe0851accc74df459e683d3755a5d96d84509d19b6b3e11c55d35a6ed4024997b28d847dd587233
-  data.tar.gz: a910cea9b47023cd6bca4771557d00e435f2acc9234acafcfd43445e82ab947e941bca3db71afb2030aeedb1454e0956bf530b8e82b6b606b5a9d5b9fd404e1b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjU5N2Y3NjIxZDMyODFiMDI3MWYzODQ1MzNiMDk2YjgxZmQwY2EyYg==
+  data.tar.gz: !binary |-
+    MTEwZTgzOWQ3MzkyNGNhNmQ3ZDY2YzE0ZGVkMDc0MTJhNWRlOWM4Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjYwYTlmNDYwNTZkZjZiMmQyZTUzNzgxOTM5NGMwMWQ0YjY5MDE3M2M3YmUx
+    MmI3MWNmN2QxMTgwMTZiMTdjNzMyODJhZjAzYTg1M2VkMTI4OTI5ZjNlMjdl
+    NTVlY2E0MDc5MTY3ZmNjOTBhZmFkMjA2MDlkYjAzYjgyNTMyNWE=
+  data.tar.gz: !binary |-
+    MGJlZGJlMjk5NWFhYjI1MjhiYjYwMmVkZjViZTdiNDE0ZjY0YWEwZmIxZDRj
+    NzEyYjk5N2Y1MDMyNWM4ZmU1YTM0ODA2ZDQ3ZTQwNTdhNTRmOGNhZmEwNjA3
+    ZTZlNzM5YzRiYmJkN2JlM2VmYTEzNWJhOThjYTRhMzRiNTg2N2U=

data/VERSION

@@ -1 +1 @@
-1.8.3
+1.8.4.rc0

data/lib/mongo.rb

@@ -2,7 +2,18 @@ module Mongo
   ASCENDING   =  1
   DESCENDING  = -1
   GEO2D       = '2d'
+  GEO2DSPHERE = '2dsphere'
   GEOHAYSTACK = 'geoHaystack'
+  TEXT        = 'text'
+  HASHED      = 'hashed'
+  INDEX_TYPES = [ ASCENDING,
+                  DESCENDING,
+                  GEO2D,
+                  GEO2DSPHERE,
+                  GEOHAYSTACK,
+                  TEXT,
+                  HASHED
+                ]
 
   DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024
   DEFAULT_MAX_MESSAGE_SIZE = DEFAULT_MAX_BSON_SIZE * 2

data/lib/mongo/collection.rb

@@ -9,7 +9,8 @@ module Mongo
                 :name,
                 :pk_factory,
                 :hint,
-                :write_concern
+                :write_concern,
+                :capped
 
     # Read Preference
     attr_accessor :read,
@@ -20,20 +21,20 @@ module Mongo
     #
     # @param [String, Symbol] name the name of the collection.
     # @param [DB] db a MongoDB database instance.
-    # 
+    #
     # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
     #   should be acknowledged
     # @option opts [Boolean] :j (false) Set journal acknowledgement
     # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
     # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
-    #   
+    #
     #   Notes about write concern:
-    #     These write concern options will be used for insert, update, and remove methods called on this  
-    #     Collection instance. If no value is provided, the default values set on this instance's DB will be used. 
+    #     These write concern options will be used for insert, update, and remove methods called on this
+    #     Collection instance. If no value is provided, the default values set on this instance's DB will be used.
     #     These option values can be overridden for any invocation of insert, update, or remove.
     #
     # @option opts [:create_pk] :pk (BSON::ObjectId) A primary key factory to use
-    #   other than the default BSON::ObjectId. 
+    #   other than the default BSON::ObjectId.
     # @option opts [:primary, :secondary] :read The default read preference for queries
     #   initiates from this connection object. If +:secondary+ is chosen, reads will be sent
     #   to one of the closest available secondary nodes. If a secondary node cannot be located, the
@@ -57,30 +58,26 @@ module Mongo
         db, name = name, db
       end
 
-      case name
-      when Symbol, String
-      else
-        raise TypeError, "new_name must be a string or symbol"
-      end
-
+      raise TypeError,
+        "Collection name must be a String or Symbol." unless [String, Symbol].include?(name.class)
       name = name.to_s
 
-      if name.empty? or name.include? ".."
-        raise Mongo::InvalidNSName, "collection names cannot be empty"
-      end
-      if name.include? "$"
-        raise Mongo::InvalidNSName, "collection names must not contain '$'" unless name =~ /((^\$cmd)|(oplog\.\$main))/
-      end
-      if name.match(/^\./) or name.match(/\.$/)
-        raise Mongo::InvalidNSName, "collection names must not start or end with '.'"
+      raise Mongo::InvalidNSName,
+        "Collection names cannot be empty." if name.empty? || name.include?("..")
+
+      if name.include?("$")
+        raise Mongo::InvalidNSName,
+          "Collection names must not contain '$'" unless name =~ /((^\$cmd)|(oplog\.\$main))/
       end
 
+      raise Mongo::InvalidNSName,
+        "Collection names must not start or end with '.'" if name.match(/^\./) || name.match(/\.$/)
+
+      pk_factory = nil
       if opts.respond_to?(:create_pk) || !opts.is_a?(Hash)
         warn "The method for specifying a primary key factory on a Collection has changed.\n" +
-          "Please specify it as an option (e.g., :pk => PkFactory)."
+             "Please specify it as an option (e.g., :pk => PkFactory)."
         pk_factory = opts
-      else
-        pk_factory = nil
       end
 
       @db, @name  = db, name
@@ -92,6 +89,7 @@ module Mongo
         @write_concern = get_write_concern(opts, db)
         @read =  opts[:read] || @db.read
         Mongo::ReadPreference::validate(@read)
+        @capped             = opts[:capped]
         @tag_sets           = opts.fetch(:tag_sets, @db.tag_sets)
         @acceptable_latency = opts.fetch(:acceptable_latency, @db.acceptable_latency)
       end
@@ -106,7 +104,7 @@ module Mongo
     #
     # @return [Boolean]
     def capped?
-      [1, true].include? @db.command({:collstats => @name})['capped']
+      @capped ||= [1, true].include?(@db.command({:collstats => @name})['capped'])
     end
 
     # Return a sub-collection of this collection by name. If 'users' is a collection, then
@@ -315,10 +313,10 @@ module Mongo
     # @return [ObjectId] the _id of the saved document.
     #
     # @option opts [Hash] :w, :j, :wtimeout, :fsync Set the write concern for this operation.
-    #   :w > 0 will run a +getlasterror+ command on the database to report any assertion. 
+    #   :w > 0 will run a +getlasterror+ command on the database to report any assertion.
     #   :j will confirm a write has been committed to the journal,
     #   :wtimeout specifies how long to wait for write confirmation,
-    #   :fsync will confirm that a write has been fsynced. 
+    #   :fsync will confirm that a write has been fsynced.
     #   Options provided here will override any write concern options set on this collection,
     #   its database object, or the current connection. See the options
     #   for DB#get_last_error.
@@ -351,23 +349,23 @@ module Mongo
     # @option opts [Boolean] :j (false) Set journal acknowledgement
     # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
     # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
-    #   
+    #
     #   Notes on write concern:
     #     Options provided here will override any write concern options set on this collection,
-    #     its database object, or the current connection. See the options for +DB#get_last_error+. 
+    #     its database object, or the current connection. See the options for +DB#get_last_error+.
     #
     # @option opts [Boolean] :continue_on_error (+false+) If true, then
     #   continue a bulk insert even if one of the documents inserted
     #   triggers a database assertion (as in a duplicate insert, for instance).
     #   If not acknowledging writes, the list of ids returned will
     #   include the object ids of all documents attempted on insert, even
-    #   if some are rejected on error. When acknowledging writes, any error will raise an 
+    #   if some are rejected on error. When acknowledging writes, any error will raise an
     #   OperationFailure exception.
     #   MongoDB v2.0+.
     # @option opts [Boolean] :collect_on_error (+false+) if true, then
     #   collects invalid documents as an array. Note that this option changes the result format.
     #
-    # @raise [Mongo::OperationFailure] will be raised iff :w > 0 and the operation fails. 
+    # @raise [Mongo::OperationFailure] will be raised iff :w > 0 and the operation fails.
     #
     # @core insert insert-instance_method
     def insert(doc_or_docs, opts={})
@@ -392,7 +390,7 @@ module Mongo
     #
     #   Notes on write concern:
     #     Options provided here will override any write concern options set on this collection,
-    #     its database object, or the current connection. See the options for +DB#get_last_error+.  
+    #     its database object, or the current connection. See the options for +DB#get_last_error+.
     #
     # @example remove all documents from the 'users' collection:
     #   users.remove
@@ -446,7 +444,7 @@ module Mongo
     #
     #   Notes on write concern:
     #     Options provided here will override any write concern options set on this collection,
-    #     its database object, or the current connection. See the options for DB#get_last_error. 
+    #     its database object, or the current connection. See the options for DB#get_last_error.
     #
     # @return [Hash, true] Returns a Hash containing the last error object if acknowledging writes.
     #   Otherwise, returns true.
@@ -483,8 +481,9 @@ module Mongo
     #
     # @param [String, Array] spec
     #   should be either a single field name or an array of
-    #   [field name, direction] pairs. Directions should be specified
-    #   as Mongo::ASCENDING, Mongo::DESCENDING, or Mongo::GEO2D.
+    #   [field name, type] pairs. Index types should be specified
+    #   as Mongo::ASCENDING, Mongo::DESCENDING, Mongo::GEO2D, Mongo::GEO2DSPHERE, Mongo::GEOHAYSTACK,
+    #   Mongo::TEXT or Mongo::HASHED.
     #
     #   Note that geospatial indexing only works with versions of MongoDB >= 1.3.3+. Keep in mind, too,
     #   that in order to geo-index a given field, that field must reference either an array or a sub-object
@@ -501,6 +500,8 @@ module Mongo
     #   feature is only available in MongoDB >= 1.3.2.
     # @option opts [Boolean] :drop_dups (nil) If creating a unique index on a collection with pre-existing records,
     #   this option will keep the first document the database indexes and drop all subsequent with duplicate values.
+    # @option opts [Integer] :bucket_size (nil) For use with geoHaystack indexes. Number of documents to group
+    #   together within a certain proximity to a given longitude and latitude.
     # @option opts [Integer] :min (nil) specify the minimum longitude and latitude for a geo index.
     # @option opts [Integer] :max (nil) specify the maximum longitude and latitude for a geo index.
     #
@@ -525,11 +526,12 @@ module Mongo
     #
     # @core indexes create_index-instance_method
     def create_index(spec, opts={})
-      opts[:dropDups] = opts[:drop_dups] if opts[:drop_dups]
-      field_spec      = parse_index_spec(spec)
-      opts            = opts.dup
-      name            = opts.delete(:name) || generate_index_name(field_spec)
-      name            = name.to_s if name
+      opts[:dropDups]   = opts[:drop_dups] if opts[:drop_dups]
+      opts[:bucketSize] = opts[:bucket_size] if opts[:bucket_size]
+      field_spec        = parse_index_spec(spec)
+      opts              = opts.dup
+      name              = opts.delete(:name) || generate_index_name(field_spec)
+      name              = name.to_s if name
       generate_indexes(field_spec, name, opts)
       name
     end
@@ -551,11 +553,12 @@ module Mongo
     #
     # @return [String] the name of the index.
     def ensure_index(spec, opts={})
-      now             = Time.now.utc.to_i
-      opts[:dropDups] = opts[:drop_dups] if opts[:drop_dups]
-      field_spec      = parse_index_spec(spec)
-      name            = opts[:name] || generate_index_name(field_spec)
-      name            = name.to_s if name
+      now               = Time.now.utc.to_i
+      opts[:dropDups]   = opts[:drop_dups] if opts[:drop_dups]
+      opts[:bucketSize] = opts[:bucket_size] if opts[:bucket_size]
+      field_spec        = parse_index_spec(spec)
+      name              = opts[:name] || generate_index_name(field_spec)
+      name              = name.to_s if name
 
       if !@cache[name] || @cache[name] <= now
         generate_indexes(field_spec, name, opts)
@@ -626,7 +629,7 @@ module Mongo
     #
     # @param [Array] pipeline Should be a single array of pipeline operator hashes.
     #
-    #   '$project' Reshapes a document stream by including fields, excluding fields, inserting computed fields, 
+    #   '$project' Reshapes a document stream by including fields, excluding fields, inserting computed fields,
     #   renaming fields,or creating/populating fields that hold sub-documents.
     #
     #   '$match' Query-like interface for filtering documents out of the aggregation pipeline.
@@ -1017,11 +1020,13 @@ module Mongo
           end
       elsif spec.is_a?(Array) && spec.all? {|field| field.is_a?(Array) }
         spec.each do |f|
-          if [Mongo::ASCENDING, Mongo::DESCENDING, Mongo::GEO2D, Mongo::GEOHAYSTACK].include?(f[1])
+          if Mongo::INDEX_TYPES.include?(f[1])
             field_spec[f[0].to_s] = f[1]
           else
             raise MongoArgumentError, "Invalid index field #{f[1].inspect}; " +
-              "should be one of Mongo::ASCENDING (1), Mongo::DESCENDING (-1) or Mongo::GEO2D ('2d')."
+              "should be one of Mongo::ASCENDING (#{Mongo::ASCENDING}), Mongo::DESCENDING (#{Mongo::DESCENDING}), " +
+              "Mongo::GEOHAYSTACK ('#{Mongo::GEOHAYSTACK}'), Mongo::GEO2DSPHERE ('#{Mongo::GEO2DSPHERE}'), " +
+              "Mongo::TEXT ('#{Mongo::TEXT}'), or Mongo::HASHED ('#{Mongo::HASHED}')"
           end
         end
       else
@@ -1109,8 +1114,8 @@ module Mongo
 
     def generate_index_name(spec)
       indexes = []
-      spec.each_pair do |field, direction|
-        indexes.push("#{field}_#{direction}")
+      spec.each_pair do |field, type|
+        indexes.push("#{field}_#{type}")
       end
       indexes.join("_")
     end

data/lib/mongo/cursor.rb

@@ -6,12 +6,13 @@ module Mongo
     include Mongo::Constants
     include Mongo::Conversions
     include Mongo::Logging
+    include Mongo::ReadPreference
 
     attr_reader :collection, :selector, :fields,
       :order, :hint, :snapshot, :timeout,
       :full_collection_name, :transformer,
       :options, :cursor_id, :show_disk_loc,
-      :comment, :read, :tag_sets
+      :comment, :read, :tag_sets, :acceptable_latency
 
     # Create a new cursor.
     #
@@ -471,6 +472,7 @@ module Mongo
             nil, @options & OP_QUERY_EXHAUST != 0)
         rescue ConnectionFailure => ex
           socket.close if socket
+          @connection.unpin_pool
           @connection.refresh
           if tries < 3 && !@socket && (!@command || Mongo::Support::secondary_ok?(@selector))
             tries += 1
@@ -483,6 +485,9 @@ module Mongo
         ensure
           socket.checkin unless @socket || socket.nil?
         end
+        if !@socket && !@command
+          @connection.pin_pool(socket.pool, read_preference)
+        end
         @returned += @n_received
         @cache += results
         @query_run = true
@@ -530,16 +535,15 @@ module Mongo
         if @pool
           socket = @pool.checkout
         elsif @command && !Mongo::Support::secondary_ok?(@selector)
-          socket = @connection.checkout_reader(:primary)
+          socket = @connection.checkout_reader({:mode => :primary})
         else
-          socket = @connection.checkout_reader(@read, @tag_sets, @acceptable_latency)
+          socket = @connection.checkout_reader(read_preference)
         end
       rescue SystemStackError, NoMemoryError, SystemCallError => ex
         @connection.close
         raise ex
       end
       @pool = socket.pool
-      #puts "checkout_socket_from_connection caller:#{caller[0][/:in `([^']+)'/,1]} self:#{self.object_id} @pool.port:#{@pool.port}"
       socket
     end
 

data/lib/mongo/db.rb

@@ -14,6 +14,12 @@ module Mongo
     SYSTEM_JS_COLLECTION        = 'system.js'
     SYSTEM_COMMAND_COLLECTION   = '$cmd'
 
+    PROFILE_LEVEL = {
+      :off       => 0,
+      :slow_only => 1,
+      :all       => 2
+    }
+
     # Counter for generating unique request ids.
     @@current_request_id = 0
 
@@ -22,10 +28,24 @@ module Mongo
     # collection that already exists, raises an error.
     #
     # Strict mode is disabled by default, but enabled (+true+) at any time.
-    attr_writer :strict
+    #
+    # @deprecated Support for strict mode has been deprecated and will be
+    # removed in version 2.0 of the driver.
+    def strict=(value)
+      unless ENV['TEST_MODE']
+        warn "Support for strict mode has been deprecated and will be " +
+             "removed in version 2.0 of the driver."
+      end
+      @strict = value
+    end
 
     # Returns the value of the +strict+ flag.
-    def strict?; @strict; end
+    #
+    # @deprecated Support for strict mode has been deprecated and will be
+    # removed in version 2.0 of the driver.
+    def strict?
+      @strict
+    end
 
     # The name of the database and the local write concern options.
     attr_reader :name, :write_concern
@@ -45,8 +65,9 @@ module Mongo
     # @param [Mongo::MongoClient] client a connection object pointing to MongoDB. Note
     #   that databases are usually instantiated via the MongoClient class. See the examples below.
     #
-    # @option opts [Boolean] :strict (False) If true, collections must exist to be accessed and must
-    #   not exist to be created. See DB#collection and DB#create_collection.
+    # @option opts [Boolean] :strict (False) [DEPRECATED] If true, collections existence checks are
+    # performed during a number of relevant operations. See DB#collection, DB#create_collection and
+    # DB#drop_collection.
     #
     # @option opts [Object, #create_pk(doc)] :pk (BSON::ObjectId) A primary key factory object,
     #   which should take a hash and return a hash which merges the original hash with any primary key
@@ -99,10 +120,8 @@ module Mongo
     #
     # @core authenticate authenticate-instance_method
     def authenticate(username, password, save_auth=true)
-      if @connection.pool_size > 1
-        if !save_auth
-          raise MongoArgumentError, "If using connection pooling, :save_auth must be set to true."
-        end
+      if @connection.pool_size > 1 && !save_auth
+        raise MongoArgumentError, "If using connection pooling, :save_auth must be set to true."
       end
 
       begin
@@ -126,17 +145,15 @@ module Mongo
       auth['nonce'] = nonce
       auth['key'] = Mongo::Support.auth_key(username, password, nonce)
       if ok?(doc = self.command(auth, :check_response => false, :socket => opts[:socket]))
-        if save_auth
-          @connection.add_auth(@name, username, password)
-        end
-        true
+        @connection.add_auth(@name, username, password) if save_auth
       else
         message = "Failed to authenticate user '#{username}' on db '#{self.name}'"
         raise Mongo::AuthenticationError.new(message, doc['code'], doc)
       end
+      true
     end
 
-    # Adds a stored Javascript function to the database which can executed  
+    # Adds a stored Javascript function to the database which can executed
     # server-side in map_reduce, db.eval and $where clauses.
     #
     # @param [String] function_name
@@ -146,7 +163,7 @@ module Mongo
     def add_stored_function(function_name, code)
       self[SYSTEM_JS_COLLECTION].save(
         {
-          "_id" => function_name, 
+          "_id" => function_name,
           :value => BSON::Code.new(code)
         }
       )
@@ -159,11 +176,8 @@ module Mongo
     #
     # @return [Boolean]
     def remove_stored_function(function_name)
-      if self[SYSTEM_JS_COLLECTION].find_one({"_id" => function_name})
-        self[SYSTEM_JS_COLLECTION].remove({"_id" => function_name}, :w => 1)
-      else
-        return false
-      end
+      return false unless self[SYSTEM_JS_COLLECTION].find_one({"_id" => function_name})
+      self[SYSTEM_JS_COLLECTION].remove({"_id" => function_name}, :w => 1)
     end
 
     # Adds a user to this database for use with authentication. If the user already
@@ -181,7 +195,7 @@ module Mongo
       user['pwd'] = Mongo::Support.hash_password(username, password)
       user['readOnly'] = true if read_only;
       users.save(user)
-      return user
+      user
     end
 
     # Remove the given user from this database. Returns false if the user
@@ -194,7 +208,7 @@ module Mongo
       if self[SYSTEM_USER_COLLECTION].find_one({:user => username})
         self[SYSTEM_USER_COLLECTION].remove({:user => username}, :w => 1)
       else
-        return false
+        false
       end
     end
 
@@ -206,21 +220,17 @@ module Mongo
     #
     # @return [Boolean]
     def logout(opts={})
-      if @connection.pool_size > 1
-        @connection.logout_pools(@name)
-      end
-
+      @connection.logout_pools(@name) if @connection.pool_size > 1
       issue_logout(opts)
     end
 
     def issue_logout(opts={})
-      doc = command({:logout => 1}, :socket => opts[:socket])
-      if ok?(doc)
+      if ok?(doc = command({:logout => 1}, :socket => opts[:socket]))
         @connection.remove_auth(@name)
-        true
       else
-        raise MongoDBError, "error logging out: #{doc.inspect}"
+        raise MongoDBError, "Error logging out: #{doc.inspect}"
       end
+      true
     end
 
     # Get an array of collection names in this database.
@@ -278,20 +288,19 @@ module Mongo
     # @return [Mongo::Collection]
     def create_collection(name, opts={})
       name = name.to_s
-      if collection_names.include?(name)
-        if strict?
-          raise MongoDBError, "Collection #{name} already exists. " +
-            "Currently in strict mode."
-        else
-          return Collection.new(name, self, opts)
-        end
+      if strict? && collection_names.include?(name)
+        raise MongoDBError, "Collection '#{name}' already exists. (strict=true)"
       end
 
-      # Create a new collection.
-      oh = BSON::OrderedHash.new
-      oh[:create] = name
-      doc = command(oh.merge(opts || {}))
-      return Collection.new(name, self, :pk => @pk_factory) if ok?(doc)
+      begin
+        cmd = BSON::OrderedHash.new
+        cmd[:create] = name
+        doc = command(cmd.merge(opts || {}))
+        return Collection.new(name, self, :pk => @pk_factory) if ok?(doc)
+      rescue OperationFailure => e
+        return Collection.new(name, self, :pk => @pk_factory) if e.message =~ /exists/
+        raise e
+      end
       raise MongoDBError, "Error creating collection: #{doc.inspect}"
     end
 
@@ -306,8 +315,7 @@ module Mongo
     # @return [Mongo::Collection]
     def collection(name, opts={})
       if strict? && !collection_names.include?(name.to_s)
-        raise Mongo::MongoDBError, "Collection #{name} doesn't exist. " +
-          "Currently in strict mode."
+        raise MongoDBError, "Collection '#{name}' doesn't exist. (strict=true)"
       else
         opts = opts.dup
         opts.merge!(:pk => @pk_factory) unless opts[:pk]
@@ -322,9 +330,12 @@ module Mongo
     #
     # @return [Boolean] +true+ on success or +false+ if the collection name doesn't exist.
     def drop_collection(name)
-      return true unless collection_names.include?(name.to_s)
-
-      ok?(command(:drop => name))
+      return false if strict? && !collection_names.include?(name.to_s)
+      begin
+        ok?(command(:drop => name))
+      rescue OperationFailure => e
+        false
+      end
     end
 
     # Run the getlasterror command with the specified replication options.
@@ -342,7 +353,7 @@ module Mongo
       cmd[:getlasterror] = 1
       cmd.merge!(opts)
       doc = command(cmd, :check_response => false)
-      raise MongoDBError, "error retrieving last error: #{doc.inspect}" unless ok?(doc)
+      raise MongoDBError, "Error retrieving last error: #{doc.inspect}" unless ok?(doc)
       doc
     end
 
@@ -362,11 +373,7 @@ module Mongo
     # @return [String, Nil] the text of the error or +nil+ if no error has occurred.
     def previous_error
       error = command(:getpreverror => 1)
-      if error["err"]
-        error
-      else
-        nil
-      end
+      error["err"] ? error : nil
     end
 
     # Reset the error history of this database
@@ -393,19 +400,19 @@ module Mongo
     # Evaluate a JavaScript expression in MongoDB.
     #
     # @param [String, Code] code a JavaScript expression to evaluate server-side.
-    # @param [Integer, Hash] args any additional argument to be passed to the +code+ expression when 
+    # @param [Integer, Hash] args any additional argument to be passed to the +code+ expression when
     #   it's run on the server.
     #
     # @return [String] the return value of the function.
     def eval(code, *args)
-      if not code.is_a? BSON::Code
+      unless code.is_a?(BSON::Code)
         code = BSON::Code.new(code)
       end
 
-      oh = BSON::OrderedHash.new
-      oh[:$eval] = code
-      oh[:args]  = args
-      doc = command(oh)
+      cmd = BSON::OrderedHash.new
+      cmd[:$eval] = code
+      cmd[:args] = args
+      doc = command(cmd)
       doc['retval']
     end
 
@@ -418,10 +425,10 @@ module Mongo
     #
     # @raise MongoDBError if there's an error renaming the collection.
     def rename_collection(from, to)
-      oh = BSON::OrderedHash.new
-      oh[:renameCollection] = "#{@name}.#{from}"
-      oh[:to] = "#{@name}.#{to}"
-      doc = DB.new('admin', @connection).command(oh, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:renameCollection] = "#{@name}.#{from}"
+      cmd[:to] = "#{@name}.#{to}"
+      doc = DB.new('admin', @connection).command(cmd, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error renaming collection: #{doc.inspect}")
     end
 
@@ -435,10 +442,10 @@ module Mongo
     #
     # @raise MongoDBError if there's an error dropping the index.
     def drop_index(collection_name, index_name)
-      oh = BSON::OrderedHash.new
-      oh[:deleteIndexes] = collection_name
-      oh[:index] = index_name.to_s
-      doc = command(oh, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:deleteIndexes] = collection_name
+      cmd[:index] = index_name.to_s
+      doc = command(cmd, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error with drop_index command: #{doc.inspect}")
     end
 
@@ -447,7 +454,7 @@ module Mongo
     #
     # @param [String] collection_name
     #
-    # @return [Hash] keys are index names and the values are lists of [key, direction] pairs
+    # @return [Hash] keys are index names and the values are lists of [key, type] pairs
     #   defining the index.
     def index_information(collection_name)
       sel  = {:ns => full_collection_name(collection_name)}
@@ -499,8 +506,9 @@ module Mongo
     # @core commands command_instance-method
     def command(selector, opts={})
       check_response = opts.fetch(:check_response, true)
-      socket         = opts[:socket]
-      raise MongoArgumentError, "command must be given a selector" unless selector.is_a?(Hash) && !selector.empty?
+      socket = opts[:socket]
+      raise MongoArgumentError, "Command must be given a selector" unless selector.is_a?(Hash) && !selector.empty?
+
       if selector.keys.length > 1 && RUBY_VERSION < '1.9' && selector.class != BSON::OrderedHash
         raise MongoArgumentError, "DB#command requires an OrderedHash when hash contains multiple keys"
       end
@@ -513,19 +521,21 @@ module Mongo
       end
 
       begin
-        result = Cursor.new(system_command_collection,
-                            :limit => -1,
-                            :selector => selector,
-                            :socket => socket,
-                            :read => read_pref,
-                            :comment => opts[:comment]).next_document
+        result = Cursor.new(
+          system_command_collection,
+          :limit => -1,
+          :selector => selector,
+          :socket => socket,
+          :read => read_pref,
+          :comment => opts[:comment]).next_document
       rescue OperationFailure => ex
         raise OperationFailure, "Database command '#{selector.keys.first}' failed: #{ex.message}"
       end
 
-      if result.nil?
-        raise OperationFailure, "Database command '#{selector.keys.first}' failed: returned null."
-      elsif (check_response && !ok?(result))
+      raise OperationFailure,
+        "Database command '#{selector.keys.first}' failed: returned null." unless result
+
+      if check_response && !ok?(result)
         message = "Database command '#{selector.keys.first}' failed: ("
         message << result.map do |key, value|
           "#{key}: '#{value}'"
@@ -533,9 +543,9 @@ module Mongo
         message << ').'
         code = result['code'] || result['assertionCode']
         raise OperationFailure.new(message, code, result)
-      else
-        result
       end
+
+      result
     end
 
     # A shortcut returning db plus dot plus collection name.
@@ -558,9 +568,8 @@ module Mongo
     #
     # @raise [MongoArgumentError] if the primary key factory has already been set.
     def pk_factory=(pk_factory)
-      if @pk_factory
-        raise MongoArgumentError, "Cannot change primary key factory once it's been set"
-      end
+      raise MongoArgumentError,
+        "Cannot change primary key factory once it's been set" if @pk_factory
 
       @pk_factory = pk_factory
     end
@@ -572,20 +581,15 @@ module Mongo
     #
     # @core profiling profiling_level-instance_method
     def profiling_level
-      oh = BSON::OrderedHash.new
-      oh[:profile] = -1
-      doc = command(oh, :check_response => false)
-      raise "Error with profile command: #{doc.inspect}" unless ok?(doc) && doc['was'].kind_of?(Numeric)
-      case doc['was'].to_i
-      when 0
-        :off
-      when 1
-        :slow_only
-      when 2
-        :all
-      else
-        raise "Error: illegal profiling level value #{doc['was']}"
-      end
+      cmd = BSON::OrderedHash.new
+      cmd[:profile] = -1
+      doc = command(cmd, :check_response => false)
+
+      raise "Error with profile command: #{doc.inspect}" unless ok?(doc)
+
+      level_sym = PROFILE_LEVEL.invert[doc['was'].to_i]
+      raise "Error: illegal profiling level value #{doc['was']}" unless level_sym
+      level_sym
     end
 
     # Set this database's profiling level. If profiling is enabled, you can
@@ -593,18 +597,9 @@ module Mongo
     #
     # @param [Symbol] level acceptable options are +:off+, +:slow_only+, or +:all+.
     def profiling_level=(level)
-      oh = BSON::OrderedHash.new
-      oh[:profile] = case level
-                     when :off
-                       0
-                     when :slow_only
-                       1
-                     when :all
-                       2
-                     else
-                       raise "Error: illegal profiling level value #{level}"
-                     end
-      doc = command(oh, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:profile] = PROFILE_LEVEL[level]
+      doc = command(cmd, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error with profile command: #{doc.inspect}")
     end
 
@@ -628,9 +623,9 @@ module Mongo
       cmd[:validate] = name
       cmd[:full] = true
       doc = command(cmd, :check_response => false)
-      if !ok?(doc)
-        raise MongoDBError, "Error with validate command: #{doc.inspect}"
-      end
+
+      raise MongoDBError, "Error with validate command: #{doc.inspect}" unless ok?(doc)
+
       if (doc.has_key?('valid') && !doc['valid']) || (doc['result'] =~ /\b(exception|corrupt)\b/i)
         raise MongoDBError, "Error: invalid collection #{name}: #{doc.inspect}"
       end