mongodb-mongo 0.6.4 → 0.6.5

data/Rakefile

@@ -8,6 +8,8 @@ begin
   require 'rake/contrib/rubyforgepublisher'
 rescue LoadError
 end
+require 'rbconfig'
+include Config
 
 # NOTE: some of the tests assume Mongo is running
 Rake::TestTask.new do |t|
@@ -26,14 +28,6 @@ task :publish => [:rdoc] do
   Rake::RubyForgePublisher.new(GEM, RUBYFORGE_USER).upload
 end
 
-desc "Compile the extension"
-task :compile do
-  cd 'ext/cbson'
-  ruby 'extconf.rb'
-  sh 'make'
-  cp 'cbson.bundle', '../../lib/mongo/ext/cbson.bundle'
-end
-
 namespace :gem do
 
   desc "Install the gem locally"
@@ -45,6 +39,15 @@ gem build mongo-ruby-driver.gemspec &&
 EOS
   end
 
+  desc "Install the optional c extensions"
+  task :install_extensions do
+    sh <<EOS
+gem build mongo-extensions.gemspec &&
+    sudo gem install mongo_ext-*.gem &&
+    rm mongo_ext-*.gem
+EOS
+  end
+
 end
 
 task :default => :list

data/bin/bson_benchmark.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+
+include XGen::Mongo::Driver
+
+TRIALS = 100000
+
+def encode(doc)
+  t0 = Time.new
+  b = BSON.new
+  TRIALS.times { |i|
+    b = BSON.new
+    b.serialize doc
+  }
+  print "took: #{Time.now.to_f - t0.to_f}\n"
+  return b
+end
+
+def decode(bson)
+  t0 = Time.new
+  doc = nil
+  TRIALS.times { |i|
+    doc = bson.deserialize
+  }
+  print "took: #{Time.now.to_f - t0.to_f}\n"
+  return doc
+end
+
+TEST_CASES = [{},
+              {
+                "hello" => "world"
+              },
+              {
+                "hello" => "world",
+                "mike" => "something",
+                "here's" => "another"
+              },
+              {
+                "int" => 200,
+                "bool" => true,
+                "an int" => 20,
+                "a bool" => false
+              },
+              {
+                "this" => 5,
+                "is" => {"a" => true},
+                "big" => [true, 5.5],
+                "object" => nil
+              }]
+
+TEST_CASES.each { |doc|
+  print "case #{doc.inspect}\n"
+  print "enc bson\n"
+  enc_bson = encode(doc)
+  print "dec bson\n"
+  raise "FAIL" unless doc == decode(enc_bson)
+}

data/lib/mongo/cursor.rb

@@ -18,9 +18,6 @@ require 'mongo/message'
 require 'mongo/util/byte_buffer'
 require 'mongo/util/bson'
 
-require 'logger'
-LOG = Logger.new('recv_file.log', 'daily')
-
 module XGen
   module Mongo
     module Driver
@@ -168,10 +165,7 @@ module XGen
 
         def read_response_header
           header_buf = ByteBuffer.new
-          read = @db.receive_full(RESPONSE_HEADER_SIZE)
-          header_buf.put_array(read.unpack("C*"))
-          LOG.debug "resp head: #{read.inspect}\n"
-          raise "BAD SIZE" unless read.length == RESPONSE_HEADER_SIZE
+          header_buf.put_array(@db.receive_full(RESPONSE_HEADER_SIZE).unpack("C*"))
           raise "Short read for DB response header; expected #{RESPONSE_HEADER_SIZE} bytes, saw #{header_buf.length}" unless header_buf.length == RESPONSE_HEADER_SIZE
           header_buf.rewind
           @result_flags = header_buf.get_int
@@ -206,16 +200,10 @@ module XGen
 
         def object_from_stream
           buf = ByteBuffer.new
-          read1 = @db.receive_full(4)
-          buf.put_array(read1.unpack("C*"))
-          LOG.debug "size: #{read1.inspect}\n"
-          raise "BAD SIZE" unless read1.length == 4
+          buf.put_array(@db.receive_full(4).unpack("C*"))
           buf.rewind
           size = buf.get_int
-          read2 = @db.receive_full(size - 4)
-          buf.put_array(read2.unpack("C*"), 4)
-          LOG.debug "body: #{read2.inspect}\n"
-          raise "BAD SIZE" unless read2.length == size - 4
+          buf.put_array(@db.receive_full(size - 4).unpack("C*"), 4)
           @n_remaining -= 1
           buf.rewind
           BSON.new.deserialize(buf)

data/lib/mongo/db.rb

@@ -374,6 +374,23 @@ module XGen
           raise "Error with count command: #{doc.inspect}"
         end
 
+        # Evaluate a JavaScript expression on MongoDB.
+        # +code+ should be a string or Code instance containing a JavaScript
+        # expression. Additional arguments will be passed to that expression
+        # when it is run on the server.
+        def eval(code, *args)
+          if not code.is_a? Code
+            code = Code.new(code)
+          end
+
+          oh = OrderedHash.new
+          oh[:$eval] = code
+          oh[:args] = args
+          doc = db_command(oh)
+          return doc['retval'] if ok?(doc)
+          raise "Error with eval command: #{doc.inspect}"
+        end
+
         # Drop index +name+ from +collection_name+. Normally called from
         # Collection#drop_index or Collection#drop_indexes.
         def drop_index(collection_name, name)

data/lib/mongo/message/message_header.rb

@@ -16,9 +16,6 @@
 
 require 'mongo/util/byte_buffer'
 
-require 'logger'
-LOG = Logger.new('recv_file.log', 'daily')
-
 module XGen
   module Mongo
     module Driver
@@ -33,10 +30,7 @@ module XGen
 
         def read_header(db)
           @buf.rewind
-          read = db.receive_full(HEADER_SIZE)
-          @buf.put_array(read.unpack("C*"))
-          LOG.debug "header: #{read.inspect}\n"
-          raise "BAD SIZE" unless read.length == HEADER_SIZE
+          @buf.put_array(db.receive_full(HEADER_SIZE).unpack("C*"))
           raise "Short read for DB response header: expected #{HEADER_SIZE} bytes, saw #{@buf.size}" unless @buf.size == HEADER_SIZE
           @buf.rewind
           @size = @buf.get_int

data/lib/mongo/util/bson.rb

@@ -71,7 +71,7 @@ class BSON
   end
 
   begin
-    require 'mongo/ext/cbson'
+    require 'mongo_ext/cbson'
     def serialize(obj)
       @buf = ByteBuffer.new(CBson.serialize(obj))
     end
@@ -129,7 +129,7 @@ class BSON
   end
 
   begin
-    require 'mongo/ext/cbson'
+    require 'mongo_ext/cbson'
     def deserialize(buf=nil)
       if buf.is_a? String
         @buf = ByteBuffer.new(buf) if buf
@@ -245,7 +245,12 @@ class BSON
   def deserialize_object_data(buf)
     size = buf.get_int
     buf.position -= 4
-    BSON.new().deserialize(buf.get(size))
+    object = BSON.new().deserialize(buf.get(size))
+    if object.has_key? "$ref"
+      DBRef.new(object["$ref"], object["$id"])
+    else
+      object
+    end
   end
 
   def deserialize_array_data(buf)
@@ -324,8 +329,10 @@ class BSON
   end
 
   def serialize_dbref_element(buf, key, val)
-    serialize_string_element(buf, key, val.namespace, REF)
-    buf.put_array(val.object_id.to_a)
+    oh = OrderedHash.new
+    oh['$ref'] = val.namespace
+    oh['$id'] = val.object_id
+    serialize_object_element(buf, key, oh)
   end
 
   def serialize_binary_element(buf, key, val)

data/mongo-ruby-driver.gemspec

@@ -1,4 +1,7 @@
+# We need to list all of the included files because we aren't allowed to use
+# Dir[...] in the github sandbox.
 PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
+                 'bin/bson_benchmark.rb',
                  'bin/mongo_console',
                  'bin/run_test_script',
                  'bin/standard_benchmark',
@@ -45,7 +48,6 @@ PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
                  'lib/mongo/util/ordered_hash.rb',
                  'lib/mongo/util/xml_to_ruby.rb',
                  'lib/mongo.rb']
-
 TEST_FILES = ['tests/mongo-qa/_common.rb',
               'tests/mongo-qa/admin',
               'tests/mongo-qa/capped',
@@ -53,6 +55,8 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
               'tests/mongo-qa/dbs',
               'tests/mongo-qa/find',
               'tests/mongo-qa/find1',
+              'tests/mongo-qa/gridfs_in',
+              'tests/mongo-qa/gridfs_out',
               'tests/mongo-qa/indices',
               'tests/mongo-qa/remove',
               'tests/mongo-qa/stress1',
@@ -75,10 +79,10 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.6.4'
+  s.version = '0.6.5'
   s.platform = Gem::Platform::RUBY
-  s.summary = 'Simple pure-Ruby driver for the 10gen Mongo DB'
-  s.description = 'A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'
+  s.summary = 'Ruby driver for the 10gen Mongo DB'
+  s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'
 
   s.require_paths = ['lib']
 
@@ -89,7 +93,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--main', 'README.rdoc', '--inline-source']
   s.extra_rdoc_files = ['README.rdoc']
 
-  s.author = 'Jim Menard'
-  s.email = 'jim@10gen.com'
+  s.authors = ['Jim Menard', 'Mike Dirolf']
+  s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 end

data/tests/mongo-qa/gridfs_in

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+
+require 'mongo/gridfs'
+include XGen::Mongo::GridFS
+
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+
+input_file = ARGV[0]
+
+File.open(input_file, "r") { |f|
+  GridStore.open(db, input_file, "w") { |g|
+    g.write(f.read)
+  }
+}

data/tests/mongo-qa/gridfs_out

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+
+require 'mongo/gridfs'
+include XGen::Mongo::GridFS
+
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+
+input_file = ARGV[0]
+output_file = ARGV[1]
+
+File.open(output_file, "w") { |f|
+  GridStore.open(db, input_file, "r") { |g|
+    f.write(g.read)
+  }
+}

data/tests/test_admin.rb

@@ -22,6 +22,7 @@ class AdminTest < Test::Unit::TestCase
   def teardown
     @admin.profiling_level = :off
     @@coll.clear if @@coll
+    @@db.error
   end
 
   def test_default_profiling_level

data/tests/test_chunk.rb

@@ -24,6 +24,7 @@ class ChunkTest < Test::Unit::TestCase
   def teardown
     @@chunks.clear
     @@files.clear
+    @@db.error
   end
 
   def test_pos

data/tests/test_cursor.rb

@@ -19,6 +19,7 @@ class CursorTest < Test::Unit::TestCase
 
   def teardown
     @@coll.clear
+    @@db.error
   end
 
   def test_explain
@@ -41,55 +42,69 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_refill_via_get_more
-    1000.times { |i|
-      @@coll.insert('a' => i)
-    }
-
-    assert_equal 1001, @@coll.count
-    count = 0
-    @@coll.find.each { |obj|
-      count += obj['a']
-    }
-    assert_equal 1001, @@coll.count
-
-    # do the same thing again for debugging
-    assert_equal 1001, @@coll.count
-    count2 = 0
-    @@coll.find.each { |obj|
-      count2 += obj['a']
-    }
-    assert_equal 1001, @@coll.count
-
-    assert_equal count, count2
-    assert_equal 499501, count
+    begin
+      assert_equal 1, @@coll.count
+      1000.times { |i|
+        assert_equal 1 + i, @@coll.count
+        @@coll.insert('a' => i)
+      }
+
+      assert_equal 1001, @@coll.count
+      count = 0
+      @@coll.find.each { |obj|
+        count += obj['a']
+      }
+      assert_equal 1001, @@coll.count
+
+      # do the same thing again for debugging
+      assert_equal 1001, @@coll.count
+      count2 = 0
+      @@coll.find.each { |obj|
+        count2 += obj['a']
+      }
+      assert_equal 1001, @@coll.count
+
+      assert_equal count, count2
+      assert_equal 499501, count
+    rescue Test::Unit::AssertionFailedError => ex
+      p @@db.collection_names
+      Process.exit 1
+    end
   end
 
   def test_refill_via_get_more_alt_coll
-    coll = @@db.collection('test-alt-coll')
-    coll.clear
-    coll.insert('a' => 1)     # collection not created until it's used
-
-    1000.times { |i|
-      coll.insert('a' => i)
-    }
-
-    assert_equal 1001, coll.count
-    count = 0
-    coll.find.each { |obj|
-      count += obj['a']
-    }
-    assert_equal 1001, coll.count
-
-    # do the same thing again for debugging
-    assert_equal 1001, coll.count
-    count2 = 0
-    coll.find.each { |obj|
-      count2 += obj['a']
-    }
-    assert_equal 1001, coll.count
-
-    assert_equal count, count2
-    assert_equal 499501, count
+    begin
+      coll = @@db.collection('test-alt-coll')
+      coll.clear
+      coll.insert('a' => 1)     # collection not created until it's used
+      assert_equal 1, coll.count
+
+      1000.times { |i|
+        assert_equal 1 + i, coll.count
+        coll.insert('a' => i)
+      }
+
+      assert_equal 1001, coll.count
+      count = 0
+      coll.find.each { |obj|
+        count += obj['a']
+      }
+      assert_equal 1001, coll.count
+
+      # do the same thing again for debugging
+      assert_equal 1001, coll.count
+      count2 = 0
+      coll.find.each { |obj|
+        count2 += obj['a']
+      }
+      assert_equal 1001, coll.count
+
+      assert_equal count, count2
+      assert_equal 499501, count
+    rescue Test::Unit::AssertionFailedError => ex
+      p @@db.collection_names
+      Process.exit 1
+    end
   end
 
   def test_close_after_query_sent

data/tests/test_db.rb

@@ -29,6 +29,7 @@ class DBTest < Test::Unit::TestCase
 
   def teardown
     @@users.clear if @@users
+    @@db.error
   end
 
   def test_close

data/tests/test_db_api.rb

@@ -19,6 +19,7 @@ class DBAPITest < Test::Unit::TestCase
 
   def teardown
     @@coll.clear
+    @@db.error
   end
 
   def test_clear
@@ -447,8 +448,28 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.insert('a' => 3)
 
     assert_equal 3, @@coll.count
-    assert_equal 1, @@coll.find('$where' => Code.new('this.a > 2')).count
-    assert_equal 2, @@coll.find('$where' => Code.new('this.a > i', {'i' => 1})).count
+    assert_equal 1, @@coll.count('$where' => Code.new('this.a > 2'))
+    assert_equal 2, @@coll.count('$where' => Code.new('this.a > i', {'i' => 1}))
+  end
+
+  def test_eval
+    assert_equal 3, @@db.eval('function (x) {return x;}', 3)
+
+    assert_equal nil, @@db.eval("function (x) {db.test_eval.save({y:x});}", 5)
+    assert_equal 5, @@db.collection('test_eval').find_first['y']
+
+    assert_equal 5, @@db.eval("function (x, y) {return x + y;}", 2, 3)
+    assert_equal 5, @@db.eval("function () {return 5;}")
+    assert_equal 5, @@db.eval("2 + 3;")
+
+    assert_equal 5, @@db.eval(Code.new("2 + 3;"))
+    assert_equal nil, @@db.eval(Code.new("return i;"))
+    assert_equal 2, @@db.eval(Code.new("return i;", {"i" => 2}))
+    assert_equal 5, @@db.eval(Code.new("i + 3;", {"i" => 2}))
+
+    assert_raise RuntimeError do
+      @@db.eval("5 ++ 5;")
+    end
   end
 
   def test_hint

data/tests/test_db_connection.rb

@@ -13,5 +13,6 @@ class DBConnectionTest < Test::Unit::TestCase
     db = Mongo.new(host, port).db('ruby-mongo-demo')
     coll = db.collection('test')
     coll.clear
+    db.error
   end
 end

data/tests/test_grid_store.rb

@@ -22,6 +22,7 @@ class GridStoreTest < Test::Unit::TestCase
   def teardown
     @@chunks.clear
     @@files.clear
+    @@db.error
   end
 
   def test_exist

data/tests/test_mongo.rb

@@ -13,6 +13,10 @@ class MongoTest < Test::Unit::TestCase
     @mongo = Mongo.new(@host, @port)
   end
 
+  def teardown
+    @mongo.db('ruby-mongo-test').error
+  end
+
   def test_database_info
     @mongo.drop_database('ruby-mongo-info-test')
     @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Jim Menard
+- Mike Dirolf
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,8 +14,8 @@ date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.
-email: jim@10gen.com
+description: A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.
+email: mongodb-dev@googlegroups.com
 executables: []
 
 extensions: []
@@ -25,6 +26,7 @@ files:
 - README.rdoc
 - Rakefile
 - mongo-ruby-driver.gemspec
+- bin/bson_benchmark.rb
 - bin/mongo_console
 - bin/run_test_script
 - bin/standard_benchmark
@@ -98,7 +100,7 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Simple pure-Ruby driver for the 10gen Mongo DB
+summary: Ruby driver for the 10gen Mongo DB
 test_files: 
 - tests/mongo-qa/_common.rb
 - tests/mongo-qa/admin
@@ -107,6 +109,8 @@ test_files:
 - tests/mongo-qa/dbs
 - tests/mongo-qa/find
 - tests/mongo-qa/find1
+- tests/mongo-qa/gridfs_in
+- tests/mongo-qa/gridfs_out
 - tests/mongo-qa/indices
 - tests/mongo-qa/remove
 - tests/mongo-qa/stress1