mongo 1.1 → 1.1.1

data/test/support/keys.rb

@@ -0,0 +1,45 @@
+class Hash
+  # Return a new hash with all keys converted to strings.
+  def stringify_keys
+    dup.stringify_keys!
+  end
+
+  # Destructively convert all keys to strings.
+  def stringify_keys!
+    keys.each do |key|
+      self[key.to_s] = delete(key)
+    end
+    self
+  end
+
+  # Return a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+.
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+
+  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

data/test/test_helper.rb

@@ -19,14 +19,49 @@ MSG
     exit
 end
 
-require 'bson_ext/cbson' if ENV['C_EXT']
+require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
 
-MONGO_TEST_DB = 'mongo-ruby-test'
+unless defined? MONGO_TEST_DB
+  MONGO_TEST_DB = 'mongo-ruby-test'
+end
 
 class Test::Unit::TestCase
   include Mongo
   include BSON
 
+  def self.standard_connection(options={})
+    Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+      ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT, options)
+  end
+
+  def standard_connection(options={})
+    self.class.standard_connection(options)
+  end
+
+  def self.host_port
+    "#{mongo_host}:#{mongo_port}"
+  end
+
+  def self.mongo_host
+    ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+  end
+
+  def self.mongo_port
+    ENV['MONGO_RUBY_DRIVER_PORT'] ? ENV['MONGO_RUBY_DRIVER_PORT'].to_i : 27017
+  end
+
+  def host_port
+    self.class.host_port
+  end
+
+  def mongo_host
+    self.class.mongo_host
+  end
+
+  def mongo_port
+    self.class.mongo_port
+  end
+
   # Generic code for rescuing connection failures and retrying operations.
   # This could be combined with some timeout functionality.
   def rescue_connection_failure

data/test/threading/test_threading_large_pool.rb

@@ -6,7 +6,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new('localhost', 27017, :pool_size => 50, :timeout => 60).db(MONGO_TEST_DB)
+  @@db = standard_connection(:pool_size => 50, :timeout => 60).db(MONGO_TEST_DB)
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data

data/test/threading_test.rb

@@ -4,7 +4,7 @@ class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new('localhost', 27017, :pool_size => 1, :timeout => 30).db(MONGO_TEST_DB)
+  @@db = standard_connection(:pool_size => 1, :timeout => 30).db(MONGO_TEST_DB)
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data

metadata

@@ -1,156 +1,207 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
-    - 1
-    - 1
-  version: "1.1"
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
-  - Jim Menard
-  - Mike Dirolf
-  - Kyle Banker
+- Jim Menard
+- Mike Dirolf
+- Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: bson
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 5
-            version: 1.0.5
-    type: :runtime
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bson
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
+  type: :runtime
+  version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables: 
-  - mongo_console
+- mongo_console
 extensions: []
 
 extra_rdoc_files: 
-  - README.rdoc
+- README.rdoc
 files: 
-  - README.rdoc
-  - HISTORY
-  - Rakefile
-  - mongo.gemspec
-  - LICENSE.txt
-  - lib/mongo.rb
-  - lib/mongo/collection.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/util/conversions.rb
-  - lib/mongo/util/core_ext.rb
-  - lib/mongo/util/server_version.rb
-  - lib/mongo/util/support.rb
-  - examples/admin.rb
-  - examples/capped.rb
-  - examples/cursor.rb
-  - examples/gridfs.rb
-  - examples/index_test.rb
-  - examples/info.rb
-  - examples/queries.rb
-  - examples/simple.rb
-  - examples/strict.rb
-  - examples/types.rb
-  - bin/bson_benchmark.rb
-  - bin/fail_if_no_c.rb
-  - bin/insert.rb
-  - bin/oid.rb
-  - bin/mongo_console
+- README.rdoc
+- HISTORY
+- Rakefile
+- mongo.gemspec
+- LICENSE.txt
+- lib/mongo.rb
+- lib/mongo/collection.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/util/conversions.rb
+- lib/mongo/util/core_ext.rb
+- lib/mongo/util/server_version.rb
+- lib/mongo/util/support.rb
+- examples/admin.rb
+- examples/capped.rb
+- examples/cursor.rb
+- examples/gridfs.rb
+- examples/index_test.rb
+- examples/info.rb
+- examples/queries.rb
+- examples/simple.rb
+- examples/strict.rb
+- examples/types.rb
+- bin/bson_benchmark.rb
+- bin/fail_if_no_c.rb
+- bin/insert.rb
+- bin/oid.rb
+- bin/mongo_console
+- test/auxillary/1.4_features.rb
+- test/auxillary/authentication_test.rb
+- test/auxillary/autoreconnect_test.rb
+- test/auxillary/slave_connection_test.rb
+- test/bson/binary_test.rb
+- test/bson/bson_test.rb
+- test/bson/byte_buffer_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/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/db_connection_test.rb
+- test/db_test.rb
+- test/grid_file_system_test.rb
+- test/grid_io_test.rb
+- test/grid_test.rb
+- test/replica_pairs/count_test.rb
+- test/replica_pairs/insert_test.rb
+- test/replica_pairs/pooled_insert_test.rb
+- test/replica_pairs/query_test.rb
+- test/replica_sets/connect_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/node_type_test.rb
+- test/replica_sets/pooled_insert_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/support/hash_with_indifferent_access.rb
+- test/support/keys.rb
+- test/support_test.rb
+- test/test_helper.rb
+- test/threading/test_threading_large_pool.rb
+- test/threading_test.rb
+- test/unit/collection_test.rb
+- test/unit/connection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/db_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.rdoc
-  - --inline-source
+- --main
+- README.rdoc
+- --inline-source
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-  - 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/db_connection_test.rb
-  - test/db_test.rb
-  - test/grid_file_system_test.rb
-  - test/grid_io_test.rb
-  - test/grid_test.rb
-  - test/support_test.rb
-  - test/test_helper.rb
-  - test/threading_test.rb
-  - test/auxillary/1.4_features.rb
-  - test/auxillary/authentication_test.rb
-  - test/auxillary/autoreconnect_test.rb
-  - test/auxillary/slave_connection_test.rb
-  - test/bson/basic_test.rb
-  - test/bson/bench_test.rb
-  - test/bson/binary_test.rb
-  - test/bson/bson_test.rb
-  - test/bson/byte_buffer_test.rb
-  - test/bson/c_encode_test.rb
-  - test/bson/java_bson_test.rb
-  - test/bson/jruby_bson_test.rb
-  - test/bson/jruby_encode_test.rb
-  - test/bson/json_test.rb
-  - test/bson/object_id_test.rb
-  - test/bson/ordered_hash_test.rb
-  - test/replica_pairs/count_test.rb
-  - test/replica_pairs/insert_test.rb
-  - test/replica_pairs/pooled_insert_test.rb
-  - test/replica_pairs/query_test.rb
-  - test/replica_sets/count_test.rb
-  - test/replica_sets/insert_test.rb
-  - test/replica_sets/node_type_test.rb
-  - test/replica_sets/pooled_insert_test.rb
-  - test/replica_sets/query_test.rb
-  - test/replica_sets/replication_ack_test.rb
-  - test/threading/test_threading_large_pool.rb
-  - test/unit/collection_test.rb
-  - test/unit/connection_test.rb
-  - test/unit/cursor_test.rb
-  - test/unit/db_test.rb
+- test/auxillary/1.4_features.rb
+- test/auxillary/authentication_test.rb
+- test/auxillary/autoreconnect_test.rb
+- test/auxillary/slave_connection_test.rb
+- test/bson/binary_test.rb
+- test/bson/bson_test.rb
+- test/bson/byte_buffer_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/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/db_connection_test.rb
+- test/db_test.rb
+- test/grid_file_system_test.rb
+- test/grid_io_test.rb
+- test/grid_test.rb
+- test/replica_pairs/count_test.rb
+- test/replica_pairs/insert_test.rb
+- test/replica_pairs/pooled_insert_test.rb
+- test/replica_pairs/query_test.rb
+- test/replica_sets/connect_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/node_type_test.rb
+- test/replica_sets/pooled_insert_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/support/hash_with_indifferent_access.rb
+- test/support/keys.rb
+- test/support_test.rb
+- test/test_helper.rb
+- test/threading/test_threading_large_pool.rb
+- test/threading_test.rb
+- test/unit/collection_test.rb
+- test/unit/connection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/db_test.rb

data/test/bson/basic_test.rb

@@ -1,99 +0,0 @@
-# encoding:utf-8
-require './test/test_helper'
-require 'complex'
-require 'bigdecimal'
-require 'rational'
-require 'benchmark'
-
-MEDIUM = {
-  'integer' => 5,
-  'number' => 5.05,
-  'boolean' => false,
-  'array' => ['test', 'benchmark']
-}
-
-
-LARGE = {
-  'base_url' => 'http://www.example.com/test-me',
-  'total_word_count' => 6743,
-  'access_time' => Time.now,
-  'meta_tags' => {
-    'description' => 'i am a long description string',
-    'author' => 'Holly Man',
-    'dynamically_created_meta_tag' => 'who know\n what'
-  },
-  'page_structure' => {
-    'counted_tags' => 3450,
-    'no_of_js_attached' => 10,
-    'no_of_images' => 6
-  },
-  'harvested_words' => ['10gen','web','open','source','application','paas',
-                        'platform-as-a-service','technology','helps',
-                        'developers','focus','building','mongodb','mongo'] * 20
-}
-
-
-
-begin
-  require 'active_support/core_ext'
-  require 'active_support/hash_with_indifferent_access'
-  Time.zone = "Pacific Time (US & Canada)"
-  Zone = Time.zone.now
-rescue LoadError
-  warn 'Could not test BSON with HashWithIndifferentAccess.'
-  module ActiveSupport
-    class TimeWithZone
-    end
-  end
-  Zone = ActiveSupport::TimeWithZone.new
-end
-
-class BSONTest < Test::Unit::TestCase
-  include BSON
-
-  def test_string
-    doc = {'doc' => 'hello, world'}
-    bson = bson = BSON::BSON_CODER.serialize(doc)
-    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
-  end
-
-  def test_object
-    doc = {'doc' => {'age' => 42, 'name' => 'Spongebob', 'shoe_size' => 9.5}}
-    bson = BSON::BSON_CODER.serialize(doc)
-    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
-  end
-
-  def test_oid
-    doc = {'doc' => ObjectID.new}
-    bson = BSON::BSON_CODER.serialize(doc)
-    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
-  end
-
-  def test_array
-    doc = {'doc' => [1, 2, "a", "b"]}
-    bson = BSON::BSON_CODER.serialize(doc)
-    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
-  end
-
-  def test_speed
-
-  Benchmark.bm do |x|
-    x.report('serialize obj') do
-      1000.times do
-        BSON::BSON_CODER.serialize(LARGE)
-      end
-    end
-  end
-
-
-
-  Benchmark.bm do |x|
-        b = BSON::BSON_CODER.serialize(LARGE)
-    x.report('deserialize obj') do
-      1000.times do
-        BSON::BSON_CODER.deserialize(b)
-      end
-    end
-  end
-  end
-end