tinymongo 0.1.8 → 0.1.9

data/README.rdoc

@@ -73,6 +73,11 @@ To create TinyMongo config file (config/tinymongo.yml) and initializer file (con
   Person.find.count # count ignores skip and limit
   Person.find.skip(1).size # size is affected by skip and limit
   
+  Person.distinct(:name)
+  
+  Person.ensure_index({:name => 1})
+  Person.drop_index({:name => 1})
+  
 == Copyright
 
 Copyright (c) 2010 Peter Jihoon Kim. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/tinymongo.rb

@@ -2,7 +2,7 @@ require 'mongo'
 
 module TinyMongo
   class << self
-    def configure(config)
+    def configure(config={})
       config = Helper.stringify_keys_in_hash(config)
     
       @host = config['host'] || 'localhost'

data/lib/tinymongo/cursor.rb

@@ -48,8 +48,8 @@ module TinyMongo
       has_next?
     end
     
-    def limit(*args)
-      call_and_wrap_retval_in_tinymongo_cursor(:limit, args)
+    def limit(number_to_return=nil)
+      call_and_wrap_retval_in_tinymongo_cursor(:limit, [number_to_return])
     end
     
     def next!
@@ -65,16 +65,18 @@ module TinyMongo
       next!
     end
     
-    def skip(*args)
-      call_and_wrap_retval_in_tinymongo_cursor(:skip, args)
+    def skip(number_to_skip=nil)
+      call_and_wrap_retval_in_tinymongo_cursor(:skip, [number_to_skip])
     end
     
-    def sort(*args)
-      if(args.length > 0 && (args[0].instance_of? Hash))
-        args[0] = args[0].map { |k, v| [k, convert_ascending_descending_to_numeric(v)] }
+    def sort(key_or_list, direction=nil)
+      if(key_or_list.kind_of? Hash)
+        key_or_list = key_or_list.map { |k, v| [k.to_s, convert_ascending_descending(v)] }
+      elsif(key_or_list.kind_of? Array)
+        key_or_list = key_or_list.map { |o| (o.kind_of? Array) ? [o[0].to_s, convert_ascending_descending(o[1])] : nil }.compact
       end
         
-      call_and_wrap_retval_in_tinymongo_cursor(:sort, args)
+      call_and_wrap_retval_in_tinymongo_cursor(:sort, [key_or_list, direction])
     end
     
     def to_a
@@ -95,12 +97,14 @@ module TinyMongo
       end
     end
     
-    def convert_ascending_descending_to_numeric(val)
-      case(val)
-      when 'ascending', 'asc', 1
-        'ascending'
-      when 'descending', 'desc', -1
-        'descending'
+    def convert_ascending_descending(val)
+      case(val.to_s)
+      when 'ascending', 'asc', '1', Mongo::ASCENDING.to_s
+        Mongo::ASCENDING
+      when 'descending', 'desc', '-1', Mongo::DESCENDING.to_s
+        Mongo::DESCENDING
+      else
+        val
       end
     end
   end

data/lib/tinymongo/model.rb

@@ -6,7 +6,7 @@ module TinyMongo
         @_tinymongo_defaults = {} if @_tinymongo_defaults.nil?
         
         args.each do |arg|
-          default = arg[:default] || arg['default'] if(arg.instance_of? Hash)
+          default = arg[:default] || arg['default'] if(arg.kind_of? Hash)
         end
         
         args.each do |arg|
@@ -40,6 +40,18 @@ module TinyMongo
         end
       end
       
+      def full_name
+        "#{db.name}.#{collection.name}"
+      end
+      
+      def get_full_name
+        full_name
+      end
+      
+      def getFullName
+        full_name
+      end
+      
       def find(query={}, fields=nil, limit=nil, skip=nil)
         query = Helper.hashify_models_in(query)
         fields = Helper.hashify_models_in(fields)
@@ -76,8 +88,12 @@ module TinyMongo
         collection.remove({ '_id' => Helper.bson_object_id(id)})
       end
 
-      def destroy(id)
-        delete(id)
+      def destroy(*args)
+        delete(*args)
+      end
+      
+      def remove(*args)
+        delete(*args)
       end
 
       def drop
@@ -95,10 +111,69 @@ module TinyMongo
       def count
         collection.count
       end
+      
+      def ensure_index(keys, options={})
+        if(keys.kind_of? Hash)
+          keys = keys.map { |k,v| [k.to_s, convert_ascending_descending_2d(v)]}
+        elsif(keys.kind_of? Array)
+          keys = keys.map { |o| (o.kind_of? Array) ? [o[0].to_s, convert_ascending_descending_2d(o[1])] : nil }.compact
+        end
+        options = Helper.symbolify_keys_in_hash(options)
+        collection.create_index(keys, options)
+      end
+      
+      def ensureIndex(*args)
+        ensure_index(*args)
+      end
+      
+      def drop_index(obj)
+        if(obj.instance_of? String)
+          index = obj
+        elsif(obj.kind_of? Hash)
+          index = get_index_name(obj)
+        elsif(obj.kind_of? Array)
+          index = get_index_name(Hash[obj])
+        else
+          return
+        end
+        
+        collection.drop_index(index)
+      end
+      
+      def dropIndex(*args)
+        drop_index(*args)
+      end
+      
+      def drop_indexes
+        collection.drop_indexes
+      end
+      
+      def dropIndexes
+        drop_indexes
+      end
+      
+      def get_indexes
+        collection.index_information.map { |k,v| v }
+      end
+      
+      def getIndexes
+        get_indexes
+      end
+      
+      def distinct(key, query=nil)
+        if(query.kind_of? Hash)
+          query = Helper.hashify_models_in(query)
+        end
+        collection.distinct(key, query)
+      end
     end
     
     def initialize(hash={})
-      @_tinymongo_hash = (Helper.deep_copy(self.class.instance_variable_get(:@_tinymongo_defaults)).merge(Helper.stringify_keys_in_hash(hash)) || {}) if hash
+      @_tinymongo_hash = {}
+      defaults = self.class.instance_variable_get(:@_tinymongo_defaults)
+      defaults = self.class.instance_variable_set(:@_tinymongo_defaults, {}) if(defaults.nil?)
+      hash = Helper.deep_copy(defaults).merge(Helper.stringify_keys_in_hash(hash || {}))
+      hash.each_pair { |key, value| set_using_setter(key, value) }
       set_tinymongo_model_class_name_in_hash(@_tinymongo_hash)
       self
     end
@@ -153,16 +228,16 @@ module TinyMongo
       return self
     end
   
-    def update_attribute(name, value)
-      send(name.to_s + '=', value)
+    def update_attribute(key, value)
+      set_using_setter(key, value)
       save
     end
   
     def update_attributes(hash={})
-      hash.each_pair { |key, value| send(key.to_s + '=', value) }
+      hash.each_pair { |key, value| set_using_setter(key, value) }
       save
     end
-  
+    
     def delete
       if(@_tinymongo_hash['_id'])
         collection.remove({ '_id' => @_tinymongo_hash['_id'] })
@@ -241,5 +316,45 @@ module TinyMongo
       end
       fields
     end
+    
+    def set_using_setter(key, value)
+      setter = key.to_s + '='
+      self.send(setter, value) if(self.respond_to? setter)
+    end
+    
+    def self.convert_ascending_descending_2d(val)
+      case(val.to_s)
+      when 'ascending', 'asc', '1', Mongo::ASCENDING.to_s
+        Mongo::ASCENDING
+      when 'descending', 'desc', '-1', Mongo::DESCENDING.to_s
+        Mongo::DESCENDING
+      when '2d', Mongo::GEO2D.to_s
+        Mongo::GEO2D
+      else
+        val
+      end
+    end
+    
+    def self.convert_ascending_descending_to_numeric(val)
+      case(val.to_s)
+      when 'ascending', 'asc', '1', Mongo::ASCENDING.to_s
+        1
+      when 'descending', 'desc', '-1', Mongo::DESCENDING.to_s
+        -1
+      else
+        val
+      end
+    end
+    
+    def self.get_index_name(hash)
+      name = ''
+      hash.each_pair do |k,v|
+        name += '_' if(name.length > 0)
+        name += k.to_s + '_'
+        v = convert_ascending_descending_to_numeric(v)
+        name += v.to_s if(v.kind_of? Integer)
+      end
+      name
+    end
   end
 end

data/test/test_tinymongo.rb

@@ -21,7 +21,7 @@ end
 
 class TinyMongoTest < Test::Unit::TestCase
   def setup
-    TinyMongo.db['dummies'].drop()
+    TinyMongo.db['dummies'].drop
   end
   
   def test_helper_stringify_keys_in_hash
@@ -116,6 +116,13 @@ class TinyMongoTest < Test::Unit::TestCase
     assert_equal TinyMongo::Helper.stringify_keys_in_hash(hash), result, result # compare
   end
 
+  def test_create_ignore_undefined_keys
+    obj = Dummy.create({'foo' => 'hello', 'bar' => 'world', 'fubar' => 'snafu'}) # save to db
+    
+    result = TinyMongo.db['dummies'].find_one({'_id' => obj._id})
+    assert_equal TinyMongo::Helper.stringify_keys_in_hash({'foo' => 'hello', 'bar' => 'world', '_id' => obj._id, '_tinymongo_model_class_name' => 'Dummy'}), result, result # compare
+  end
+
   def test_save_update
     obj = Dummy.create('foo' => 'hello') 
     obj.foo = 'bye'
@@ -313,10 +320,19 @@ class TinyMongoTest < Test::Unit::TestCase
     obj2 = Dummy.create('foo' => 2) 
     obj3 = Dummy.create('foo' => 1) 
     
-    cursor = Dummy.find.sort(['foo', 'ascending'])
+    cursor = Dummy.find.sort('foo')
     assert_equal [obj3, obj2, obj1], cursor.to_a
   end
 
+  def test_cursor_sort_array
+    obj1 = Dummy.create('foo' => 3) 
+    obj2 = Dummy.create('foo' => 2) 
+    obj3 = Dummy.create('foo' => 1) 
+    
+    cursor = Dummy.find.sort([['foo', 'ascending']])
+    assert_equal [obj3, obj2, obj1], cursor.to_a
+  end
+  
   def test_cursor_sort_hash
     obj1 = Dummy.create('foo' => 3) 
     obj2 = Dummy.create('foo' => 2) 
@@ -492,4 +508,64 @@ class TinyMongoTest < Test::Unit::TestCase
     assert_equal 'world', d.bar[1].foo
   end
   
+  def test_full_name
+    assert_equal 'tinymongo_test.dummies', Dummy.full_name
+  end
+  
+  def test_get_indexes
+    Dummy.create
+    assert_equal [{'name' => '_id_', 'ns' => 'tinymongo_test.dummies', 'key' => {'_id' => 1}}], Dummy.get_indexes
+  end
+
+  def test_ensure_index
+    Dummy.create
+    assert_equal 'foo_1', Dummy.ensure_index({'foo' => 1})
+    assert_equal 'foo_1_bar_-1', Dummy.ensure_index({'foo' => 1, 'bar' => -1})
+    assert_equal [{"name" => "_id_", "ns" => "tinymongo_test.dummies", "key" => {"_id" => 1}},
+                  {"name" => "foo_1", "ns" => "tinymongo_test.dummies", "key" => {"foo" => 1}}, 
+                  {"name" => "foo_1_bar_-1", "ns" => "tinymongo_test.dummies", "key" => {"foo" => 1, "bar" => -1}}],
+                  Dummy.get_indexes
+  end
+  
+  def test_drop_index
+    Dummy.create
+    index_name = Dummy.ensure_index({'foo' => 1})
+    assert_equal [{"name" => "_id_", "ns" => "tinymongo_test.dummies", "key" => {"_id" => 1}},
+                  {"name" => "foo_1", "ns" => "tinymongo_test.dummies", "key" => {"foo" => 1}}],
+                  Dummy.get_indexes
+    Dummy.drop_index(index_name)
+    assert_equal [{'name' => '_id_', 'ns' => 'tinymongo_test.dummies', 'key' => {'_id' => 1}}], Dummy.get_indexes
+  end
+  
+  def test_drop_index_hash
+    Dummy.create
+    index_name = Dummy.ensure_index({'foo' => 1, 'bar' => -1})
+    Dummy.drop_index({'foo' => 1, 'bar' => -1})
+    assert_equal [{'name' => '_id_', 'ns' => 'tinymongo_test.dummies', 'key' => {'_id' => 1}}], Dummy.get_indexes
+  end
+  
+  def test_drop_index_array
+    Dummy.create
+    index_name = Dummy.ensure_index({'foo' => 1, 'bar' => -1})
+    Dummy.drop_index([['foo', 1], ['bar', -1]])
+    assert_equal [{'name' => '_id_', 'ns' => 'tinymongo_test.dummies', 'key' => {'_id' => 1}}], Dummy.get_indexes
+  end
+  
+  def test_drop_indexes
+    Dummy.create
+    Dummy.ensure_index({'foo' => 1})
+    Dummy.ensure_index({'bar' => 1})
+    Dummy.drop_indexes
+    assert_equal [{'name' => '_id_', 'ns' => 'tinymongo_test.dummies', 'key' => {'_id' => 1}}], Dummy.get_indexes
+  end
+  
+  def test_distinct
+    Dummy.create('foo' => 'hello', 'bar' => 'hello')
+    Dummy.create('foo' => 'hello', 'bar' => 'world')
+    Dummy.create('foo' => 'world', 'bar' => 'world')
+    Dummy.create('foo' => 'world', 'bar' => 'world')
+    assert_equal ['hello','world'], Dummy.distinct('foo')
+    assert_equal ['hello'], Dummy.distinct('foo', {'bar' => 'hello'})
+    assert_equal ['hello','world'], Dummy.distinct('foo', {'bar' => 'world'})
+  end
 end

data/tinymongo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinymongo}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Peter Jihoon Kim