mongo 1.6.2 → 1.6.4

data/lib/mongo/version.rb

@@ -1,3 +1,3 @@
 module Mongo
-  VERSION = "1.6.2"
+  VERSION = "1.6.4"
 end

data/test/auxillary/1.4_features.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # Demonstrate features in MongoDB 1.4
 class Features14Test < Test::Unit::TestCase

data/test/auxillary/authentication_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: This test requires bouncing the server.
 # It also requires that a user exists on the admin database.

data/test/auxillary/autoreconnect_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: This test requires bouncing the server
 class AutoreconnectTest < Test::Unit::TestCase

data/test/auxillary/fork_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class ForkTest < Test::Unit::TestCase
   include Mongo

data/test/auxillary/repl_set_auth_test.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 require './test/tools/auth_repl_set_manager'
 require './test/replica_sets/rs_test_helper'
 

data/test/auxillary/slave_connection_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: these tests are run only if we can connect to a single MongoDB in slave mode.
 class SlaveConnectionTest < Test::Unit::TestCase

data/test/auxillary/threaded_authentication_test.rb

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'thread'
 require 'test/unit'
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # NOTE: This test requires bouncing the server.
 # It also requires that a user exists on the admin database.

data/test/bson/binary_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class BinaryTest < Test::Unit::TestCase
   def setup

data/test/bson/bson_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'set'
 
 if RUBY_VERSION < '1.9'
@@ -141,6 +141,13 @@ class BSONTest < Test::Unit::TestCase
       end
     end
 
+    def test_forced_encoding_with_valid_utf8
+      doc = {'doc' => "\xC3\xB6".force_encoding("ISO-8859-1")}
+      serialized = @encoder.serialize(doc)
+      deserialized = @encoder.deserialize(serialized)
+      assert_equal(doc['doc'], deserialized['doc'].force_encoding("ISO-8859-1"))
+    end
+
     # Based on a test from sqlite3-ruby
     def test_default_internal_is_honored
       before_enc = Encoding.default_internal

data/test/bson/byte_buffer_test.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class ByteBufferTest < Test::Unit::TestCase
   include BSON

data/test/bson/hash_with_indifferent_access_test.rb

@@ -1,5 +1,5 @@
 # encoding:utf-8
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require './test/support/hash_with_indifferent_access'
 
 class HashWithIndifferentAccessTest < Test::Unit::TestCase

data/test/bson/json_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rubygems'
 require 'json'
 

data/test/bson/object_id_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rubygems'
 require 'json'
 
@@ -135,4 +135,14 @@ class ObjectIdTest < Test::Unit::TestCase
     id = ObjectId.new
     assert_equal({"$oid" => id.to_s}, id.as_json)
   end
+
+  def test_object_id_array_flatten
+    id = ObjectId.new
+    assert_equal [ id ], [[ id ]].flatten
+  end
+
+  def test_object_id_array_flatten_bang
+    id = ObjectId.new
+    assert_equal [ id ], [[ id ]].flatten!
+  end
 end

data/test/bson/ordered_hash_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class OrderedHashTest < Test::Unit::TestCase
 

data/test/bson/timestamp_test.rb

@@ -1,4 +1,4 @@
-require './test/bson/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TimestampTest < Test::Unit::TestCase
 

data/test/collection_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'rbconfig'
 
 class TestCollection < Test::Unit::TestCase

data/test/connection_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 require 'stringio'
 require 'thread'
@@ -58,6 +58,30 @@ class TestConnection < Test::Unit::TestCase
     assert_equal mongo_port, con.primary_pool.port
   end
 
+  def test_env_mongodb_uri
+    begin
+      old_mongodb_uri = ENV['MONGODB_URI']
+      ENV['MONGODB_URI'] = "mongodb://#{host_port}"
+      con = Connection.new
+      assert_equal mongo_host, con.primary_pool.host
+      assert_equal mongo_port, con.primary_pool.port
+    ensure
+      ENV['MONGODB_URI'] = old_mongodb_uri
+    end
+  end
+
+  def test_from_uri_implicit_mongodb_uri
+    begin
+      old_mongodb_uri = ENV['MONGODB_URI']
+      ENV['MONGODB_URI'] = "mongodb://#{host_port}"
+      con = Connection.from_uri
+      assert_equal mongo_host, con.primary_pool.host
+      assert_equal mongo_port, con.primary_pool.port
+    ensure
+      ENV['MONGODB_URI'] = old_mongodb_uri
+    end
+  end
+
   def test_server_version
     assert_match(/\d\.\d+(\.\d+)?/, @conn.server_version.to_s)
   end

data/test/conversions_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
 

data/test/cursor_fail_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 
 class CursorFailTest < Test::Unit::TestCase

data/test/cursor_message_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 
 class CursorMessageTest < Test::Unit::TestCase

data/test/cursor_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase

data/test/db_api_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class DBAPITest < Test::Unit::TestCase
   include Mongo
@@ -183,13 +183,67 @@ class DBAPITest < Test::Unit::TestCase
     # Sorting using empty array; no order guarantee should not blow up.
     docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => []).to_a
     assert_equal 4, docs.size
+  end
 
+  def test_find_sorting_with_hash
     # 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.
+
+    @@coll.remove
+    @@coll.insert('a' => 1, 'b' => 2)
+    @@coll.insert('a' => 2, 'b' => 1)
+    @@coll.insert('a' => 3, 'b' => 2)
+    @@coll.insert('a' => 4, 'b' => 1)
+    
     oh = BSON::OrderedHash.new
     oh['a'] = -1
-    assert_raise InvalidSortValueError do 
-      docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => oh).to_a
+
+    # Sort as a method
+    docs = @@coll.find.sort(oh).to_a
+    assert_equal 4, docs.size
+    assert_equal 4, docs[0]['a']
+    assert_equal 3, docs[1]['a']
+    assert_equal 2, docs[2]['a']
+    assert_equal 1, docs[3]['a']
+
+    # Sort as an option
+    docs = @@coll.find({}, :sort => oh).to_a
+    assert_equal 4, docs.size
+    assert_equal 4, docs[0]['a']
+    assert_equal 3, docs[1]['a']
+    assert_equal 2, docs[2]['a']
+    assert_equal 1, docs[3]['a']
+
+    if RUBY_VERSION > '1.9'
+      docs = @@coll.find({}, :sort => {:a => -1}).to_a
+      assert_equal 4, docs.size
+      assert_equal 4, docs[0]['a']
+      assert_equal 3, docs[1]['a']
+      assert_equal 2, docs[2]['a']
+      assert_equal 1, docs[3]['a']
+
+      docs = @@coll.find.sort(:a => -1).to_a
+      assert_equal 4, docs.size
+      assert_equal 4, docs[0]['a']
+      assert_equal 3, docs[1]['a']
+      assert_equal 2, docs[2]['a']
+      assert_equal 1, docs[3]['a']
+
+      docs = @@coll.find.sort(:b => -1, :a => 1).to_a
+      assert_equal 4, docs.size
+      assert_equal 1, docs[0]['a']
+      assert_equal 3, docs[1]['a']
+      assert_equal 2, docs[2]['a']
+      assert_equal 4, docs[3]['a']
+    else
+      # Sort as an option
+      assert_raise InvalidSortValueError do
+        @@coll.find({}, :sort => {:a => -1}).to_a
+      end
+      # Sort as a method
+      assert_raise InvalidSortValueError do
+        @@coll.find.sort(:a => -1).to_a
+      end
     end
   end
 

data/test/db_connection_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class DBConnectionTest < Test::Unit::TestCase
 

data/test/db_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'digest/md5'
 require 'stringio'
 require 'logger'

data/test/grid_file_system_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do

data/test/grid_io_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class GridIOTest < Test::Unit::TestCase
 
@@ -122,6 +122,35 @@ class GridIOTest < Test::Unit::TestCase
       end
     end
 
+    context "Writing" do
+      setup do
+        @filename = 'test'
+        @length = 50000
+        @times = 10
+      end
+
+      should "correctly write multiple chunks from mutiple writes" do
+        file = GridIO.new(@files, @chunks, @filename, 'w')
+
+        @times.times do
+          file.write("1" * @length)
+        end
+
+        file.close
+
+        file = GridIO.new(@files, @chunks, @filename, 'r')
+
+        total_size = 0
+        while !file.eof?
+          total_size += file.read(@length).length
+        end
+
+        file.close
+
+        assert_equal total_size, @times * @length
+      end
+    end
+
     context "Seeking" do
       setup do
         @filename = 'test'

data/test/grid_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 include Mongo
 
 def read_and_write_stream(filename, read_length, opts={})

data/test/pool_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 require 'thread'
 
 class PoolTest < Test::Unit::TestCase

data/test/replica_sets/basic_test.rb

@@ -25,6 +25,16 @@ class BasicTest < Test::Unit::TestCase
     assert @conn.connected?
   end
 
+  def test_multiple_concurrent_replica_set_connection
+    @conn1 = ReplSetConnection.new(build_seeds(3), :name => @rs.name)
+    @conn2 = ReplSetConnection.new(build_seeds(3), :name => @rs.name)
+    assert @conn1.connected?
+    assert @conn2.connected?
+
+    assert @conn1.manager != @conn2.manager
+    assert @conn1.local_manager != @conn2.local_manager
+  end
+
   def test_cache_original_seed_nodes
     seeds = build_seeds(3) << "#{@rs.host}:19356"
     @conn = ReplSetConnection.new(seeds, :name => @rs.name)

data/test/replica_sets/connect_test.rb

@@ -105,6 +105,34 @@ class ConnectTest < Test::Unit::TestCase
     assert @conn.is_a?(ReplSetConnection)
     assert @conn.connected?
   end
+
+  def test_connect_with_connection_string_in_env_var
+    begin
+      old_mongodb_uri = ENV['MONGODB_URI']
+      ENV['MONGODB_URI'] = "mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name}"
+      silently do
+        @conn = ReplSetConnection.new
+      end
+      assert @conn.is_a?(ReplSetConnection)
+      assert @conn.connected?
+    ensure
+      ENV['MONGODB_URI'] = old_mongodb_uri
+    end
+  end
+
+  def test_connect_with_connection_string_in_implicit_mongodb_uri
+    begin
+      old_mongodb_uri = ENV['MONGODB_URI']
+      ENV['MONGODB_URI'] = "mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name}"
+      silently do
+        @conn = Connection.from_uri
+      end
+      assert @conn.is_a?(ReplSetConnection)
+      assert @conn.connected?
+    ensure
+      ENV['MONGODB_URI'] = old_mongodb_uri
+    end
+  end
   
   def test_connect_with_new_seed_format
     @conn = ReplSetConnection.new build_seeds(3)
@@ -128,4 +156,21 @@ class ConnectTest < Test::Unit::TestCase
     assert @conn.safe[:fsync]
     assert @conn.read_pool
   end
+
+  def test_connect_with_full_connection_string_in_env_var
+    begin
+      old_mongodb_uri = ENV['MONGODB_URI']
+      ENV['MONGODB_URI'] = "mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name};safe=true;w=2;fsync=true;slaveok=true"
+      silently do
+        @conn = ReplSetConnection.new
+      end
+      assert @conn.is_a?(ReplSetConnection)
+      assert @conn.connected?
+      assert_equal 2, @conn.safe[:w]
+      assert @conn.safe[:fsync]
+      assert @conn.read_pool
+    ensure
+      ENV['MONGODB_URI'] = old_mongodb_uri
+    end
+  end
 end