redis-mutex 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/redis/mutex/macro.rb

@@ -17,21 +17,31 @@ class Redis
         end
 
         def method_added(target)
-          return if target.to_s =~ /^auto_mutex_methods.*$/
+          return if target.to_s =~ /^auto_mutex_methods/
           return unless self.auto_mutex_methods[target]
           without_method  = "#{target}_without_auto_mutex"
           with_method     = "#{target}_with_auto_mutex"
+          after_method    = "#{target}_after_failure"
           return if method_defined?(without_method)
+          options = self.auto_mutex_methods[target]
+
+          if options[:after_failure].is_a?(Proc)
+            define_method(after_method, &options[:after_failure])
+          end
 
           define_method(with_method) do |*args|
             key = self.class.name << '#' << target.to_s
-            options = self.class.auto_mutex_methods[target]
+            response = nil
 
             success = Redis::Mutex.lock(key, options) do
-              send(without_method, *args)
+              response = send(without_method, *args)
+            end
+
+            if !success and respond_to?(after_method)
+              response = send(after_method, *args)
             end
 
-            options[:after_failure].call if !success and options[:after_failure]
+            response
           end
 
           alias_method without_method, target

data/redis-mutex.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "redis-mutex"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenn Ejima"]

data/spec/redis_mutex_spec.rb

@@ -78,25 +78,19 @@ describe Redis::Mutex do
 
       class C
         include Redis::Mutex::Macro
-        auto_mutex :run_singularly, :block => 0, :after_failure => lambda { @@failure += 1 }
-        @@success = 0
-        @@failure = 0
+        auto_mutex :run_singularly, :block => 0, :after_failure => lambda {|id| return "failure: #{id}" }
 
-        def run_singularly
+        def run_singularly(id)
           sleep 0.1
-          Thread.exclusive { @@success += 1 }
+          return "success: #{id}"
         end
-
-        def self.success; @@success; end
-        def self.failure; @@failure; end
       end
 
-      t1 = Thread.new { C.new.run_singularly }
-      t2 = Thread.new { C.new.run_singularly }
+      t1 = Thread.new { C.new.run_singularly(1).should == "success: 1" }
+      sleep 0.01 # In most cases t1 wins, but make sure to give it a head start, not exceeding the sleep inside the method
+      t2 = Thread.new { C.new.run_singularly(2).should == "failure: 2" }
       t1.join
       t2.join
-      C.success.should == 1
-      C.failure.should == 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-mutex
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-classy
-  requirement: &2166010020 !ruby/object:Gem::Requirement
+  requirement: &2162029080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166010020
+  version_requirements: *2162029080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166009440 !ruby/object:Gem::Requirement
+  requirement: &2161974220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166009440
+  version_requirements: *2161974220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2166008600 !ruby/object:Gem::Requirement
+  requirement: &2161971780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166008600
+  version_requirements: *2161971780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2166006520 !ruby/object:Gem::Requirement
+  requirement: &2161970380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166006520
+  version_requirements: *2161970380
 description: Distrubuted mutex using Redis
 email: kenn.ejima@gmail.com
 executables: []
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2916954195788433702
+      hash: -2314477826109442509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: