mongodb-mongo_record 0.1.0 → 0.1.1

data/README.rdoc

@@ -3,6 +3,10 @@
 MongoRecord is an ActiveRecord-like framework for the 10gen
 Mongo[http://www.mongodb.org/] database.
 
+This library is for use outside of Ruby on Rails. If you want to use Mongo
+with Ruby on Rails, please see the 'activerecord-mongo-adapter' project at
+http://github.com/mongodb/activerecord-mongo-adapter.
+
 This document assumes you have read the Mongo documentation.
 
 A quick code sample:
@@ -34,8 +38,9 @@ A quick code sample:
   $ gem sources -a http://gems.github.com
   $ sudo gem install mongodb-mongo-activerecord-ruby
 
-MongoRecord depends on the Mongo Ruby Driver. Installing the MongoRecord gem
-will also install the Mongo Ruby Driver if you don't have it already.
+MongoRecord depends on the Mongo Ruby Driver, version 0.5.4 or higher.
+Installing the MongoRecord gem will also install the Mongo Ruby Driver if you
+don't have it already.
 
 The source code is available at http://github.com/mongodb/mongo-ruby-driver.
 You can either clone the git repository or download a tarball or zip file.

data/examples/tracks.rb

@@ -14,7 +14,9 @@ class Track < MongoRecord::Base
   end
 end
 
-MongoRecord::Base.connection = XGen::Mongo::Driver::Mongo.new.db('mongorecord-test')
+host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+port = ENV['MONGO_RUBY_DRIVER_PORT'] || XGen::Mongo::Driver::Mongo::DEFAULT_PORT
+MongoRecord::Base.connection = XGen::Mongo::Driver::Mongo.new(host,port).db('mongorecord-test')
 
 # Create data
 

data/lib/mongo_record/base.rb

@@ -299,7 +299,18 @@ module MongoRecord
       # Returns the number of matching records.
       def count(options={})
         criteria = criteria_from(options[:conditions]).merge!(where_func(options[:where]))
-        collection.count(criteria)
+        begin
+          collection.count(criteria)
+        rescue => ex
+          if ex.to_s =~ /Error with count command.*ns does not exist/
+            # Return 0 because we will graciously assume that we are being
+            # called from a subclass that has been initialized properly, and
+            # is therefore mentioned in the schema.
+            0
+          else
+            raise ex
+          end
+        end
       end
 
       # Deletes the record with the given id from the collection.
@@ -398,7 +409,7 @@ module MongoRecord
       def find_initial(options)
         criteria = criteria_from(options[:conditions]).merge!(where_func(options[:where]))
         fields = fields_from(options[:select])
-        row = collection.find(criteria, :fields => fields, :limit => 1).next_object
+        row = collection.find_first(criteria, :fields => fields)
         (row.nil? || row['_id'] == nil) ? nil : self.new(row)
       end
 
@@ -427,7 +438,7 @@ module MongoRecord
         fields = fields_from(options[:select])
 
         if ids.length == 1
-          row = collection.find(criteria, :fields => fields, :limit => 1).next_object
+          row = collection.find_first(criteria, :fields => fields)
           raise RecordNotFound, "Couldn't find #{name} with ID=#{ids[0]} #{criteria.inspect}" if row == nil || row.empty?
           self.new(row)
         else

data/mongo-activerecord-ruby.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'mongo_record'
-  s.version = '0.1.0'
+  s.version = '0.1.1'
   s.platform = Gem::Platform::RUBY
   s.summary = 'ActiveRecord-like models for the 10gen Mongo DB'
-  s.description = 'MongoRecord is an ActiveRecord-like framework for the 10gen Monog database. For more information about Mongo, see http://www.mongodb.org.'
+  s.description = 'MongoRecord is an ActiveRecord-like framework for the 10gen Mongo database. For more information about Mongo, see http://www.mongodb.org.'
   
-  s.add_dependency('mongodb-mongo-ruby-driver', ['>= 0.1.3'])
+  s.add_dependency('mongodb-mongo', ['>= 0.5.4'])
 
   s.require_paths = ['lib']
   

data/tests/test_log_device.rb

@@ -23,23 +23,26 @@ class LoggerTest < Test::Unit::TestCase
 
   MAX_RECS = 3
 
+  @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || XGen::Mongo::Driver::Mongo::DEFAULT_PORT
+  @@db = XGen::Mongo::Driver::Mongo.new(@@host, @@port).db('mongorecord-test')
+
   def setup
-    @db = XGen::Mongo::Driver::Mongo.new.db('mongorecord-test')
-    @db.drop_collection('testlogger') # can't remove recs from capped colls
-    MongoRecord::LogDevice.connection = @db
+    @@db.drop_collection('testlogger') # can't remove recs from capped colls
+    MongoRecord::LogDevice.connection = @@db
     # Create a log device with a max of MAX_RECS records
     @logger = Logger.new(MongoRecord::LogDevice.new('testlogger', :size => 1_000_000, :max => MAX_RECS))
   end
 
   def teardown
-    @db.drop_collection('testlogger') # can't remove recs from capped colls
+    @@db.drop_collection('testlogger') # can't remove recs from capped colls
   end
 
   # We really don't have to test much more than this. We can trust that Mongo
   # works properly.
   def test_max
-    assert_not_nil @db
-    assert_equal @db.name, MongoRecord::LogDevice.connection.name
+    assert_not_nil @@db
+    assert_equal @@db.name, MongoRecord::LogDevice.connection.name
     collection = MongoRecord::LogDevice.connection.collection('testlogger')
     MAX_RECS.times { |i|
       @logger.debug("test message #{i+1}")
@@ -53,10 +56,10 @@ class LoggerTest < Test::Unit::TestCase
   end
 
   def test_alternate_connection
-    old_db = @db
-    alt_db = XGen::Mongo::Driver::Mongo.new.db('mongorecord-test-log-device')
+    old_db = @@db
+    alt_db = XGen::Mongo::Driver::Mongo.new(@@host, @@port).db('mongorecord-test-log-device')
     begin
-      @db = nil
+      @@db = nil
       MongoRecord::LogDevice.connection = alt_db
 
       logger = Logger.new(MongoRecord::LogDevice.new('testlogger', :size => 1_000_000, :max => MAX_RECS))
@@ -64,14 +67,14 @@ class LoggerTest < Test::Unit::TestCase
 
       coll = alt_db.collection('testlogger')
       assert_equal 1, coll.count()
-      rec = coll.find({}, :limit => 1).next_object
+      rec = coll.find_first
       assert_not_nil rec
       assert_match /test message/, rec['msg']
     rescue => ex
       fail ex.to_s
     ensure
-      @db = old_db
-      MongoRecord::LogDevice.connection = @db
+      @@db = old_db
+      MongoRecord::LogDevice.connection = @@db
       alt_db.drop_collection('testlogger')
     end
   end

data/tests/test_mongo.rb

@@ -40,27 +40,29 @@ end
 
 class MongoTest < Test::Unit::TestCase
 
+  @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || XGen::Mongo::Driver::Mongo::DEFAULT_PORT
+  @@db = XGen::Mongo::Driver::Mongo.new(@@host, @@port).db('mongorecord-test')
+  @@students = @@db.collection('students')
+  @@courses = @@db.collection('courses')
+  @@tracks = @@db.collection('tracks')
+
   def setup
     super
-    @db = XGen::Mongo::Driver::Mongo.new.db('mongorecord-test')
-    MongoRecord::Base.connection = @db
-
-    @students = @db.collection('students')
-    @courses = @db.collection('courses')
-    @tracks = @db.collection('tracks')
+    MongoRecord::Base.connection = @@db
 
-    @students.clear
-    @courses.clear
-    @tracks.clear
+    @@students.clear
+    @@courses.clear
+    @@tracks.clear
 
     # Manually insert data without using MongoRecord::Base
-    @tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
-    @tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
-    @tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
-    @tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
+    @@tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
+    @@tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
+    @@tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
+    @@tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
     @mayor_id = XGen::Mongo::Driver::ObjectID.new
-    @tracks.insert({:_id => @mayor_id, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'The Mayor Of Simpleton', :track => 2})
-    @tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'King For A Day', :track => 3})
+    @@tracks.insert({:_id => @mayor_id, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'The Mayor Of Simpleton', :track => 2})
+    @@tracks.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'King For A Day', :track => 3})
 
     @mayor_str = "artist: XTC, album: Oranges & Lemons, song: The Mayor Of Simpleton, track: 2"
     @mayor_song = 'The Mayor Of Simpleton'
@@ -74,9 +76,9 @@ class MongoTest < Test::Unit::TestCase
   end
 
   def teardown
-#     @students.clear
-    @courses.clear
-    @tracks.clear
+    @@students.clear
+    @@courses.clear
+    @@tracks.clear
     super
   end
 
@@ -299,6 +301,11 @@ class MongoTest < Test::Unit::TestCase
     assert_equal 3, Track.count(:conditions => {:artist => 'XTC'})
   end
 
+  def test_count_collection_missing
+    @@db.drop_collection('tracks')
+    assert_equal 0, Track.count
+  end
+
   def test_select
     str = Track.find(:all, :select => :album).inject('') { |str, t| str + t.to_s }
     assert str.include?("artist: , album: Oranges & Lemons, song: , track:")
@@ -568,12 +575,12 @@ class MongoTest < Test::Unit::TestCase
 
   def test_alternate_connection
     old_db = MongoRecord::Base.connection
-    assert_equal @db, old_db
-    alt_db = XGen::Mongo::Driver::Mongo.new.db('mongorecord-test-alt-conn')
+    assert_equal @@db, old_db
+    alt_db = XGen::Mongo::Driver::Mongo.new(@@host, @@port).db('mongorecord-test-alt-conn')
     assert_not_equal old_db, alt_db
     alt_db.drop_collection('students')
     begin
-      @db = nil
+      @@db = nil
       MongoRecord::Base.connection = alt_db
       assert_equal alt_db, MongoRecord::Base.connection
 
@@ -587,8 +594,8 @@ class MongoTest < Test::Unit::TestCase
       assert s.save, "save failed"
       assert_equal 1, coll.count()
     ensure
-      @db = old_db
-      MongoRecord::Base.connection = @db
+      @@db = old_db
+      MongoRecord::Base.connection = @@db
       alt_db.drop_collection('students')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo_record
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jim Menard
@@ -9,19 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongodb-mongo-ruby-driver
+  name: mongodb-mongo
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 0.5.4
     version: 
-description: MongoRecord is an ActiveRecord-like framework for the 10gen Monog database. For more information about Mongo, see http://www.mongodb.org.
+description: MongoRecord is an ActiveRecord-like framework for the 10gen Mongo database. For more information about Mongo, see http://www.mongodb.org.
 email: jim@10gen.com
 executables: []