lock_method 0.5.3 → 0.5.4

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.5.4 / 2012-04-18
+
+* Enhancements
+
+  * Simplify and DRY
+
+* Bug fixes
+
+  * Fix redis compat
+
 0.5.3 / 2012-04-17
 
 * Bug fixes

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 gem 'test-unit'
 gem 'dalli'
 gem 'redis'
+gem 'redis-namespace'

data/lib/lock_method.rb

@@ -16,13 +16,51 @@ module LockMethod
   class Locked < ::StandardError
   end
 
-  MUTEX = ::Mutex.new
+  CONFIG_MUTEX = ::Mutex.new
 
   def LockMethod.config #:nodoc:
-    @config || MUTEX.synchronize do
+    @config || CONFIG_MUTEX.synchronize do
       @config ||= Config.new
     end
   end
+
+  def LockMethod.original_method_id(method_id)
+    "_unlocked_#{method_id}"
+  end
+
+  def LockMethod.klass_name(obj)
+    (obj.is_a?(::Class) or obj.is_a?(::Module)) ? obj.to_s : obj.class.to_s
+  end
+
+  def LockMethod.method_delimiter(obj)
+    (obj.is_a?(::Class) or obj.is_a?(::Module)) ? '.' : '#'
+  end
+
+  def LockMethod.method_signature(obj, method_id)
+    [ klass_name(obj), method_id ].join method_delimiter(obj)
+  end
+
+  def LockMethod.resolve_lock(obj)
+    case obj
+    when ::Array
+      obj.map do |v|
+        resolve_lock v
+      end
+    when ::Hash
+      obj.inject({}) do |memo, (k, v)|
+        kk = resolve_lock k
+        vv = resolve_lock v
+        memo[kk] = vv
+        memo
+      end
+    else
+      obj.respond_to?(:as_lock) ? [obj.class.name, obj.as_lock] : obj
+    end
+  end
+
+  def LockMethod.digest(obj)
+    ::Digest::SHA1.hexdigest ::Marshal.dump(resolve_lock(obj))
+  end
   
   # All Objects, including instances and Classes, get the <tt>#lock_method_clear</tt> method.
   module InstanceMethods
@@ -58,17 +96,16 @@ module LockMethod
     #       # lock_method :get_latest_entries, 800 #seconds
     #     end
     def lock_method(*args)
-      options = args.extract_options!
-      options = options.symbolize_keys
+      options = args.extract_options!.symbolize_keys
+      spin = options[:spin]
+      ttl = options[:ttl]
       method_id = args.first
       if args.last.is_a?(::Numeric)
-        options[:ttl] ||= args.last
+        ttl ||= args.last
       end
-      original_method_id = "_unlocked_#{method_id}"
-      alias_method original_method_id, method_id
-      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
+      alias_method LockMethod.original_method_id(method_id), method_id
+      define_method method_id do |*my_args, &blk|
+        lock = ::LockMethod::Lock.new(self, method_id, my_args, ttl, spin, &blk)
         lock.call_and_lock
       end
     end

data/lib/lock_method/default_storage_client.rb

@@ -8,7 +8,7 @@ module LockMethod
       attr_reader :created_at
       attr_reader :ttl
       attr_reader :v
-      def initialize(ttl, v)
+      def initialize(v, ttl)
         @created_at = ::Time.now
         @ttl = ttl.to_f
         @v = v
@@ -18,13 +18,11 @@ module LockMethod
       end
     end
 
-    attr_reader :dir
+    DIR = ::File.join ::Dir.tmpdir, 'lock_method'
 
     def initialize
       @mutex = ::Mutex.new
-      dir = ::File.expand_path ::File.join(::Dir.tmpdir, 'lock_method')
-      ::FileUtils.mkdir(dir) unless ::File.directory?(dir)
-      @dir = dir
+      ::FileUtils.mkdir(DIR) unless ::File.directory?(DIR)
     end
 
     def get(k)
@@ -39,11 +37,11 @@ module LockMethod
     end
   
     def set(k, v, ttl)
-      entry = Entry.new ttl, v
+      entry = Entry.new v, ttl
       @mutex.synchronize do
         ::File.open(path(k), 'wb') do |f|
           f.flock ::File::LOCK_EX
-          f.write ::Marshal.dump entry
+          f.write ::Marshal.dump(entry)
         end
       end
     end
@@ -53,7 +51,7 @@ module LockMethod
     end
   
     def flush
-      ::Dir["#{dir}/*.lock"].each do |path|
+      ::Dir["#{DIR}/*.lock"].each do |path|
         ::FileUtils.rm_f path
       end
     end
@@ -61,7 +59,7 @@ module LockMethod
     private
 
     def path(k)
-      ::File.join dir, "#{::Digest::SHA1.hexdigest(k)}.lock"
+      ::File.join DIR, "#{::Digest::SHA1.hexdigest(k)}.lock"
     end
   end
 end

data/lib/lock_method/lock.rb

@@ -1,80 +1,29 @@
 require 'digest/sha1'
+
 module LockMethod
   class Lock #:nodoc: all
-    class << self
-      def find(cache_key)
-        LockMethod.config.storage.get cache_key
-      end
-      def klass_name(obj)
-        (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) or obj.is_a?(::Module)) ? '.' : '#'
-      end
-      def method_signature(obj, method_id)
-        [ klass_name(obj), method_id ].join method_delimiter(obj)
-      end
-      def resolve_lock(obj)
-        case obj
-        when ::Array
-          obj.map do |v|
-            resolve_lock v
-          end
-        when ::Hash
-          obj.inject({}) do |memo, (k, v)|
-            kk = resolve_lock k
-            vv = resolve_lock v
-            memo[kk] = vv
-            memo
-          end
-        else
-          obj.respond_to?(:as_lock) ? [obj.class.name, obj.as_lock] : obj
-        end
-      end
-    end
-
     attr_reader :obj
     attr_reader :method_id
     attr_reader :args
     attr_reader :blk
     attr_reader :original_method_id
+    attr_reader :method_signature
+    attr_reader :ttl
+    attr_reader :args_digest
 
-    def initialize(obj, method_id, options = {}, &blk)
+    def initialize(obj, method_id, args = nil, ttl = LockMethod.config.default_ttl, spin = false, &blk)
       @mutex = ::Mutex.new
       @obj = obj
       @method_id = method_id
+      @original_method_id = LockMethod.original_method_id method_id
+      @method_signature = LockMethod.method_signature obj, method_id
+      @args = args
+      @args_digest = args.to_a.empty? ? 'empty' : LockMethod.digest(args)
+      @ttl = ttl #!!!!!
+      @spin = spin
       @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?
-      @spin == true
-    end
-    
-    def method_signature
-      @method_signature ||= Lock.method_signature(obj, method_id)
     end
     
-    def ttl
-      @ttl ||= LockMethod.config.default_ttl
-    end
-    
-    def obj_digest
-      @obj_digest || @mutex.synchronize do
-        @obj_digest ||= ::Digest::SHA1.hexdigest(::Marshal.dump(Lock.resolve_lock(obj)))
-      end
-    end
-
-    def args_digest
-      @args_digest || @mutex.synchronize do
-        @args_digest ||= args.to_a.empty? ? 'empty' : ::Digest::SHA1.hexdigest(::Marshal.dump(Lock.resolve_lock(args)))
-      end
-    end
-        
     def delete
       LockMethod.config.storage.delete cache_key
     end
@@ -84,17 +33,9 @@ module LockMethod
     end
     
     def locked?
-      !!Lock.find(cache_key)
+      !!LockMethod.config.storage.get(cache_key)
     end
     
-    def cache_key
-      if obj.is_a?(::Class) or obj.is_a?(::Module)
-        [ 'LockMethod', 'Lock', method_signature, args_digest ].join ','
-      else
-        [ 'LockMethod', 'Lock', method_signature, obj_digest, args_digest ].join ','
-      end
-    end
-            
     def marshal_dump
       []
     end
@@ -118,5 +59,19 @@ module LockMethod
         end
       end
     end
+
+    private
+
+    def cache_key
+      if obj.is_a?(::Class) or obj.is_a?(::Module)
+        [ 'LockMethod', 'Lock', method_signature, args_digest ].join ','
+      else
+        [ 'LockMethod', 'Lock', method_signature, LockMethod.digest(obj), args_digest ].join ','
+      end
+    end
+
+    def spin?
+      @spin == true
+    end
   end
 end

data/lib/lock_method/version.rb

@@ -1,3 +1,3 @@
 module LockMethod
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/test/shared_tests.rb

@@ -159,8 +159,8 @@ module SharedTests
       Blog2.get_latest_entries2
     end
     
-    # but the lock expiry is 1 second, so by 1.2&change we're done
-    sleep 5
+    # but the lock expiry is 5 seconds, so by 5.2&change we're done
+    sleep 3.2
     assert_nothing_raised do
       Blog2.get_latest_entries2
     end

data/test/test_redis_storage.rb

@@ -1,17 +1,16 @@
 require 'helper'
 
-if ENV['REDIS_URL']
-  require 'redis'
-  require 'uri'
+require 'redis'
+require 'redis-namespace'
+require 'uri'
 
-  class TestRedisStorage < Test::Unit::TestCase
-    def setup
-      uri = URI.parse(ENV["REDIS_URL"])
-      my_cache = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
-      my_cache.flushdb
-      LockMethod.config.storage = my_cache
-    end
-    
-    include SharedTests
+class TestRedisStorage < Test::Unit::TestCase
+  def setup
+    # uri = URI.parse(ENV["REDIS_URL"])
+    r = Redis.new#(:host => uri.host, :port => uri.port, :password => uri.password)
+    my_cache = Redis::Namespace.new(:test_lock_method, :redis => r)
+    LockMethod.config.storage = my_cache
   end
+  
+  include SharedTests
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_method
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cache