mongo 1.5.2 → 1.6.0

data/test/unit/connection_test.rb

@@ -45,6 +45,28 @@ class ConnectionTest < Test::Unit::TestCase
         @conn = Connection.from_uri("mongodb://#{host_name}/foo", :connect => false)
         assert_equal [host_name, 27017], @conn.host_to_try
       end
+      
+      should "set safe options on connection" do
+        host_name = "localhost"
+        opts = "safe=true&w=2&wtimeoutMS=1000&fsync=true&journal=true"
+        @conn = Connection.from_uri("mongodb://#{host_name}/foo?#{opts}", :connect => false)
+        assert_equal({:w => 2, :wtimeout => 1000, :fsync => true, :j => true}, @conn.safe)
+      end
+      
+      should "have wtimeoutMS take precidence over the depricated wtimeout" do
+        host_name = "localhost"
+        opts = "safe=true&wtimeout=100&wtimeoutMS=500"
+        @conn = Connection.from_uri("mongodb://#{host_name}/foo?#{opts}", :connect => false)
+        assert_equal({:wtimeout => 500}, @conn.safe)
+      end
+      
+      should "set timeout options on connection" do
+        host_name = "localhost"
+        opts = "connectTimeoutMS=1000&socketTimeoutMS=5000"
+        @conn = Connection.from_uri("mongodb://#{host_name}/foo?#{opts}", :connect => false)
+        assert_equal 1, @conn.connect_timeout
+        assert_equal 5, @conn.op_timeout
+      end
 
       should "parse a uri with a hyphen & underscore in the username or password" do
         @conn = Connection.from_uri("mongodb://hyphen-user_name:p-s_s@localhost:27017/db", :connect => false)

data/test/unit/cursor_test.rb

@@ -5,8 +5,10 @@ class CursorTest < Test::Unit::TestCase
     setup do
       @logger     = mock()
       @logger.stubs(:debug)
-      @connection = stub(:class => Connection, :logger => @logger, :slave_ok? => false, :read_preference => :primary)
-      @db         = stub(:name => "testing", :slave_ok? => false, :connection => @connection, :read_preference => :primary)
+      @connection = stub(:class => Connection, :logger => @logger,
+        :slave_ok? => false, :read_preference => :primary, :log_duration => false)
+      @db         = stub(:name => "testing", :slave_ok? => false,
+        :connection => @connection, :read_preference => :primary)
       @collection = stub(:db => @db, :name => "items", :read_preference => :primary)
       @cursor     = Cursor.new(@collection)
     end
@@ -100,7 +102,8 @@ class CursorTest < Test::Unit::TestCase
     setup do
       @logger     = mock()
       @logger.stubs(:debug)
-      @connection = stub(:class => Connection, :logger => @logger, :slave_ok? => false)
+      @connection = stub(:class => Connection, :logger => @logger, :slave_ok? => false,
+        :log_duration => false)
       @db = stub(:slave_ok? => true, :name => "testing", :connection => @connection)
       @collection = stub(:db => @db, :name => "items", :read_preference => :primary)
     end

data/test/unit/read_test.rb

@@ -13,7 +13,7 @@ class ReadTest < Test::Unit::TestCase
   context "Read mode on replica set connection: " do
     setup do
       @read_preference = :secondary
-      @con = Mongo::ReplSetConnection.new(['localhost', 27017], :read => @read_preference, :connect => false)
+      @con = Mongo::ReplSetConnection.new(['localhost:27017'], :read => @read_preference, :connect => false)
     end
 
     should "store read preference on Connection" do

data/test/uri_test.rb

@@ -1,6 +1,6 @@
 require './test/test_helper'
 
-class TestThreading < Test::Unit::TestCase
+class URITest < Test::Unit::TestCase
   include Mongo
 
   def test_uri_without_port
@@ -78,11 +78,19 @@ class TestThreading < Test::Unit::TestCase
   end
 
   def test_opts_safe
-    parser = Mongo::URIParser.new('mongodb://localhost:27018?safe=true;w=2;wtimeout=200;fsync=true')
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?safe=true;w=2;journal=true;wtimeout=200;fsync=true;wtimeoutMS=200')
     assert parser.safe
     assert_equal 2, parser.w
     assert_equal 200, parser.wtimeout
     assert parser.fsync
+    assert parser.journal
+    assert_equal 200, parser.wtimeoutms
+  end
+  
+  def test_opts_nonsafe_timeout
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?connectTimeoutMS=5500&socketTimeoutMS=500')
+    assert_equal 5.5, parser.connecttimeoutms
+    assert_equal 0.5, parser.sockettimeoutms
   end
 
   def test_opts_replica_set
@@ -93,4 +101,11 @@ class TestThreading < Test::Unit::TestCase
     assert_equal 'foo', parser.replicaset
     assert_equal 'replicaset', parser.connect
   end
+
+  def test_case_insensitivity
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?wtimeoutms=500&JOURNAL=true&SaFe=true')
+    assert_equal 500, parser.wtimeoutms
+    assert_equal true, parser.journal
+    assert_equal true, parser.safe
+  end
 end

metadata

@@ -1,243 +1,227 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 2
-  version: 1.5.2
 platform: ruby
-authors: 
+authors:
 - Jim Menard
 - Mike Dirolf
 - Kyle Banker
+- Tyler Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bson
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70200440295420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70200440295420
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
-executables: 
+executables:
 - mongo_console
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - mongo.gemspec
 - LICENSE.txt
 - lib/mongo.rb
 - lib/mongo/collection.rb
-- lib/mongo/networking.rb
+- lib/mongo/connection.rb
+- lib/mongo/cursor.rb
+- lib/mongo/db.rb
+- lib/mongo/exceptions.rb
 - lib/mongo/gridfs/grid.rb
 - lib/mongo/gridfs/grid_ext.rb
 - lib/mongo/gridfs/grid_file_system.rb
 - lib/mongo/gridfs/grid_io.rb
 - lib/mongo/gridfs/grid_io_fix.rb
-- lib/mongo/version.rb
-- lib/mongo/util/pool_manager.rb
+- lib/mongo/networking.rb
+- lib/mongo/repl_set_connection.rb
 - lib/mongo/util/conversions.rb
 - lib/mongo/util/core_ext.rb
-- lib/mongo/util/ssl_socket.rb
-- lib/mongo/util/pool.rb
+- lib/mongo/util/logging.rb
 - lib/mongo/util/node.rb
-- lib/mongo/util/uri_parser.rb
+- lib/mongo/util/pool.rb
+- lib/mongo/util/pool_manager.rb
 - lib/mongo/util/server_version.rb
+- lib/mongo/util/ssl_socket.rb
 - lib/mongo/util/support.rb
-- lib/mongo/util/logging.rb
-- lib/mongo/connection.rb
-- lib/mongo/exceptions.rb
-- lib/mongo/repl_set_connection.rb
-- lib/mongo/db.rb
-- lib/mongo/cursor.rb
+- lib/mongo/util/uri_parser.rb
+- lib/mongo/version.rb
 - docs/CREDITS.md
-- docs/WRITE_CONCERN.md
-- docs/RELEASES.md
+- docs/FAQ.md
 - docs/GridFS.md
 - docs/HISTORY.md
-- docs/FAQ.md
-- docs/TUTORIAL.md
-- docs/REPLICA_SETS.md
 - docs/READ_PREFERENCE.md
+- docs/RELEASES.md
+- docs/REPLICA_SETS.md
 - docs/TAILABLE_CURSORS.md
+- docs/TUTORIAL.md
+- docs/WRITE_CONCERN.md
 - bin/mongo_console
-- test/tools/repl_set_manager.rb
-- test/tools/auth_repl_set_manager.rb
-- test/uri_test.rb
-- test/conversions_test.rb
-- test/grid_io_test.rb
-- test/cursor_fail_test.rb
-- test/unit/cursor_test.rb
-- test/unit/pool_test.rb
-- test/unit/pool_manager_test.rb
-- test/unit/collection_test.rb
-- test/unit/node_test.rb
-- test/unit/db_test.rb
-- test/unit/connection_test.rb
-- test/unit/read_test.rb
-- test/unit/safe_test.rb
-- test/unit/grid_test.rb
-- test/support_test.rb
-- test/cursor_test.rb
-- test/support/keys.rb
-- test/support/hash_with_indifferent_access.rb
-- test/test_helper.rb
-- test/threading_test.rb
-- test/auxillary/repl_set_auth_test.rb
-- test/auxillary/autoreconnect_test.rb
-- test/auxillary/threaded_authentication_test.rb
-- test/auxillary/authentication_test.rb
 - 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/threading/threading_with_large_pool_test.rb
-- test/replica_sets/pooled_insert_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/read_preference_test.rb
-- test/replica_sets/connect_test.rb
-- test/replica_sets/basic_test.rb
-- test/replica_sets/count_test.rb
-- test/replica_sets/refresh_test.rb
-- test/replica_sets/replication_ack_test.rb
-- test/replica_sets/query_test.rb
-- test/replica_sets/refresh_with_threads_test.rb
-- test/replica_sets/rs_test_helper.rb
-- test/collection_test.rb
-- test/cursor_message_test.rb
+- test/auxillary/threaded_authentication_test.rb
 - test/bson/binary_test.rb
-- test/bson/json_test.rb
+- test/bson/bson_test.rb
 - test/bson/byte_buffer_test.rb
-- test/bson/ordered_hash_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/bson/json_test.rb
 - test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
 - test/bson/test_helper.rb
-- test/bson/bson_test.rb
 - test/bson/timestamp_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
-- test/load/unicorn/load.rb
-- test/load/thin/load.rb
-- test/db_test.rb
+- test/collection_test.rb
 - test/connection_test.rb
+- test/conversions_test.rb
+- test/cursor_fail_test.rb
+- test/cursor_message_test.rb
+- test/cursor_test.rb
 - test/db_api_test.rb
-- test/grid_file_system_test.rb
-- test/safe_test.rb
 - test/db_connection_test.rb
+- test/db_test.rb
+- test/grid_file_system_test.rb
+- test/grid_io_test.rb
 - test/grid_test.rb
+- test/load/thin/load.rb
+- test/load/unicorn/load.rb
+- test/replica_sets/basic_test.rb
+- test/replica_sets/complex_connect_test.rb
+- test/replica_sets/connect_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/pooled_insert_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/read_preference_test.rb
+- test/replica_sets/refresh_test.rb
+- test/replica_sets/refresh_with_threads_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/rs_test_helper.rb
+- test/safe_test.rb
+- test/support/hash_with_indifferent_access.rb
+- test/support/keys.rb
+- test/support_test.rb
+- test/test_helper.rb
+- test/threading/threading_with_large_pool_test.rb
+- test/threading_test.rb
+- test/tools/auth_repl_set_manager.rb
+- test/tools/repl_set_manager.rb
+- test/unit/collection_test.rb
+- test/unit/connection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/db_test.rb
+- test/unit/grid_test.rb
+- test/unit/node_test.rb
+- test/unit/pool_manager_test.rb
+- test/unit/pool_test.rb
+- test/unit/read_test.rb
+- test/unit/safe_test.rb
+- test/uri_test.rb
 homepage: http://www.mongodb.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Ruby driver for the MongoDB
-test_files: 
-- test/tools/repl_set_manager.rb
-- test/tools/auth_repl_set_manager.rb
-- test/uri_test.rb
-- test/conversions_test.rb
-- test/grid_io_test.rb
-- test/cursor_fail_test.rb
-- test/unit/cursor_test.rb
-- test/unit/pool_test.rb
-- test/unit/pool_manager_test.rb
-- test/unit/collection_test.rb
-- test/unit/node_test.rb
-- test/unit/db_test.rb
-- test/unit/connection_test.rb
-- test/unit/read_test.rb
-- test/unit/safe_test.rb
-- test/unit/grid_test.rb
-- test/support_test.rb
-- test/cursor_test.rb
-- test/support/keys.rb
-- test/support/hash_with_indifferent_access.rb
-- test/test_helper.rb
-- test/threading_test.rb
-- test/auxillary/repl_set_auth_test.rb
-- test/auxillary/autoreconnect_test.rb
-- test/auxillary/threaded_authentication_test.rb
-- test/auxillary/authentication_test.rb
+summary: Ruby driver for MongoDB
+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/threading/threading_with_large_pool_test.rb
-- test/replica_sets/pooled_insert_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/read_preference_test.rb
-- test/replica_sets/connect_test.rb
-- test/replica_sets/basic_test.rb
-- test/replica_sets/count_test.rb
-- test/replica_sets/refresh_test.rb
-- test/replica_sets/replication_ack_test.rb
-- test/replica_sets/query_test.rb
-- test/replica_sets/refresh_with_threads_test.rb
-- test/replica_sets/rs_test_helper.rb
-- test/collection_test.rb
-- test/cursor_message_test.rb
+- test/auxillary/threaded_authentication_test.rb
 - test/bson/binary_test.rb
-- test/bson/json_test.rb
+- test/bson/bson_test.rb
 - test/bson/byte_buffer_test.rb
-- test/bson/ordered_hash_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/bson/json_test.rb
 - test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
 - test/bson/test_helper.rb
-- test/bson/bson_test.rb
 - test/bson/timestamp_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
-- test/load/unicorn/load.rb
-- test/load/thin/load.rb
-- test/db_test.rb
+- test/collection_test.rb
 - test/connection_test.rb
+- test/conversions_test.rb
+- test/cursor_fail_test.rb
+- test/cursor_message_test.rb
+- test/cursor_test.rb
 - test/db_api_test.rb
-- test/grid_file_system_test.rb
-- test/safe_test.rb
 - test/db_connection_test.rb
+- test/db_test.rb
+- test/grid_file_system_test.rb
+- test/grid_io_test.rb
 - test/grid_test.rb
+- test/load/thin/load.rb
+- test/load/unicorn/load.rb
+- test/replica_sets/basic_test.rb
+- test/replica_sets/complex_connect_test.rb
+- test/replica_sets/connect_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/pooled_insert_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/read_preference_test.rb
+- test/replica_sets/refresh_test.rb
+- test/replica_sets/refresh_with_threads_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/rs_test_helper.rb
+- test/safe_test.rb
+- test/support/hash_with_indifferent_access.rb
+- test/support/keys.rb
+- test/support_test.rb
+- test/test_helper.rb
+- test/threading/threading_with_large_pool_test.rb
+- test/threading_test.rb
+- test/tools/auth_repl_set_manager.rb
+- test/tools/repl_set_manager.rb
+- test/unit/collection_test.rb
+- test/unit/connection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/db_test.rb
+- test/unit/grid_test.rb
+- test/unit/node_test.rb
+- test/unit/pool_manager_test.rb
+- test/unit/pool_test.rb
+- test/unit/read_test.rb
+- test/unit/safe_test.rb
+- test/uri_test.rb
+has_rdoc: true