lib/redis/objects/locks.rb in redis-objects-0.3.0 vs lib/redis/objects/locks.rb in redis-objects-0.3.1

@@ -14,26 +14,27 @@
       module ClassMethods
         # Define a new lock.  It will function like a model attribute,
         # so it can be used alongside ActiveRecord/DataMapper, etc.
         def lock(name, options={})
           options[:timeout] ||= 5  # seconds
-          @redis_objects[name] = options.merge(:type => :lock)
+          lock_name = "#{name}_lock"
+          @redis_objects[lock_name.to_sym] = options.merge(:type => :lock)
           if options[:global]
             instance_eval <<-EndMethods
-              def #{name}_lock(&block)
-                @#{name} ||= Redis::Lock.new(field_key(:#{name}_lock, ''), redis, @redis_objects[:#{name}])
+              def #{lock_name}(&block)
+                @#{lock_name} ||= Redis::Lock.new(field_key(:#{lock_name}), redis, @redis_objects[:#{lock_name}])
               end
             EndMethods
             class_eval <<-EndMethods
-              def #{name}_lock(&block)
-                self.class.#{name}(block)
+              def #{lock_name}(&block)
+                self.class.#{lock_name}(block)
               end
             EndMethods
           else
             class_eval <<-EndMethods
-              def #{name}_lock(&block)
-                @#{name} ||= Redis::Lock.new(field_key(:#{name}_lock), redis, self.class.redis_objects[:#{name}])
+              def #{lock_name}(&block)
+                @#{lock_name} ||= Redis::Lock.new(field_key(:#{lock_name}), redis, self.class.redis_objects[:#{lock_name}])
               end
             EndMethods
           end
         end
 
@@ -41,25 +42,26 @@
         # (on any server) will spin waiting for the lock up to the :timeout
         # that was specified when the lock was defined.
         def obtain_lock(name, id, &block)
           verify_lock_defined!(name)
           raise ArgumentError, "Missing block to #{self.name}.obtain_lock" unless block_given?
-          lock_name = field_key("#{name}_lock", id)
-          Redis::Lock.new(lock_name, redis, self.redis_objects[name]).lock(&block)
+          lock_name = "#{name}_lock"
+          Redis::Lock.new(field_key(lock_name, id), redis, @redis_objects[lock_name.to_sym]).lock(&block)
         end
 
         # Clear the lock.  Use with care - usually only in an Admin page to clear
         # stale locks (a stale lock should only happen if a server crashes.)
         def clear_lock(name, id)
           verify_lock_defined!(name)
-          lock_name = field_key("#{name}_lock", id)
-          redis.del(lock_name)
+          redis.del(field_key("#{name}_lock", id))
         end
-        
+
         private
         
         def verify_lock_defined!(name)
-          raise Redis::Objects::UndefinedLock, "Undefined lock :#{name} for class #{self.name}" unless @redis_objects.has_key?(name)
+          unless @redis_objects.has_key?("#{name}_lock".to_sym)
+            raise Redis::Objects::UndefinedLock, "Undefined lock :#{name} for class #{self.name}"
+          end
         end
       end
     end
   end
 end