locker 0.0.2 → 0.0.3

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 /spec/database.yml
+.rvmrc

data/lib/locker/locker.rb

@@ -39,10 +39,12 @@ class Locker
 
     if @locked
       begin
+        parent_thread = Thread.current
+
         renewer = Thread.new do
           while @locked
             sleep @renew_every
-            renew
+            renew(parent_thread)
           end
         end
 
@@ -67,9 +69,9 @@ class Locker
     @locked = update_all(["locked_by = NULL"],["key = ? and locked_by = ?", @key, @identifier])
   end
 
-  def renew
+  def renew(thread=Thread.current)
     @locked = update_all(["locked_until = clock_timestamp() at time zone 'UTC' + #{lock_interval}"], ["key = ? and locked_by = ?", @key, @identifier])
-    raise LockStolen unless @locked
+    thread.raise LockStolen unless @locked
     @locked
   end
 

data/lib/locker/version.rb

@@ -1,3 +1,3 @@
 class Locker
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/locker/locker_spec.rb

@@ -76,6 +76,15 @@ describe Locker do
       lock.update_attribute(:locked_by, "someone else")
       expect{ locker.renew }.to raise_error(Locker::LockStolen)
     end
+
+    it "should raise to the parent thread when the renewer is in a thread and someone steals the lock" do
+      expect do
+        Locker.run("steal me", :renew_every => (0.1).seconds) do
+          Lock.find_by_key("steal me").update_attribute(:locked_by, "contrived example")
+          sleep(0.3)
+        end
+      end.to raise_error(Locker::LockStolen)
+    end
   end
 
   describe "blocking" do

data/spec/spec_helper.rb

@@ -11,14 +11,15 @@ ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.default_timezone = "UTC"
 
 config = YAML.load_file(File.join(File.dirname(__FILE__), 'database.yml'))
-ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
 begin
-  ActiveRecord::Base.establish_connection(config)
-rescue
+  ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
   ActiveRecord::Base.connection.create_database(config['database'], config.merge("encoding" => config['encoding'] || ENV['CHARSET'] || 'utf8'))
-  ActiveRecord::Base.establish_connection(config)
+rescue ActiveRecord::StatementInvalid => e
+  raise unless e.message =~ /database "locker_test" already exists/
 end
 
+ActiveRecord::Base.establish_connection(config)
+
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS locks")
 ActiveRecord::Base.connection.create_table(:locks) do |t|
   t.string :locked_by

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: locker
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nathan Sutton
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: locker
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Locker is a locking mechanism for limiting the concurrency of ruby code using the database.