mongodb-mongo 0.9 → 0.10

data/README.rdoc

@@ -1,11 +1,6 @@
 = Introduction
 
-This is a Ruby driver for the 10gen Mongo DB. For more information about
-Mongo, see http://www.mongodb.org.
-
-Start by reading the XGen::Mongo::Driver::Mongo and XGen::Mongo::Driver::DB
-documentation, then move on to XGen::Mongo::Driver::Collection and
-XGen::Mongo::Driver::Cursor.
+This is a Ruby driver for MongoDB[http://www.mongodb.org].
 
 Here is a quick code sample. See the files in the "examples" subdirectory for
 many more.
@@ -23,8 +18,7 @@ many more.
   coll.find().each { |doc| puts doc.inspect }
 
 This driver also includes an implementation of a GridStore class, a Ruby
-interface to Mongo's GridFS storage. NOTE: the GridStore code may be moved to
-a separate project.
+interface to Mongo's GridFS storage.
 
 = Installation
 
@@ -78,7 +72,6 @@ Here's how to start mongo and run the "simple.rb" example:
 
 See also the test code, especially tests/test_db_api.rb.
 
-
 = The Driver
 
 Here is some simple example code:
@@ -143,25 +136,15 @@ string.
 == Primary Keys
 
 The field _id is a primary key. It is treated specially by the database, and
-its use makes many operations more efficient.
-
-The value of an _id may be of any type. (Older versions of Mongo required that
-they be XGen::Mongo::Driver::ObjectID instances.)
-
-The database itself inserts an _id value if none is specified when a record is
-inserted.
-
-The driver automatically sends the _id field to the database first, which is
-how Mongo likes it. You don't have to worry about where the _id field is in
-your hash record, or worry if you are using an OrderedHash or not.
+its use makes many operations more efficient. The value of an _id may be of
+any type. The database itself inserts an _id value if none is specified when
+a record is inserted.
 
 === Primary Key Factories
 
 A primary key factory is a class you supply to a DB object that knows how to
-generate _id values. Primary key factories are no longer necessary because
-Mongo now inserts an _id value for every record that does not already have
-one. However, if you want to control _id values or even their types, using a
-PK factory lets you do so.
+generate _id values. If you want to control _id values or even their types,
+using a PK factory lets you do so.
 
 You can tell the Ruby Mongo driver how to create primary keys by passing in
 the :pk option to the Mongo#db method.
@@ -173,7 +156,7 @@ A primary key factory object must respond to :create_pk, which should take a
 hash and return a hash which merges the original hash with any primary key
 fields the factory wishes to inject. NOTE: if the object already has a primary
 key, the factory should not inject a new key; this means that the object is
-being used in a repsert but it already exists. The idea here is that when ever
+being used in a repsert but it already exists. The idea here is that whenever
 a record is inserted, the :pk object's +create_pk+ method will be called and
 the new hash returned will be inserted.
 
@@ -285,30 +268,6 @@ Then open the file html/index.html.
 
 See the git log comments.
 
-
-= To Do
-
-* Tests for update and repsert.
-
-* Add a way to specify a collection of databases on startup (a simple array of
-  IP address/port numbers, perhaps, or a hash or something). The driver would
-  then find the master and, on each subsequent command, ask that machine if it
-  is the master before proceeding.
-
-* Introduce optional per-database and per-collection PKInjector.
-
-* More tests.
-
-== Optimizations
-
-* Only update message sizes once, not after every write of a value. This will
-  require an explicit call to update_message_length in each message subclass.
-
-* ensure_index commands should be cached to prevent excessive communication
-  with the database. (Or, the driver user should be informed that ensure_index
-  is not a lightweight operation for the particular driver.)
-
-
 = Credits
 
 Adrian Madrid, aemadrid@gmail.com
@@ -331,6 +290,13 @@ John Nunemaker, http://railstips.org
 * Collection#create_index takes symbols as well as strings
 * Fix for Collection#save
 
+David James, djames@sunlightfoundation.com
+* Fix dates to return as UTC
+
+Paul Dlug, paul.dlug@gmail.com
+* Generate _id on the client side if not provided
+* Collection#insert and Collection#save return _id
+
 = License
 
  Copyright 2008-2009 10gen Inc.

data/lib/mongo/db.rb

@@ -475,9 +475,13 @@ module XGen
               objects.collect! { |o|
                 @pk_factory.create_pk(o)
               }
+            else
+              objects = objects.collect do |o|
+                o[:_id] || o['_id'] ? o : o.merge(:_id => ObjectID.new)
+              end
             end
             send_to_db(InsertMessage.new(@name, collection_name, true, *objects))
-            objects
+            objects.collect { |o| o[:_id] || o['_id'] }
           }
         end
 

data/lib/mongo/gridfs/grid_store.rb

@@ -93,6 +93,18 @@ module XGen
             }
           end
 
+          # List the contains of all GridFS files stored in the given db and
+          # root collection.
+          #
+          # :db :: the database to use
+          #
+          # :root_collection :: the root collection to use
+          def list(db, root_collection=DEFAULT_ROOT_COLLECTION)
+            db.collection("#{root_collection}.files").find().map { |f|
+              f['filename']
+            }
+          end
+
           def readlines(db, name, separator=$/)
             GridStore.open(db, name, 'r') { |gs|
               gs.readlines(separator)

data/lib/mongo/util/bson.rb

@@ -245,7 +245,7 @@ class BSON
 
   def deserialize_date_data(buf)
     millisecs = buf.get_long()
-    Time.at(millisecs.to_f / 1000.0) # at() takes fractional seconds
+    Time.at(millisecs.to_f / 1000.0).utc # at() takes fractional seconds
   end
 
   def deserialize_boolean_data(buf)

data/mongo-ruby-driver.gemspec

@@ -79,7 +79,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.9'
+  s.version = '0.10'
   s.platform = Gem::Platform::RUBY
   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.'

data/tests/test_bson.rb

@@ -117,6 +117,13 @@ class BSONTest < Test::Unit::TestCase
     assert_in_delta doc['date'], doc2['date'], 0.001
   end
 
+  def test_date_returns_as_utc
+    doc = {'date' => Time.now}
+    @b.serialize(doc)
+    doc2 = @b.deserialize
+    assert doc2['date'].utc?
+  end
+
   def test_dbref
     oid = ObjectID.new
     doc = {}

data/tests/test_db.rb

@@ -66,19 +66,20 @@ class DBTest < Test::Unit::TestCase
     coll = db.collection('test')
     coll.clear
 
+    insert_id = coll.insert('name' => 'Fred', 'age' => 42)
     # new id gets added to returned object
-    obj = coll.insert('name' => 'Fred', 'age' => 42)
     row = coll.find_first({'name' => 'Fred'}, :limit => 1)
     oid = row['_id']
     assert_not_nil oid
-    assert_equal obj, row
+    assert_equal insert_id, oid
 
     oid = XGen::Mongo::Driver::ObjectID.new
-    obj = coll.insert('_id' => oid, 'name' => 'Barney', 'age' => 41)
-    row = coll.find_first({'name' => 'Barney'}, :limit => 1)
+    data = {'_id' => oid, 'name' => 'Barney', 'age' => 41}
+    coll.insert(data)
+    row = coll.find_first({'name' => data['name']}, :limit => 1)
     db_oid = row['_id']
     assert_equal oid, db_oid
-    assert_equal obj, row
+    assert_equal data, row
 
     coll.clear
   end

data/tests/test_db_api.rb

@@ -13,7 +13,8 @@ class DBAPITest < Test::Unit::TestCase
 
   def setup
     @@coll.clear
-    @r1 = @@coll.insert('a' => 1) # collection not created until it's used
+    @r1 = {'a' => 1}
+    @@coll.insert(@r1) # collection not created until it's used
     @@coll_full_name = 'ruby-mongo-test.test'
   end
 
@@ -29,8 +30,8 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_insert
-    @@coll.insert('a' => 2)
-    @@coll.insert('b' => 3)
+    assert_kind_of ObjectID, @@coll.insert('a' => 2)
+    assert_kind_of ObjectID, @@coll.insert('b' => 3)
 
     assert_equal 3, @@coll.count
     docs = @@coll.find().to_a
@@ -46,7 +47,11 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_insert_multiple
-    @@coll.insert({'a' => 2}, {'b' => 3})
+    ids = @@coll.insert({'a' => 2}, {'b' => 3})
+    
+    ids.each do |i|
+      assert_kind_of ObjectID, i
+    end
 
     assert_equal 3, @@coll.count
     docs = @@coll.find().to_a
@@ -614,7 +619,7 @@ class DBAPITest < Test::Unit::TestCase
 
     a = {"hello" => "world"}
 
-    @@coll.save(a)
+    assert_kind_of ObjectID, @@coll.save(a)
     assert_equal 1, @@coll.count
 
     @@coll.save(@@coll.find_first)

data/tests/test_grid_store.rb

@@ -31,6 +31,16 @@ class GridStoreTest < Test::Unit::TestCase
     assert !GridStore.exist?(@@db, 'foobar', 'another_root')
   end
 
+  def test_list
+    assert_equal ['foobar'], GridStore.list(@@db)
+    assert_equal ['foobar'], GridStore.list(@@db, 'fs')
+    assert_equal [], GridStore.list(@@db, 'my_fs')
+
+    GridStore.open(@@db, 'test', 'w') { |f| f.write("my file") }
+
+    assert_equal ['foobar', 'test'], GridStore.list(@@db)
+  end
+
   def test_small_write
     rows = @@files.find({'filename' => 'foobar'}).to_a
     assert_not_nil rows

data/tests/test_round_trip.rb

@@ -67,7 +67,7 @@ EOS
       XMLToRuby.new.xml_to_ruby(f)
     }
 
-    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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: "0.10"
 platform: ruby
 authors: 
 - Jim Menard
@@ -75,6 +75,7 @@ files:
 - lib/mongo.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Ruby driver for the 10gen Mongo DB