tinymongo 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/tinymongo/model.rb

@@ -39,30 +39,32 @@ module TinyMongo
       end
       
       def find(*args)
-        new_args = []
-        args.each do |arg|
-          new_args << Helper.hashify_models_in(arg)
-        end
+        return [] if((args.size > 0) && (args.compact.size == 0))
+        
+        new_args = args.map {|arg| Helper.hashify_models_in(arg) }
         cursor = collection.find(*new_args)
         
-        if(cursor && cursor.count > 0)
+        if(cursor)
           hashes = cursor.to_a
           objs = hashes.map { |hash| self.new(hash) }
         end
         
-        cursor ? objs : nil
+        cursor ? objs : []
       end
 
       def find_one(*args)
-        if([BSON::ObjectID, String].include? args[0].class)
+        if((args.size > 0) && (args.compact.size == 0))
+          return nil
+        elsif((args.size == 1) && ([BSON::ObjectID, String].include? args[0].class))
           hash = collection.find_one({'_id' => Helper.bson_object_id(args[0])})
         else
-          hash = collection.find_one(*args)
+          new_args = args.map {|arg| Helper.hashify_models_in(arg) }
+          hash = collection.find_one(*new_args)
         end
         hash ? self.new(hash) : nil
       end
 
-      def create(hash)
+      def create(hash={})
         obj = self.new(hash)
         obj.save
       end
@@ -71,6 +73,10 @@ module TinyMongo
         collection.remove({ '_id' => Helper.bson_object_id(id)})
       end
 
+      def destroy(id)
+        delete(id)
+      end
+
       def drop
         collection.drop
       end
@@ -100,6 +106,10 @@ module TinyMongo
       @_tinymongo_hash['_id'] = Helper.bson_object_id(val)
     end
     
+    def ==(another)
+      self.to_hash == another.to_hash
+    end
+    
     def db
       self.db
     end
@@ -109,7 +119,7 @@ module TinyMongo
     end
     
     def to_hash
-      @_tinymongo_hash.clone
+      @_tinymongo_hash.dup
     end
     
     def reload
@@ -138,7 +148,7 @@ module TinyMongo
       save
     end
   
-    def update_attributes(hash)
+    def update_attributes(hash={})
       hash.each_pair { |key, value| send(key.to_s + '=', value) }
       save
     end
@@ -152,11 +162,7 @@ module TinyMongo
     def destroy
       delete
     end
-  
-    def destroy(id)
-      delete(id)
-    end
-    
+      
     include Modifiers
   end
 end

data/lib/tinymongo/modifiers.rb

@@ -1,38 +1,38 @@
 module TinyMongo
   module Modifiers
-    def inc(hash)
+    def inc(hash={})
       do_modifier_operation_and_reload('$inc', hash)
     end
   
-    def set(hash)
+    def set(hash={})
       do_modifier_operation_and_reload('$set', hash)
     end
   
-    def unset(hash)
+    def unset(hash={})
       do_modifier_operation_and_reload('$unset', hash)
     end
   
-    def push(hash)
+    def push(hash={})
       do_modifier_operation_and_reload('$push', hash)
     end
   
-    def push_all(hash)
+    def push_all(hash={})
       do_modifier_operation_and_reload('$pushAll', hash)
     end
   
-    def add_to_set(hash)
+    def add_to_set(hash={})
       do_modifier_operation_and_reload('$addToSet', hash)
     end
   
-    def pop(hash)
+    def pop(hash={})
       do_modifier_operation_and_reload('$pop', hash)
     end
   
-    def pull(hash)
+    def pull(hash={})
       do_modifier_operation_and_reload('$pull', hash)
     end
   
-    def pull_all(hash)
+    def pull_all(hash={})
       do_modifier_operation_and_reload('$pullAll', hash)
     end
     

data/test/test_tinymongo.rb

@@ -103,32 +103,84 @@ class TinyMongoTest < Test::Unit::TestCase
     assert_equal 'hello', result['bar']
   end
   
-  def test_find_one_using_id
-    o_id = TinyMongo.db['dummies'].save({'foo' => 'hello'})
-    
-    found = Dummy.find_one(o_id)
+  def test_find_nothing
+    found = Dummy.find()
+    assert_equal [], found
+  end
     
-    assert_equal 'hello', found.foo
-    assert_equal o_id, found._id
+  def test_find_all_one
+    obj = Dummy.create('foo' => 'hello') 
+    found = Dummy.find()
+    assert_equal [obj], found
+  end
+  
+  def test_find_all_many
+    obj = Dummy.create('foo' => 'hello') 
+    obj2 = Dummy.create('foo' => 'hello') 
+    found = Dummy.find()
+    assert_equal [obj, obj2], found
+  end
+  
+  def test_find_among_many
+    obj = Dummy.create('foo' => 'hello') 
+    obj2 = Dummy.create('foo' => 'hello') 
+    obj3 = Dummy.create('foo' => 'bye') 
+    found1 = Dummy.find({'foo' => 'hello'})
+    found2 = Dummy.find({'foo' => 'bye'})
+    assert_equal [obj, obj2], found1
+    assert_equal [obj3], found2
+  end
+  
+  def test_find_one
+    obj = Dummy.create('foo' => 'hello') 
+    found = Dummy.find_one()
+    assert_equal obj, found
+  end
+  
+  def test_find_one_nil
+    found = Dummy.find_one(nil)
+    assert_equal nil, found
+  end
+  
+  def test_find_one_using_id
+    obj = Dummy.create('foo' => 'hello') 
+    found = Dummy.find_one(obj._id)
+    assert_equal obj, found
   end
   
   def test_find_one_using_id_string
-    o_id = TinyMongo.db['dummies'].save({'foo' => 'hello'})
-    
-    found = Dummy.find_one(o_id.to_s)
-    
-    assert_equal 'hello', found.foo
-    assert_equal o_id, found._id
+    obj = Dummy.create('foo' => 'hello') 
+    found = Dummy.find_one(obj._id.to_s)
+    assert_equal obj, found
+  end
+
+  def test_find_one_using_id_in_hash
+    obj = Dummy.create('foo' => 'hello') 
+    found = Dummy.find_one({'_id' => obj._id})
+    assert_equal obj, found
+  end
+  
+  def test_find_one_using_id_string_in_hash
+    obj = Dummy.create('foo' => 'hello') 
+    found = Dummy.find_one({'_id' => obj._id.to_s})
+    assert_equal obj, found
   end
 
   def test_find_one_using_hash
-    o_id = TinyMongo.db['dummies'].save({'foo' => 'hello', 'bar' => 'world'})
-    
+    obj = Dummy.create('foo' => 'hello') 
     found = Dummy.find_one({'foo' => 'hello'})
-    
-    assert_equal 'hello', found.foo
-    assert_equal 'world', found.bar
-    assert_equal o_id, found._id
+    assert_equal obj, found
+  end
+  
+  def test_to_hash
+    obj = Dummy.create('foo' => 'hello')
+    assert_equal({'_id' => obj._id, 'foo' => 'hello'}, obj.to_hash)
+  end
+  
+  def test_eq
+    obj = Dummy.create('foo' => 'hello')
+    obj2 = Dummy.find_one()
+    assert_equal obj, obj2
   end
   
   def test_count

data/tinymongo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinymongo}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Jihoon Kim"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Peter Jihoon Kim