mongo 1.6.1 → 1.6.2

data/lib/mongo/util/uri_parser.rb

@@ -139,11 +139,11 @@ module Mongo
         if @connect == 'direct'
           opts[:slave_ok] = true
         else
-          opts[:read_secondary] = true
+          opts[:read] = :secondary
         end
       end
 
-      opts[:rs_name] = @replicaset if @replicaset
+      opts[:name] = @replicaset if @replicaset
 
       opts
     end

data/lib/mongo/version.rb

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

data/test/auxillary/repl_set_auth_test.rb

@@ -1,21 +1,22 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require './test/test_helper'
 require './test/tools/auth_repl_set_manager'
+require './test/replica_sets/rs_test_helper'
 
 class AuthTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @manager = AuthReplSetManager.new(:start_port => 40000)
-    @manager.start_set
+    @rs = AuthReplSetManager.new(:start_port => 40000)
+    @rs.start_set
   end
 
   def teardown
-    @manager.cleanup_set
+    #@rs.cleanup_set
   end
 
   def test_repl_set_auth
-    @conn = ReplSetConnection.new(build_seeds(3), :name => @manager.name)
+    @conn = ReplSetConnection.new(build_seeds(3), :name => @rs.name)
 
     # Add an admin user
     @conn['admin'].add_user("me", "secret")
@@ -51,7 +52,20 @@ class AuthTest < Test::Unit::TestCase
     end
 
     # But not when authenticated
-    @slave1['admin'].authenticate("me", "secret")
+    assert @slave1['admin'].authenticate("me", "secret")
     assert @slave1['foo']['stuff'].find_one
+
+    # Same should apply when using :secondary_only
+    @second_only = ReplSetConnection.new(build_seeds(3), 
+      :require_primary => false, :read => :secondary_only)
+
+    # Find should fail
+    assert_raise_error Mongo::OperationFailure, "unauthorized" do
+      @second_only['foo']['stuff'].find_one
+    end
+
+    # But not when authenticated
+    assert @second_only['admin'].authenticate("me", "secret")
+    assert @second_only['foo']['stuff'].find_one
   end
 end

data/test/bson/bson_test.rb

@@ -3,19 +3,21 @@ require './test/bson/test_helper'
 require 'set'
 
 if RUBY_VERSION < '1.9'
-  require 'complex'
-  require 'rational'
+  silently do
+    require 'complex'
+    require 'rational'
+  end
 end
 require 'bigdecimal'
 
 begin
   require 'date'
   require 'tzinfo'
-  require 'active_support/core_ext'
+  require 'active_support/timezone'
   Time.zone = "Pacific Time (US & Canada)"
   Zone = Time.zone.now
 rescue LoadError
-  warn 'Mocking time with zone'
+  #warn 'Mocking time with zone'
   module ActiveSupport
     class TimeWithZone
       def initialize(utc_time, zone)
@@ -74,23 +76,21 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_limit_max_bson_size
-    doc = {'name' => 'a' * BSON_CODER.max_bson_size}
+    doc = {'name' => 'a' * BSON::DEFAULT_MAX_BSON_SIZE}
     assert_raise InvalidDocument do
       assert @encoder.serialize(doc)
     end
   end
 
-  def test_max_bson_size
-    assert BSON_CODER.max_bson_size >= BSON::DEFAULT_MAX_BSON_SIZE
-  end
-
   def test_update_max_bson_size
     require 'ostruct'
     mock_conn = OpenStruct.new
     size      = 7 * 1024 * 1024
     mock_conn.max_bson_size = size
-    assert_equal size, BSON_CODER.update_max_bson_size(mock_conn)
-    assert_equal size, BSON_CODER.max_bson_size
+    silently do
+      assert_equal size, BSON_CODER.update_max_bson_size(mock_conn)
+      assert_equal size, BSON_CODER.max_bson_size
+    end
   end
 
   def test_round_trip
@@ -217,10 +217,10 @@ class BSONTest < Test::Unit::TestCase
     doc = {'doc' => {'age' => 42, 'date' => Time.now.utc, 'shoe_size' => 9.5}}
     bson = @encoder.serialize(doc)
     doc2 = @encoder.deserialize(bson)
-    assert doc['doc']
-    assert_equal 42,  doc['doc']['age']
-    assert_equal 9.5, doc['doc']['shoe_size']
-    assert_in_delta Time.now, doc['doc']['date'], 1
+    assert doc2['doc']
+    assert_equal 42,  doc2['doc']['age']
+    assert_equal 9.5, doc2['doc']['shoe_size']
+    assert_in_delta Time.now, doc2['doc']['date'], 1
   end
 
   def test_oid
@@ -269,6 +269,7 @@ class BSONTest < Test::Unit::TestCase
     doc = {'date' => [Time.now.utc]}
     bson = @encoder.serialize(doc)
     doc2 = @encoder.deserialize(bson)
+    assert doc2
   end
 
   def test_date_returns_as_utc
@@ -279,6 +280,7 @@ class BSONTest < Test::Unit::TestCase
   end
 
   def test_date_before_epoch
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ then return true end 
     begin
       doc = {'date' => Time.utc(1600)}
       bson = @encoder.serialize(doc)
@@ -297,7 +299,7 @@ class BSONTest < Test::Unit::TestCase
     [DateTime.now, Date.today, Zone].each do |invalid_date|
       doc = {:date => invalid_date}
       begin
-      bson = BSON::BSON_CODER.serialize(doc)
+      BSON::BSON_CODER.serialize(doc)
       rescue => e
       ensure
         if !invalid_date.is_a? Time
@@ -431,7 +433,7 @@ class BSONTest < Test::Unit::TestCase
 
   if !(RUBY_PLATFORM =~ /java/)
     def test_timestamp
-      val = {"test" => [4, 20]}
+      # val = {"test" => [4, 20]}
       result = @encoder.deserialize([0x13, 0x00, 0x00, 0x00,
                                      0x11, 0x74, 0x65, 0x73,
                                      0x74, 0x00, 0x04, 0x00,
@@ -455,7 +457,7 @@ class BSONTest < Test::Unit::TestCase
   def test_overflow
     doc = {"x" => 2**75}
     assert_raise RangeError do
-      bson = @encoder.serialize(doc)
+      @encoder.serialize(doc)
     end
 
     doc = {"x" => 9223372036854775}
@@ -466,7 +468,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc["x"] = doc["x"] + 1
     assert_raise RangeError do
-      bson = @encoder.serialize(doc)
+      @encoder.serialize(doc)
     end
 
     doc = {"x" => -9223372036854775}
@@ -477,7 +479,7 @@ class BSONTest < Test::Unit::TestCase
 
     doc["x"] = doc["x"] - 1
     assert_raise RangeError do
-      bson = BSON::BSON_CODER.serialize(doc)
+      BSON::BSON_CODER.serialize(doc)
     end
   end
 
@@ -529,7 +531,7 @@ class BSONTest < Test::Unit::TestCase
     #one = {"_foo" => "foo"}
 
     #assert_equal @encoder.serialize(one).to_a, @encoder.serialize(dup).to_a
-    warn "Pending test for duplicate keys"
+    #warn "Pending test for duplicate keys"
   end
 
   def test_no_duplicate_id_when_moving_id

data/test/bson/json_test.rb

@@ -7,7 +7,7 @@ class JSONTest < Test::Unit::TestCase
   # This test passes when run by itself but fails
   # when run as part of the whole test suite.
   def test_object_id_as_json
-    warn "Pending test object id as json"
+    #warn "Pending test object id as json"
     #id = BSON::ObjectId.new
 
     #obj = {'_id' => id}

data/test/collection_test.rb

@@ -1,4 +1,5 @@
 require './test/test_helper'
+require 'rbconfig'
 
 class TestCollection < Test::Unit::TestCase
   @@connection ||= standard_connection(:op_timeout => 10)
@@ -42,8 +43,10 @@ class TestCollection < Test::Unit::TestCase
   end
 
   def test_pk_factory_on_collection
-    @coll = Collection.new('foo', @@db, TestPK)
-    assert_equal TestPK, @coll.pk_factory
+    silently do
+      @coll = Collection.new('foo', @@db, TestPK)
+      assert_equal TestPK, @coll.pk_factory
+    end
 
 
     @coll2 = Collection.new('foo', @@db, :pk => TestPK)
@@ -197,6 +200,7 @@ class TestCollection < Test::Unit::TestCase
     docs << {:bar => 1}
     doc_ids, error_docs = @@test.insert(docs, :collect_on_error => true)
     assert_equal 2, @@test.count
+    assert_equal 2, doc_ids.count
     assert_equal error_docs, []
   end
 
@@ -215,16 +219,20 @@ class TestCollection < Test::Unit::TestCase
 
     doc_ids, error_docs = @@test.insert(docs, :collect_on_error => true)
     assert_equal 2, @@test.count
+    assert_equal 2, doc_ids.count
     assert_equal error_docs, invalid_docs
   end
 
   def test_bson_invalid_encoding_serialize_error_with_collect_on_error
+    # Broken for current JRuby
+    if RUBY_PLATFORM == 'java' then return end
     docs = []
     docs << {:foo => 1}
     docs << {:bar => 1}
     invalid_docs = []
-    invalid_docs << {"\223\372\226{" => 1} # non utf8 encoding
-    docs += invalid_docs
+    invalid_docs << {"\223\372\226}" => 1} # non utf8 encoding
+    docs += invalid_docs 
+    
     assert_raise BSON::InvalidStringEncoding do
       @@test.insert(docs, :collect_on_error => false)
     end
@@ -232,6 +240,7 @@ class TestCollection < Test::Unit::TestCase
 
     doc_ids, error_docs = @@test.insert(docs, :collect_on_error => true)
     assert_equal 2, @@test.count
+    assert_equal 2, doc_ids.count
     assert_equal error_docs, invalid_docs
   end
 
@@ -652,6 +661,7 @@ class TestCollection < Test::Unit::TestCase
   end
 
   def test_saving_dates_pre_epoch
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ then return true end
     begin
       @@test.save({'date' => Time.utc(1600)})
       assert_in_delta Time.utc(1600), @@test.find_one()["date"], 2

data/test/connection_test.rb

@@ -133,7 +133,7 @@ class TestConnection < Test::Unit::TestCase
     output = StringIO.new
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
-    connection = standard_connection(:logger => logger).db(MONGO_TEST_DB)
+    standard_connection(:logger => logger).db(MONGO_TEST_DB)
     assert output.string.include?("admin['$cmd'].find")
   end
 
@@ -141,8 +141,8 @@ class TestConnection < Test::Unit::TestCase
     output = StringIO.new
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
-    connection = standard_connection(:logger => logger).db(MONGO_TEST_DB)
-    assert_match /\(\d+ms\)/, output.string
+    standard_connection(:logger => logger).db(MONGO_TEST_DB)
+    assert_match(/\(\d+ms\)/, output.string)
     assert output.string.include?("admin['$cmd'].find")
   end
 
@@ -170,11 +170,13 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_nodes
-    conn = Connection.multi([['foo', 27017], ['bar', 27018]], :connect => false)
-    nodes = conn.nodes
-    assert_equal 2, nodes.length
-    assert_equal ['foo', 27017], nodes[0]
-    assert_equal ['bar', 27018], nodes[1]
+    silently do
+      @conn = Connection.multi([['foo', 27017], ['bar', 27018]], :connect => false)
+    end
+    seeds = @conn.seeds
+    assert_equal 2, seeds.length
+    assert_equal ['foo', 27017], seeds[0]
+    assert_equal ['bar', 27018], seeds[1]
   end
 
   def test_fsync_lock
@@ -227,7 +229,7 @@ class TestConnection < Test::Unit::TestCase
     conn.expects(:[]).with('admin').returns(admin_db)
 
     conn.connect
-    assert_equal Mongo::DEFAULT_MAX_BSON_SIZE, BSON::BSON_CODER.max_bson_size
+    assert_equal Mongo::DEFAULT_MAX_BSON_SIZE, conn.max_bson_size
   end
 
   def test_connection_activity
@@ -290,7 +292,7 @@ class TestConnection < Test::Unit::TestCase
   context "Socket pools" do
     context "checking out writers" do
       setup do
-        @con = standard_connection(:pool_size => 10, :timeout => 10)
+        @con = standard_connection(:pool_size => 10, :pool_timeout => 10)
         @coll = @con[MONGO_TEST_DB]['test-connection-exceptions']
       end
 
@@ -325,7 +327,7 @@ class TestConnection < Test::Unit::TestCase
 
   context "Connection exceptions" do
     setup do
-      @con = standard_connection(:pool_size => 10, :timeout => 10)
+      @con = standard_connection(:pool_size => 10, :pool_timeout => 10)
       @coll = @con[MONGO_TEST_DB]['test-connection-exceptions']
     end
 
@@ -363,6 +365,7 @@ class TestConnection < Test::Unit::TestCase
       TCPSocket.stubs(:new).returns(fake_socket)
 
       @con.primary_pool.checkout_new_socket
+      @con.primary_pool.expects(:warn)
       assert @con.primary_pool.close
     end
   end

data/test/cursor_test.rb

@@ -238,17 +238,17 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_timeout
-    opts = Cursor.new(@@coll).query_opts
+    opts = Cursor.new(@@coll).options
     assert_equal 0, opts & Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT
 
-    opts = Cursor.new(@@coll, :timeout => false).query_opts
+    opts = Cursor.new(@@coll, :timeout => false).options
     assert_equal Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT,
       opts & Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT
   end
 
   def test_limit_exceptions
     cursor      = @@coll.find()
-    firstResult = cursor.next_document
+    cursor.next_document
     assert_raise InvalidOperation, "Cannot modify the query once it has been run or closed." do
       cursor.limit(1)
     end
@@ -278,7 +278,7 @@ class CursorTest < Test::Unit::TestCase
 
   def test_skip_exceptions
     cursor      = @@coll.find()
-    firstResult = cursor.next_document
+    cursor.next_document
     assert_raise InvalidOperation, "Cannot modify the query once it has been run or closed." do
       cursor.skip(1)
     end

data/test/grid_file_system_test.rb

@@ -263,7 +263,9 @@ class GridFileSystemTest < Test::Unit::TestCase
 
       should "seek only in read mode" do
         assert_raise GridError do
-          @grid.open('hello', 'w') {|f| f.seek(0) }
+          silently do
+            @grid.open('hello', 'w') { |f| f.seek(0) }
+          end
         end
       end
     end

data/test/grid_io_test.rb

@@ -45,7 +45,7 @@ class GridIOTest < Test::Unit::TestCase
       should "read data character by character using" do
         bytes = 0
         file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
-        while char = file.getc
+        while file.getc
           bytes += 1
         end
         assert_equal bytes, 1_000_000
@@ -111,7 +111,7 @@ class GridIOTest < Test::Unit::TestCase
 
       should "tell position, eof, and rewind" do
         file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
-        string = file.read(1000)
+        file.read(1000)
         assert_equal 1000, file.pos
         assert !file.eof?
         file.read

data/test/grid_test.rb

@@ -2,7 +2,7 @@ require './test/test_helper'
 include Mongo
 
 def read_and_write_stream(filename, read_length, opts={})
-  io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
+  io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r+b')
   id   = @grid.put(io, opts.merge!(:filename => filename + read_length.to_s))
   file = @grid.get(id)
   io.rewind
@@ -142,7 +142,9 @@ class GridTest < Test::Unit::TestCase
       end
 
       should "ignore special keys" do
-        id = @grid.put(@data, :file_length => 100, :phrase => "blimey")
+        id = silently do
+          @grid.put(@data, :file_length => 100, :phrase => "blimey")
+        end
         file = @grid.get(id)
 
         assert_equal "blimey", file['phrase']
@@ -153,8 +155,9 @@ class GridTest < Test::Unit::TestCase
     context "Storing data with a length of zero" do
       setup do
         @grid = Grid.new(@db, 'test-fs')
-        @id   = @grid.put('', :filename => 'sample',
-                          :metadata => {'app' => 'photos'})
+        @id = silently do
+          @grid.put('', :filename => 'sample', :metadata => {'app' => 'photos'})
+        end
       end
 
       should "return the zero length" do
@@ -201,7 +204,9 @@ class GridTest < Test::Unit::TestCase
         @grid = Grid.new(@db, 'test-fs')
         filename = 'empty_data'
         @io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
-        id    = @grid.put(@io, :filename => filename)
+        id = silently do
+          @grid.put(@io, :filename => filename)
+        end
         @file = @grid.get(id)
         @io.rewind
         @data = @io.read
@@ -239,7 +244,9 @@ class GridTest < Test::Unit::TestCase
       end
 
       should "put and get an empty io object" do
-        read_and_write_stream('empty_data', 1)
+        silently do
+          read_and_write_stream('empty_data', 1)
+        end
       end
 
       should "put and get a small io object" do