mongodb-mongo 0.5.3 → 0.6.1

data/tests/mongo-qa/count1

@@ -3,6 +3,14 @@
 require File.join(File.dirname(__FILE__), '_common.rb')
 db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
+if $DEBUG
+  3.times { |i| db.drop_collection("test#{i+1}") }
+  db.create_collection('test1')
+  db.collection('test2').insert({:name => 'a'})
+  c = db.collection('test3')
+  100.times { |i| c.insert(:i => i, :foo => 'bar') }
+end
+
 puts db.collection('test1').count
 puts db.collection('test2').count
 puts db.collection('test3').count('i' => 'a')

data/tests/mongo-qa/dbs

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+
+if $DEBUG
+  3.times { |i| db.drop_collection("dbs_#{i+1}") }
+end
+
+def print_dbs_names(db)
+  db.collection_names.select{ |n| n =~ /\.dbs/ }.sort.each { |name|
+    puts name.sub(/^#{db.name}\./, '')
+  }
+end
+
+db.collection('dbs_1').insert('foo' => 'bar')
+db.collection('dbs_2').insert('psi' => 'phi')
+puts db.name
+print_dbs_names(db)
+db.drop_collection('dbs_1')
+db.create_collection('dbs_3')
+print_dbs_names(db)

data/tests/mongo-qa/find

@@ -3,4 +3,8 @@
 require File.join(File.dirname(__FILE__), '_common.rb')
 db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
+if $DEBUG
+  db.drop_collection('test')
+end
+
 db.collection('test').insert('a' => 2)

data/tests/mongo-qa/find1

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+
+if $DEBUG
+  db.drop_collection('c')
+  c = db.collection('c')
+  (5..15).each { |i| c.insert(:x => 0, :y => i, :z => (i+64).chr) }
+  (1..50).each { |i| c.insert(:x => 1, :y => i, :z => (i+64).chr) }
+  (5..15).each { |i| c.insert(:x => 2, :y => i, :z => (i+64).chr) }
+end
+
+cursor = db.collection('c').find({'x' => 1}, :sort => 'y', :offset => 20, :limit => 10)
+cursor.each { |row| puts row['z'] }

data/tests/mongo-qa/indices

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+x = db.collection('x')
+y = db.collection('y')
+
+def sorted_index_info(c)
+  c.index_information.sort { |a,b| a[:name] <=> b[:name] }
+end
+
+def sorted_info_keys(info)
+  info[:keys].keys.sort.collect { |key| "#{key}_1" }.join("_")
+end
+
+def check_keys(c, expected)
+  keys = sorted_index_info(c).collect {|info| sorted_info_keys(info)}
+  if keys == expected
+    ''
+  else
+    "#{c.name} indices should start out #{expected.inspect} but is #{keys.inspect}"
+  end
+end
+
+if $DEBUG
+  x.drop                        # also drops indexes
+  x.insert('field1' => 'f1', 'field2' => 'f2')
+  x.create_index('field1_1', 'field1')
+  x.create_index('field2_1', 'field2')
+  y.drop
+end
+
+# There should only be two indices on x, and none on y. We raise an error if
+# the preconditions are not met. (They were not, on our testing harness, for a
+# while due to Mongo behavior.)
+err = []
+err << check_keys(x, ['field1_1', 'field2_1'])
+err << check_keys(y, [])
+raise "\n#{err.join("\n")}" unless err == ['', '']
+
+x.drop_index('field1_1')
+sorted_index_info(x).each { |info| puts sorted_info_keys(info) }
+
+y.create_index('abc', ['a', 'b', 'c'])
+y.create_index('d', ['d'])
+sorted_index_info(y).each { |info| puts sorted_info_keys(info) }

data/tests/mongo-qa/remove

@@ -3,5 +3,23 @@
 require File.join(File.dirname(__FILE__), '_common.rb')
 db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
 
+if $DEBUG
+  c = db.collection('remove1')
+  c.clear
+  50.times { |i| c.insert(:a => i) }
+  c = db.collection('remove2')
+  c.clear
+  c.insert(:a => 3, :b => 1)
+  c.insert(:a => 3, :b => 3)
+  c.insert(:a => 2, :b => 3)
+  c.insert(:b => 3)
+end
+
 db.collection('remove1').clear
 db.collection('remove2').remove('a' => 3)
+
+if $DEBUG
+  puts "remove1 count = #{db.collection('remove1').count}"
+  puts "remove2 count = #{db.collection('remove2').count}"
+  db.collection('remove2').find.each { |row| puts row.inspect }
+end

data/tests/mongo-qa/stress1

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+LONG_STRING = "lksjhasoh1298alshasoidiohaskjasiouashoasasiugoas" * 6
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+c = db.collection('stress1')
+
+n1 = 50_000
+n2 = 10_000
+
+if $DEBUG
+  n1 = 5
+  n2 = 1
+  c.drop
+end
+
+n1.times { |i|
+  c.insert(:name => "asdf#{i}", :date => Time.now, :id => i,
+           :blah => LONG_STRING, :subarray => [])
+}
+puts
+
+n2.times { |i|
+  x = c.find_first({:id => i})
+  x['subarray'] = "foo#{i}"
+  p x
+  c.modify({:id => i}, x)
+}
+puts
+
+if $DEBUG
+  puts "stress1 has #{c.count} records"
+  c.find.each { |row| puts "#{row['id']}: #{row['subarray'].inspect}" }
+end

data/tests/mongo-qa/test1

@@ -2,6 +2,10 @@
 
 require File.join(File.dirname(__FILE__), '_common.rb')
 db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
-
 coll = db.collection('part1')
+
+if $DEBUG
+  coll.drop
+end
+
 100.times { |i| coll.insert('x' => i) }

data/tests/mongo-qa/update

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+foo = db.collection('foo')
+
+if $DEBUG
+  foo.drop
+  foo.insert(:x => 1)
+end
+
+foo.modify({:x => 1}, {:x => 1, :y => 2})
+foo.modify({:x => 2}, {:x => 1, :y => 7})
+foo.repsert({:x => 3}, {:x => 4, :y => 1})
+
+if $DEBUG
+  foo.find.each { |row| puts row.inspect }
+end

data/tests/test_db.rb

@@ -67,14 +67,14 @@ class DBTest < Test::Unit::TestCase
 
     # new id gets added to returned object
     obj = coll.insert('name' => 'Fred', 'age' => 42)
-    row = coll.find({'name' => 'Fred'}, :limit => 1).next_object
+    row = coll.find_first({'name' => 'Fred'}, :limit => 1)
     oid = row['_id']
     assert_not_nil oid
     assert_equal obj, row
 
     oid = XGen::Mongo::Driver::ObjectID.new
     obj = coll.insert('_id' => oid, 'name' => 'Barney', 'age' => 41)
-    row = coll.find({'name' => 'Barney'}, :limit => 1).next_object
+    row = coll.find_first({'name' => 'Barney'}, :limit => 1)
     db_oid = row['_id']
     assert_equal oid, db_oid
     assert_equal obj, row

data/tests/test_db_api.rb

@@ -216,6 +216,18 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 4, docs.size
   end
 
+  def test_find_first
+    x = @@coll.find_first('a' => 1)
+    assert_not_nil x
+    assert_equal 1, x['a']
+  end
+
+  def test_find_first_no_records
+    @@coll.clear
+    x = @@coll.find_first('a' => 1)
+    assert_nil x
+  end
+
   def test_drop_collection
     assert @@db.drop_collection(@@coll.name), "drop of collection #{@@coll.name} failed"
     assert !@@db.collection_names.include?(@@coll_full_name)

data/tests/test_objectid.rb

@@ -73,14 +73,14 @@ class ObjectIDTest < Test::Unit::TestCase
     assert_equal @o.to_s, o2.to_s
   end
 
-  def test_legal_oid_string
-    assert !ObjectID.legal_oid_string(nil)
-    assert !ObjectID.legal_oid_string("fred")
-    assert !ObjectID.legal_oid_string("0000")
-    assert !ObjectID.legal_oid_string('000102030405060708090A0')
-    assert ObjectID.legal_oid_string('000102030405060708090A0B')
-    assert ObjectID.legal_oid_string('abcdefABCDEF123456789012')
-    assert !ObjectID.legal_oid_string('abcdefABCDEF12345678901x')
+  def test_legal
+    assert !ObjectID.legal?(nil)
+    assert !ObjectID.legal?("fred")
+    assert !ObjectID.legal?("0000")
+    assert !ObjectID.legal?('000102030405060708090A0')
+    assert ObjectID.legal?('000102030405060708090A0B')
+    assert ObjectID.legal?('abcdefABCDEF123456789012')
+    assert !ObjectID.legal?('abcdefABCDEF12345678901x')
   end
 
   def test_from_string_leading_zeroes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jim Menard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -22,13 +22,24 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- README.rdoc
+- Rakefile
+- mongo-ruby-driver.gemspec
 - bin/mongo_console
 - 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
-- lib/mongo.rb
+- examples/strict.rb
+- examples/types.rb
 - lib/mongo/admin.rb
 - lib/mongo/collection.rb
 - lib/mongo/cursor.rb
@@ -58,9 +69,7 @@ files:
 - lib/mongo/util/byte_buffer.rb
 - lib/mongo/util/ordered_hash.rb
 - lib/mongo/util/xml_to_ruby.rb
-- README.rdoc
-- Rakefile
-- mongo-ruby-driver.gemspec
+- lib/mongo.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 post_install_message: 
@@ -91,12 +100,17 @@ specification_version: 2
 summary: Simple pure-Ruby driver for the 10gen Mongo DB
 test_files: 
 - tests/mongo-qa/_common.rb
+- tests/mongo-qa/admin
 - tests/mongo-qa/capped
-- tests/mongo-qa/circular
 - tests/mongo-qa/count1
+- tests/mongo-qa/dbs
 - tests/mongo-qa/find
+- tests/mongo-qa/find1
+- tests/mongo-qa/indices
 - tests/mongo-qa/remove
+- tests/mongo-qa/stress1
 - tests/mongo-qa/test1
+- tests/mongo-qa/update
 - tests/test_admin.rb
 - tests/test_bson.rb
 - tests/test_byte_buffer.rb

data/tests/mongo-qa/circular

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), '_common.rb')
-db = Mongo.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
-
-colla = db.collection('a')
-collb = db.collection('b')
-collc = db.collection('c')
-
-colla.insert('c' => 'b')
-collb.insert('c' => 1)
-
-x_id = ObjectID.new
-x_dbref = DBRef.new(nil, 'thiz', db, 'c', x_id)
-x = {'_id' => x_id, 'that' => 2, 'thiz' => x_dbref}
-collc.insert(x)