mongo 0.17.1 → 0.18

data/lib/mongo/errors.rb

@@ -27,8 +27,17 @@ module Mongo
   # Raised when invalid arguments are sent to Mongo Ruby methods.
   class MongoArgumentError < MongoRubyError; end
 
+  # Raised on failures in connection to the database server.
+  class ConnectionError < MongoRubyError; end
+
+  # Raised on failures in connection to the database server.
+  class ConnectionTimeoutError < MongoRubyError; end
+
   # Raised when a database operation fails.
   class OperationFailure < MongoDBError; end
+  
+  # Raised when a database operation fails.
+  class ConnectionFailure < MongoDBError; end
 
   # Raised when a client attempts to perform an invalid operation.
   class InvalidOperation < MongoDBError; end

data/lib/mongo/gridfs/grid_store.rb

@@ -442,7 +442,7 @@ module GridFS
       md5_command = OrderedHash.new
       md5_command['filemd5'] = @files_id
       md5_command['root'] = @root
-      h['md5'] = @db.db_command(md5_command)['md5']
+      h['md5'] = @db.command(md5_command)['md5']
       h
     end
 

data/lib/mongo/util/conversions.rb

@@ -19,7 +19,7 @@ module Mongo #:nodoc:
   # objects to mongo-friendly parameters.
   module Conversions
 
-    ASCENDING = ["ascending", "asc", "1"]
+    ASCENDING  = ["ascending", "asc", "1"]
     DESCENDING = ["descending", "desc", "-1"]
 
     # Converts the supplied +Array+ to a +Hash+ to pass to mongo as
@@ -28,17 +28,9 @@ module Mongo #:nodoc:
     #
     # Example:
     #
-    # *DEPRECATED
-    #
-    # <tt>array_as_sort_parameters(["field1", "field2"])</tt> =>
-    # <tt>{ "field1" => "1", "field2" => "1" }</tt>
-    #
-    # *New Syntax:
-    #
     # <tt>array_as_sort_parameters([["field1", :asc], ["field2", :desc]])</tt> =>
     # <tt>{ "field1" => 1, "field2" => -1}</tt>
     def array_as_sort_parameters(value)
-      warn_if_deprecated(value)
       order_by = OrderedHash.new
       value.each do |param|
         if (param.class.name == "String")
@@ -50,7 +42,7 @@ module Mongo #:nodoc:
       order_by
     end
 
-    # Converts the supplied +String+ to a +Hash+ to pass to mongo as
+    # Converts the supplied +String+ or +Symbol+ to a +Hash+ to pass to mongo as
     # a sorting parameter with ascending order. If the +String+
     # is empty then an empty +Hash+ will be returned.
     #
@@ -61,22 +53,8 @@ module Mongo #:nodoc:
     # <tt>string_as_sort_parameters("field")</tt> => <tt>{ "field" => 1 }</tt>
     # <tt>string_as_sort_parameters("")</tt> => <tt>{}</tt>
     def string_as_sort_parameters(value)
-      warn_if_deprecated(value)
-      return {} if value.empty?
-      { value => 1 }
-    end
-
-    # Converts the supplied +Symbol+ to a +Hash+ to pass to mongo as
-    # a sorting parameter with ascending order.
-    #
-    # Example:
-    #
-    # *DEPRECATED
-    #
-    # <tt>symbol_as_sort_parameters(:field)</tt> => <tt>{ "field" => 1 }</tt>
-    def symbol_as_sort_parameters(value)
-      warn_if_deprecated(value)
-      { value.to_s => 1 }
+      return {} if (str = value.to_s).empty?
+      { str => 1 }
     end
 
     # Converts the +String+, +Symbol+, or +Integer+ to the 
@@ -96,15 +74,5 @@ module Mongo #:nodoc:
         "#{self} was supplied as a sort direction when acceptable values are: " +
         "Mongo::ASCENDING, 'ascending', 'asc', :ascending, :asc, 1, Mongo::DESCENDING, 'descending', 'desc', :descending, :desc, -1.")
     end
-
-    # This is the method to call when the client needs to be warned of
-    # deprecation in the way sorting parameters are supplied.
-    def warn_if_deprecated(value)
-      unless value.is_a?(Array) && value.first.is_a?(Array)
-        warn("Specifying sort order as #{value.inspect} has been deprecated in favor of a new syntax: \n" +
-          "  :sort => [['field1', '(ascending|descending)'], ['field2', '(ascending|descending)']]")
-      end
-    end
-
   end
 end

data/test/replica/count_test.rb

@@ -0,0 +1,34 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: this test should be run only if a replica pair is running.
+class ReplicaPairCountTest < Test::Unit::TestCase
+  include Mongo
+ 
+  def setup 
+    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil)
+    @db = @conn.db('mongo-ruby-test')
+    @db.drop_collection("test-pairs")
+    @coll = @db.collection("test-pairs")
+  end
+
+  def test_correct_count_after_insertion_reconnect
+    @coll.insert({:a => 20}, :safe => true)
+    assert_equal 1, @coll.count
+
+    # Sleep to allow resync
+    sleep(3)
+
+    puts "Please disconnect the current master."
+    gets
+
+    rescue_connection_failure do 
+      @coll.insert({:a => 30}, :safe => true)
+    end
+    @coll.insert({:a => 40}, :safe => true)
+    assert_equal 3, @coll.count, "Second count failed"
+  end
+
+end

data/test/replica/insert_test.rb

@@ -0,0 +1,50 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: this test should be run only if a replica pair is running.
+class ReplicaPairInsertTest < Test::Unit::TestCase
+  include Mongo
+ 
+  def setup 
+    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil)
+    @db = @conn.db('mongo-ruby-test')
+    @db.drop_collection("test-pairs")
+    @coll = @db.collection("test-pairs")
+  end
+
+  def test_insert
+    @coll.save({:a => 20}, :safe => true)
+    puts "Please disconnect the current master."
+    gets
+
+    rescue_connection_failure do 
+      @coll.save({:a => 30}, :safe => true)
+    end
+
+    @coll.save({:a => 40}, :safe => true)
+    @coll.save({:a => 50}, :safe => true)
+    @coll.save({:a => 60}, :safe => true)
+    @coll.save({:a => 70}, :safe => true)
+
+    puts "Please reconnect the old master to make sure that the new master " + 
+         "has synced with the previous master. Note: this may have happened already."
+    gets
+    results = []
+    
+    rescue_connection_failure do 
+      @coll.find.each {|r| results << r}
+      [20, 30, 40, 50, 60, 70].each do |a|
+        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+      end
+    end
+
+    @coll.save({:a => 80}, :safe => true)
+    @coll.find.each {|r| results << r}
+    [20, 30, 40, 50, 60, 70, 80].each do |a|
+      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a} on second find"
+    end
+  end
+
+end

data/test/replica/pooled_insert_test.rb

@@ -0,0 +1,54 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: this test should be run only if a replica pair is running.
+class ReplicaPairPooledInsertTest < Test::Unit::TestCase
+  include Mongo
+ 
+  def setup 
+    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil, :pool_size => 10, :timeout => 5)
+    @db = @conn.db('mongo-ruby-test')
+    @db.drop_collection("test-pairs")
+    @coll = @db.collection("test-pairs")
+  end
+
+  def test_insert
+    expected_results = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    @coll.save({:a => -1}, :safe => true)
+    puts "Please disconnect the current master."
+    gets
+
+    threads = []
+    10.times do |i|
+      threads[i] = Thread.new do 
+        rescue_connection_failure do 
+          @coll.save({:a => i}, :safe => true)
+        end
+      end
+    end
+
+    puts "Please reconnect the old master to make sure that the new master " + 
+         "has synced with the previous master. Note: this may have happened already." + 
+         "Note also that when connection with multiple threads, you may need to wait a few seconds" +
+         "after restarting the old master so that all the data has had a chance to sync." +
+         "This is a case of eventual consistency."
+    gets
+    results = []
+    
+    rescue_connection_failure do 
+      @coll.find.each {|r| results << r}
+      expected_results.each do |a|
+        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+      end
+    end
+
+    @coll.save({:a => 10}, :safe => true)
+    @coll.find.each {|r| results << r}
+    (expected_results + [10]).each do |a|
+      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a} on second find"
+    end
+  end
+
+end

data/test/replica/query_test.rb

@@ -0,0 +1,39 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: this test should be run only if a replica pair is running.
+class ReplicaPairQueryTest < Test::Unit::TestCase
+  include Mongo
+ 
+  def setup 
+    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil)
+    @db = @conn.db('mongo-ruby-test')
+    @db.drop_collection("test-pairs")
+    @coll = @db.collection("test-pairs")
+  end
+
+  def test_query
+    @coll.save({:a => 20})
+    @coll.save({:a => 30})
+    @coll.save({:a => 40})
+    results = []
+    @coll.find.each {|r| results << r}
+    [20, 30, 40].each do |a|
+      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+    end
+
+    puts "Please disconnect the current master."
+    gets
+
+    results = []
+    rescue_connection_failure do 
+      @coll.find.each {|r| results << r}
+      [20, 30, 40].each do |a|
+        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+      end
+    end
+  end
+
+end

data/test/test_collection.rb

@@ -144,7 +144,7 @@ class TestCollection < Test::Unit::TestCase
 
       # Can't duplicate an index.
       assert_raise OperationFailure do
-        @@test.update({}, {"x" => 10}, :safe => true, :upsert => true)
+        @@test.update({}, {"x" => 10}, :safe => true)
       end
     end
   end
@@ -154,7 +154,6 @@ class TestCollection < Test::Unit::TestCase
 
     @@test.save("hello" => "world")
     @@test.save("hello" => "world")
-    assert(@@db.error.include?("E11000"))
 
     assert_raise OperationFailure do
       @@test.save({"hello" => "world"}, :safe => true)
@@ -266,6 +265,28 @@ class TestCollection < Test::Unit::TestCase
     assert c.closed?
   end
 
+  def test_mapreduce
+    @@test << { "user_id" => 1 }
+    @@test << { "user_id" => 2 }
+
+    m = "function() { emit(this.user_id, 1); }"
+    r = "function(k,vals) { return 1; }"
+    res = @@test.map_reduce(m, r);
+    assert res.find_one({"_id" => 1})
+    assert res.find_one({"_id" => 2})
+  end
+
+  def test_mapreduce_with_code_objects
+    @@test << { "user_id" => 1 }
+    @@test << { "user_id" => 2 }
+
+    m = Code.new("function() { emit(this.user_id, 1); }")
+    r = Code.new("function(k,vals) { return 1; }")
+    res = @@test.map_reduce(m, r);
+    assert res.find_one({"_id" => 1})
+    assert res.find_one({"_id" => 2})
+  end
+
   def test_saving_dates_pre_epoch
     begin
       @@test.save({'date' => Time.utc(1600)})
@@ -291,9 +312,6 @@ class TestCollection < Test::Unit::TestCase
       @@test.save(:foo => i)
     end
 
-    # TODO remove test for deprecated :offset option
-    assert_equal 5, @@test.find({}, :offset => 5).next_object()["foo"]
-
     assert_equal 5, @@test.find({}, :skip => 5).next_object()["foo"]
     assert_equal nil, @@test.find({}, :skip => 10).next_object()
 
@@ -388,11 +406,6 @@ class TestCollection < Test::Unit::TestCase
       assert_equal 0, @collection.find.count
     end
 
-    should "remove all records if deprecated clear is used" do 
-      @collection.clear
-      assert_equal 0, @collection.find.count
-    end
-
     should "remove only matching records" do 
       @collection.remove({:name => "Jones"})
       assert_equal 1, @collection.size

data/test/test_connection.rb

@@ -79,8 +79,7 @@ class TestConnection < Test::Unit::TestCase
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
     db = Connection.new(@host, @port, :logger => logger).db('ruby-mongo-test')
-
-    assert output.string.include?("$cmd.find")
+    assert output.string.include?("admin.$cmd.find")
   end
   
   def test_connection_logger
@@ -106,23 +105,23 @@ class TestConnection < Test::Unit::TestCase
     assert !@mongo.database_names.include?('ruby-mongo-will-be-deleted')
   end
 
-  def test_pair
-    db = Connection.new({:left => ['foo', 123]})
-    pair = db.instance_variable_get('@pair')
-    assert_equal 2, pair.length
-    assert_equal ['foo', 123], pair[0]
-    assert_equal ['localhost', Connection::DEFAULT_PORT], pair[1]
-
-    db = Connection.new({:right => 'bar'})
-    pair = db.instance_variable_get('@pair')
-    assert_equal 2, pair.length
-    assert_equal ['localhost', Connection::DEFAULT_PORT], pair[0]
-    assert_equal ['bar', Connection::DEFAULT_PORT], pair[1]
-
-    db = Connection.new({:right => ['foo', 123], :left => 'bar'})
-    pair = db.instance_variable_get('@pair')
-    assert_equal 2, pair.length
-    assert_equal ['bar', Connection::DEFAULT_PORT], pair[0]
-    assert_equal ['foo', 123], pair[1]
+  def test_nodes
+    db = Connection.new({:left => ['foo', 123]}, nil, :connect => false)
+    nodes = db.nodes
+    assert_equal 2, db.nodes.length
+    assert_equal ['foo', 123], nodes[0]
+    assert_equal ['localhost', Connection::DEFAULT_PORT], nodes[1]
+
+    db = Connection.new({:right => 'bar'}, nil, :connect => false)
+    nodes = db.nodes
+    assert_equal 2, nodes.length
+    assert_equal ['localhost', Connection::DEFAULT_PORT], nodes[0]
+    assert_equal ['bar', Connection::DEFAULT_PORT], nodes[1]
+
+    db = Connection.new({:right => ['foo', 123], :left => 'bar'}, nil, :connect => false)
+    nodes = db.nodes
+    assert_equal 2, nodes.length
+    assert_equal ['bar', Connection::DEFAULT_PORT], nodes[0]
+    assert_equal ['foo', 123], nodes[1]
   end
 end

data/test/test_conversions.rb

@@ -28,7 +28,7 @@ class ConversionsTest < Test::Unit::TestCase
   end
 
   def test_symbol_as_sort_parameters
-    params = symbol_as_sort_parameters(:field)
+    params = string_as_sort_parameters(:field)
     assert_equal({ "field" => 1 }, params)
   end
 
@@ -118,4 +118,4 @@ class ConversionsTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/test_cursor.rb

@@ -246,26 +246,26 @@ class CursorTest < Test::Unit::TestCase
   def test_kill_cursors
     @@coll.drop
 
-    client_cursors = @@db.db_command("cursorInfo" => 1)["clientCursors_size"]
-    by_location = @@db.db_command("cursorInfo" => 1)["byLocation_size"]
+    client_cursors = @@db.command("cursorInfo" => 1)["clientCursors_size"]
+    by_location = @@db.command("cursorInfo" => 1)["byLocation_size"]
 
     10000.times do |i|
       @@coll.insert("i" => i)
     end
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     10.times do |i|
       @@coll.find_one()
     end
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     10.times do |i|
       a = @@coll.find()
@@ -274,49 +274,49 @@ class CursorTest < Test::Unit::TestCase
     end
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a = @@coll.find()
     a.next_object()
 
     assert_not_equal(client_cursors,
-                     @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                     @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_not_equal(by_location,
-                     @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                     @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a.close()
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a = @@coll.find({}, :limit => 10).next_object()
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     @@coll.find() do |cursor|
       cursor.next_object()
     end
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     @@coll.find() { |cursor|
       cursor.next_object()
     }
 
     assert_equal(client_cursors,
-                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+                 @@db.command("cursorInfo" => 1)["clientCursors_size"])
     assert_equal(by_location,
-                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+                 @@db.command("cursorInfo" => 1)["byLocation_size"])
   end
 
   def test_count_with_fields