Merge branch 'master' of git://github.com/brianmario/interlock

Conflicts: lib/interlock/active_record.rb
evan · Nov 10, 2008 · 7a15728 · 7a15728
2 parents ab2d9fa + 29fe9f4
commit 7a15728
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/interlock/active_record.rb b/lib/interlock/active_record.rb
@@ -33,5 +33,15 @@ def expire_interlock_keys
 
     before_save :expire_interlock_keys
     after_destroy :expire_interlock_keys
+
+    #
+    # Reload. Expires the cache and force reload from db.
+    #
+    def reload_with_interlock(options)
+      self.expire_interlock_keys
+      reload_without_interlock(options)
+    end
+    alias_method_chain :reload, :interlock
+
   end
 end