mongorilla 0.5.0 → 0.6.0

data/lib/mongorilla/collection.rb

@@ -6,7 +6,7 @@ module Mongorilla
     @@slaves = nil
     @@slave_index = 0
     @@config = nil
-    @@loger = nil
+    @@logger = nil
 
     def self.master
       @@master
@@ -24,11 +24,15 @@ module Mongorilla
       @@config = YAML.load(File.read(path))
     end
 
+    def self.output_log(method,contents)
+      @@logger.send(method,contents) if @@logger
+    end
+
     def self.build(path=File.expand_path("../config.yml",__FILE__),logger=nil)
       load_config(path)
       @@config["max_retries"] ||= 10
       @@config["meantime"] ||= 0.5
-      @@loger = logger
+      @@logger = logger
       if @@config["hosts"]
         @@master = Mongo::ReplSetConnection.new(*@@config["hosts"]).db(@@config["database"])
       elsif @@config["slaves"]
@@ -69,7 +73,7 @@ module Mongorilla
     end
 
     def count(cond={},opt={})
-      @@loger.info("count #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+      @@logger.info("count #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@logger
       find(cond,opt).count
     end
 
@@ -81,7 +85,7 @@ module Mongorilla
           opt[:read] = :primary
         end
         rescue_connection_failure do
-          @@loger.info("find(master) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+          @@logger.info("find(master) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@logger
           w_col.find(cond,opt)
         end
       else
@@ -90,11 +94,11 @@ module Mongorilla
         end
         begin
           rescue_connection_failure do
-            @@loger.info("find(secondary) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+            @@logger.info("find(secondary) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@logger
             r_col.find(cond,opt)
           end
         rescue
-          @@loger.info("find(master) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+          @@logger.info("find(master) #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@logger
           w_col.find(cond,opt)
         end
       end
@@ -102,14 +106,14 @@ module Mongorilla
 
     def insert(data,opt={})
       rescue_connection_failure do
-        @@loger.info("insert #{@name} data:#{data.inspect} opt:#{opt.inspect}") if @@loger
+        @@logger.info("insert #{@name} data:#{data.inspect} opt:#{opt.inspect}") if @@logger
         w_col.insert(data,opt)
       end
     end
 
     def update(cond,data,opt)
       rescue_connection_failure do
-        @@loger.info("update #{@name} cond:#{cond.inspect} data:#{data.inspect} opt:#{opt.inspect}") if @@loger
+        @@logger.info("update #{@name} cond:#{cond.inspect} data:#{data.inspect} opt:#{opt.inspect}") if @@logger
         w_col.update(cond,data,opt)
       end
     end
@@ -121,7 +125,7 @@ module Mongorilla
         cond = {:_id => cond}
       end
       rescue_connection_failure do
-        @@loger.info("remove #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@loger
+        @@logger.info("remove #{@name} cond:#{cond.inspect} opt:#{opt.inspect}") if @@logger
         w_col.remove(cond,opt)
       end
     end

data/lib/mongorilla/document.rb

@@ -137,6 +137,11 @@ module Mongorilla
         end
         opt[:safe] = true if [SYNC,RELOAD].include?(mode)
         cond.merge!({"_id" => @doc["_id"]})
+        if @changes.keys.length == 0
+          Collection.output_log("warn","save no changed data cond:#{cond.inspect} orig:#{@orig.inspect} doc:#{@doc.inspect}")
+          reset
+          return false
+        end
         if @changes
           ret = self.class.collection.update(cond,@changes,opt)
           if opt[:safe] && ret["n"] != 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongorilla
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &13628080 !ruby/object:Gem::Requirement
+  requirement: &21889500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13628080
+  version_requirements: *21889500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13626300 !ruby/object:Gem::Requirement
+  requirement: &21900320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *13626300
+  version_requirements: *21900320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13624320 !ruby/object:Gem::Requirement
+  requirement: &21910420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13624320
+  version_requirements: *21910420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13635240 !ruby/object:Gem::Requirement
+  requirement: &21920380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13635240
+  version_requirements: *21920380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &13632820 !ruby/object:Gem::Requirement
+  requirement: &21919120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13632820
+  version_requirements: *21919120
 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: -946876484673399883
+      hash: 4484259814971262728
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: