mongo 0.18 → 0.18.1

data/test/test_connection.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
+require 'test/test_helper'
 require 'logger'
 require 'stringio'
 

data/test/test_conversions.rb

@@ -1,8 +1,7 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'test/test_helper'
 require 'mongo/errors'
 require 'mongo/util/conversions'
 require 'mongo/util/ordered_hash'
-require 'test/unit'
 
 class ConversionsTest < Test::Unit::TestCase
   include Mongo::Conversions

data/test/test_cursor.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
+require 'test/test_helper'
 
 # NOTE: assumes Mongo is running
 class CursorTest < Test::Unit::TestCase

data/test/test_db.rb

@@ -1,7 +1,5 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'test/test_helper'
 require 'digest/md5'
-require 'mongo'
-require 'test/unit'
 require 'stringio'
 require 'logger'
 

data/test/test_db_api.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
+require 'test/test_helper'
 
 # NOTE: assumes Mongo is running
 class DBAPITest < Test::Unit::TestCase

data/test/test_db_connection.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
+require 'test/test_helper'
 
 # NOTE: assumes Mongo is running
 class DBConnectionTest < Test::Unit::TestCase

data/test/test_grid_store.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'test/unit'
-require 'mongo'
+require 'test/test_helper'
 require 'mongo/gridfs'
 
 class GridStoreTest < Test::Unit::TestCase

data/test/test_helper.rb

@@ -1,8 +1,10 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rubygems'
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems' if ENV['C_EXT']
+require 'mongo'
 require 'test/unit'
 
 begin
+  require 'rubygems'
   require 'shoulda'
   require 'mocha'
   rescue LoadError
@@ -17,7 +19,7 @@ MSG
     exit
 end
 
-require 'mongo'
+require 'mongo_ext/cbson' if ENV['C_EXT']
 
 # NOTE: most tests assume that MongoDB is running.
 class Test::Unit::TestCase

data/test/test_objectid.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
+require 'test/test_helper'
 
 class ObjectIDTest < Test::Unit::TestCase
 
@@ -123,4 +121,10 @@ class ObjectIDTest < Test::Unit::TestCase
     assert_equal s, ObjectID.legacy_string_convert(l)
   end
 
+  def test_generation_time
+    time = Time.now
+    id   = ObjectID.new
+
+    assert_in_delta time.to_i, id.generation_time.to_i, 2
+  end
 end

data/test/test_ordered_hash.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo/util/ordered_hash'
-require 'test/unit'
+require 'test/test_helper'
 
 class OrderedHashTest < Test::Unit::TestCase
 

data/test/test_round_trip.rb

@@ -1,8 +1,7 @@
 HERE = File.dirname(__FILE__)
 $LOAD_PATH[0,0] = File.join(HERE, '..', 'lib')
-require 'mongo'
+require 'test/test_helper'
 require 'mongo/util/xml_to_ruby'
-require 'test/unit'
 
 # For each xml/bson file in the data subdirectory, we turn the XML into an
 # OrderedHash and then test both Ruby-to-BSON and BSON-to-Ruby translations.
@@ -74,19 +73,14 @@ EOS
     File.open(File.join(dir, "#{name}.bson"), 'rb') { |f|
       # Read the BSON from the file
       bson = f.read
-      bson = if RUBY_VERSION >= '1.9'
-               bson.bytes.to_a
-             else
-               bson.split(//).collect { |c| c[0] }
-             end
 
       # Turn the Ruby object into BSON bytes and compare with the BSON bytes
       # from the file.
-      bson_from_ruby = BSON.new.serialize(obj).to_a
+      bson_from_ruby = BSON.serialize(obj)
 
       begin
-        assert_equal bson.length, bson_from_ruby.length
-        assert_equal bson, bson_from_ruby
+        assert_equal bson.length, bson_from_ruby.to_s.length
+        assert_equal bson, bson_from_ruby.to_s
       rescue => ex
 #         File.open(File.join(dir, "#{name}_out_a.bson"), 'wb') { |f| # DEBUG
 #           bson_from_ruby.each { |b| f.putc(b) }
@@ -99,15 +93,15 @@ EOS
       # We're passing a nil db to the contructor here, but that's OK because
       # the BSON DBRef bytes don't contain the db object in any case, and we
       # don't care what the database is.
-      obj_from_bson = BSON.new.deserialize(ByteBuffer.new(bson_from_ruby))
+      obj_from_bson = BSON.deserialize(bson_from_ruby)
       assert_kind_of OrderedHash, obj_from_bson
 
       # Turn that Ruby object into BSON and compare it to the original BSON
       # bytes.
-      bson_from_ruby = BSON.new.serialize(obj_from_bson).to_a
+      bson_from_ruby = BSON.serialize(obj_from_bson)
       begin
-        assert_equal bson.length, bson_from_ruby.length
-        assert_equal bson, bson_from_ruby
+        assert_equal bson.length, bson_from_ruby.to_s.length
+        assert_equal bson, bson_from_ruby.to_s
       rescue => ex
 #         File.open(File.join(dir, "#{name}_out_b.bson"), 'wb') { |f| # DEBUG
 #           bson_from_ruby.each { |b| f.putc(b) }

data/test/test_slave_connection.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
+require 'test/test_helper'
 
 # NOTE: these tests are run only if we can connect to a single MongoDB in slave mode.
 class SlaveConnectionTest < Test::Unit::TestCase

data/test/unit/connection_test.rb

@@ -22,7 +22,7 @@ class ConnectionTest < Test::Unit::TestCase
     context "given a single node" do
       setup do
         TCPSocket.stubs(:new).returns(new_mock_socket)
-        @conn = Connection.new('localhost', 27107, :connect => false)
+        @conn = Connection.new('localhost', 27017, :connect => false)
 
         admin_db = new_mock_db
         admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
@@ -45,6 +45,22 @@ class ConnectionTest < Test::Unit::TestCase
     end
   end
 
+  context "with a nonstandard port" do 
+    setup do 
+      TCPSocket.stubs(:new).returns(new_mock_socket)
+      @conn = Connection.new('255.255.255.255', 2500, :connect => false)
+      admin_db = new_mock_db
+      admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+      @conn.expects(:[]).with('admin').returns(admin_db)
+      @conn.connect_to_master
+    end
+
+    should "set localhost and port correctly" do
+      assert_equal '255.255.255.255', @conn.host
+      assert_equal 2500, @conn.port
+    end
+  end
+
   context "Connection pooling: " do
     setup do
       TCPSocket.stubs(:new).returns(new_mock_socket)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: "0.18"
+  version: 0.18.1
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -05:00
+date: 2009-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -42,7 +42,8 @@ files:
 - lib/mongo/types/dbref.rb
 - lib/mongo/types/objectid.rb
 - lib/mongo/types/regexp_of_holding.rb
-- lib/mongo/util/bson.rb
+- lib/mongo/util/bson_c.rb
+- lib/mongo/util/bson_ruby.rb
 - lib/mongo/util/byte_buffer.rb
 - lib/mongo/util/conversions.rb
 - lib/mongo/util/ordered_hash.rb
@@ -67,8 +68,6 @@ files:
 - bin/fail_if_no_c.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --main
@@ -91,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Ruby driver for the MongoDB
 test_files: 
 - test/mongo-qa/_common.rb