lock_method 0.1.0 → 0.1.1

data/README.rdoc

@@ -6,12 +6,17 @@ It's like <tt>alias_method</tt>, but it's <tt>lock_method</tt>!
 
     require 'lock_method'
     class Blog
-      # [...]
+      attr_accessor :url
+      
       def get_latest_entries
         sleep 5
       end
-      # [...]
       lock_method :get_latest_entries
+
+      # used by lock_method to differentiate between instances
+      def hash
+        url.hash
+      end
     end
 
 Then you can do
@@ -23,12 +28,22 @@ Just in case, you can clear them
 
     my_blog.clear_method_lock :get_latest_entries
 
-== One lock per method
+== Ignores arguments when locking a 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.
 
+== Defining #hash
+
+If you want to lock instance methods, you should define <tt>#hash</tt> on those instances.
+
+You should follow Ruby convention and have <tt>#hash</tt> return a <tt>Fixnum</tt>.
+
+Ideally, you should try to make a <tt>String</tt> or a <tt>Hash</tt> and call the standard <tt>#hash</tt> on that.
+
+Note: this is NOT the same thing as <tt>#to_hash</tt>! That returns a <tt>Hash</tt>... but what we want is an integer "hash code."
+
 == Configuration (and supported cache clients)
 
 The default is to use filesystem lockfiles, usually in <tt>/tmp/lock_method/*</tt>.

data/lib/lock_method.rb

@@ -55,5 +55,5 @@ end
 
 unless ::Object.method_defined? :lock_method
   ::Object.send :include, ::LockMethod::InstanceMethods
-  ::Object.extend ::LockMethod::ClassMethods
+  ::Class.send :include, ::LockMethod::ClassMethods
 end

data/lib/lock_method/lock.rb

@@ -85,7 +85,15 @@ module LockMethod
     end
     
     def cache_key
-      [ 'LockMethod', 'Lock', method_signature ].join ','
+      if obj.is_a? ::Class
+        [ 'LockMethod', 'Lock', method_signature ].join ','
+      else
+        [ 'LockMethod', 'Lock', method_signature, obj_hash ].join ','
+      end
+    end
+    
+    def obj_hash
+      @obj_hash ||= obj.hash
     end
     
     def in_force?

data/lib/lock_method/version.rb

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

data/test/helper.rb

@@ -25,6 +25,9 @@ class Blog1
     ["voo vaa #{name}"]
   end
   lock_method :get_latest_entries2, 5 # second
+  def hash
+    name.hash
+  end
 end
 
 class Blog2
@@ -42,13 +45,6 @@ class Blog2
   end
 end
 
-def new_instance_of_my_blog
-  Blog1.new 'my_blog', 'http://my_blog.example.com'
-end
-def new_instance_of_another_blog
-  Blog1.new 'another_blog', 'http://another_blog.example.com'
-end
-
 class Test::Unit::TestCase
 
 end

data/test/shared_tests.rb

@@ -1,3 +1,10 @@
+def new_instance_of_my_blog
+  Blog1.new 'my_blog', 'http://my_blog.example.com'
+end
+def new_instance_of_another_blog
+  Blog1.new 'another_blog', 'http://another_blog.example.com'
+end
+
 module SharedTests
   def test_locked_method_return_value
     assert_equal ["hello from my_blog"], new_instance_of_my_blog.get_latest_entries
@@ -104,6 +111,20 @@ module SharedTests
     end
   end
   
+  def test_instance_method_lock_is_unique_to_instance
+    pid = Kernel.fork { new_instance_of_my_blog.get_latest_entries }
+  
+    # give it a bit of time to lock
+    sleep 1
+    
+    # the blocker won't have finished
+    assert_nothing_raised do
+      new_instance_of_another_blog.get_latest_entries
+    end
+  
+    Process.wait pid
+  end
+  
   def test_clear_instance_method_lock
     pid = Kernel.fork { new_instance_of_my_blog.get_latest_entries }
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lock_method
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -06:00
+date: 2011-03-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency