mongodb-mongo_record 0.4.1 → 0.4.2

data/README.rdoc

@@ -3,10 +3,6 @@
 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:
@@ -26,7 +22,7 @@ A quick code sample:
   end
 
   MongoRecord::Base.connection =
-    XGen::Mongo::Driver::Mongo.new.db('mongorecord-test')
+    Mongo::Mongo.new.db('mongorecord-test')
 
   t = Track.new(:artist => 'Level 42', :album => 'Standing In The Light',
                 :song => 'Micro-Kid', :track => 1)

data/examples/tracks.rb

@@ -15,8 +15,8 @@ class Track < MongoRecord::Base
 end
 
 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')
+port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::Mongo::DEFAULT_PORT
+MongoRecord::Base.connection = Mongo::Mongo.new(host,port).db('mongorecord-test')
 
 # Create data
 
@@ -24,12 +24,12 @@ puts "Creating 6 records using \"raw\" Mongo access..."
 db = MongoRecord::Base.connection
 coll = db.collection('tracks')
 coll.remove({})
-coll.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
-coll.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
-coll.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
-coll.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
-coll.insert({:_id => XGen::Mongo::Driver::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'The Mayor Of Simpleton', :track => 2})
-song_id = XGen::Mongo::Driver::ObjectID.new
+coll.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
+coll.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
+coll.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
+coll.insert({:_id => Mongo::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
+coll.insert({:_id => Mongo::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'The Mayor Of Simpleton', :track => 2})
+song_id = Mongo::ObjectID.new
 coll.insert({:_id => song_id, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'King For A Day', :track => 3})
 puts "Data created. One song_id = #{song_id}."
 puts "There are #{coll.count()} records in the tracks collection."

data/lib/mongo_record/base.rb

@@ -22,11 +22,11 @@ require 'mongo_record/sql'
 class String
   # Convert this String to an ObjectID.
   def to_oid
-    XGen::Mongo::Driver::ObjectID.legal?(self) ? XGen::Mongo::Driver::ObjectID.from_string(self) : self
+    Mongo::ObjectID.legal?(self) ? XGen::Mongo::Driver::ObjectID.from_string(self) : self
   end
 end
 
-class XGen::Mongo::Driver::ObjectID
+class Mongo::ObjectID
   # Convert this object to an ObjectID.
   def to_oid
     self
@@ -39,7 +39,7 @@ module MongoRecord
     def create_pk(row)
       return row if row[:_id]
       row.delete(:_id)          # in case it is nil
-      row['_id'] ||= XGen::Mongo::Driver::ObjectID.new
+      row['_id'] ||= Mongo::ObjectID.new
       row
     end
   end
@@ -157,13 +157,13 @@ module MongoRecord
 
         if fields.length == 2 &&
           ( fields[1].to_s == 'asc' || fields[1].to_s == 'desc' ||
-            fields[1] == XGen::Mongo::ASCENDING || fields[1] == XGen::Mongo::DESCENDING )
+            fields[1] == Mongo::ASCENDING || fields[1] == Mongo::DESCENDING )
           fields = [fields]
         end
 
         fields = fields.map do |field|
           field = field.respond_to?(:[]) ? field : [field, :asc]
-          field[1] = (field[1] == :desc) ? XGen::Mongo::DESCENDING : XGen::Mongo::ASCENDING
+          field[1] = (field[1] == :desc) ? Mongo::DESCENDING : Mongo::ASCENDING
           field
         end
 
@@ -381,7 +381,7 @@ module MongoRecord
       def count(options={})
         criteria = criteria_from(options[:conditions],options[:criteria]).merge!(where_func(options[:where]))
         begin
-          collection.count(criteria)
+          collection.find(criteria).count()
         rescue => ex
           if ex.to_s =~ /Error with count command.*ns missing/
             # Return 0 because we will graciously assume that we are being
@@ -495,7 +495,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_first(criteria, :fields => fields)
+      #   row = collection.find_one(criteria, :fields => fields)
       #   (row.nil? || row['_id'] == nil) ? nil : self.new(row)
       # end
 
@@ -541,7 +541,7 @@ module MongoRecord
         fields = fields_from(options[:select])
 
         if ids.length == 1
-          row = collection.find_first(criteria, :fields => fields)
+          row = collection.find_one(criteria, :fields => fields)
           raise RecordNotFound, "Couldn't find #{name} with ID=#{ids[0]} #{criteria.inspect}" if row == nil || row.empty?
           self.new(row)
         else
@@ -656,7 +656,7 @@ module MongoRecord
       # +func+ must be +nil+ or a JavaScript expression or function in a
       # string.
       def where_func(func)    # :nodoc:
-        func ? {'$where' => XGen::Mongo::Driver::Code.new(func)} : {}
+        func ? {'$where' => Mongo::Code.new(func)} : {}
       end
 
       def replace_named_bind_variables(str, h) # :nodoc:
@@ -815,7 +815,7 @@ module MongoRecord
 
     # Return true if this object is new---that is, does not yet have an id.
     def new_record?
-      @_id.nil? || self.class.collection.find_first("_id" => @_id).nil?
+      @_id.nil? || self.class.collection.find_one("_id" => @_id).nil?
     end
 
     # Convert this object to a Mongo value suitable for saving to the
@@ -826,11 +826,11 @@ module MongoRecord
       key_names.each {|key|
         value = instance_variable_get("@#{key}").to_mongo_value
         if value.instance_of? Hash and value["_ns"]
-          value = XGen::Mongo::Driver::DBRef.new(value["_ns"], value["_id"])
+          value = Mongo::DBRef.new(value["_ns"], value["_id"])
         elsif value.instance_of? Array
           value = value.map {|v|
             if v.instance_of? Hash and v["_ns"]
-              XGen::Mongo::Driver::DBRef.new(v["_ns"], v["_id"])
+              Mongo::DBRef.new(v["_ns"], v["_id"])
             else
               v
             end
@@ -855,7 +855,7 @@ module MongoRecord
     # +self+ if all is well.
     def update
       set_update_times
-      self.class.collection.modify({:_id => @_id}, to_mongo_value)
+      self.class.collection.update({:_id => @_id}, to_mongo_value)
       if self.class.collection.db.error?
         return false
       end
@@ -955,7 +955,7 @@ module MongoRecord
     def init_ivar(ivar_name, val)
       sym = ivar_name[1..-1].to_sym
       if self.class.subobjects.keys.include?(sym)
-        if val.instance_of? XGen::Mongo::Driver::DBRef
+        if val.instance_of? Mongo::DBRef
           val = self.class.collection.db.dereference(val)
         end
         instance_variable_set(ivar_name, self.class.subobjects[sym].new(val))
@@ -963,7 +963,7 @@ module MongoRecord
         klazz = self.class.arrays[sym]
         val = [val] unless val.kind_of?(Array)
         instance_variable_set(ivar_name, val.collect {|v|
-                                if v.instance_of? XGen::Mongo::Driver::DBRef
+                                if v.instance_of? Mongo::DBRef
                                   v = self.class.collection.db.dereference(v)
                                 end
                                 v.kind_of?(MongoRecord::Base) ? v : klazz.new(v)

data/mongo-activerecord-ruby.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'mongo_record'
-  s.version = '0.4.1'
+  s.version = '0.4.2'
   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 Mongo database. For more information about Mongo, see http://www.mongodb.org.'
 
-  s.add_dependency('mongodb-mongo', ['>= 0.10'])
+  s.add_dependency('mongodb-mongo', ['>= 0.13'])
 
   s.require_paths = ['lib']
 

data/tests/test_log_device.rb

@@ -24,8 +24,8 @@ 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')
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::Mongo::DEFAULT_PORT
+  @@db = Mongo::Mongo.new(@@host, @@port).db('mongorecord-test')
 
   def setup
     @@db.drop_collection('testlogger') # can't remove recs from capped colls
@@ -57,7 +57,7 @@ class LoggerTest < Test::Unit::TestCase
 
   def test_alternate_connection
     old_db = @@db
-    alt_db = XGen::Mongo::Driver::Mongo.new(@@host, @@port).db('mongorecord-test-log-device')
+    alt_db = Mongo::Mongo.new(@@host, @@port).db('mongorecord-test-log-device')
     begin
       @@db = nil
       MongoRecord::LogDevice.connection = alt_db
@@ -67,7 +67,7 @@ class LoggerTest < Test::Unit::TestCase
 
       coll = alt_db.collection('testlogger')
       assert_equal 1, coll.count()
-      rec = coll.find_first
+      rec = coll.find_one
       assert_not_nil rec
       assert_match /test message/, rec['msg']
     rescue => ex

data/tests/test_mongo.rb

@@ -48,8 +48,8 @@ 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')
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::Mongo::DEFAULT_PORT
+  @@db = Mongo::Mongo.new(@@host, @@port).db('mongorecord-test')
   @@students = @@db.collection('students')
   @@courses = @@db.collection('courses')
   @@tracks = @@db.collection('tracks')
@@ -65,13 +65,13 @@ class MongoTest < Test::Unit::TestCase
     @@playlists.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})
-    @mayor_id = XGen::Mongo::Driver::ObjectID.new
+    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
+    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
+    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
+    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
+    @mayor_id = Mongo::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 => Mongo::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'
@@ -624,7 +624,7 @@ 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(@@host, @@port).db('mongorecord-test-alt-conn')
+    alt_db = Mongo::Mongo.new(@@host, @@port).db('mongorecord-test-alt-conn')
     assert_not_equal old_db, alt_db
     alt_db.drop_collection('students')
     begin
@@ -755,7 +755,7 @@ class MongoTest < Test::Unit::TestCase
     Track.index [:artist, :created_at]
     Track.index [:song, :desc], true
     Track.index [:artist, [:album, :desc]]
-    Track.index [:created_at, XGen::Mongo::ASCENDING]
+    Track.index [:created_at, Mongo::ASCENDING]
 
     assert Track.indexes.has_key?("artist_1")
     assert Track.indexes.has_key?("artist_1_created_at_1")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo_record
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jim Menard
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.10"
+        version: "0.13"
     version: 
 description: MongoRecord is an ActiveRecord-like framework for the 10gen Mongo database. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-user@googlegroups.com