mongodb-mongo_record 0.2 → 0.3

data/README.rdoc

@@ -72,6 +72,15 @@ See MongoRecord::LogDevice. When running outside of the cloud (for example,
 during development), all log messages are echoed to $stderr which is normally
 the console.
 
+== Credits
+Jim Mulholland, jim at squeejee dot com
+* Ability to save custom attributes not declared in the model
+* Save and retrieve custom "_id" fields
+* Find_each functionality
+* Find_last based on the created_at field
+* Assigning created_at and updated_at fields even if they are not declared
+* Alias methods for "first", "last" and "all"
+
 == To Do
 
 * DBRefs

data/lib/mongo_record/base.rb

@@ -119,7 +119,7 @@ module MongoRecord
       # lower_case_with_underscores.
       def collection_name(coll_name)
         @coll_name = coll_name
-        field(:_id, :_ns, :_update)
+        field(:_id, :_ns)
       end
 
       # Creates one or more collection fields. Each field will be saved to
@@ -287,10 +287,10 @@ module MongoRecord
       # is the same as
       #   Person.find(:all).skip(10).limit(10).sort({:created_on => 1})
       #
-      
-    
-      def find(*args)        
-        options = extract_options_from_args!(args)        
+
+
+      def find(*args)
+        options = extract_options_from_args!(args)
         options.symbolize_keys!
         case args.first
         when :first
@@ -303,7 +303,7 @@ module MongoRecord
           find_from_ids(args, options)
         end
       end
-      
+
       # Yields each record that was found by the find +options+. The find is
       # performed by find.
       #
@@ -313,20 +313,20 @@ module MongoRecord
       #     person.party_all_night!
       #   end
 
-      def find_each(*args)        
-        options = extract_options_from_args!(args)        
+      def find_each(*args)
+        options = extract_options_from_args!(args)
         options.symbolize_keys!
         find_every(options).each do |record|
-          yield record 
+          yield record
         end
         self
       end
-      
+
       def all(*args)
         options = extract_options_from_args!(args)
         find_every(options)
       end
-          
+
       def first(*args)
 #        args = ([:first]<<args).flatten
         options = extract_options_from_args!(args)
@@ -362,10 +362,10 @@ module MongoRecord
       end
 
       def sum(column)
-        x = self.find(:all, :select=>column)   
+        x = self.find(:all, :select=>column)
         x.map {|p1| p1.followers_count}.compact.sum
       end
-      
+
       # Deletes the record with the given id from the collection.
       def delete(id)
         collection.remove({:_id => id})
@@ -465,7 +465,7 @@ module MongoRecord
       #   row = collection.find_first(criteria, :fields => fields)
       #   (row.nil? || row['_id'] == nil) ? nil : self.new(row)
       # end
-      
+
       def find_initial(options)
         options[:limit] = 1
         options[:order] = 'created_at asc'
@@ -483,7 +483,7 @@ module MongoRecord
       def find_every(options)
         options.symbolize_keys!
         criteria = criteria_from(options[:conditions], options[:criteria]).merge!(where_func(options[:where]))
-                
+
         find_options = {}
         find_options[:fields] = fields_from(options[:select]) if options[:select]
         find_options[:limit] = options[:limit].to_i if options[:limit]
@@ -528,10 +528,10 @@ module MongoRecord
 
       def ids_clause(ids)
         #ids.length == 1 ? ids[0].to_oid : {'$in' => ids.collect{|id| id.to_oid}}
-        
-        if ids.length == 1 
+
+        if ids.length == 1
           ids[0].is_a?(String) ? ids[0].to_oid : ids[0]
-        else 
+        else
           {'$in' => ids.collect{|id| id.is_a?(String) ? id.to_oid : id}}
         end
       end
@@ -577,7 +577,7 @@ module MongoRecord
           opts = criteria_from_hash(condition)
         else
           opts = {}
-        end        
+        end
         opts ||= {}
         criteria ||= {}
         opts.merge!(criteria)
@@ -771,7 +771,7 @@ module MongoRecord
 
     # Save self and returns true if the save was successful, false if not.
     def save
-      create_or_update      
+      create_or_update
     end
 
     # Save self and returns true if the save was successful and raises
@@ -789,14 +789,22 @@ module MongoRecord
     # database.
     def to_mongo_value
       h = {}
-#      self.class.mongo_ivar_names.each {|iv| h[iv] = instance_variable_get("@#{iv}").to_mongo_value }
-      mongo_values = self.instance_values
-      # If the "_id" value is not set but an "id" value is, set "_id" equal to "id"
-      if mongo_values["_id"].nil? && !mongo_values["id"].nil?
-        mongo_values["_id"] = mongo_values["id"]
-      end
-      key_names = mongo_values.keys + self.class.subobjects.keys + self.class.arrays.keys
-      key_names.each {|key| h[key] = instance_variable_get("@#{key}").to_mongo_value }
+      key_names = self.instance_values.keys
+      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"])
+        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"])
+            else
+              v
+            end
+          }
+        end
+        h[key] = value
+      }
       h
     end
 
@@ -804,6 +812,7 @@ module MongoRecord
     def create
       create_date = self.instance_variable_defined?("@created_at") ? self.created_at : nil
       set_create_times(create_date)
+      @_ns = self.class.collection.name
       with_id = self.class.collection.insert(to_mongo_value)
       @_id = with_id['_id'] || with_id[:_id]
       with_id
@@ -817,7 +826,7 @@ module MongoRecord
       if self.class.collection.db.error?
         return false
       end
-      self      
+      self
     end
 
     # Remove self from the database and set @_id to nil. If self has no
@@ -839,12 +848,12 @@ module MongoRecord
     def [](attr_name)
       self.send(attr_name)
     end
-    
+
     def []=(attr_name, value)
       self.class.field(attr_name)
       self.send(attr_name.to_s + '=', value)
     end
-    
+
     def method_missing(sym, *args)
       if self.instance_variables.include?("@#{sym}")
         self.class.field(sym)
@@ -853,7 +862,7 @@ module MongoRecord
         super
       end
     end
-   
+
     #--
     # ================================================================
     # These methods exist so we can plug in ActiveRecord validation, etc.
@@ -913,11 +922,19 @@ 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
+          val = self.class.collection.db.dereference(val)
+        end
         instance_variable_set(ivar_name, self.class.subobjects[sym].new(val))
       elsif self.class.arrays.keys.include?(sym)
         klazz = self.class.arrays[sym]
         val = [val] unless val.kind_of?(Array)
-        instance_variable_set(ivar_name, val.collect {|v| v.kind_of?(MongoRecord::Base) ? v : klazz.new(v)})
+        instance_variable_set(ivar_name, val.collect {|v|
+                                if v.instance_of? XGen::Mongo::Driver::DBRef
+                                  v = self.class.collection.db.dereference(v)
+                                end
+                                v.kind_of?(MongoRecord::Base) ? v : klazz.new(v)
+                              })
       else
         instance_variable_set(ivar_name, val)
       end

data/mongo-activerecord-ruby.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'mongo_record'
-  s.version = '0.2'
+  s.version = '0.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.add_dependency('mongodb-mongo', ['>= 0.6.7'])
 
   s.require_paths = ['lib']
 

data/tests/test_mongo.rb

@@ -164,7 +164,7 @@ class MongoTest < Test::Unit::TestCase
   def test_find_all
     assert_all_songs Track.find(:all).inject('') { |str, t| str + t.to_s }
   end
-  
+
   def test_find_using_hash
     str = Track.find(:all, :conditions => {:album => 'Aliens Ate My Buick'}).inject('') { |str, t| str + t.to_s }
     assert_match(/song: The Ability to Swing/, str)
@@ -271,11 +271,9 @@ class MongoTest < Test::Unit::TestCase
     assert_equal "Budapest by Blimp:Europa and the Pirate Twins:Garden Of Earthly Delights:King For A Day:The Ability to Swing:The Mayor Of Simpleton",
                  tracks.collect {|t| t.song }.join(':')
 
-    # TODO this should work, but the database does not yet sort this properly
-#     tracks = Track.find(:all, :order => "artist desc, song")
-#     assert_not_nil tracks
-#     assert_equal "Garden Of Earthly Delights:King For A Day:The Mayor Of Simpleton:Budapest by Blimp:Europa and the Pirate Twins:The Ability to Swing",
-#                  tracks.collect {|t| t.song }.join(':')
+    tracks = Track.find(:all, :order => "artist desc, song")
+    assert_not_nil tracks
+    assert_equal "Garden Of Earthly Delights:King For A Day:The Mayor Of Simpleton:Budapest by Blimp:Europa and the Pirate Twins:The Ability to Swing", tracks.collect {|t| t.song }.join(':')
   end
 
   def test_delete
@@ -560,34 +558,54 @@ class MongoTest < Test::Unit::TestCase
     assert_equal s.created_on, s.updated_on
   end
 
-# # TODO dbrefs are not yet implemented
-#   # This reproduces a bug where DBRefs weren't being created properly because
-#   # the MongoRecord::Base objects weren't storing the magic _ns, _update, and
-#   # other values set by the database.
-#   def test_db_ref
-#     s = Student.new(:name => 'Spongebob Squarepants', :address => @spongebob_addr)
-#     s.save
+  # This reproduces a bug where DBRefs weren't being created properly because
+  # the MongoRecord::Base objects weren't storing _ns
+  def test_db_ref
+    s = Student.new(:name => 'Spongebob Squarepants', :address => @spongebob_addr)
+    s.save
+
+    @course1.save
+    assert_not_nil @course1.id
+    assert_not_nil @course1["_ns"]
+
+    s.add_score(@course1.id, 3.5)
+    s.save
+
+    score = s.scores.first
+    assert_not_nil score
+    assert_equal @course1.name, score.for_course.name
 
-#     @course1.save
-#     assert_not_nil @course1.id
+    # Now change the name of @course1 and see the student's score's course
+    # name change.
+    @course1.name = 'changed'
+    @course1.save
 
-#     s.add_score(@course1.id, 3.5)
-#     s.save                      # This used to blow up
+    s = Student.find(:first, :conditions => "name = 'Spongebob Squarepants'")
+    assert_not_nil s
+    assert_equal 1, s.scores.length
+    assert_equal 'changed', s.scores.first.for_course.name
 
-#     score = s.scores.first
-#     assert_not_nil score
-#     assert_equal @course1.name, score.for_course.name
 
-#     # Now change the name of @course1 and see the student's score's course
-#     # name change.
-#     @course1.name = 'changed'
-#     @course1.save
+    # Now try with has_many
+    score.save
+    s.scores = [score]
+    s.save
 
-#     s = Student.find(:first, :conditions => "name = 'Spongebob Squarepants'")
-#     assert_not_nil s
-#     assert_equal 1, s.scores.length
-#     assert_equal 'changed', s.scores.first.for_course.name
-#   end
+    assert_equal 3.5, s.scores.first.grade
+
+    s = Student.find(:first, :conditions => "name = 'Spongebob Squarepants'")
+    assert_not_nil s
+    assert_equal 1, s.scores.length
+    assert_equal 3.5, s.scores.first.grade
+
+    score.grade = 4.0
+    score.save
+
+    s = Student.find(:first, :conditions => "name = 'Spongebob Squarepants'")
+    assert_not_nil s
+    assert_equal 1, s.scores.length
+    assert_equal 4.0, s.scores.first.grade
+  end
 
   def test_subobjects_have_no_ids
     @spongebob_addr.id
@@ -637,7 +655,7 @@ class MongoTest < Test::Unit::TestCase
       assert_match /undefined method \`foobar\' for Track:Class/, ex.to_s
     end
   end
-  
+
   def test_adding_custom_attributes
     s = Student.new(:silly_name => 'Yowza!')
     s.save
@@ -653,22 +671,22 @@ class MongoTest < Test::Unit::TestCase
     assert_match(/song: The Mayor Of Simpleton/, str)
     assert_match(/song: King For A Day/, str)
   end
-  
-  
-  #################  
-  
-  
+
+
+  #################
+
+
   def test_find_all_alias
     assert_all_songs Track.all.inject('') { |str, t| str + t.to_s }
-  end  
-  
+  end
+
   def test_find_first_alias
     t = Track.first
     assert t.kind_of?(Track)
     str = t.to_s
     assert_match(/artist: [^,]+,/, str, "did not find non-empty artist name")
   end
-  
+
   def test_find_last
     c = Course.new(:name=>"History")
     c.save
@@ -698,7 +716,7 @@ class MongoTest < Test::Unit::TestCase
     assert_equal(count, Playlist.count)
   end
 
-  
+
   def test_update_attributes
     opts = {:artist => 'Bon Jovi', :album => 'Slippery When Wet', :song => 'Livin On A Prayer'}
     track = Track.new
@@ -706,7 +724,7 @@ class MongoTest < Test::Unit::TestCase
     t = Track.find_by_artist("Bon Jovi")
     assert_equal(t.album, "Slippery When Wet")
   end
-  
+
   def test_update_attributes_for_custom_attributes
     opts = {:artist => 'The Outfield', :album => 'Play Deep', :song => 'Your Love', :year => 1986}
     playlist = Playlist.new
@@ -714,7 +732,7 @@ class MongoTest < Test::Unit::TestCase
     p = Playlist.find_by_artist("The Outfield")
     assert_equal(p.year, 1986)
   end
-  
+
   def test_custom_id
     track = Track.new
     track.id = 123

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo_record
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Jim Menard
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.7
     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