tinymongo 0.1.1 → 0.1.2

data/README.rdoc

@@ -6,15 +6,15 @@ Simple MongoDB wrapper
 
   gem install tinymongo
 
-== Rails Setup
+== Rails Setup (Rails 3)
 
-To create TinyMongo config file (config/tinymongo.yml), do the following:
+To create TinyMongo config file (config/tinymongo.yml) and initializer file (config/initializers/tinymongo.rb), do the following:
 
   rails generate tinymongo
   
 == Connecting To MongoDB directly (for non-Rails projects)
 
-  TinyMongo.configure({:host => 'localhost', :database => 'test'})
+  TinyMongo.configure({:host => 'localhost', :database => 'db_name'})
   TinyMongo.connect
   
 == Example

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/init.rb

@@ -1,4 +1 @@
 require 'tinymongo'
-
-TinyMongo.configure(YAML.load_file(Rails.root + 'config' + 'tinymongo.yml')[Rails.env])
-TinyMongo.connect

data/lib/generators/USAGE

@@ -6,3 +6,4 @@ Example:
 
     This will create:
         config/tinymongo.yml
+        config/initializers/tinymongo.rb

data/lib/generators/templates/tinymongo.rb

@@ -0,0 +1,2 @@
+TinyMongo.configure(YAML.load_file(Rails.root + 'config' + 'tinymongo.yml')[Rails.env])
+TinyMongo.connect

data/lib/generators/tinymongo_generator.rb

@@ -3,6 +3,7 @@ class TinymongoGenerator < Rails::Generators::Base
   
   def generate_config
     template "tinymongo.yml.erb", "config/tinymongo.yml"
+    copy_file "tinymongo.rb", "config/initializers/tinymongo.rb"
   end
   
   private

data/lib/tinymongo/model.rb

@@ -23,6 +23,7 @@ module TinyMongo
       end
       
       def db
+        raise 'Not connected to MongoDB. Please connect using TinyMongo.connect().' unless TinyMongo.connected?
         TinyMongo.db
       end
 
@@ -46,10 +47,11 @@ module TinyMongo
 
       def find_one(*args)
         if([BSON::ObjectID, String].include? args[0].class)
-          self.new(collection.find_one({'_id' => Helper.bson_object_id(args[0])}))
+          o = collection.find_one({'_id' => Helper.bson_object_id(args[0])})
         else
-          self.new(collection.find_one(*args))
+          o = collection.find_one(*args)
         end
+        o ? self.new(o) : nil
       end
 
       def create(hash)
@@ -103,7 +105,16 @@ module TinyMongo
     end
   
     def save
-      return create_or_update
+      if(@_tinymongo_hash['_id'].nil?) # new 
+        oid = collection.save(@_tinymongo_hash)
+        if(oid)
+          @_tinymongo_hash.delete(:_id)
+          @_tinymongo_hash['_id'] = oid
+        end
+      else # update
+        collection.update({ '_id' => @_tinymongo_hash['_id'] }, @_tinymongo_hash, :upsert => true)
+      end
+      return self
     end
   
     def update_attribute(name, value)
@@ -255,18 +266,5 @@ module TinyMongo
         collection.update({ '_id' => @_tinymongo_hash['_id'] }, { '$pullAll' => Helper.hashify_models_in_hash(hash) })
       end
     end
-  
-    protected  
-    def create_or_update
-      if(@_tinymongo_hash['_id'].nil?) # new 
-        oid = collection.save(@_tinymongo_hash)
-        @_tinymongo_hash.delete(:_id)
-        @_tinymongo_hash['_id'] = oid
-      else # update
-        collection.update({ '_id' => @_tinymongo_hash['_id'] }, @_tinymongo_hash)
-      end
-      return self
-    end
-
   end
 end

data/lib/tinymongo.rb

@@ -11,6 +11,7 @@ module TinyMongo
       @database = config['database'] || 'mongo'
       @username = config['username']
       @password = config['password']
+      @configured = true
     end
   
     def db
@@ -18,6 +19,8 @@ module TinyMongo
     end
 
     def connect
+      raise 'Please do TinyMongo.configure() before attempting to connect.' unless @configured
+      
       if defined?(PhusionPassenger) && @connection
         PhusionPassenger.on_event(:starting_worker_process) do |forked|
           @connection.connect_to_master if forked
@@ -34,7 +37,11 @@ module TinyMongo
         end
       end
       
-      true
+      @connected = true
+    end
+    
+    def connected?
+      @connected ? true : false
     end
   end
 end

data/tinymongo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinymongo}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Jihoon Kim"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "init.rb",
      "lib/generators/USAGE",
+     "lib/generators/templates/tinymongo.rb",
      "lib/generators/templates/tinymongo.yml.erb",
      "lib/generators/tinymongo_generator.rb",
      "lib/tinymongo.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Peter Jihoon Kim
@@ -60,6 +60,7 @@ files:
 - VERSION
 - init.rb
 - lib/generators/USAGE
+- lib/generators/templates/tinymongo.rb
 - lib/generators/templates/tinymongo.yml.erb
 - lib/generators/tinymongo_generator.rb
 - lib/tinymongo.rb