visit-counter 0.1.0 → 0.1.1

data/lib/visit-counter/store/redis_store.rb

@@ -34,6 +34,32 @@ module VisitCounter
           redis.set(key, 0)
         end
 
+        def substract(key, by)
+          redis.decrby(key, by)
+        end
+
+        def aquire_lock!(object)
+          redis.setnx(lock_key(object), 1)
+        end
+
+        def unlock!(object)
+          redis.del(lock_key(object))
+        end
+
+        def lock_key(object)
+          "#{object.class.name.downcase}_#{object.id}_object_cache_lock"
+        end
+
+        def with_lock(object, &block)
+          if aquire_lock!(object)
+            begin
+              yield
+            ensure
+              unlock!(object)
+            end
+          end
+        end
+
       end
     end
   end

data/lib/visit-counter/version.rb

@@ -1,3 +1,3 @@
 module VisitCounter
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/visit-counter/visit_counter.rb

@@ -33,9 +33,13 @@ module VisitCounter
       current_count + count
     end
 
-    def nullify_counter_cache(name)
+    def nullify_counter_cache(name, substract = nil)
       key = VisitCounter::Key.key(self, name)
-      VisitCounter::Store.engine.nullify(key)
+      if substract
+        VisitCounter::Store.engine.substract(key, substract)
+      else
+        VisitCounter::Store.engine.nullify(key)
+      end
     end
   end
 
@@ -68,8 +72,10 @@ module VisitCounter
       end
 
       def persist(object, staged_count, diff, name)
-        object.update_attribute(name, staged_count + diff)
-        object.nullify_counter_cache(name)
+        VisitCounter::Store.engine.with_lock(object) do
+          object.update_attribute(name, staged_count + diff)
+          object.nullify_counter_cache(name, diff)
+        end
       end
 
       def default_threshold(method)
@@ -79,6 +85,7 @@ module VisitCounter
           0.3
         end
       end
+
     end
   end
 end

data/spec/lib/visit_counter_spec.rb

@@ -16,6 +16,7 @@ class DummyObject
 end
 
 VisitCounter::Store::RedisStore.redis = Redis.new(host: "localhost")
+VisitCounter::Store::RedisStore.redis.flushdb
 
 describe VisitCounter do
   describe "incrementing counters" do
@@ -110,6 +111,31 @@ describe VisitCounter do
     end
   end
 
+  describe "locked objects" do
+    before :each do
+      @d = DummyObject.new
+      @d.stub!(:id).and_return(1)
+      @d.nullify_counter_cache(:counter)
+    end
+
+    it "should lock object when updating" do
+      VisitCounter::Store.engine.should_receive(:with_lock)
+      VisitCounter::Helper.persist(@d, 1, 1, :counter)
+    end
+
+    it "should not persist if object is locked" do
+      VisitCounter::Store.engine.stub!(:aquire_lock!).and_return(false)
+      @d.should_not_receive(:update_attribute)
+      VisitCounter::Helper.persist(@d, 1, 1, :counter)
+    end
+
+    it "should persist if object is locked" do
+      VisitCounter::Store.engine.stub!(:aquire_lock!).and_return(true)
+      @d.should_receive(:update_attribute)
+      VisitCounter::Helper.persist(@d, 1, 1, :counter)
+    end
+  end
+
   describe "overriding the getter" do
     before :all do
       DummyObject.cached_counter :counter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visit-counter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec