lock_method 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.2 / 2012-04-17
+
+* Enhancements
+
+  * Support locking methods that have block arguments
+
 0.5.1 / 2012-04-17
 
 * Bug fixes

data/lib/lock_method/lock.rb

@@ -36,15 +36,19 @@ module LockMethod
     attr_reader :obj
     attr_reader :method_id
     attr_reader :args
+    attr_reader :blk
+    attr_reader :original_method_id
 
-    def initialize(obj, method_id, options = {})
+    def initialize(obj, method_id, options = {}, &blk)
       @mutex = ::Mutex.new
       @obj = obj
       @method_id = method_id
+      @blk = blk
       options = options.symbolize_keys
       @ttl = options[:ttl]
       @args = options[:args]
       @spin = options[:spin]
+      @original_method_id = options[:original_method_id]
     end
     
     def spin?
@@ -99,7 +103,7 @@ module LockMethod
       # nothing
     end
     
-    def call_and_lock(*original_method_id_and_args)
+    def call_and_lock
       while locked? and spin?
         ::Kernel.sleep 0.5
       end
@@ -108,7 +112,7 @@ module LockMethod
       else
         begin
           save
-          obj.send(*original_method_id_and_args)
+          obj.send(*([original_method_id]+args), &blk)
         ensure
           delete
         end

data/lib/lock_method/version.rb

@@ -1,3 +1,3 @@
 module LockMethod
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/lock_method.rb

@@ -64,10 +64,10 @@ module LockMethod
       end
       original_method_id = "_unlocked_#{method_id}"
       alias_method original_method_id, method_id
-      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))
+      define_method method_id do |*args1, &blk|
+        options1 = options.merge(:args => args1, :original_method_id => original_method_id)
+        lock = ::LockMethod::Lock.new self, method_id, options1, &blk
+        lock.call_and_lock
       end
     end
   end

data/test/helper.rb

@@ -81,6 +81,13 @@ module BlogSpin
   end
 end
 
-class Test::Unit::TestCase
-
+module BlogBlock
+  def self.get_latest_entries
+    sleep 2
+    yield
+    "i yielded"
+  end
+  class << self
+    lock_method :get_latest_entries
+  end
 end

data/test/shared_tests.rb

@@ -206,4 +206,26 @@ module SharedTests
     
     assert_equal 'danke schoen', BlogSpin.get_latest_entries
   end
+
+  def test_15_block
+    blocker = Thread.new do
+      BlogBlock.get_latest_entries { $stderr.write "i'm in the way!" }
+    end
+    
+    # give it a bit of time to lock
+    sleep 1
+    
+    # the blocker won't have finished
+    assert_raises(LockMethod::Locked) do
+      BlogBlock.get_latest_entries { $stderr.write "don't print me" }
+    end
+    
+    # wait to finish
+    blocker.join
+    
+    # now we're sure
+    assert_nothing_raised do
+      BlogBlock.get_latest_entries { $stderr.write "i'm now allowed" }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_method
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors: