mongodb-mongo_record 0.1.2 → 0.1.3

data/lib/mongo_record/base.rb

@@ -16,6 +16,7 @@
 
 require 'rubygems'
 require 'mongo/types/objectid'
+require 'mongo/types/code'
 require 'mongo/cursor'
 require 'mongo_record/convert'
 require 'mongo_record/sql'
@@ -175,7 +176,7 @@ module MongoRecord
                           val != nil && (!val.kind_of?(String) || val != '')
                         })
           klass_name = options[:class_name] || field_name_to_class_name(name)
-          @subobjects[name] = Kernel.const_get(klass_name)
+          @subobjects[name] = eval(klass_name)
         end
       end
 
@@ -192,7 +193,7 @@ module MongoRecord
           define_method("#{name}=".to_sym, lambda { |val| instance_variable_set(ivar_name, val) })
           define_method("#{name}?".to_sym, lambda { !instance_variable_get(ivar_name).empty? })
           klass_name = options[:class_name] || field_name_to_class_name(name)
-          @arrays[name] = Kernel.const_get(klass_name)
+          @arrays[name] = eval(klass_name)
         end
       end
 
@@ -302,7 +303,7 @@ module MongoRecord
         begin
           collection.count(criteria)
         rescue => ex
-          if ex.to_s =~ /Error with count command.*ns does not exist/
+          if ex.to_s =~ /Error with count command.*ns missing/
             # 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.
@@ -542,7 +543,7 @@ module MongoRecord
       # +func+ must be +nil+ or a JavaScript expression or function in a
       # string.
       def where_func(func)    # :nodoc:
-        func ? {'$where' => func} : {}
+        func ? {'$where' => XGen::Mongo::Driver::Code.new(func)} : {}
       end
 
       def replace_named_bind_variables(str, h) # :nodoc:
@@ -724,8 +725,8 @@ module MongoRecord
     # +self+ if all is well.
     def update
       set_update_times
-      row = self.class.collection.insert(to_mongo_value)
-      if row['_id'].to_s != @_id.to_s
+      self.class.collection.modify({:_id => @_id}, to_mongo_value)
+      if self.class.collection.db.error?
         return false
       end
       self

data/mongo-activerecord-ruby.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'mongo_record'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   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.6.1'])
 
   s.require_paths = ['lib']
-  
+
   s.files = ['examples/tracks.rb', 'lib/mongo_record.rb',
              'lib/mongo_record/base.rb',
              'lib/mongo_record/convert.rb',
@@ -19,17 +19,18 @@ Gem::Specification.new do |s|
   s.test_files = ['tests/address.rb',
                   'tests/course.rb',
                   'tests/student.rb',
+                  'tests/class_in_module.rb',
                   'tests/test_log_device.rb',
                   'tests/test_mongo.rb',
                   'tests/test_sql.rb',
                   'tests/track2.rb',
                   'tests/track3.rb']
-  
+
   s.has_rdoc = true
   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-user@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 end

data/tests/class_in_module.rb

@@ -0,0 +1,11 @@
+require 'mongo_record'
+
+module MyMod
+  class A < MongoRecord::Base
+    field :something
+  end
+end
+
+class B < MongoRecord::Base
+  has_many :a, :class_name => "MyMod::A"
+end

data/tests/test_mongo.rb

@@ -19,6 +19,7 @@ require 'mongo_record'
 require File.join(File.dirname(__FILE__), 'course')
 require File.join(File.dirname(__FILE__), 'address')
 require File.join(File.dirname(__FILE__), 'student')
+require File.join(File.dirname(__FILE__), 'class_in_module')
 
 class Track < MongoRecord::Base
   collection_name :tracks
@@ -135,12 +136,14 @@ class MongoTest < Test::Unit::TestCase
   end
 
   def test_update
+    count = @@tracks.count()
     t = Track.find_by_track(2)
     t.track = 99
     t.save
     str = @mayor_str.sub(/2/, '99')
     assert_equal(str, t.to_s)
     assert_equal(str, Track.find_by_track(99).to_s)
+    assert_equal(count, @@tracks.count())
   end
 
   def test_find_all
@@ -399,6 +402,16 @@ class MongoTest < Test::Unit::TestCase
     assert (score.for_course.name == @score1.for_course.name && score.grade == @score1.grade), "oops: first score is wrong: #{score}"
   end
 
+  def test_has_many_class_in_module
+    a1 = MyMod::A.new(:something => 4)
+    a2 = MyMod::A.new(:something => 10)
+    b = B.new(:a => [a1, a2])
+    assert_not_nil b.a
+    assert_equal 2, b.a.length
+    assert_equal a1, b.a[0]
+    assert_equal a2, b.a[1]
+  end
+
   def test_field_query_methods
     s = Student.new(:name => 'Spongebob Squarepants', :email => 'spongebob@example.com', :scores => [@score1, @score2])
     assert s.name?

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo_record
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jim Menard
+- Mike Dirolf
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongodb-mongo
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -22,7 +24,7 @@ dependencies:
         version: 0.6.1
     version: 
 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
+email: mongodb-user@googlegroups.com
 executables: []
 
 extensions: []
@@ -72,6 +74,7 @@ test_files:
 - tests/address.rb
 - tests/course.rb
 - tests/student.rb
+- tests/class_in_module.rb
 - tests/test_log_device.rb
 - tests/test_mongo.rb
 - tests/test_sql.rb