expirable_locking 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/expirable_locking.gemspec

@@ -0,0 +1,50 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{expirable_locking}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Eric Chapweske"]
+  s.date = %q{2011-03-21}
+  s.description = %q{A tiny ActiveRecord extension for expirable locking.}
+  s.email = %q{eac@zendesk.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "expirable_locking.gemspec",
+     "lib/expirable_locking.rb",
+     "test/expirable_locking_test.rb",
+     "test/helper.rb"
+  ]
+  s.homepage = %q{http://github.com/eac/expirable_locking}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{A tiny ActiveRecord extension for expirable locking.}
+  s.test_files = [
+    "test/expirable_locking_test.rb",
+     "test/helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/expirable_locking.rb

@@ -1,10 +1,13 @@
 module ExpirableLocking
 
   def self.extended(base)
-    base.named_scope :unlocked, lambda {
-      { :conditions => [ "locked_at IS NULL OR locked_at < ?", base.lock_duration.ago ] }
-    }
-    base.send(:include, InstanceMethods)
+    base.class_eval do
+      named_scope :unlocked, lambda {
+        { :conditions => [ "locked_at IS NULL OR locked_at < ?", base.lock_duration.ago ] }
+      }
+
+      include InstanceMethods
+    end
   end
 
   module InstanceMethods
@@ -30,20 +33,50 @@ module ExpirableLocking
   def unlock(record)
     return true if record.destroyed?
 
-    1 == update_all({ :locked_at => nil }, { :id => record, :locked_at => record.locked_at })
+    new_attributes = unlock_attributes
+    if result = (1 == update_all(new_attributes, { :id => record, :locked_at => record.locked_at }))
+
+      new_attributes.each do |key, value|
+        record.write_attribute_without_dirty(key, value)
+      end
+
+    end
+
+    result
   end
 
   # Updates lock timestamp without triggering validations/callbacks.
   def touch_lock(record)
-    locked_at = default_timezone == :utc ? Time.now.utc : Time.now
-    result    = update_all({ :locked_at => locked_at }, { :id => record })
+    new_attributes = lock_attributes
+    result = update_all(new_attributes, { :id => record })
 
     if result == 1
-      record.write_attribute_without_dirty(:locked_at, locked_at)
+      new_attributes.each do |key, value|
+        record.write_attribute_without_dirty(key, value)
+      end
     end
 
     result
   end
 
+  def unlock_attributes
+    lock_attributes.tap do |attributes|
+      attributes.keys.each { |key| attributes[key] = nil }
+    end
+  end
+
+  def lock_attributes
+    locked_at = default_timezone == :utc ? Time.now.utc : Time.now
+
+    Hash.new.tap do |attributes|
+      attributes[:locked_at] = locked_at
+      attributes[:locked_by] = lock_name if method_defined?(:locked_by)
+    end
+  end
+
+  def lock_name
+    "#{`hostname`.chomp}:#{Process.pid}"
+  end
+
 end
 

data/test/expirable_locking_test.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'socket'
 
 class ExpirableLockingTest < ActiveRecord::TestCase
 
@@ -51,6 +52,27 @@ class ExpirableLockingTest < ActiveRecord::TestCase
         assert_equal true, @record.lock_with_expiry
       end
 
+      should "add the name of the locking process" do
+        assert_equal nil, @record.locked_by
+        @model.stubs(:lock_name).returns('host.example:1234')
+        assert @record.lock_with_expiry
+        @record.reload
+
+        assert_equal 'host.example:1234', @record.locked_by
+      end
+
+    end
+
+    context "lock_name" do
+
+      should "include the host name" do
+        assert_match Socket.gethostname, @model.lock_name
+      end
+
+      should "include the pid" do
+        assert_match Process.pid.to_s, @model.lock_name
+      end
+
     end
 
     context "unlocking" do
@@ -82,6 +104,8 @@ class ExpirableLockingTest < ActiveRecord::TestCase
         @record.unlock
 
         assert @model.unlocked.include?(@record)
+        assert_equal nil, @record.locked_at
+        assert_equal nil, @record.locked_by
       end
 
     end
@@ -102,4 +126,3 @@ class ExpirableLockingTest < ActiveRecord::TestCase
   end
 
 end
-

data/test/helper.rb

@@ -24,6 +24,7 @@ ActiveRecord::Schema.define do
     table.timestamps
 
     table.datetime :locked_at
+    table.string   :locked_by
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: expirable_locking
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Eric Chapweske
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -07:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- expirable_locking.gemspec
 - lib/expirable_locking.rb
 - test/expirable_locking_test.rb
 - test/helper.rb
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A tiny ActiveRecord extension for expirable locking.