lock_method 0.2.1 → 0.3.0

data/lib/lock_method/lock.rb

@@ -14,16 +14,6 @@ module LockMethod
       def method_signature(obj, method_id)
         [ klass_name(obj), method_id ].join method_delimiter(obj)
       end
-      def process_alive?(pid)
-        ::Process.kill 0, pid
-      rescue ::Errno::ESRCH
-        false
-      end
-      def thread_alive?(thread_object_id)
-        if thr = ::Thread.list.detect { |t| t.object_id == thread_object_id }
-          thr.status == 'sleep' or thr.status == 'run'
-        end
-      end
     end
 
     attr_reader :obj
@@ -36,8 +26,13 @@ module LockMethod
       options = options.symbolize_keys
       @ttl = options[:ttl]
       @args = options[:args]
+      @spin = options[:spin]
     end
-        
+    
+    def spin?
+      @spin == true
+    end
+    
     def method_signature
       @method_signature ||= Lock.method_signature(obj, method_id)
     end
@@ -46,14 +41,6 @@ module LockMethod
       @ttl ||= Config.instance.default_ttl
     end
     
-    def pid
-      @pid ||= ::Process.pid
-    end
-    
-    def thread_object_id
-      @thread_object_id ||= ::Thread.current.object_id
-    end
-    
     def obj_hash
       @obj_hash ||= obj.respond_to?(:method_lock_hash) ? obj.method_lock_hash : obj.hash
     end
@@ -71,9 +58,7 @@ module LockMethod
     end
     
     def locked?
-      if other_lock = Lock.find(cache_key)
-        other_lock.process_and_thread_still_alive?
-      end
+      !!Lock.find(cache_key)
     end
     
     def cache_key
@@ -84,23 +69,18 @@ module LockMethod
       end
     end
             
-    def process_and_thread_still_alive?
-      if pid == ::Process.pid
-        Lock.thread_alive? thread_object_id
-      else
-        Lock.process_alive? pid
-      end
-    end
-
     def marshal_dump
-      [ pid, thread_object_id ]
+      []
     end
     
     def marshal_load(source)
-      @pid, @thread_object_id = source
+      # nothing
     end
     
     def call_and_lock(*original_method_id_and_args)
+      until !spin? or !locked?
+        ::Kernel.sleep 0.5
+      end
       if locked?
         raise Locked
       else

data/lib/lock_method/version.rb

@@ -1,3 +1,3 @@
 module LockMethod
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/lock_method.rb

@@ -34,7 +34,11 @@ module LockMethod
 
   # All Classes (but not instances), get the <tt>.lock_method</tt> method.
   module ClassMethods
-    # Lock a method. TTL in seconds, defaults to whatever's in LockMethod.config.default_ttl
+    # Lock a method.
+    #
+    # Options:
+    # * <tt>:ttl</tt> TTL in seconds, defaults to whatever's in LockMethod.config.default_ttl
+    # * <tt>:spin</tt> Whether to wait indefinitely for another lock to expire
     #
     # Note 2: Check out LockMethod.config.default_ttl... the default is 24 hours!
     #
@@ -49,12 +53,19 @@ module LockMethod
     #       # if you wanted a different ttl...
     #       # lock_method :get_latest_entries, 800 #seconds
     #     end
-    def lock_method(method_id, ttl = nil)
+    def lock_method(*args)
+      options = args.extract_options!
+      options = options.symbolize_keys
+      method_id = args.first
+      if args.last.is_a?(::Numeric)
+        options[:ttl] ||= args.last
+      end
       original_method_id = "_unlocked_#{method_id}"
       alias_method original_method_id, method_id
-      define_method method_id do |*args|
-        lock = ::LockMethod::Lock.new self, method_id, :ttl => ttl, :args => args
-        lock.call_and_lock original_method_id, *args
+      define_method method_id do |*args1|
+        options = options.merge(:args => args1)
+        lock = ::LockMethod::Lock.new self, method_id, options
+        lock.call_and_lock original_method_id, *args1
       end
     end
   end

data/test/helper.rb

@@ -74,6 +74,16 @@ module BlogM
   end
 end
 
+module BlogSpin
+  def self.get_latest_entries
+    sleep 2
+    'danke schoen'
+  end
+  class << self
+    lock_method :get_latest_entries, :spin => true
+  end
+end
+
 class Test::Unit::TestCase
 
 end

data/test/shared_tests.rb

@@ -48,48 +48,6 @@ module SharedTests
     end
   end
   
-  def test_04_locked_by_SIGKILLed_process
-    pid = Kernel.fork { Blog2.get_latest_entries }
-    
-    # give it a bit of time to lock
-    sleep 1
-    
-    # the blocker won't have finished
-    assert_raises(LockMethod::Locked) do
-      Blog2.get_latest_entries
-    end
-  
-    # kill it and then wait for it to be reaped
-    Process.detach pid
-    Process.kill 9, pid
-    sleep 1
-    
-    # now we're sure
-    assert_nothing_raised do
-      Blog2.get_latest_entries
-    end
-  end
-  
-  def test_05_locked_by_killed_thread
-    blocker = Thread.new { Blog2.get_latest_entries }
-  
-    # give it a bit of time to lock
-    sleep 1
-    
-    # the blocker won't have finished
-    assert_raises(LockMethod::Locked) do
-      Blog2.get_latest_entries
-    end
-  
-    # kinda like a SIGKILL
-    blocker.kill
-    
-    # now we're sure
-    assert_nothing_raised do
-      Blog2.get_latest_entries
-    end
-  end
-  
   def test_06_locked_by_normally_finishing_thread
     blocker = Thread.new { Blog2.get_latest_entries }
   
@@ -239,4 +197,13 @@ module SharedTests
     Encoding.default_internal = old_int
     Encoding.default_external = old_ext
   end
+  
+  def test_14_spin
+    pid = Kernel.fork { BlogSpin.get_latest_entries }
+  
+    # give it a bit of time to lock
+    sleep 1
+    
+    assert_equal 'danke schoen', BlogSpin.get_latest_entries
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_method
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cache
-  requirement: &2161845800 !ruby/object:Gem::Requirement
+  requirement: &2153961100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161845800
+  version_requirements: *2153961100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161843720 !ruby/object:Gem::Requirement
+  requirement: &2153960680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161843720
+  version_requirements: *2153960680
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2161841860 !ruby/object:Gem::Requirement
+  requirement: &2153960220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161841860
+  version_requirements: *2153960220
 - !ruby/object:Gem::Dependency
   name: memcached
-  requirement: &2161830720 !ruby/object:Gem::Requirement
+  requirement: &2153959800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161830720
+  version_requirements: *2153959800
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2161830100 !ruby/object:Gem::Requirement
+  requirement: &2153959380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161830100
+  version_requirements: *2153959380
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2161829520 !ruby/object:Gem::Requirement
+  requirement: &2153958940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161829520
+  version_requirements: *2153958940
 description: Like alias_method, but it's lock_method!
 email:
 - seamus@abshere.net