mongorilla 0.4.0 → 0.5.0

data/lib/mongorilla/collection.rb

@@ -69,7 +69,7 @@ module Mongorilla
     end
 
     def count(cond={},opt={})
-      @@loger.info("count cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+      @@loger.info("count #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
       find(cond,opt).count
     end
 
@@ -81,7 +81,7 @@ module Mongorilla
           opt[:read] = :primary
         end
         rescue_connection_failure do
-          @@loger.info("find(master) cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+          @@loger.info("find(master) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
           w_col.find(cond,opt)
         end
       else
@@ -90,11 +90,11 @@ module Mongorilla
         end
         begin
           rescue_connection_failure do
-            @@loger.info("find(secondary) cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+            @@loger.info("find(secondary) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
             r_col.find(cond,opt)
           end
         rescue
-          @@loger.info("find(master) cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+          @@loger.info("find(master) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
           w_col.find(cond,opt)
         end
       end
@@ -102,14 +102,14 @@ module Mongorilla
 
     def insert(data,opt={})
       rescue_connection_failure do
-        @@loger.info("insert data:#{data.inspect} opt:#{opt.inspect}") if @@loger
+        @@loger.info("insert #{@name} data:#{data.inspect} opt:#{opt.inspect}") if @@loger
         w_col.insert(data,opt)
       end
     end
 
     def update(cond,data,opt)
       rescue_connection_failure do
-        @@loger.info("update cond:#{cond.inspect} data:#{data.inspect} opt:#{opt.inspect}") if @@loger
+        @@loger.info("update #{@name} cond:#{cond.inspect} data:#{data.inspect} opt:#{opt.inspect}") if @@loger
         w_col.update(cond,data,opt)
       end
     end
@@ -121,7 +121,7 @@ module Mongorilla
         cond = {:_id => cond}
       end
       rescue_connection_failure do
-        @@loger.info("remove cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+        @@loger.info("remove #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
         w_col.remove(cond,opt)
       end
     end

data/lib/mongorilla/document.rb

@@ -36,7 +36,7 @@ module Mongorilla
       end
       alias_method :id,:_id
       col_name = pluralize(c.to_s)
-      @@col = Collection.new(col_name)
+      c.instance_variable_set("@col",Collection.new(col_name))
 
       def initialize(doc)
         @orig = doc.dup
@@ -138,7 +138,7 @@ module Mongorilla
         opt[:safe] = true if [SYNC,RELOAD].include?(mode)
         cond.merge!({"_id" => @doc["_id"]})
         if @changes
-          ret = @@col.update(cond,@changes,opt)
+          ret = self.class.collection.update(cond,@changes,opt)
           if opt[:safe] && ret["n"] != 1
             reset
             return false
@@ -163,19 +163,19 @@ module Mongorilla
 
       def reload
         @changes={}
-        @doc = @@col.find_one(id,:master => true)
+        @doc = self.class.collection.find_one(id,:master => true)
         @orig = @doc.dup
       end
 
       def c.collection
-        @@col
+        @col
       end
 
       def c.create(data,opt={})
         if opt == {}
           opt[:safe] = true
         end
-        ret = @@col.insert(data,opt)
+        ret = @col.insert(data,opt)
         if opt[:safe] == true
           if ret.is_a? Array
             ret.map{|uid| find(uid,:master=>true)}
@@ -186,7 +186,7 @@ module Mongorilla
       end
 
       def c.find_one(cond,opt={})
-        ret = @@col.find_one(cond,opt)
+        ret = @col.find_one(cond,opt)
         if ret
           return self.new(ret)
         else
@@ -195,25 +195,25 @@ module Mongorilla
       end
 
       def c.count(cond={},opt={})
-        @@col.count(cond,opt)
+        @col.count(cond,opt)
       end
 
       def c.find(cond={},opt={})
         if !cond.is_a? Hash
           find_one(cond,opt)
         else
-          ret = @@col.find(cond,opt)
+          ret = @col.find(cond,opt)
           return [] if ret.count == 0
           ret.map{|r| self.new(r)}
         end
       end
 
       def c.update(cond,data,opt={})
-        @@col.update(cond,data,opt)
+        @col.update(cond,data,opt)
       end
 
       def c.remove(cond={},opt={})
-        @@col.remove(cond,opt)
+        @col.remove(cond,opt)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongorilla
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &6696960 !ruby/object:Gem::Requirement
+  requirement: &13628080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6696960
+  version_requirements: *13628080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6709540 !ruby/object:Gem::Requirement
+  requirement: &13626300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *6709540
+  version_requirements: *13626300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &6707820 !ruby/object:Gem::Requirement
+  requirement: &13624320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *6707820
+  version_requirements: *13624320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &6706740 !ruby/object:Gem::Requirement
+  requirement: &13635240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *6706740
+  version_requirements: *13635240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &6705460 !ruby/object:Gem::Requirement
+  requirement: &13632820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6705460
+  version_requirements: *13632820
 description: Small Object Document Mapper for Mongo. you can update atomic  with condition
 email: laten@nifty.com
 executables: []
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 874128066911654633
+      hash: -946876484673399883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: