mongo 0.1.0 → 0.15

data/{tests → test}/test_round_trip.rb

@@ -8,12 +8,12 @@ require 'test/unit'
 # OrderedHash and then test both Ruby-to-BSON and BSON-to-Ruby translations.
 #
 # There is a whole other project that includes similar tests
-# (http://github.com/mongodb/mongo-qa). If the directory ../mongo-qa exists,
-# then we find the BSON test files there and use those, too. Use the Rake task
-# "mongo_qa" to obtain those tests.
+# (http://github.com/mongodb/mongo-qa). If the directory ../../mongo-qa
+# exists, (that is, the top-level dir of mongo-qa is next to the top-level dir
+# of this project), then we find the BSON test files there and use those, too.
 class RoundTripTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   @@ruby = nil
 
@@ -47,7 +47,7 @@ EOS
   # Dynamically generate one test for each test file. This way, if one test
   # fails the others will still run.
   create_test_for_round_trip_files_in_dir(File.join(HERE, 'data'))
-  mongo_qa_dir = File.join(HERE, '..', 'mongo-qa/modules/bson_tests')
+  mongo_qa_dir = File.join(HERE, '../..', 'mongo-qa/modules/bson_tests/tests')
   if File.exist?(mongo_qa_dir)
     %w(basic_types complex single_types).each { |subdir_name|
       create_test_for_round_trip_files_in_dir(File.join(mongo_qa_dir, subdir_name))
@@ -64,10 +64,14 @@ EOS
   #   generated)
   def one_round_trip(dir, name)
     obj = File.open(File.join(dir, "#{name}.xson")) { |f|
-      XMLToRuby.new.xml_to_ruby(f)
+      begin
+        XMLToRuby.new.xml_to_ruby(f)
+      rescue => ex # unsupported type
+        return
+      end
     }
 
-    File.open(File.join(dir, "#{name}.bson"), 'r') { |f|
+    File.open(File.join(dir, "#{name}.bson"), 'rb') { |f|
       # Read the BSON from the file
       bson = f.read
       bson = if RUBY_VERSION >= '1.9'
@@ -93,9 +97,9 @@ EOS
       # Turn those BSON bytes back into a Ruby object.
       #
       # We're passing a nil db to the contructor here, but that's OK because
-      # the BSON DBFef bytes don't contain the db object in any case, and we
+      # 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(nil).deserialize(ByteBuffer.new(bson_from_ruby))
+      obj_from_bson = BSON.new.deserialize(ByteBuffer.new(bson_from_ruby))
       assert_kind_of OrderedHash, obj_from_bson
 
       # Turn that Ruby object into BSON and compare it to the original BSON

data/test/test_threading.rb

@@ -0,0 +1,37 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+class TestThreading < Test::Unit::TestCase
+
+  include Mongo
+
+  @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+  @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
+  @@coll = @@db.collection('thread-test-collection')
+
+  def test_threading
+    @@coll.clear
+
+    1000.times do |i|
+      @@coll.insert("x" => i)
+    end
+
+    threads = []
+
+    10.times do |i|
+      threads[i] = Thread.new{
+        sum = 0
+        @@coll.find().each { |document|
+          sum += document["x"]
+        }
+        assert_equal 499500, sum
+      }
+    end
+
+    10.times do |i|
+      threads[i].join
+    end
+  end
+end

metadata

@@ -1,33 +1,56 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: "0.15"
 platform: ruby
 authors: 
 - Jim Menard
+- Mike Dirolf
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-15 00:00:00 -05:00
+date: 2009-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: This is a simple pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.
-email: jimm@io.com
-executables: 
-- mongo_console
-extensions: []
+description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
+email: mongodb-dev@googlegroups.com
+executables: []
 
-extra_rdoc_files: []
+extensions: []
 
+extra_rdoc_files: 
+- README.rdoc
 files: 
+- README.rdoc
+- Rakefile
+- mongo-ruby-driver.gemspec
+- bin/bson_benchmark.rb
 - bin/mongo_console
-- bin/validate
+- bin/run_test_script
+- bin/standard_benchmark
+- examples/admin.rb
+- examples/benchmarks.rb
+- examples/blog.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
 - lib/mongo/admin.rb
 - lib/mongo/collection.rb
+- lib/mongo/connection.rb
 - lib/mongo/cursor.rb
 - lib/mongo/db.rb
+- lib/mongo/gridfs/chunk.rb
+- lib/mongo/gridfs/grid_store.rb
+- lib/mongo/gridfs.rb
+- lib/mongo/errors.rb
 - lib/mongo/message/get_more_message.rb
 - lib/mongo/message/insert_message.rb
 - lib/mongo/message/kill_cursors_message.rb
@@ -39,36 +62,26 @@ files:
 - lib/mongo/message/remove_message.rb
 - lib/mongo/message/update_message.rb
 - lib/mongo/message.rb
-- lib/mongo/mongo.rb
 - lib/mongo/query.rb
 - lib/mongo/types/binary.rb
+- lib/mongo/types/code.rb
 - lib/mongo/types/dbref.rb
 - lib/mongo/types/objectid.rb
 - lib/mongo/types/regexp_of_holding.rb
-- lib/mongo/types/undefined.rb
 - lib/mongo/util/bson.rb
 - lib/mongo/util/byte_buffer.rb
 - lib/mongo/util/ordered_hash.rb
 - lib/mongo/util/xml_to_ruby.rb
 - lib/mongo.rb
-- tests/test_admin.rb
-- tests/test_bson.rb
-- tests/test_byte_buffer.rb
-- tests/test_cursor.rb
-- tests/test_db.rb
-- tests/test_db_api.rb
-- tests/test_db_connection.rb
-- tests/test_message.rb
-- tests/test_objectid.rb
-- tests/test_ordered_hash.rb
-- tests/test_round_trip.rb
-- Rakefile
-- README.rdoc
 has_rdoc: true
 homepage: http://www.mongodb.org
-post_install_message: 
-rdoc_options: []
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --main
+- README.rdoc
+- --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -85,10 +98,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: mongo
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Simple pure-Ruby driver for the 10gen Mongo DB
-test_files: []
-
+specification_version: 3
+summary: Ruby driver for the MongoDB
+test_files: 
+- test/mongo-qa/_common.rb
+- test/mongo-qa/admin
+- test/mongo-qa/capped
+- test/mongo-qa/count1
+- test/mongo-qa/dbs
+- test/mongo-qa/find
+- test/mongo-qa/find1
+- test/mongo-qa/gridfs_in
+- test/mongo-qa/gridfs_out
+- test/mongo-qa/indices
+- test/mongo-qa/remove
+- test/mongo-qa/stress1
+- test/mongo-qa/test1
+- test/mongo-qa/update
+- test/test_admin.rb
+- test/test_bson.rb
+- test/test_byte_buffer.rb
+- test/test_chunk.rb
+- test/test_collection.rb
+- test/test_connection.rb
+- test/test_cursor.rb
+- test/test_db.rb
+- test/test_db_api.rb
+- test/test_db_connection.rb
+- test/test_grid_store.rb
+- test/test_message.rb
+- test/test_objectid.rb
+- test/test_ordered_hash.rb
+- test/test_threading.rb
+- test/test_round_trip.rb

data/bin/validate

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-#
-# usage: validate somefile.xson somefile.bson
-#
-# Reads somefile.xson file (XML that describes a Mongo-type document),
-# converts it into a Ruby OrderedHash, runs that through the BSON
-# serialization code, and writes the BSON bytes to somefile.bson.
-#
-# In addition, this script takes the generated BSON, reads it in then writes
-# it back out to a temp BSON file. If they are different, we report that error
-# to STDOUT.
-#
-# This script is used by the mongo-qa project
-# (http://github.com/mongodb/mongo-qa).
-
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'mongo/util/xml_to_ruby'
-
-if ARGV.length < 2
-  $stderr.puts "usage: validate somefile.xson somefile.bson"
-  exit 1
-end
-
-# Translate the .xson XML into a Ruby object, turn that object into BSON, and
-# write the BSON to the file as requested.
-obj = File.open(ARGV[0], 'rb') { |f| XMLToRuby.new.xml_to_ruby(f) }
-bson = BSON.new.serialize(obj).to_a
-File.open(ARGV[1], 'wb') { |f| bson.each { |b| f.putc(b) } }
-
-# Now the additional testing. Read the generated BSON back in, deserialize it,
-# and re-serialize the results. Compare that BSON with the BSON from the file
-# we output.
-bson = File.open(ARGV[1], 'rb') { |f| 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
-
-if bson.length != bson_from_ruby.length
-  $stderr.puts "error: round-trip BSON lengths differ when testing #{ARGV[0]}"
-  exit 1
-elsif bson != bson_from_ruby
-  $stderr.puts "error: round-trip BSON contents differ when testing #{ARGV[0]}"
-  exit 1
-end

data/lib/mongo/mongo.rb

@@ -1,74 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# ++
-
-require 'mongo/db'
-
-module XGen
-  module Mongo
-    module Driver
-
-      # Represents a Mongo database server.
-      class Mongo
-
-        DEFAULT_PORT = 27017
-
-        # Either nodes_or_host is a host name string and port is an optional
-        # port number that defaults to DEFAULT_PORT, or nodes_or_host is an
-        # array of arrays, where each is a host/port pair (or a host with no
-        # port). Finally, if nodes_or_host is nil then host is 'localhost' and
-        # port is DEFAULT_PORT. Since that's so confusing, here are a few
-        # examples:
-        #
-        #  Mongo.new                         # localhost, DEFAULT_PORT
-        #  Mongo.new("localhost")            # localhost, DEFAULT_PORT
-        #  Mongo.new("localhost", 3000)      # localhost, 3000
-        #  Mongo.new([["localhost"]])        # localhost, DEFAULT_PORT
-        #  Mongo.new([["localhost", 3000]])  # localhost, 3000
-        #  Mongo.new([["db1.example.com", 3000], ["db2.example.com", 3000]]])
-        #
-        # When a DB object first connects, it tries nodes and stops at the
-        # first one it connects to.
-        def initialize(nodes_or_host=nil, port=nil)
-          @nodes = case nodes_or_host
-                   when String
-                     [[nodes_or_host, port || DEFAULT_PORT]]
-                   when Array
-                     nodes_or_host.collect { |nh| [nh[0], nh[1] || DEFAULT_PORT] }
-                   when nil
-                     [['localhost', DEFAULT_PORT]]
-                   end
-        end
-
-        # Return the XGen::Mongo::Driver::DB named +db_name+.
-        def db(db_name)
-          XGen::Mongo::Driver::DB.new(db_name, @nodes)
-        end
-
-        # Not implemented.
-        def clone_database(from)
-          raise "not implemented"
-        end
-
-        # Not implemented.
-        def copy_database(from_host, from_db, to_db)
-          raise "not implemented"
-        end
-
-      end
-    end
-  end
-end
-

data/lib/mongo/types/undefined.rb

@@ -1,31 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# ++
-
-module XGen
-  module Mongo
-    module Driver
-
-      # A special "undefined" type to match Mongo's storage of UNKNOWN values.
-      # "UNKNOWN" comes from JavaScript.
-      #
-      # NOTE: this class does not attempt to provide ANY of the semantics an
-      # "unknown" object might need. It isn't nil, it isn't special in any
-      # way, and there isn't any singleton value.
-      class Undefined < Object; end
-
-    end
-  end
-end

data/tests/test_bson.rb

@@ -1,135 +0,0 @@
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-require 'test/unit'
-
-class BSONTest < Test::Unit::TestCase
-
-  include XGen::Mongo::Driver
-
-  def setup
-    # We don't pass a DB to the constructor, even though we are about to test
-    # deserialization. This means that when we deserialize, any DBRefs will
-    # have nil @db ivars. That's fine for now.
-    @b = BSON.new
-  end
-
-  def test_string
-    doc = {'doc' => 'hello, world'}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_code
-    doc = {'$where' => 'this.a.b < this.b'}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_number
-    doc = {'doc' => 41.99}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_int
-    doc = {'doc' => 42}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_object
-    doc = {'doc' => {'age' => 42, 'name' => 'Spongebob', 'shoe_size' => 9.5}}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_oid
-    doc = {'doc' => ObjectID.new}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_array
-    doc = {'doc' => [1, 2, 'a', 'b']}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_regex
-    doc = {'doc' => /foobar/i}
-    @b.serialize(doc)
-    doc2 = @b.deserialize
-    assert_equal doc, doc2
-
-    r = doc2['doc']
-    assert_kind_of XGen::Mongo::Driver::RegexpOfHolding, r
-    assert_equal '', r.extra_options_str
-
-    r.extra_options_str << 'zywcab'
-    assert_equal 'zywcab', r.extra_options_str
-
-    b = BSON.new
-    doc = {'doc' => r}
-    b.serialize(doc)
-    doc2 = nil
-    doc2 = b.deserialize
-    assert_equal doc, doc2
-
-    r = doc2['doc']
-    assert_kind_of XGen::Mongo::Driver::RegexpOfHolding, r
-    assert_equal 'abcwyz', r.extra_options_str # must be sorted
-  end
-
-  def test_boolean
-    doc = {'doc' => true}
-    @b.serialize(doc)
-    assert_equal doc, @b.deserialize
-  end
-
-  def test_date
-    doc = {'date' => Time.now}
-    @b.serialize(doc)
-    doc2 = @b.deserialize
-    # Mongo only stores seconds, so comparing raw Time objects will fail
-    # because the fractional seconds will be different.
-    assert_equal doc['date'].to_i, doc2['date'].to_i
-  end
-
-  def test_null
-  end
-
-  def test_dbref
-    oid = ObjectID.new
-    doc = {}
-    doc['dbref'] = DBRef.new(doc, 'dbref', nil, 'namespace', oid)
-    @b.serialize(doc)
-    doc2 = @b.deserialize
-    assert_equal 'namespace', doc2['dbref'].namespace
-    assert_equal oid, doc2['dbref'].object_id
-  end
-
-  def test_symbol
-    doc = {'sym' => :foo}
-    @b.serialize(doc)
-    doc2 = @b.deserialize
-    assert_equal :foo, doc2['sym']
-  end
-
-  def test_binary
-    bin = 'binstring'.to_mongo_binary
-    assert_kind_of Binary, bin
-
-    doc = {'bin' => bin}
-    @b.serialize(doc)
-    doc2 = @b.deserialize
-    assert_equal 'binstring', doc2['bin']
-  end
-
-  def test_undefined
-    doc = {'undef' => Undefined.new}
-    @b.serialize(doc)
-    doc2 = @b.deserialize
-    assert_kind_of Undefined, doc2['undef']
-  end
-
-end