lock_method 0.1.2 → 0.1.3

data/README.rdoc

@@ -28,6 +28,10 @@ Just in case, you can clear them
 
     my_blog.clear_method_lock :get_latest_entries
 
+== Real-world usage
+
+In production use at {carbon.brighterplanet.com}[http://carbon.brighterplanet.com], the Brighter Planet emission estimate web service.
+
 == 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.
@@ -44,6 +48,10 @@ Ideally, you should try to make a <tt>String</tt> or a <tt>Hash</tt> and call th
 
 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."
 
+== Defining #method_lock_hash instead of #hash
+
+If you don't want to modify #hash, you can use #method_lock_hash instead.
+
 == Configuration (and supported cache clients)
 
 The default is to use filesystem lockfiles, usually in <tt>/tmp/lock_method/*</tt>.

data/lib/lock_method.rb

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

data/lib/lock_method/lock.rb

@@ -7,10 +7,10 @@ module LockMethod
         end
       end
       def klass_name(obj)
-        obj.is_a?(::Class) ? obj.to_s : obj.class.to_s
+        (obj.is_a?(::Class) or obj.is_a?(::Module)) ? obj.to_s : obj.class.to_s
       end
       def method_delimiter(obj)
-        obj.is_a?(::Class) ? '.' : '#'
+        (obj.is_a?(::Class) or obj.is_a?(::Module)) ? '.' : '#'
       end
       def method_signature(obj, method_id)
         [ klass_name(obj), method_id ].join method_delimiter(obj)
@@ -85,7 +85,7 @@ module LockMethod
     end
     
     def cache_key
-      if obj.is_a? ::Class
+      if obj.is_a?(::Class) or obj.is_a?(::Module)
         [ 'LockMethod', 'Lock', method_signature ].join ','
       else
         [ 'LockMethod', 'Lock', method_signature, obj_hash ].join ','
@@ -93,7 +93,7 @@ module LockMethod
     end
     
     def obj_hash
-      @obj_hash ||= obj.hash
+      @obj_hash ||= obj.respond_to?(:method_lock_hash) ? obj.method_lock_hash : obj.hash
     end
     
     def in_force?

data/lib/lock_method/version.rb

@@ -1,3 +1,3 @@
 module LockMethod
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/helper.rb

@@ -26,10 +26,19 @@ class Blog1
   end
   lock_method :get_latest_entries2, 5 # second
   def hash
+    raise "Used hash"
+  end
+  def method_lock_hash
     name.hash
   end
 end
 
+class Blog1a < Blog1
+  def method_lock_hash
+    raise "Used method_lock_hash"
+  end
+end
+
 class Blog2
   class << self
     def get_latest_entries
@@ -45,6 +54,21 @@ class Blog2
   end
 end
 
+module BlogM
+  def self.get_latest_entries
+    sleep 8
+    'danke schoen'
+  end
+  def self.get_latest_entries2
+    sleep 8
+    ["voo vaa #{name}"]
+  end
+  class << self
+    lock_method :get_latest_entries
+    lock_method :get_latest_entries2, 5 # second
+  end
+end
+
 class Test::Unit::TestCase
 
 end

data/test/shared_tests.rb

@@ -29,6 +29,25 @@ module SharedTests
     end
   end
   
+    def test_module_method_locked_by_normally_terminating_process
+    pid = Kernel.fork { BlogM.get_latest_entries }
+  
+    # give it a bit of time to lock
+    sleep 1
+    
+    # the blocker won't have finished
+    assert_raises(LockMethod::Locked) do
+      BlogM.get_latest_entries
+    end
+  
+    # let the blocker finish
+    Process.wait pid
+    
+    assert_nothing_raised do
+      BlogM.get_latest_entries
+    end
+  end
+  
   def test_locked_by_SIGKILLed_process
     pid = Kernel.fork { Blog2.get_latest_entries }
     

data/test/test_memcached_storage.rb

@@ -4,7 +4,7 @@ require 'memcached'
 
 class TestMemcachedStorage < Test::Unit::TestCase
   def setup
-    my_cache = Memcached.new 'localhost:11211'
+    my_cache = Memcached.new 'localhost:11211', :retry_timeout => 1, :server_failure_limit => 25
     my_cache.flush
     LockMethod.config.storage = my_cache
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lock_method
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -06:00
+date: 2011-03-12 23:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lock_method
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Lets you lock methods (to memcached, redis, etc.) as though you had a lockfile for each one