tinymongo 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/tinymongo/errors.rb

@@ -0,0 +1,22 @@
+module TinyMongo
+  class Error < StandardError
+  end
+  
+  class NotConfiguredError < Error
+    def initialize
+      super('Please do TinyMongo.configure() before attempting to connect!')
+    end
+  end
+  
+  class NotConnectedError < Error
+    def initialize
+      super('Not connected to MongoDB. Please connect using TinyMongo.connect()!')
+    end
+  end
+  
+  class ModifierOperationError < Error
+    def initialize
+      super('Modifier operations are not allowed on objects that are not yet saved!')
+    end
+  end
+end

data/lib/tinymongo/helper.rb

@@ -28,11 +28,7 @@ module TinyMongo
       end
       
       def hashify_models_in_array(array)
-        new_array = []
-        array.each do |value|
-          new_array << hashify_models_in(value)
-        end
-        new_array
+        new_array = array.map { |value| hashify_models_in(value) }
       end
       
       def hashify_models_in_hash(hash)

data/lib/tinymongo/model.rb

@@ -1,3 +1,5 @@
+require 'tinymongo/modifiers'
+
 module TinyMongo
   class Model
     class << self
@@ -23,7 +25,6 @@ module TinyMongo
       end
       
       def db
-        raise 'Not connected to MongoDB. Please connect using TinyMongo.connect().' unless TinyMongo.connected?
         TinyMongo.db
       end
 
@@ -42,16 +43,23 @@ module TinyMongo
         args.each do |arg|
           new_args << Helper.hashify_models_in(arg)
         end
-        collection.find(*new_args)
+        cursor = collection.find(*new_args)
+        
+        if(cursor && cursor.count > 0)
+          hashes = cursor.to_a
+          objs = hashes.map { |hash| self.new(hash) }
+        end
+        
+        cursor ? objs : nil
       end
 
       def find_one(*args)
         if([BSON::ObjectID, String].include? args[0].class)
-          o = collection.find_one({'_id' => Helper.bson_object_id(args[0])})
+          hash = collection.find_one({'_id' => Helper.bson_object_id(args[0])})
         else
-          o = collection.find_one(*args)
+          hash = collection.find_one(*args)
         end
-        o ? self.new(o) : nil
+        hash ? self.new(hash) : nil
       end
 
       def create(hash)
@@ -80,6 +88,10 @@ module TinyMongo
       end
     end
     
+    def initialize(hash={})
+      @_tinymongo_hash = Helper.stringify_keys_in_hash(hash)
+    end
+
     def _id
       @_tinymongo_hash['_id']
     end
@@ -87,10 +99,6 @@ module TinyMongo
     def _id=(val)
       @_tinymongo_hash['_id'] = Helper.bson_object_id(val)
     end
-  
-    def initialize(hash={})
-      @_tinymongo_hash = Helper.stringify_keys_in_hash(hash)
-    end
     
     def db
       self.db
@@ -103,16 +111,24 @@ module TinyMongo
     def to_hash
       @_tinymongo_hash.clone
     end
-  
+    
+    def reload
+      if(self._id)
+        obj = collection.find_one({ '_id' => self._id })
+        @_tinymongo_hash = Helper.stringify_keys_in_hash(obj) if(obj)
+      end
+    end
+
     def save
-      if(@_tinymongo_hash['_id'].nil?) # new 
+      if(self._id.nil?) # new 
         oid = collection.save(@_tinymongo_hash)
         if(oid)
           @_tinymongo_hash.delete(:_id)
-          @_tinymongo_hash['_id'] = oid
+          self._id = oid
         end
       else # update
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, @_tinymongo_hash, :upsert => true)
+        collection.update({ '_id' => self._id }, @_tinymongo_hash, :upsert => true)
+        reload
       end
       return self
     end
@@ -128,8 +144,8 @@ module TinyMongo
     end
   
     def delete
-      if(@_tinymongo_hash['_id'])
-        collection.remove({ '_id' => @_tinymongo_hash['_id'] })
+      if(self._id)
+        collection.remove({ '_id' => self._id })
       end
     end
   
@@ -140,131 +156,7 @@ module TinyMongo
     def destroy(id)
       delete(id)
     end
-  
-    def inc(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-        
-        if(@_tinymongo_hash[key] && (@_tinymongo_hash[key].kind_of? Numeric))
-          send(key + '=', (send(key) + value))
-        else
-          send(key + '=', value)
-        end
-      end
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$inc' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def set(hash)
-      hash.each_pair { |key, value| send(key.to_s + '=', value) }
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$set' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def unset(hash)
-      hash.each_key do |key| 
-        @_tinymongo_hash.delete(key.to_s)
-      end
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$unset' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def push(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-        
-        if(@_tinymongo_hash[key] && (@_tinymongo_hash[key].instance_of? Array))
-          send(key) << value
-        else
-          send(key + '=', value)
-        end
-      end
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$push' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def push_all(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-        
-        if(@_tinymongo_hash[key] && (@_tinymongo_hash[key].instance_of? Array))
-          value.each { |v| send(key) << value }
-        else
-          send(key + '=', value)
-        end
-      end
-
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$pushAll' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def add_to_set(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-        
-        if(!(@_tinymongo_hash[key].include? value) && (@_tinymongo_hash[key].instance_of? Array))
-          send(key) << value
-        end
-      end
     
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$addToSet' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def pop(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-
-        if(@_tinymongo_hash[key] && (@_tinymongo_hash[key].instance_of? Array))
-          if(value == 1)
-            send(key).pop
-          elsif(value == -1)
-            send(key).shift
-          end
-        end
-      end
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$pop' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def pull(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-        if(@_tinymongo_hash[key] && (@_tinymongo_hash[key].instance_of? Array))
-          send(key).delete_if { |v| v == value }
-        end
-      end
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$pull' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
-  
-    def pull_all(hash)
-      hash.each_pair do |key, value|
-        key = key.to_s
-        if(@_tinymongo_hash[key] && (@_tinymongo_hash[key].instance_of? Array))
-          value.each do |v|
-            send(key).delete_if { |w| w == v }
-          end
-        end
-      end
-    
-      if(@_tinymongo_hash['_id'])
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$pullAll' => Helper.hashify_models_in_hash(hash) })
-      end
-    end
+    include Modifiers
   end
 end

data/lib/tinymongo/modifiers.rb

@@ -0,0 +1,46 @@
+module TinyMongo
+  module Modifiers
+    def inc(hash)
+      do_modifier_operation_and_reload('$inc', hash)
+    end
+  
+    def set(hash)
+      do_modifier_operation_and_reload('$set', hash)
+    end
+  
+    def unset(hash)
+      do_modifier_operation_and_reload('$unset', hash)
+    end
+  
+    def push(hash)
+      do_modifier_operation_and_reload('$push', hash)
+    end
+  
+    def push_all(hash)
+      do_modifier_operation_and_reload('$pushAll', hash)
+    end
+  
+    def add_to_set(hash)
+      do_modifier_operation_and_reload('$addToSet', hash)
+    end
+  
+    def pop(hash)
+      do_modifier_operation_and_reload('$pop', hash)
+    end
+  
+    def pull(hash)
+      do_modifier_operation_and_reload('$pull', hash)
+    end
+  
+    def pull_all(hash)
+      do_modifier_operation_and_reload('$pullAll', hash)
+    end
+    
+    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) })
+      reload
+    end
+  end
+end

data/lib/tinymongo.rb

@@ -15,11 +15,12 @@ module TinyMongo
     end
   
     def db
+      raise NotConnectedError unless TinyMongo.connected?
       @db
     end
 
     def connect
-      raise 'Please do TinyMongo.configure() before attempting to connect.' unless @configured
+      raise NotConfiguredError unless @configured
       
       if defined?(PhusionPassenger) && @connection
         PhusionPassenger.on_event(:starting_worker_process) do |forked|
@@ -46,5 +47,6 @@ module TinyMongo
   end
 end
 
+require 'tinymongo/errors'
 require 'tinymongo/helper'
 require 'tinymongo/model'

data/tinymongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinymongo}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-21}
+  s.date = %q{2010-07-22}
   s.description = %q{Simple MongoDB wrapper}
   s.email = %q{raingrove@gmail.com}
   s.extra_rdoc_files = [
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
      "lib/generators/templates/tinymongo.yml.erb",
      "lib/generators/tinymongo_generator.rb",
      "lib/tinymongo.rb",
+     "lib/tinymongo/errors.rb",
      "lib/tinymongo/helper.rb",
      "lib/tinymongo/model.rb",
+     "lib/tinymongo/modifiers.rb",
      "test/test_helper.rb",
      "test/test_tinymongo.rb",
      "tinymongo.gemspec"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter Jihoon Kim
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +09:00
+date: 2010-07-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,8 +64,10 @@ files:
 - lib/generators/templates/tinymongo.yml.erb
 - lib/generators/tinymongo_generator.rb
 - lib/tinymongo.rb
+- lib/tinymongo/errors.rb
 - lib/tinymongo/helper.rb
 - lib/tinymongo/model.rb
+- lib/tinymongo/modifiers.rb
 - test/test_helper.rb
 - test/test_tinymongo.rb
 - tinymongo.gemspec