mongo 1.0 → 1.0.1

data/lib/mongo.rb

@@ -1,7 +1,9 @@
+# encoding: UTF-8
+
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end
 
 module Mongo
@@ -40,6 +42,7 @@ require 'mongo/connection'
 require 'mongo/cursor'
 require 'mongo/db'
 require 'mongo/exceptions'
+require 'mongo/gridfs/grid_ext'
 require 'mongo/gridfs/grid'
 require 'mongo/gridfs/grid_io'
 require 'mongo/gridfs/grid_file_system'

data/lib/mongo/collection.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -203,17 +205,22 @@ module Mongo
     #
     # @return [ObjectID] the _id of the saved document.
     #
-    # @option opts [Boolean] :safe (+false+) 
-    #   If true, check that the save succeeded. OperationFailure
-    #   will be raised on an error. Note that a safe check requires an extra
-    #   round-trip to the database.
-    def save(doc, options={})
+    # @option opts [Boolean, Hash] :safe (+false+)
+    #   run the operation in safe mode, which run a getlasterror command on the
+    #   database to report any assertion. In addition, a hash can be provided to
+    #   run an fsync and/or wait for replication of the save (>= 1.5.1). See the options
+    #   for DB#error.
+    #
+    # @raise [OperationFailure] when :safe mode fails.
+    #
+    # @see DB#remove for options that can be passed to :safe.
+    def save(doc, opts={})
       if doc.has_key?(:_id) || doc.has_key?('_id')
         id = doc[:_id] || doc['_id']
-        update({:_id => id}, doc, :upsert => true, :safe => options.delete(:safe))
+        update({:_id => id}, doc, :upsert => true, :safe => opts[:safe])
         id
       else
-        insert(doc, :safe => options.delete(:safe))
+        insert(doc, :safe => opts[:safe])
       end
     end
 
@@ -226,10 +233,13 @@ module Mongo
     #   the _id of the inserted document or a list of _ids of all inserted documents.
     #   Note: the object may have been modified by the database's PK factory, if it has one.
     #
-    # @option opts [Boolean] :safe (+false+) 
-    #   If true, check that the save succeeded. OperationFailure
-    #   will be raised on an error. Note that a safe check requires an extra
-    #   round-trip to the database.
+    # @option opts [Boolean, Hash] :safe (+false+)
+    #   run the operation in safe mode, which run a getlasterror command on the
+    #   database to report any assertion. In addition, a hash can be provided to
+    #   run an fsync and/or wait for replication of the insert (>= 1.5.1). See the options
+    #   for DB#error.
+    #
+    # @see DB#remove for options that can be passed to :safe.
     #
     # @core insert insert-instance_method
     def insert(doc_or_docs, options={})
@@ -245,8 +255,11 @@ module Mongo
     # @param [Hash] selector
     #   If specified, only matching documents will be removed.
     #
-    # @option opts [Boolean] :safe [false] run the operation in safe mode, which
-    #   will call :getlasterror on the database and report any assertions.
+    # @option opts [Boolean, Hash] :safe (+false+)
+    #   run the operation in safe mode, which run a getlasterror command on the
+    #   database to report any assertion. In addition, a hash can be provided to
+    #   run an fsync and/or wait for replication of the remove (>= 1.5.1). See the options
+    #   for DB#error.
     #
     # @example remove all documents from the 'users' collection:
     #   users.remove
@@ -260,6 +273,8 @@ module Mongo
     # @raise [Mongo::OperationFailure] an exception will be raised iff safe mode is enabled
     #   and the operation fails.
     #
+    # @see DB#remove for options that can be passed to :safe.
+    #
     # @core remove remove-instance_method
     def remove(selector={}, opts={})
       # Initial byte is 0.
@@ -270,7 +285,7 @@ module Mongo
 
       if opts[:safe]
         @connection.send_message_with_safe_check(Mongo::Constants::OP_DELETE, message, @db.name,
-          "#{@db.name}['#{@name}'].remove(#{selector.inspect})")
+          "#{@db.name}['#{@name}'].remove(#{selector.inspect})", opts[:safe])
         # the return value of send_message_with_safe_check isn't actually meaningful --
         # only the fact that it didn't raise an error is -- so just return true
         true
@@ -312,7 +327,7 @@ module Mongo
       message.put_array(BSON::BSON_CODER.serialize(document, false, true).to_a)
       if options[:safe]
         @connection.send_message_with_safe_check(Mongo::Constants::OP_UPDATE, message, @db.name,
-          "#{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})")
+          "#{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})", options[:safe])
       else
         @connection.send_message(Mongo::Constants::OP_UPDATE, message,
           "#{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})")
@@ -360,7 +375,7 @@ module Mongo
     # @core indexes create_index-instance_method
     def create_index(spec, opts={})
       opts.assert_valid_keys(:min, :max, :background, :unique, :dropDups)
-      field_spec = OrderedHash.new
+      field_spec = BSON::OrderedHash.new
       if spec.is_a?(String) || spec.is_a?(Symbol)
         field_spec[spec.to_s] = 1
       elsif spec.is_a?(Array) && spec.all? {|field| field.is_a?(Array) }
@@ -432,7 +447,7 @@ module Mongo
     #
     # @core findandmodify find_and_modify-instance_method
     def find_and_modify(opts={})
-      cmd = OrderedHash.new
+      cmd = BSON::OrderedHash.new
       cmd[:findandmodify] = @name
       cmd.merge!(opts)
       cmd[:sort] = Mongo::Support.format_order_clause(opts[:sort]) if opts[:sort]
@@ -465,7 +480,7 @@ module Mongo
       map    = BSON::Code.new(map) unless map.is_a?(BSON::Code)
       reduce = BSON::Code.new(reduce) unless reduce.is_a?(BSON::Code)
 
-      hash = OrderedHash.new
+      hash = BSON::OrderedHash.new
       hash['mapreduce'] = self.name
       hash['map'] = map
       hash['reduce'] = reduce
@@ -557,7 +572,7 @@ module Mongo
     # @return [Array] an array of distinct values.
     def distinct(key, query=nil)
       raise MongoArgumentError unless [String, Symbol].include?(key.class)
-      command = OrderedHash.new
+      command = BSON::OrderedHash.new
       command[:distinct] = @name
       command[:key]      = key.to_s
       command[:query]    = query
@@ -639,7 +654,7 @@ module Mongo
       when nil
         nil
       else
-        h = OrderedHash.new
+        h = BSON::OrderedHash.new
         hint.to_a.each { |k| h[k] = 1 }
         h
       end
@@ -657,7 +672,7 @@ module Mongo
       documents.each { |doc| message.put_array(BSON::BSON_CODER.serialize(doc, check_keys, true).to_a) }
       if safe
         @connection.send_message_with_safe_check(Mongo::Constants::OP_INSERT, message, @db.name,
-          "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})")
+          "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})", safe)
       else
         @connection.send_message(Mongo::Constants::OP_INSERT, message,
           "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})")

data/lib/mongo/connection.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -172,6 +174,9 @@ module Mongo
     # specificed in the list of auths. This method is called automatically
     # by DB#authenticate.
     #
+    # Note: this method will not actually issue an authentication command. To do that,
+    # either run Connection#apply_saved_authentication or DB#authenticate.
+    #
     # @param [String] db_name
     # @param [String] username
     # @param [String] password
@@ -266,7 +271,7 @@ module Mongo
     # @param [String] username username for authentication against from_db (>=1.3.x).
     # @param [String] password password for authentication against from_db (>=1.3.x).
     def copy_database(from, to, from_host="localhost", username=nil, password=nil)
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:copydb]   = 1
       oh[:fromhost] = from_host
       oh[:fromdb]   = from
@@ -275,7 +280,7 @@ module Mongo
         unless username && password
           raise MongoArgumentError, "Both username and password must be supplied for authentication."
         end
-        nonce_cmd = OrderedHash.new
+        nonce_cmd = BSON::OrderedHash.new
         nonce_cmd[:copydbgetnonce] = 1
         nonce_cmd[:fromhost] = from_host
         result = self["admin"].command(nonce_cmd, true, true)
@@ -347,13 +352,17 @@ module Mongo
     # @param [BSON::ByteBuffer] message a message to send to the database.
     # @param [String] db_name the name of the database. used on call to get_last_error.
     # @param [String] log_message text version of +message+ for logging.
+    # @param [Hash] last_error_params parameters to be sent to getLastError. See DB#error for
+    #   available options.
+    #
+    # @see DB#error for valid last error params.
     #
     # @return [Array]
     #   An array whose indexes include [0] documents returned, [1] number of document received,
     #   and [3] a cursor_id.
-    def send_message_with_safe_check(operation, message, db_name, log_message=nil)
+    def send_message_with_safe_check(operation, message, db_name, log_message=nil, last_error_params=false)
       message_with_headers = add_message_headers(operation, message)
-      message_with_check   = last_error_message(db_name)
+      message_with_check   = last_error_message(db_name, last_error_params)
       @logger.debug("  MONGODB #{log_message || message}") if @logger
       begin
         sock = checkout
@@ -366,7 +375,7 @@ module Mongo
       ensure
         checkin(sock)
       end
-      if num_received == 1 && error = docs[0]['err']
+      if num_received == 1 && (error = docs[0]['err'] || docs[0]['errmsg'])
         raise Mongo::OperationFailure, error
       end
       [docs, num_received, cursor_id]
@@ -644,13 +653,21 @@ module Mongo
       [docs, number_received, cursor_id]
     end
 
-    def last_error_message(db_name)
+    # Constructs a getlasterror message. This method is used exclusively by
+    # Connection#send_message_with_safe_check.
+    def last_error_message(db_name, opts)
       message = BSON::ByteBuffer.new
       message.put_int(0)
       BSON::BSON_RUBY.serialize_cstr(message, "#{db_name}.$cmd")
       message.put_int(0)
       message.put_int(-1)
-      message.put_array(BSON::BSON_CODER.serialize({:getlasterror => 1}, false).unpack("C*"))
+      cmd = BSON::OrderedHash.new
+      cmd[:getlasterror] = 1
+      if opts.is_a?(Hash)
+        opts.assert_valid_keys(:w, :wtimeout, :fsync)
+        cmd.merge!(opts)
+      end
+      message.put_array(BSON::BSON_CODER.serialize(cmd, false).unpack("C*"))
       add_message_headers(Mongo::Constants::OP_QUERY, message)
     end
 

data/lib/mongo/cursor.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # Copyright (C) 2008-2010 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -94,7 +96,7 @@ module Mongo
     #
     # @raise [OperationFailure] on a database error.
     def count
-      command = OrderedHash["count",  @collection.name,
+      command = BSON::OrderedHash["count",  @collection.name,
                             "query",  @selector,
                             "fields", @fields]
       response = @db.command(command)
@@ -299,10 +301,14 @@ module Mongo
          selector
         when nil
           {}
-        when String
-          {"$where" => Code.new(selector)}
-        when Code
+        when BSON::Code
+          warn "Collection#find will no longer take a JavaScript string in future versions. " +
+            "Please specify your $where query explicitly."
           {"$where" => selector}
+        when String
+          warn "Collection#find will no longer take a JavaScript string in future versions. " +
+            "Please specify your $where query explicitly."
+          {"$where" => BSON::Code.new(selector)}
       end
     end
 
@@ -366,7 +372,7 @@ module Mongo
 
     def construct_query_spec
       return @selector if @selector.has_key?('$query')
-      spec = OrderedHash.new
+      spec = BSON::OrderedHash.new
       spec['$query']    = @selector
       spec['$orderby']  = Mongo::Support.format_order_clause(@order) if @order
       spec['$hint']     = @hint if @hint && @hint.length > 0

data/lib/mongo/db.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -89,7 +91,7 @@ module Mongo
       raise "error retrieving nonce: #{doc}" unless ok?(doc)
       nonce = doc['nonce']
 
-      auth = OrderedHash.new
+      auth = BSON::OrderedHash.new
       auth['authenticate'] = 1
       auth['user'] = username
       auth['nonce'] = nonce
@@ -212,7 +214,7 @@ module Mongo
       end
 
       # Create a new collection.
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:create] = name
       doc = command(oh.merge(options || {}))
       ok = doc['ok']
@@ -247,11 +249,19 @@ module Mongo
     # Get the error message from the most recently executed database
     # operation for this connection.
     #
-    # @return [String, Nil] either the text describing the error or nil if no 
+    # @option opts [Boolean] :fsync (false)
+    # @option opts [Integer] :w (nil)
+    # @option opts [Integer] :wtimeout (nil)
+    #
+    # @return [String, Nil] either the text describing an error or nil if no
     #   error has occurred.
-    def error
-      doc = command(:getlasterror => 1)
-      raise MongoDBError, "error retrieving last error: #{doc}" unless ok?(doc)
+    def error(opts={})
+      opts.assert_valid_keys(:w, :wtimeout, :fsync)
+      cmd = BSON::OrderedHash.new
+      cmd[:getlasterror] = 1
+      cmd.merge!(opts) unless opts.empty?
+      doc = command(cmd)
+      raise MongoDBError, "error retrieving last error: #{doc.inspect}" unless ok?(doc)
       doc['err']
     end
 
@@ -329,7 +339,7 @@ module Mongo
         code = BSON::Code.new(code)
       end
 
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:$eval] = code
       oh[:args] = args
       doc = command(oh)
@@ -346,7 +356,7 @@ module Mongo
     # 
     # @raise MongoDBError if there's an error renaming the collection.
     def rename_collection(from, to)
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:renameCollection] = "#{@name}.#{from}"
       oh[:to] = "#{@name}.#{to}"
       doc = command(oh, true)
@@ -363,7 +373,7 @@ module Mongo
     #
     # @raise MongoDBError if there's an error renaming the collection.
     def drop_index(collection_name, index_name)
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:deleteIndexes] = collection_name
       oh[:index] = index_name
       doc = command(oh)
@@ -494,7 +504,7 @@ module Mongo
     #
     # @core profiling profiling_level-instance_method
     def profiling_level
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:profile] = -1
       doc = command(oh)
       raise "Error with profile command: #{doc.inspect}" unless ok?(doc) && doc['was'].kind_of?(Numeric)
@@ -515,7 +525,7 @@ module Mongo
     #
     # @param [Symbol] level acceptable options are +:off+, +:slow_only+, or +:all+.
     def profiling_level=(level)
-      oh = OrderedHash.new
+      oh = BSON::OrderedHash.new
       oh[:profile] = case level
                      when :off
                        0

data/lib/mongo/exceptions.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+
+#
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/mongo/gridfs/grid.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -18,6 +20,8 @@ module Mongo
 
   # Implementation of the MongoDB GridFS specification. A file store.
   class Grid
+    include GridExt::InstanceMethods
+
     DEFAULT_FS_NAME = 'fs'
 
     # Initialize a new Grid instance, consisting of a MongoDB database
@@ -44,15 +48,15 @@ module Mongo
     #
     # @param [String, #read] data a string or io-like object to store.
     #
-    # @options opts [String] :filename (nil) a name for the file.
-    # @options opts [Hash] :metadata ({}) any additional data to store with the file.
-    # @options opts [ObjectID] :_id (ObjectID) a unique id for
+    # @option opts [String] :filename (nil) a name for the file.
+    # @option opts [Hash] :metadata ({}) any additional data to store with the file.
+    # @option opts [ObjectID] :_id (ObjectID) a unique id for
     #   the file to be use in lieu of an automatically generated one.
-    # @options opts [String] :content_type ('binary/octet-stream') If no content type is specified,
+    # @option opts [String] :content_type ('binary/octet-stream') If no content type is specified,
     #   the content type will may be inferred from the filename extension if the mime-types gem can be
     #   loaded. Otherwise, the content type 'binary/octet-stream' will be used.
-    # @options opts [Integer] (262144) :chunk_size size of file chunks in bytes.
-    # @options opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
+    # @option opts [Integer] (262144) :chunk_size size of file chunks in bytes.
+    # @option opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
     #   will be validated using an md5 hash. If validation fails, an exception will be raised.
     #
     # @return [Mongo::ObjectID] the file's id.

data/lib/mongo/gridfs/grid_ext.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -15,16 +17,41 @@
 # ++
 
 module Mongo
-  module ClassMethods
-
-    def exists?(criteria)
-      BSON::ObjectID:
-      @files.find_one(query)
-    end
+  module GridExt
+    module InstanceMethods
 
-    def list(query={})
-      @files.find(query)
+      # Check the existence of a file matching the given query selector.
+      #
+      # Note that this method can be used with both the Grid and GridFileSystem classes. Also
+      # keep in mind that if you're going to be performing lots of existence checks, you should
+      # keep an instance of Grid or GridFileSystem handy rather than instantiating for each existence
+      # check. Alternatively, simply keep a reference to the proper files collection and query that
+      # as needed. That's exactly how this methods works.
+      #
+      # @param [Hash] selector a query selector.
+      #
+      # @example
+      #
+      #   # Check for the existence of a given filename
+      #   @grid = GridFileSystem.new(@db)
+      #   @grid.exist?(:filename => 'foo.txt')
+      #
+      #   # Check for existence filename and content type
+      #   @grid = GridFileSystem.new(@db)
+      #   @grid.exist?(:filename => 'foo.txt', :content_type => 'image/jpg')
+      #
+      #   # Check for existence by _id
+      #   @grid = Grid.new(@db)
+      #   @grid.exist?(:_id => BSON::ObjectID.from_string('4bddcd24beffd95a7db9b8c8'))
+      #
+      #   # Check for existence by an arbitrary attribute.
+      #   @grid = Grid.new(@db)
+      #   @grid.exist?(:tags => {'$in' => ['nature', 'zen', 'photography']})
+      #
+      # @return [nil, Hash] either nil for the file's metadata as a hash.
+      def exist?(selector)
+        @files.find_one(selector)
+      end
     end
-
   end
 end

data/lib/mongo/gridfs/grid_file_system.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -19,8 +21,9 @@ module Mongo
   # A file store built on the GridFS specification featuring
   # an API and behavior similar to that of a traditional file system.
   class GridFileSystem
+    include GridExt::InstanceMethods
 
-    # Initialize a new Grid instance, consisting of a MongoDB database
+    # Initialize a new GridFileSystem instance, consisting of a MongoDB database
     # and a filesystem prefix if not using the default.
     #
     # @param [Mongo::DB] db a MongoDB database.
@@ -51,17 +54,17 @@ module Mongo
     #   or writing to the file.
     # @param [Hash] opts see GridIO#new
     #
-    # @options opts [Hash] :metadata ({}) any additional data to store with the file.
-    # @options opts [ObjectID] :_id (ObjectID) a unique id for
+    # @option opts [Hash] :metadata ({}) any additional data to store with the file.
+    # @option opts [ObjectID] :_id (ObjectID) a unique id for
     #   the file to be use in lieu of an automatically generated one.
-    # @options opts [String] :content_type ('binary/octet-stream') If no content type is specified,
+    # @option opts [String] :content_type ('binary/octet-stream') If no content type is specified,
     #   the content type will may be inferred from the filename extension if the mime-types gem can be
     #   loaded. Otherwise, the content type 'binary/octet-stream' will be used.
-    # @options opts [Integer] (262144) :chunk_size size of file chunks in bytes.
-    # @options opts [Boolean] :delete_old (false) ensure that old versions of the file are deleted. This option
+    # @option opts [Integer] (262144) :chunk_size size of file chunks in bytes.
+    # @option opts [Boolean] :delete_old (false) ensure that old versions of the file are deleted. This option
     #  only work in 'w' mode. Certain precautions must be taken when deleting GridFS files. See the notes under
     #  GridFileSystem#delete.
-    # @options opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
+    # @option opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
     #   will be validated using an md5 hash. If validation fails, an exception will be raised.
     #
     # @example

data/lib/mongo/gridfs/grid_io.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -43,14 +45,14 @@ module Mongo
     # @option opts [Hash] :query a query selector used when opening the file in 'r' mode.
     # @option opts [Hash] :query_opts any query options to be used when opening the file in 'r' mode.
     # @option opts [String] :fs_name the file system prefix.
-    # @options opts [Integer] (262144) :chunk_size size of file chunks in bytes.
-    # @options opts [Hash] :metadata ({}) any additional data to store with the file.
-    # @options opts [ObjectID] :_id (ObjectID) a unique id for
+    # @option opts [Integer] (262144) :chunk_size size of file chunks in bytes.
+    # @option opts [Hash] :metadata ({}) any additional data to store with the file.
+    # @option opts [ObjectID] :_id (ObjectID) a unique id for
     #   the file to be use in lieu of an automatically generated one.
-    # @options opts [String] :content_type ('binary/octet-stream') If no content type is specified,
+    # @option opts [String] :content_type ('binary/octet-stream') If no content type is specified,
     #   the content type will may be inferred from the filename extension if the mime-types gem can be
     #   loaded. Otherwise, the content type 'binary/octet-stream' will be used.
-    # @options opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
+    # @option opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
     #   will be validated using an md5 hash. If validation fails, an exception will be raised.
     def initialize(files, chunks, filename, mode, opts={})
       @files        = files
@@ -197,7 +199,7 @@ module Mongo
     private
 
     def create_chunk(n)
-      chunk = OrderedHash.new
+      chunk = BSON::OrderedHash.new
       chunk['_id']      = BSON::ObjectID.new
       chunk['n']        = n
       chunk['files_id'] = @files_id
@@ -319,7 +321,7 @@ module Mongo
     end
 
     def to_mongo_object
-      h                = OrderedHash.new
+      h                = BSON::OrderedHash.new
       h['_id']         = @files_id
       h['filename']    = @filename if @filename
       h['contentType'] = @content_type
@@ -335,7 +337,7 @@ module Mongo
 
     # Get a server-side md5 and validate against the client if running in safe mode.
     def get_md5
-      md5_command            = OrderedHash.new
+      md5_command            = BSON::OrderedHash.new
       md5_command['filemd5'] = @files_id
       md5_command['root']    = @fs_name
       @server_md5 = @files.db.command(md5_command)['md5']

data/lib/mongo/util/conversions.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #
@@ -31,7 +33,7 @@ module Mongo #:nodoc:
     # <tt>array_as_sort_parameters([["field1", :asc], ["field2", :desc]])</tt> =>
     # <tt>{ "field1" => 1, "field2" => -1}</tt>
     def array_as_sort_parameters(value)
-      order_by = OrderedHash.new
+      order_by = BSON::OrderedHash.new
       if value.first.is_a? Array
         value.each do |param|
           if (param.class.name == "String")

data/lib/mongo/util/core_ext.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/mongo/util/server_version.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/lib/mongo/util/support.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # --
 # Copyright (C) 2008-2010 10gen Inc.
 #

data/test/auxillary/1.4_features.rb

@@ -150,7 +150,7 @@ class Features14Test < Test::Unit::TestCase
       end
 
       should "use geoNear command to return distances from a point" do
-        cmd = OrderedHash.new
+        cmd = BSON::OrderedHash.new
         cmd['geoNear'] = 'places'
         cmd['near']    = @empire_state
         cmd['num']     = 6

data/test/collection_test.rb

@@ -115,6 +115,39 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  if @@version >= "1.5.1"
+    def test_safe_mode_with_advanced_safe_with_invalid_options
+      assert_raise_error ArgumentError, "Unknown key(s): wtime" do
+        @@test.insert({:foo => 1}, :safe => {:w => 2, :wtime => 1, :fsync => true})
+      end
+      assert_raise_error ArgumentError, "Unknown key(s): wtime" do
+        @@test.update({:foo => 1}, {:foo => 2}, :safe => {:w => 2, :wtime => 1, :fsync => true})
+      end
+
+      assert_raise_error ArgumentError, "Unknown key(s): wtime" do
+        @@test.remove({:foo => 2}, :safe => {:w => 2, :wtime => 1, :fsync => true})
+      end
+    end
+
+    def test_safe_mode_with_w_failure
+      assert_raise_error OperationFailure, "timed out waiting for slaves" do
+        @@test.insert({:foo => 1}, :safe => {:w => 2, :wtimeout => 1, :fsync => true})
+      end
+      assert_raise_error OperationFailure, "timed out waiting for slaves" do
+        @@test.update({:foo => 1}, {:foo => 2}, :safe => {:w => 2, :wtimeout => 1, :fsync => true})
+      end
+      assert_raise_error OperationFailure, "timed out waiting for slaves" do
+        @@test.remove({:foo => 2}, :safe => {:w => 2, :wtimeout => 1, :fsync => true})
+      end
+    end
+
+    def test_safe_mode_with_write_and_fsync
+      assert @@test.insert({:foo => 1}, :safe => {:w => 1, :wtimeout => 1, :fsync => true})
+      assert @@test.update({:foo => 1}, {:foo => 2}, :safe => {:w => 1, :wtimeout => 1, :fsync => true})
+      assert @@test.remove({:foo => 2}, :safe => {:w => 1, :wtimeout => 1, :fsync => true})
+    end
+  end
+
   def test_update
     id1 = @@test.save("x" => 5)
     @@test.update({}, {"$inc" => {"x" => 1}})
@@ -272,6 +305,16 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  if @@version >= "1.5.1"
+    def test_fields_with_slice
+      @@test.save({:foo => [1, 2, 3, 4, 5, 6], :test => 'slice'})
+
+      doc = @@test.find_one({:test => 'slice'}, :fields => {'foo' => {'$slice' => [0, 3]}})
+      assert_equal [1, 2, 3], doc['foo']
+      @@test.remove
+    end
+  end
+
   def test_find_one
     id = @@test.save("hello" => "world", "foo" => "bar")
 
@@ -280,14 +323,14 @@ class TestCollection < Test::Unit::TestCase
     assert_equal @@test.find_one(nil), @@test.find_one()
     assert_equal @@test.find_one({}), @@test.find_one()
     assert_equal @@test.find_one("hello" => "world"), @@test.find_one()
-    assert_equal @@test.find_one(OrderedHash["hello", "world"]), @@test.find_one()
+    assert_equal @@test.find_one(BSON::OrderedHash["hello", "world"]), @@test.find_one()
 
     assert @@test.find_one(nil, :fields => ["hello"]).include?("hello")
     assert !@@test.find_one(nil, :fields => ["foo"]).include?("hello")
     assert_equal ["_id"], @@test.find_one(nil, :fields => []).keys()
 
     assert_equal nil, @@test.find_one("hello" => "foo")
-    assert_equal nil, @@test.find_one(OrderedHash["hello", "foo"])
+    assert_equal nil, @@test.find_one(BSON::OrderedHash["hello", "foo"])
     assert_equal nil, @@test.find_one(ObjectID.new)
 
     assert_raise TypeError do

data/test/connection_test.rb

@@ -3,7 +3,6 @@ require 'logger'
 require 'stringio'
 require 'thread'
 
-# NOTE: assumes Mongo is running
 class TestConnection < Test::Unit::TestCase
 
   include Mongo

data/test/cursor_test.rb

@@ -1,7 +1,6 @@
 require 'test/test_helper'
 require 'logger'
 
-# NOTE: assumes Mongo is running
 class CursorTest < Test::Unit::TestCase
 
   include Mongo

data/test/db_api_test.rb

@@ -1,6 +1,5 @@
 require 'test/test_helper'
 
-# NOTE: assumes Mongo is running
 class DBAPITest < Test::Unit::TestCase
   include Mongo
   include BSON
@@ -47,14 +46,14 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_save_ordered_hash
-    oh = OrderedHash.new
+    oh = BSON::OrderedHash.new
     oh['a'] = -1
     oh['b'] = 'foo'
 
     oid = @@coll.save(oh)
     assert_equal 'foo', @@coll.find_one(oid)['b']
 
-    oh = OrderedHash['a' => 1, 'b' => 'foo']
+    oh = BSON::OrderedHash['a' => 1, 'b' => 'foo']
     oid = @@coll.save(oh)
     assert_equal 'foo', @@coll.find_one(oid)['b']
   end
@@ -188,7 +187,7 @@ class DBAPITest < Test::Unit::TestCase
 
     # Sorting using ordered hash. You can use an unordered one, but then the
     # order of the keys won't be guaranteed thus your sort won't make sense.
-    oh = OrderedHash.new
+    oh = BSON::OrderedHash.new
     oh['a'] = -1
     assert_raise InvalidSortValueError do 
       docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => oh).to_a
@@ -470,8 +469,18 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.insert('a' => 3)
 
     assert_equal 3, @@coll.count
-    assert_equal 1, @@coll.find('$where' => Code.new('this.a > 2')).count()
-    assert_equal 2, @@coll.find('$where' => Code.new('this.a > i', {'i' => 1})).count()
+    assert_equal 1, @@coll.find('$where' => BSON::Code.new('this.a > 2')).count()
+    assert_equal 2, @@coll.find('$where' => BSON::Code.new('this.a > i', {'i' => 1})).count()
+  end
+
+  def test_implicit_where
+    @@coll.remove
+    @@coll.insert('a' => 2)
+    @@coll.insert('a' => 3)
+
+    assert_equal 2, @@coll.count
+    assert_equal 1, @@coll.find('this.a > 2').count()
+    assert_equal 2, @@coll.find(BSON::Code.new('this.a > z', {'z' => 1})).to_a.length
   end
 
   def test_eval

data/test/db_connection_test.rb

@@ -1,6 +1,5 @@
 require 'test/test_helper'
 
-# NOTE: assumes Mongo is running
 class DBConnectionTest < Test::Unit::TestCase
 
   include Mongo

data/test/db_test.rb

@@ -10,7 +10,6 @@ class TestPKFactory
   end
 end
 
-# NOTE: assumes Mongo is running
 class DBTest < Test::Unit::TestCase
 
   include Mongo
@@ -183,6 +182,24 @@ class DBTest < Test::Unit::TestCase
     assert_nil @@db.previous_error
   end
 
+  if @@version >= "1.5.1"
+    def test_failing_error_params
+      assert_raise_error Mongo::MongoDBError, "timed out waiting for slaves" do
+        @@db.error(:w => 2, :wtimeout => 10, :fsync => true)
+      end
+    end
+
+    def test_passing_error_params
+      assert_nil @@db.error(:w => 1, :wtimeout => 10, :fsync => true)
+    end
+
+    def test_invalid_error_params
+      assert_raise_error ArgumentError, "Unknown key(s): z" do
+        @@db.error(:z => 1, :wtimeout => 10, :fsync => true)
+      end
+    end
+  end
+
   def test_check_command_response
     command = {:forceerror => 1}
     assert_raise OperationFailure do 

data/test/grid_file_system_test.rb

@@ -25,6 +25,15 @@ class GridFileSystemTest < Test::Unit::TestCase
         @grid = GridFileSystem.new(@db)
       end
 
+      should "return existence of the file" do
+        file = @grid.exist?(:filename => 'sample.file')
+        assert_equal 'sample.file', file['filename']
+      end
+
+      should "return nil if the file doesn't exist" do
+        assert_nil @grid.exist?(:filename => 'foo.file')
+      end
+
       should "read sample data" do
         data = @grid.open('sample.file', 'r') { |f| f.read }
         assert_equal data.length, @chunks_data.length

data/test/grid_test.rb

@@ -22,6 +22,15 @@ class GridTest < Test::Unit::TestCase
         @id   = @grid.put(@data, :filename => 'sample', :metadata => {'app' => 'photos'})
       end
 
+      should "check existence" do
+        file = @grid.exist?(:filename => 'sample')
+        assert_equal 'sample', file['filename']
+      end
+
+      should "return nil if it doesn't exist" do
+        assert_nil @grid.exist?(:metadata => 'foo')
+      end
+
       should "retrieve the stored data" do
         data = @grid.get(@id).data
         assert_equal @data, data

data/test/test_helper.rb

@@ -23,7 +23,6 @@ require 'bson_ext/cbson' if ENV['C_EXT']
 
 MONGO_TEST_DB = 'mongo-ruby-test'
 
-# NOTE: most tests assume that MongoDB is running.
 class Test::Unit::TestCase
   include Mongo
   include BSON
@@ -42,4 +41,13 @@ class Test::Unit::TestCase
       end
     end
   end
+
+  def assert_raise_error(klass, message)
+    begin
+      yield
+    rescue => e
+      assert_equal klass, e.class
+      assert e.message.include?(message), "#{e.message} does not include #{message}."
+    end
+  end
 end

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jim Menard
@@ -15,22 +11,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-05-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id001
+        version: 1.0.1
+    version: 
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables: []
@@ -85,20 +78,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB