lock_method 0.0.2 → 0.1.0

data/README.rdoc

@@ -21,7 +21,13 @@ Then you can do
 
 Just in case, you can clear them
 
-    my_blog.clear_lock :get_latest_entries
+    my_blog.clear_method_lock :get_latest_entries
+
+== One lock per method
+
+lock_method ignores arguments when locking. So if you call Foo.bar(:a), calls to Foo.bar(:b) will be locked until the first call finishes.
+
+Maybe future versions will support this.
 
 == Configuration (and supported cache clients)
 

data/lib/lock_method/config.rb

@@ -1,3 +1,4 @@
+require 'cache'
 require 'singleton'
 module LockMethod
   # Here's where you set config options.
@@ -28,8 +29,9 @@ module LockMethod
     def storage=(raw_client_or_nil)
       if raw_client_or_nil.nil?
         @storage = nil
+      elsif raw_client_or_nil.is_a?(::Cache)
+        @storage = raw_client_or_nil
       else
-        require 'cache'
         @storage = ::Cache.new raw_client_or_nil
       end
     end

data/lib/lock_method/lock.rb

@@ -1,8 +1,8 @@
 module LockMethod
   class Lock #:nodoc: all
     class << self
-      def find(method_signature)
-        if hsh = Config.instance.storage.get(method_signature)
+      def find(cache_key)
+        if hsh = Config.instance.storage.get(cache_key)
           new hsh
         end
       end
@@ -59,7 +59,7 @@ module LockMethod
     end
     
     def delete
-      Config.instance.storage.delete method_signature
+      Config.instance.storage.delete cache_key
     end
     
     def save
@@ -68,7 +68,7 @@ module LockMethod
       self.thread_object_id
       self.expiry
       # --
-      Config.instance.storage.set method_signature, to_hash, ttl
+      Config.instance.storage.set cache_key, to_hash, ttl
     end
     
     def to_hash
@@ -79,11 +79,15 @@ module LockMethod
     end
     
     def locked?
-      if existing_lock = Lock.find(method_signature)
+      if existing_lock = Lock.find(cache_key)
         existing_lock.in_force?
       end
     end
     
+    def cache_key
+      [ 'LockMethod', 'Lock', method_signature ].join ','
+    end
+    
     def in_force?
       not expired? and process_and_thread_still_exist?
     end

data/lib/lock_method/version.rb

@@ -1,3 +1,3 @@
 module LockMethod
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/lock_method.rb

@@ -13,13 +13,13 @@ module LockMethod
     Config.instance
   end
   
-  # All Objects, including instances and Classes, get the <tt>#clear_lock</tt> method.
+  # All Objects, including instances and Classes, get the <tt>#clear_method_lock</tt> method.
   module InstanceMethods
     # Clear the lock for a particular method.
     #
     # Example:
-    #     my_blog.clear_lock :get_latest_entries
-    def clear_lock(method_id)
+    #     my_blog.clear_method_lock :get_latest_entries
+    def clear_method_lock(method_id)
       lock = ::LockMethod::Lock.new :obj => self, :method_id => method_id
       lock.delete
     end

data/test/shared_tests.rb

@@ -116,7 +116,7 @@ module SharedTests
     end
   
     # but now we clear the lock
-    new_instance_of_my_blog.clear_lock :get_latest_entries
+    new_instance_of_my_blog.clear_method_lock :get_latest_entries
     assert_nothing_raised do
       new_instance_of_my_blog.get_latest_entries
     end
@@ -136,7 +136,7 @@ module SharedTests
     end
     
     # but now we clear the lock
-    Blog2.clear_lock :get_latest_entries
+    Blog2.clear_method_lock :get_latest_entries
     assert_nothing_raised do
       Blog2.get_latest_entries
     end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -06:00
+date: 2011-02-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency