mongo 1.0.1 → 1.0.2

data/Rakefile

@@ -134,18 +134,18 @@ namespace :gem do
 
   desc "Install the gem locally"
   task :install do
+    sh "gem build bson.gemspec"
+    sh "gem install bson-*.gem"
     sh "gem build mongo-ruby-driver.gemspec"
     sh "gem install mongo-*.gem"
     sh "rm mongo-*.gem"
+    sh "rm bson-*.gem"
   end
 
   desc "Install the optional c extensions"
   task :install_extensions do
-    sh "gem build bson.gemspec"
     sh "gem build bson_ext.gemspec"
-    sh "gem install bson-*.gem"
     sh "gem install bson_ext-*.gem"
-    sh "rm bson-*.gem"
     sh "rm bson_ext-*.gem"
   end
 

data/lib/mongo.rb

@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end
 
 module Mongo
@@ -24,8 +24,6 @@ module Mongo
     OP_QUERY_TAILABLE          = 2
     OP_QUERY_SLAVE_OK          = 4
     OP_QUERY_NO_CURSOR_TIMEOUT = 16
-
-    DEFAULT_BATCH_SIZE = 100
   end
 
 end

data/lib/mongo/collection.rb

@@ -452,7 +452,7 @@ module Mongo
       cmd.merge!(opts)
       cmd[:sort] = Mongo::Support.format_order_clause(opts[:sort]) if opts[:sort]
 
-      @db.command(cmd, false, true)['value']
+      @db.command(cmd)['value']
     end
 
     # Perform a map/reduce operation on the current collection.
@@ -536,9 +536,9 @@ module Mongo
         group_command['group']['finalize'] = finalize
       end
 
-      result = @db.command group_command
+      result = @db.command(group_command)
 
-      if result["ok"] == 1
+      if Mongo::Support.ok?(result)
         result["retval"]
       else
         raise OperationFailure, "group command failed: #{result['errmsg']}"

data/lib/mongo/connection.rb

@@ -219,7 +219,7 @@ module Mongo
     #
     # @return [Hash]
     def database_info
-      doc = self['admin'].command({:listDatabases => 1}, false, true)
+      doc = self['admin'].command({:listDatabases => 1})
       returning({}) do |info|
         doc['databases'].each { |db| info[db['name']] = db['sizeOnDisk'].to_i }
       end
@@ -283,12 +283,12 @@ module Mongo
         nonce_cmd = BSON::OrderedHash.new
         nonce_cmd[:copydbgetnonce] = 1
         nonce_cmd[:fromhost] = from_host
-        result = self["admin"].command(nonce_cmd, true, true)
+        result = self["admin"].command(nonce_cmd)
         oh[:nonce] = result["nonce"]
         oh[:username] = username
         oh[:key] = Mongo::Support.auth_key(username, password, oh[:nonce])
       end
-      self["admin"].command(oh, true, true)
+      self["admin"].command(oh)
     end
 
     # Increment and return the next available request id.
@@ -306,7 +306,7 @@ module Mongo
     #
     # @return [Hash]
     def server_info
-      self["admin"].command({:buildinfo => 1}, false, true)
+      self["admin"].command({:buildinfo => 1})
     end
 
     # Get the build version of the current server.
@@ -422,8 +422,9 @@ module Mongo
           socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
           # If we're connected to master, set the @host and @port
-          result = self['admin'].command({:ismaster => 1}, false, false, socket)
-          if result['ok'] == 1 && ((is_master = result['ismaster'] == 1) || @slave_ok)
+          result = self['admin'].command({:ismaster => 1}, :check_response => false, :sock => socket)
+          if Mongo::Support.ok?(result) &&
+              ((is_master = result['ismaster'] == 1) || @slave_ok)
             @host, @port = host, port
             apply_saved_authentication
           end

data/lib/mongo/cursor.rb

@@ -40,6 +40,9 @@ module Mongo
 
       @selector   = convert_selector_for_query(options[:selector])
       @fields     = convert_fields_for_query(options[:fields])
+      if options[:admin]
+        warn "The admin option to Cursor#new has been deprecated. The cursor should now be passed the admin collection explicitly."
+      end
       @admin      = options[:admin]    || false
       @skip       = options[:skip]     || 0
       @limit      = options[:limit]    || 0
@@ -50,7 +53,7 @@ module Mongo
       @explain    = options[:explain]
       @socket     = options[:socket]
       @tailable   = options[:tailable] || false
-      @batch_size = options[:batch_size] || Mongo::Constants::DEFAULT_BATCH_SIZE
+      @batch_size = options[:batch_size] || 0
 
       @full_collection_name = "#{@collection.db.name}.#{@collection.name}"
       @cache = []
@@ -100,7 +103,7 @@ module Mongo
                             "query",  @selector,
                             "fields", @fields]
       response = @db.command(command)
-      return response['n'].to_i if response['ok'] == 1
+      return response['n'].to_i if Mongo::Support.ok?(response)
       return 0 if response['errmsg'] == "ns missing"
       raise OperationFailure, "Count failed: #{response['errmsg']}"
     end
@@ -264,7 +267,6 @@ module Mongo
     def query_options_hash
       { :selector => @selector,
         :fields   => @fields,
-        :admin    => @admin,
         :skip     => @skip_num,
         :limit    => @limit_num,
         :order    => @order,

data/lib/mongo/db.rb

@@ -87,7 +87,7 @@ module Mongo
     #
     # @core authenticate authenticate-instance_method
     def authenticate(username, password, save_auth=true)
-      doc = command(:getnonce => 1)
+      doc = command({:getnonce => 1}, :check_response => false)
       raise "error retrieving nonce: #{doc}" unless ok?(doc)
       nonce = doc['nonce']
 
@@ -96,7 +96,7 @@ module Mongo
       auth['user'] = username
       auth['nonce'] = nonce
       auth['key'] = Mongo::Support.auth_key(username, password, nonce)
-      if ok?(command(auth))
+      if ok?(self.command(auth, :check_response => false))
         if save_auth
           @connection.add_auth(@name, username, password)
         end
@@ -217,8 +217,7 @@ module Mongo
       oh = BSON::OrderedHash.new
       oh[:create] = name
       doc = command(oh.merge(options || {}))
-      ok = doc['ok']
-      return Collection.new(self, name, @pk_factory) if ok.kind_of?(Numeric) && (ok.to_i == 1 || ok.to_i == 0)
+      return Collection.new(self, name, @pk_factory) if ok?(doc)
       raise MongoDBError, "Error creating collection: #{doc.inspect}"
     end
 
@@ -260,7 +259,7 @@ module Mongo
       cmd = BSON::OrderedHash.new
       cmd[:getlasterror] = 1
       cmd.merge!(opts) unless opts.empty?
-      doc = command(cmd)
+      doc = command(cmd, :check_response => false)
       raise MongoDBError, "error retrieving last error: #{doc.inspect}" unless ok?(doc)
       doc['err']
     end
@@ -359,7 +358,7 @@ module Mongo
       oh = BSON::OrderedHash.new
       oh[:renameCollection] = "#{@name}.#{from}"
       oh[:to] = "#{@name}.#{to}"
-      doc = command(oh, true)
+      doc = DB.new('admin', @connection).command(oh)
       ok?(doc) || raise(MongoDBError, "Error renaming collection: #{doc.inspect}")
     end
 
@@ -427,8 +426,7 @@ module Mongo
     #
     # @return [Boolean]
     def ok?(doc)
-      ok = doc['ok']
-      ok.kind_of?(Numeric) && ok.to_i == 1
+      Mongo::Support.ok?(doc)
     end
 
     # Send a command to the database.
@@ -441,29 +439,38 @@ module Mongo
     # to see how it works.
     #
     # @param [OrderedHash, Hash] selector an OrderedHash, or a standard Hash with just one
-    # key, specifying the command to be performed.
+    # key, specifying the command to be performed. In Ruby 1.9, OrderedHash isn't necessary since
+    # hashes are ordered by default.
     #
     # @param [Boolean] admin If +true+, the command will be executed on the admin
-    # collection.
+    # collection. DEPRECATED.
     #
-    # @param [Boolean] check_response If +true+, will raise an exception if the
+    # @option opts [Boolean] :check_response (true) If +true+, raises an exception if the
     # command fails.
-    #
-    # @param [Socket] sock a socket to use. This is mainly for internal use.
+    # @option opts [Socket] :sock a socket to use for sending the command. This is mainly for internal use.
     #
     # @return [Hash]
     #
     # @core commands command_instance-method
-    def command(selector, admin=false, check_response=false, sock=nil)
+    def command(selector, opts={}, old_check_response=false, old_sock=nil)
+      if opts.is_a?(Hash)
+        check_response = opts[:check_response].nil? ? true : opts[:check_response]
+        sock           = opts[:sock]
+      else
+        warn "The options passed to DB#command should now be passed as hash keys; the admin option has been deprecated."
+        admin          = opts
+        check_response = old_check_response
+        sock           = old_sock
+      end
       raise MongoArgumentError, "command must be given a selector" unless selector.is_a?(Hash) && !selector.empty?
-      if selector.class.eql?(Hash) && selector.keys.length > 1
+      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
 
       result = Cursor.new(system_command_collection, :admin => admin,
         :limit => -1, :selector => selector, :socket => sock).next_document
 
-      if check_response && !ok?(result)
+      if result.nil? || (check_response && !ok?(result))
         raise OperationFailure, "Database command '#{selector.keys.first}' failed: #{result.inspect}"
       else
         result

data/lib/mongo/util/support.rb

@@ -68,5 +68,15 @@ module Mongo
             "[['field1', '(ascending|descending)'], ['field2', '(ascending|descending)']]"
       end
     end
+
+    # Determine if a database command has succeeded by
+    # checking the document response.
+    #
+    # @param [Hash] doc
+    #
+    # @return [Boolean] true if the 'ok' key is either 1 or *true*.
+    def ok?(doc)
+      doc['ok'] == 1.0 || doc['ok'] == true
+    end
   end
 end

data/test/connection_test.rb

@@ -21,7 +21,7 @@ class TestConnection < Test::Unit::TestCase
   def test_server_info
     server_info = @mongo.server_info
     assert server_info.keys.include?("version")
-    assert_equal 1.0, server_info["ok"]
+    assert Mongo::Support.ok?(server_info)
   end
 
   def test_server_version
@@ -71,7 +71,7 @@ class TestConnection < Test::Unit::TestCase
     end
 
     result = @mongo.copy_database('old', 'new', 'localhost', 'bob', 'secret')
-    assert result['ok'].to_i == 1
+    assert Mongo::Support.ok?(result)
 
     @mongo.drop_database('old')
     @mongo.drop_database('new')

data/test/db_test.rb

@@ -152,18 +152,27 @@ class DBTest < Test::Unit::TestCase
     assert @@db.logout
   end
 
+  def test_command
+    assert_raise OperationFailure do
+      @@db.command({:non_command => 1}, :check_response => true)
+    end
+
+    result = @@db.command({:non_command => 1}, :check_response => false)
+    assert !Mongo::Support.ok?(result)
+  end
+
   def test_error
     @@db.reset_error_history
     assert_nil @@db.error
     assert !@@db.error?
     assert_nil @@db.previous_error
 
-    @@db.send(:command, :forceerror => 1)
+    @@db.command({:forceerror => 1}, :check_response => false)
     assert @@db.error?
     assert_not_nil @@db.error
     assert_not_nil @@db.previous_error
 
-    @@db.send(:command, :forceerror => 1)
+    @@db.command({:forceerror => 1}, :check_response => false)
     assert @@db.error?
     assert @@db.error
     prev_error = @@db.previous_error
@@ -203,7 +212,7 @@ class DBTest < Test::Unit::TestCase
   def test_check_command_response
     command = {:forceerror => 1}
     assert_raise OperationFailure do 
-      @@db.command(command, false, true)
+      @@db.command(command)
     end
   end
 

data/test/support_test.rb

@@ -0,0 +1,19 @@
+require 'test/test_helper'
+
+class SupportTest < Test::Unit::TestCase
+  include Mongo
+
+  def test_command_response_succeeds
+    assert Support.ok?('ok' => 1)
+    assert Support.ok?('ok' => 1.0)
+    assert Support.ok?('ok' => true)
+  end
+
+  def test_command_response_fails
+    assert !Support.ok?('ok' => 0)
+    assert !Support.ok?('ok' => 0.0)
+    assert !Support.ok?('ok' => 0.0)
+    assert !Support.ok?('ok' => 'str')
+    assert !Support.ok?('ok' => false)
+  end
+end

data/test/unit/db_test.rb

@@ -22,8 +22,10 @@ class DBTest < Test::Unit::TestCase
       end
 
       should "raise an error if given a hash with more than one key" do
-        assert_raise MongoArgumentError do
-          @db.command(:buildinfo => 1, :somekey => 1)
+        if RUBY_VERSION < '1.9'
+          assert_raise MongoArgumentError do
+            @db.command(:buildinfo => 1, :somekey => 1)
+          end
         end
       end
 
@@ -60,7 +62,7 @@ class DBTest < Test::Unit::TestCase
 
       should "raise an error if collection creation fails" do
         @db.expects(:collection_names).returns([])
-        @db.expects(:command).returns({})
+        @db.expects(:command).returns({'ok' => 0})
         assert_raise Mongo::MongoDBError do
           @db.create_collection("foo")
         end
@@ -73,13 +75,6 @@ class DBTest < Test::Unit::TestCase
         end
       end
 
-      should "raise an error if rename fails" do
-        @db.expects(:command).returns({})
-        assert_raise Mongo::MongoDBError do
-          @db.rename_collection("foo", "bar")
-        end
-      end
-
       should "raise an error if drop_index fails" do
         @db.expects(:command).returns({})
         assert_raise Mongo::MongoDBError do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
-- Jim Menard
-- Mike Dirolf
-- Kyle Banker
+  - Jim Menard
+  - Mike Dirolf
+  - Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -04:00
+date: 2010-06-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bson
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.1
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: bson
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.0.2
+      version: 
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables: []
@@ -31,60 +31,60 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+  - README.rdoc
 files: 
-- README.rdoc
-- Rakefile
-- mongo-ruby-driver.gemspec
-- LICENSE.txt
-- lib/mongo.rb
-- lib/mongo/collection.rb
-- lib/mongo/connection.rb
-- lib/mongo/cursor.rb
-- lib/mongo/db.rb
-- lib/mongo/exceptions.rb
-- lib/mongo/gridfs/grid.rb
-- lib/mongo/gridfs/grid_ext.rb
-- lib/mongo/gridfs/grid_file_system.rb
-- lib/mongo/gridfs/grid_io.rb
-- lib/mongo/util/conversions.rb
-- lib/mongo/util/core_ext.rb
-- lib/mongo/util/server_version.rb
-- lib/mongo/util/support.rb
-- examples/admin.rb
-- examples/capped.rb
-- examples/cursor.rb
-- examples/gridfs.rb
-- examples/index_test.rb
-- examples/info.rb
-- examples/queries.rb
-- examples/simple.rb
-- examples/strict.rb
-- examples/types.rb
-- bin/bson_benchmark.rb
-- bin/fail_if_no_c.rb
+  - README.rdoc
+  - Rakefile
+  - mongo-ruby-driver.gemspec
+  - LICENSE.txt
+  - lib/mongo.rb
+  - lib/mongo/collection.rb
+  - lib/mongo/connection.rb
+  - lib/mongo/cursor.rb
+  - lib/mongo/db.rb
+  - lib/mongo/exceptions.rb
+  - lib/mongo/gridfs/grid.rb
+  - lib/mongo/gridfs/grid_ext.rb
+  - lib/mongo/gridfs/grid_file_system.rb
+  - lib/mongo/gridfs/grid_io.rb
+  - lib/mongo/util/conversions.rb
+  - lib/mongo/util/core_ext.rb
+  - lib/mongo/util/server_version.rb
+  - lib/mongo/util/support.rb
+  - examples/admin.rb
+  - examples/capped.rb
+  - examples/cursor.rb
+  - examples/gridfs.rb
+  - examples/index_test.rb
+  - examples/info.rb
+  - examples/queries.rb
+  - examples/simple.rb
+  - examples/strict.rb
+  - examples/types.rb
+  - bin/bson_benchmark.rb
+  - bin/fail_if_no_c.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
-- --inline-source
+  - --main
+  - README.rdoc
+  - --inline-source
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 requirements: []
 
@@ -94,28 +94,29 @@ signing_key:
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-- test/auxillary/1.4_features.rb
-- test/auxillary/authentication_test.rb
-- test/auxillary/autoreconnect_test.rb
-- test/collection_test.rb
-- test/connection_test.rb
-- test/conversions_test.rb
-- test/cursor_test.rb
-- test/db_api_test.rb
-- test/db_connection_test.rb
-- test/db_test.rb
-- test/grid_file_system_test.rb
-- test/grid_io_test.rb
-- test/grid_test.rb
-- test/replica/count_test.rb
-- test/replica/insert_test.rb
-- test/replica/pooled_insert_test.rb
-- test/replica/query_test.rb
-- test/slave_connection_test.rb
-- test/test_helper.rb
-- test/threading/test_threading_large_pool.rb
-- test/threading_test.rb
-- test/unit/collection_test.rb
-- test/unit/connection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/db_test.rb
+  - test/collection_test.rb
+  - test/connection_test.rb
+  - test/conversions_test.rb
+  - test/cursor_test.rb
+  - test/db_api_test.rb
+  - test/db_connection_test.rb
+  - test/db_test.rb
+  - test/grid_file_system_test.rb
+  - test/grid_io_test.rb
+  - test/grid_test.rb
+  - test/slave_connection_test.rb
+  - test/support_test.rb
+  - test/test_helper.rb
+  - test/threading_test.rb
+  - test/auxillary/1.4_features.rb
+  - test/auxillary/authentication_test.rb
+  - test/auxillary/autoreconnect_test.rb
+  - test/replica/count_test.rb
+  - test/replica/insert_test.rb
+  - test/replica/pooled_insert_test.rb
+  - test/replica/query_test.rb
+  - test/threading/test_threading_large_pool.rb
+  - test/unit/collection_test.rb
+  - test/unit/connection_test.rb
+  - test/unit/cursor_test.rb
+  - test/unit/db_test.rb