tinymongo 0.1.5 → 0.1.6

data/README.rdoc

@@ -26,11 +26,11 @@ To create TinyMongo config file (config/tinymongo.yml) and initializer file (con
   class Person < TinyMongo::Model
     mongo_collection :people          # optional if using Rails
     mongo_key :name
-    mongo_key :age
-    mongo_key :children
+    mongo_key :age, :default => 0
+    mongo_key :children, :default => []
   
     def make_child
-      child = Person.create(:name => 'Baby', :age => 0)
+      child = Person.create(:name => 'Baby')
       push({:children => child})      # push child into children array
     end
   

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/tinymongo/cursor.rb

@@ -87,7 +87,7 @@ module TinyMongo
     
     def next_document
       doc = @_tinymongo_cursor.next_document
-      @_tinymongo_model_class.new(doc)
+      @_tinymongo_model_class.new(doc) if doc
     end
     
     def query_options_hash
@@ -120,7 +120,7 @@ module TinyMongo
       return [] if @_tinymongo_cursor.nil?
       
       hashes = @_tinymongo_cursor.to_a
-      hashes.map { |hash| @_tinymongo_model_class.new(hash) }
+      hashes.map { |hash| @_tinymongo_model_class.new(hash) if hash }
     end
     
     protected

data/lib/tinymongo/model.rb

@@ -2,13 +2,22 @@ module TinyMongo
   class Model
     class << self
       def mongo_key(*args)
-        args.each do |key_name|
-          if([Symbol, String].include? key_name.class)
-            key_name_s = key_name.to_s
-            key_name_sym = key_name.to_sym
+        default = nil
+        @_tinymongo_defaults = {} if @_tinymongo_defaults.nil?
+        
+        args.each do |arg|
+          default = arg[:default] || arg['default'] if(arg.instance_of? Hash)
+        end
+        
+        args.each do |arg|
+          if([Symbol, String].include? arg.class)
+            key_name_s = arg.to_s
+            key_name_sym = arg.to_sym
 
             define_method(key_name_sym) { instance_variable_get(:@_tinymongo_hash)[key_name_s] }
             define_method("#{key_name_s}=") { |val| instance_variable_get(:@_tinymongo_hash)[key_name_s] = val }
+            
+            @_tinymongo_defaults[key_name_s] = default if default
           end
         end
       end
@@ -79,7 +88,7 @@ module TinyMongo
     end
     
     def initialize(hash={})
-      @_tinymongo_hash = Helper.stringify_keys_in_hash(hash) || {}
+      @_tinymongo_hash = (self.class.instance_variable_get(:@_tinymongo_defaults).merge(Helper.stringify_keys_in_hash(hash)) || {}) if hash
     end
 
     def _id
@@ -90,8 +99,17 @@ module TinyMongo
       @_tinymongo_hash['_id'] = Helper.bson_object_id(val)
     end
     
+    def id
+      @_tinymongo_hash['_id'].to_s
+    end
+    
+    def id=(val)
+      @_tinymongo_hash['_id'] = Helper.bson_object_id(val)
+    end
+    
     def ==(another)
-      self.to_hash == another.to_hash
+      (self.instance_variable_get(:@_tinymongo_hash) == another.instance_variable_get(:@_tinymongo_hash)) &&
+      (self.kind_of? TinyMongo::Model) && (another.kind_of? TinyMongo::Model)
     end
     
     def db
@@ -106,22 +124,26 @@ module TinyMongo
       @_tinymongo_hash.dup
     end
     
+    def to_param
+      @_tinymongo_hash['_id'].to_s
+    end
+    
     def reload
-      if(self._id)
-        obj = collection.find_one({ '_id' => self._id })
+      if(@_tinymongo_hash['_id'])
+        obj = collection.find_one({ '_id' => @_tinymongo_hash['_id'] })
         @_tinymongo_hash = Helper.stringify_keys_in_hash(obj) if(obj)
       end
     end
 
     def save
-      if(self._id.nil?) # new 
+      if(@_tinymongo_hash['_id'].nil?) # new 
         oid = collection.save(@_tinymongo_hash)
         if(oid)
           @_tinymongo_hash.delete(:_id)
-          self._id = oid
+          @_tinymongo_hash['_id'] = oid
         end
       else # update
-        collection.update({ '_id' => self._id }, @_tinymongo_hash, :upsert => true)
+        collection.update({ '_id' => @_tinymongo_hash['_id'] }, @_tinymongo_hash, :upsert => true)
         reload
       end
       return self
@@ -138,8 +160,8 @@ module TinyMongo
     end
   
     def delete
-      if(self._id)
-        collection.remove({ '_id' => self._id })
+      if(@_tinymongo_hash['_id'])
+        collection.remove({ '_id' => @_tinymongo_hash['_id'] })
       end
     end
   
@@ -185,8 +207,8 @@ module TinyMongo
   
     protected
     def do_modifier_operation_and_reload(operator, hash)
-      raise ModifierOperationError unless self._id
-      collection.update({ '_id' => self._id }, { operator => Helper.hashify_models_in_hash(hash) })
+      raise ModifierOperationError unless @_tinymongo_hash['_id']
+      collection.update({ '_id' => @_tinymongo_hash['_id'] }, { operator => Helper.hashify_models_in_hash(hash) })
       reload
     end
   end

data/test/test_tinymongo.rb

@@ -10,6 +10,15 @@ class Dummy < TinyMongo::Model
   mongo_key :bar
 end
 
+class DummyTwo < TinyMongo::Model
+  mongo_key :foo, :bar
+end
+
+class DummyDefault < TinyMongo::Model
+  mongo_key :foo, :default => 'hello'
+  mongo_key :bar, :default => 'world'
+end
+
 class TinyMongoTest < Test::Unit::TestCase
   def setup
     TinyMongo.db['dummies'].drop()
@@ -57,6 +66,28 @@ class TinyMongoTest < Test::Unit::TestCase
     assert_equal 'world', m.bar
   end
   
+  def test_mongo_two_keys_in_one_line
+    m = DummyTwo.new('foo' => 'hello')
+    m.bar = 'world'
+    
+    assert_equal 'hello', m.foo
+    assert_equal 'world', m.bar
+  end
+  
+  def test_mongo_key_with_default_value
+    m = DummyDefault.new
+    
+    assert_equal 'hello', m.foo
+    assert_equal 'world', m.bar
+  end
+  
+  def test_mongo_key_override_default_value
+    m = DummyDefault.new(:foo => 'world', :bar => 'hello')
+    
+    assert_equal 'world', m.foo
+    assert_equal 'hello', m.bar
+  end
+  
   def test_save_new
     hash = {'foo' => 'hello', 'bar' => 'world'}
     
@@ -189,11 +220,21 @@ class TinyMongoTest < Test::Unit::TestCase
     assert_equal true, cursor.has_next?
   end
 
+  def test_cursor_has_next_is_false
+    cursor = Dummy.find
+    assert_equal false, cursor.has_next?
+  end
+
   def test_cursor_next_document
     obj = Dummy.create
     cursor = Dummy.find
     assert_equal obj, cursor.next_document
   end
+
+  def test_cursor_next_document_nil
+    cursor = Dummy.find
+    assert_equal nil, cursor.next_document
+  end
   
   def test_cursor_skip
     Dummy.create('foo' => 1) 
@@ -203,6 +244,15 @@ class TinyMongoTest < Test::Unit::TestCase
     cursor = Dummy.find.skip(2)
     assert_equal obj, cursor.next_document
   end
+
+  def test_cursor_skip_all
+    Dummy.create('foo' => 1) 
+    Dummy.create('foo' => 2) 
+    obj = Dummy.create('foo' => 3) 
+    
+    cursor = Dummy.find.skip(3)
+    assert_equal nil, cursor.next_document
+  end
   
   def test_cursor_skip_count
     Dummy.create('foo' => 1) 
@@ -221,6 +271,11 @@ class TinyMongoTest < Test::Unit::TestCase
     cursor = Dummy.find
     assert_equal [obj1, obj2, obj3], cursor.to_a
   end
+
+  def test_cursor_to_a_empty
+    cursor = Dummy.find
+    assert_equal [], cursor.to_a
+  end
   
   def test_cursor_sort
     obj1 = Dummy.create('foo' => 3) 
@@ -286,8 +341,18 @@ class TinyMongoTest < Test::Unit::TestCase
     assert_equal({'_id' => obj._id, 'foo' => 'hello'}, obj.to_hash)
   end
   
+  def test_id
+    obj = Dummy.create
+    assert_equal obj._id.to_s, obj.id
+  end
+  
+  def test_to_param
+    obj = Dummy.create
+    assert_equal obj._id.to_s, obj.to_param
+  end
+  
   def test_eq
-    obj = Dummy.create('foo' => 'hello')
+    obj = Dummy.create
     obj2 = Dummy.find_one()
     assert_equal obj, obj2
   end

data/tinymongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinymongo}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Jihoon Kim"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2010-07-27}
   s.description = %q{Simple MongoDB wrapper}
   s.email = %q{raingrove@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Peter Jihoon Kim
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +09:00
+date: 2010-07-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency