throttler 0.1.1 → 0.1.3

data/lib/throttler.rb

@@ -3,21 +3,24 @@ module Throttler
   require "fileutils"
 
   def throttle(name, interval=1.0)
-    path = "/tmp/.#{name}"
+    begin
+      path = "/tmp/.#{name}"
 
-    FileUtils.touch path unless File.exist? path
+      FileUtils.touch path unless File.exist? path
 
-    file = File.open(path, "r+")
-    file.flock(File::LOCK_EX)
+      file = File.open(path, "r+")
+      file.flock(File::LOCK_EX)
     
-    last = file.gets.to_f || Time.now.to_f - interval
-    sleep [last + interval - Time.now.to_f, 0.0].max
+      last = file.gets.to_f || Time.now.to_f - interval
+      sleep [last + interval - Time.now.to_f, 0.0].max
 
-    yield if block_given?
+      yield if block_given?
 
-    file.rewind
-    file.write(Time.now.to_f)
-    file.flock(File::LOCK_UN)
-    file.close    
+      file.rewind
+      file.write(Time.now.to_f)
+    ensure
+      file.flock(File::LOCK_UN)
+      file.close
+    end
   end
 end

data/spec/throttler_spec.rb

@@ -13,6 +13,10 @@ class Foo
     throttle("baz"){ noop }
   end
 
+  def exceptional
+    throttle("bar"){ raise }
+  end
+
   def noop; end
 end
 
@@ -29,7 +33,7 @@ describe Throttler do
       end
     end
 
-    time.should be_close 2, 0.01
+    time.should be_close 2, 0.1
   end
 
   it "throttles threads" do
@@ -75,4 +79,9 @@ describe Throttler do
 
     count.should eql 6
   end
+
+  it "removes lock if block raises exception" do
+    lambda{ Foo.new.exceptional }.should raise_error
+    File.open("/tmp/.bar") { |f| f.flock(File::LOCK_EX | File::LOCK_NB).should_not be_false }
+  end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: throttler
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Hakan Ensari
+- Piotr Laszewski
 autorequire: 
 bindir: bin
 cert_chain: []