mongo 1.2.4 → 1.3.0.rc0

data/test/grid_file_system_test.rb

@@ -1,5 +1,4 @@
 require './test/test_helper'
-include Mongo
 
 class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do

data/test/grid_io_test.rb

@@ -1,5 +1,4 @@
 require './test/test_helper'
-include Mongo
 
 class GridIOTest < Test::Unit::TestCase
 
@@ -33,6 +32,78 @@ class GridIOTest < Test::Unit::TestCase
       end
     end
 
+    context "StringIO methods" do
+      setup do
+        @filename = 'test'
+        @mode     = 'w'
+        @data     = "012345678\n" * 100000
+        @file = GridIO.new(@files, @chunks, @filename, @mode)
+        @file.write(@data)
+        @file.close
+      end
+
+      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
+          bytes += 1
+        end
+        assert_equal bytes, 1_000_000
+      end
+
+      should "read length is a length is given" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        string = file.gets(1000)
+        assert_equal string.length, 1000
+        bytes = 0
+        bytes += string.length
+        while string = file.gets(1000)
+          bytes += string.length
+        end
+        assert_equal bytes, 1_000_000
+      end
+
+      should "read to the end of the line by default and assign to $_" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        string = file.gets
+        assert_equal 10, string.length
+      end
+
+      should "read to a given separator" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        string = file.gets("5")
+        assert_equal 6, string.length
+      end
+
+      should "read a multi-character separator" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        string = file.gets("45")
+        assert_equal 6, string.length
+        string = file.gets("45")
+        assert_equal "678\n012345", string
+        string = file.gets("\n01")
+        assert_equal "678\n01", string
+      end
+
+      should "read a mult-character separator with a length" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        string = file.gets("45", 3)
+        assert_equal 3, string.length
+      end
+
+      should "tell position, eof, and rewind" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        string = file.read(1000)
+        assert_equal 1000, file.pos
+        assert !file.eof?
+        file.read
+        assert file.eof?
+        file.rewind
+        assert_equal 0, file.pos
+        assert_equal 1_000_000, file.read.length
+      end
+    end
+
     context "Seeking" do
       setup do
         @filename = 'test'

data/test/grid_test.rb

@@ -1,6 +1,22 @@
 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')
+  id   = @grid.put(io, opts.merge!(:filename => filename + read_length.to_s))
+  file = @grid.get(id)
+  io.rewind
+  data = io.read
+  if data.respond_to?(:force_encoding)
+    data.force_encoding("binary")
+  end
+  read_data = ""
+  while(chunk = file.read(read_length))
+    read_data << chunk
+  end
+  assert_equal data.length, read_data.length
+end
+
 class GridTest < Test::Unit::TestCase
   context "Tests:" do
     setup do
@@ -161,22 +177,6 @@ class GridTest < Test::Unit::TestCase
 
     context "Streaming: " do || {}
       setup do
-        def read_and_write_stream(filename, read_length, opts={})
-          io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
-          id   = @grid.put(io, opts.merge!(:filename => filename + read_length.to_s))
-          file = @grid.get(id)
-          io.rewind
-          data = io.read
-          if data.respond_to?(:force_encoding)
-            data.force_encoding("binary")
-          end
-          read_data = ""
-          while(chunk = file.read(read_length))
-            read_data << chunk
-          end
-          assert_equal data.length, read_data.length
-        end
-
         @grid = Grid.new(@db, 'test-fs')
       end
 

data/test/replica_sets/connect_test.rb

@@ -39,6 +39,14 @@ class ConnectTest < Test::Unit::TestCase
     assert_equal RS.arbiters.sort, @conn.arbiters.sort
   end
 
+  def test_host_port_accessors
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]], :name => RS.name)
+
+    assert_equal @conn.host, RS.primary[0]
+    assert_equal @conn.port, RS.primary[1]
+  end
+
   def test_connect_with_primary_node_killed
     node = RS.kill_primary
 

data/test/replica_sets/query_test.rb

@@ -27,6 +27,8 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
       assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
     end
 
+    puts "Benchmark before failover: #{benchmark_queries}"
+
     RS.kill_primary
 
     results = []
@@ -35,7 +37,15 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
       [20, 30, 40].each do |a|
         assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
       end
+
+    puts "Benchmark after failover: #{benchmark_queries}"
     end
   end
 
+  def benchmark_queries
+    t1 = Time.now
+    10000.times { @coll.find_one }
+    Time.now - t1
+  end
+
 end

data/test/support/hash_with_indifferent_access.rb

@@ -38,19 +38,6 @@ class Hash
 
   alias_method :to_options,  :symbolize_keys
   #alias_method :to_options!, :symbolize_keys!
-
-  # Validate all keys in a hash match *valid keys, raising ArgumentError on a mismatch.
-  # Note that keys are NOT treated indifferently, meaning if you use strings for keys but assert symbols
-  # as keys, this will fail.
-  #
-  # ==== Examples
-  #   { :name => "Rob", :years => "28" }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key(s): years"
-  #   { :name => "Rob", :age => "28" }.assert_valid_keys("name", "age") # => raises "ArgumentError: Unknown key(s): name, age"
-  #   { :name => "Rob", :age => "28" }.assert_valid_keys(:name, :age) # => passes, raises nothing
-  def assert_valid_keys(*valid_keys)
-    unknown_keys = keys - [valid_keys].flatten
-    raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
-  end
 end
 
 module ActiveSupport

data/test/support_test.rb

@@ -1,7 +1,6 @@
 require './test/test_helper'
 
 class SupportTest < Test::Unit::TestCase
-  include Mongo
 
   def test_command_response_succeeds
     assert Support.ok?('ok' => 1)

data/test/test_helper.rb

@@ -1,14 +1,22 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems' if ENV['C_EXT']
+require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
 require 'mongo'
 require 'test/unit'
 
+def silently
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  result = yield
+  $VERBOSE = warn_level
+  result
+end
+
 begin
-  require 'rubygems'
-  require 'shoulda'
-  require 'mocha'
-  rescue LoadError
-    puts <<MSG
+  require 'rubygems' if RUBY_VERSION < "1.9.0" && !ENV['C_EXT']
+  silently { require 'shoulda' }
+  silently { require 'mocha' }
+rescue LoadError
+  puts <<MSG
 
 This test suite requires shoulda and mocha.
 You can install them as follows:
@@ -16,7 +24,8 @@ You can install them as follows:
   gem install mocha
 
 MSG
-    exit
+
+  exit
 end
 
 require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
@@ -69,7 +78,17 @@ class Test::Unit::TestCase
     self.class.mongo_port
   end
 
-  
+  def new_mock_socket(host='localhost', port=27017)
+    socket = Object.new
+    socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+    socket.stubs(:close)
+    socket
+  end
+
+  def new_mock_db
+    db = Object.new
+  end
+
   def assert_raise_error(klass, message)
     begin
       yield

data/test/timeout_test.rb

@@ -0,0 +1,14 @@
+require './test/test_helper'
+
+class TestTimeout < Test::Unit::TestCase
+
+  def test_timeout
+    @conn = standard_connection(:op_timeout => 2)
+    assert @conn[MONGO_TEST_DB]['test'].save({:a => 1})
+    assert @conn[MONGO_TEST_DB]['test'].find.next
+    assert_raise OperationTimeout do
+      @conn[MONGO_TEST_DB]['test'].find({'$where' => 'function() { while(true) { this.a == 1 } }'}).next
+    end
+  end
+
+end

data/test/unit/collection_test.rb

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

data/test/unit/connection_test.rb

@@ -3,19 +3,6 @@ include Mongo
 
 class ConnectionTest < Test::Unit::TestCase
   context "Initialization: " do
-    setup do
-      def new_mock_socket(host='localhost', port=27017)
-        socket = Object.new
-        socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        socket.stubs(:close)
-        socket
-      end
-
-      def new_mock_db
-        db = Object.new
-      end
-    end
-
     context "given a single node" do
       setup do
         @conn = Connection.new('localhost', 27017, :connect => false)

data/test/unit/cursor_test.rb

@@ -12,28 +12,32 @@ class CursorTest < Test::Unit::TestCase
     end
 
     should "set timeout" do
-      assert_equal true, @cursor.timeout
+      assert @cursor.timeout
+      assert @cursor.query_options_hash[:timeout]
     end
 
     should "set selector" do
-      assert @cursor.selector == {}
+      assert_equal({}, @cursor.selector)
 
       @cursor = Cursor.new(@collection, :selector => {:name => "Jones"})
-      assert @cursor.selector == {:name => "Jones"}
+      assert_equal({:name => "Jones"}, @cursor.selector)
+      assert_equal({:name => "Jones"}, @cursor.query_options_hash[:selector])
     end
 
     should "set fields" do
       assert_nil @cursor.fields
 
       @cursor = Cursor.new(@collection, :fields => [:name, :date])
-      assert @cursor.fields == {:name => 1, :date => 1}
+      assert_equal({:name => 1, :date => 1}, @cursor.fields)
+      assert_equal({:name => 1, :date => 1}, @cursor.query_options_hash[:fields])
     end
 
     should "set mix fields 0 and 1" do
       assert_nil @cursor.fields
 
       @cursor = Cursor.new(@collection, :fields => {:name => 1, :date => 0})
-      assert @cursor.fields == {:name => 1, :date => 0}
+      assert_equal({:name => 1, :date => 0}, @cursor.fields)
+      assert_equal({:name => 1, :date => 0}, @cursor.query_options_hash[:fields])
     end
 
     should "set limit" do
@@ -41,6 +45,7 @@ class CursorTest < Test::Unit::TestCase
 
       @cursor = Cursor.new(@collection, :limit => 10)
       assert_equal 10, @cursor.limit
+      assert_equal 10, @cursor.query_options_hash[:limit]
     end
 
 
@@ -49,6 +54,7 @@ class CursorTest < Test::Unit::TestCase
 
       @cursor = Cursor.new(@collection, :skip => 5)
       assert_equal 5, @cursor.skip
+      assert_equal 5, @cursor.query_options_hash[:skip]
     end
 
     should "set sort order" do
@@ -56,6 +62,7 @@ class CursorTest < Test::Unit::TestCase
 
       @cursor = Cursor.new(@collection, :order => "last_name")
       assert_equal "last_name", @cursor.order
+      assert_equal "last_name", @cursor.query_options_hash[:order]
     end
 
     should "set hint" do
@@ -63,6 +70,7 @@ class CursorTest < Test::Unit::TestCase
 
       @cursor = Cursor.new(@collection, :hint => "name")
       assert_equal "name", @cursor.hint
+      assert_equal "name", @cursor.query_options_hash[:hint]
     end
 
     should "cache full collection name" do
@@ -72,7 +80,9 @@ class CursorTest < Test::Unit::TestCase
 
   context "Query fields" do
     setup do
-      @connection = stub(:class => Collection, :logger => @logger)
+      @logger     = mock()
+      @logger.stubs(:debug)
+      @connection = stub(:class => Connection, :logger => @logger)
       @db = stub(:slave_ok? => true, :name => "testing", :connection => @connection)
       @collection = stub(:db => @db, :name => "items")
     end

data/test/unit/db_test.rb

@@ -1,18 +1,16 @@
 require './test/test_helper'
 
+def insert_message(db, documents)
+  documents = [documents] unless documents.is_a?(Array)
+  message = ByteBuffer.new
+  message.put_int(0)
+  Mongo::BSON_CODER.serialize_cstr(message, "#{db.name}.test")
+  documents.each { |doc| message.put_array(Mongo::BSON_CODER.new.serialize(doc, true).to_a) }
+  message = db.add_message_headers(Mongo::Constants::OP_INSERT, message)
+end
+
 class DBTest < Test::Unit::TestCase
   context "DBTest: " do
-    setup do
-      def insert_message(db, documents)
-        documents = [documents] unless documents.is_a?(Array)
-        message = ByteBuffer.new
-        message.put_int(0)
-        Mongo::BSON_CODER..serialize_cstr(message, "#{db.name}.test")
-        documents.each { |doc| message.put_array(Mongo::BSON_CODER.new.serialize(doc, true).to_a) }
-        message = db.add_message_headers(Mongo::Constants::OP_INSERT, message)
-      end
-    end
-
     context "DB commands" do
       setup do
         @conn = stub()

data/test/unit/repl_set_connection_test.rb

@@ -3,19 +3,6 @@ include Mongo
 
 class ReplSetConnectionTest < Test::Unit::TestCase
   context "Initialization: " do
-    setup do
-      def new_mock_socket(host='localhost', port=27017)
-        socket = Object.new
-        socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        socket.stubs(:close)
-        socket
-      end
-
-      def new_mock_db
-        db = Object.new
-      end
-    end
-
     context "connecting to a replica set" do
       setup do
         TCPSocket.stubs(:new).returns(new_mock_socket('localhost', 27017))

data/test/unit/safe_test.rb

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

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
+  prerelease: 6
+  version: 1.3.0.rc0
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +23,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 2
-        - 4
-        version: 1.2.4
+        version: 1.3.0.rc0
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -66,12 +56,14 @@ files:
 - lib/mongo/util/pool.rb
 - lib/mongo/util/server_version.rb
 - lib/mongo/util/support.rb
+- lib/mongo/util/timeout.rb
 - lib/mongo/util/uri_parser.rb
 - docs/1.0_UPGRADE.md
 - docs/CREDITS.md
 - docs/FAQ.md
 - docs/GridFS.md
 - docs/HISTORY.md
+- docs/RELEASES.md
 - docs/REPLICA_SETS.md
 - docs/TUTORIAL.md
 - docs/WRITE_CONCERN.md
@@ -79,6 +71,7 @@ files:
 - test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
+- test/auxillary/fork_test.rb
 - test/auxillary/repl_set_auth_test.rb
 - test/auxillary/slave_connection_test.rb
 - test/auxillary/threaded_authentication_test.rb
@@ -90,6 +83,7 @@ files:
 - test/bson/json_test.rb
 - test/bson/object_id_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/timestamp_test.rb
 - test/collection_test.rb
 - test/connection_test.rb
 - test/conversions_test.rb
@@ -121,6 +115,7 @@ files:
 - test/test_helper.rb
 - test/threading/threading_with_large_pool_test.rb
 - test/threading_test.rb
+- test/timeout_test.rb
 - test/tools/auth_repl_set_manager.rb
 - test/tools/repl_set_manager.rb
 - test/unit/collection_test.rb
@@ -148,23 +143,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
@@ -172,6 +161,7 @@ test_files:
 - test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
+- test/auxillary/fork_test.rb
 - test/auxillary/repl_set_auth_test.rb
 - test/auxillary/slave_connection_test.rb
 - test/auxillary/threaded_authentication_test.rb
@@ -183,6 +173,7 @@ test_files:
 - test/bson/json_test.rb
 - test/bson/object_id_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/timestamp_test.rb
 - test/collection_test.rb
 - test/connection_test.rb
 - test/conversions_test.rb
@@ -214,6 +205,7 @@ test_files:
 - test/test_helper.rb
 - test/threading/threading_with_large_pool_test.rb
 - test/threading_test.rb
+- test/timeout_test.rb
 - test/tools/auth_repl_set_manager.rb
 - test/tools/repl_set_manager.rb
 - test/unit/collection_test.rb