rufus-cloche 1.0.3 → 1.0.4

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-cloche CHANGELOG.txt
 
 
+== rufus-cloche - 1.0.4    not yet released
+
+- reinforce "gone detection again"
+
+
 == rufus-cloche - 1.0.3    released 2013/02/21
 
 - fix issue when putting a just deleted doc

data/TODO.txt

@@ -9,4 +9,5 @@
 [o] work/msgs/.0/8811-2151883888-1260352977.0.json issue...
 
 [ ] LRU ?
+[ ] do not lock for cloche#get ?
 

data/lib/rufus/cloche.rb

@@ -92,7 +92,7 @@ module Rufus
       ) if rev.class != Fixnum && rev.class != Bignum
 
       r =
-        lock(rev == -1, type, key) do |file|
+        lock(rev == -1 ? :create : :write, type, key) do |file|
 
           cur = do_get(file)
 
@@ -111,7 +111,7 @@ module Rufus
     #
     def get(type, key)
 
-      r = lock(false, type, key) { |f| do_get(f) }
+      r = lock(:read, type, key) { |f| do_get(f) }
 
       r == false ? nil : r
     end
@@ -136,7 +136,7 @@ module Rufus
       type, key = doc['type'], doc['_id']
 
       r =
-        lock(false, type, key) do |f|
+        lock(:delete, type, key) do |f|
 
           cur = do_get(f)
 
@@ -287,7 +287,7 @@ module Rufus
       [ File.join(dir_for(type), subdir), "#{nkey}.json" ]
     end
 
-    def lock(create, type, key, &block)
+    def lock(ltype, type, key, &block)
 
       @mutex.synchronize do
         begin
@@ -295,8 +295,8 @@ module Rufus
           d, f = path_for(type, key)
           fn = File.join(d, f)
 
-          FileUtils.mkdir_p(d) if create && ( ! File.exist?(d))
-          FileUtils.touch(fn) if create && ( ! File.exist?(fn))
+          FileUtils.mkdir_p(d) if ltype == :create && ( ! File.exist?(d))
+          FileUtils.touch(fn) if ltype == :create && ( ! File.exist?(fn))
 
           file = File.new(fn, 'r+') rescue nil
 
@@ -304,7 +304,10 @@ module Rufus
 
           file.flock(File::LOCK_EX) unless @nolock
 
-          7.times { return false unless File.exist?(fn) } unless create
+          if ltype == :write
+            Thread.pass
+            21.times { return false unless File.exist?(fn) }
+          end
             #
             # We got the lock, but is the file still here?
             #

data/lib/rufus/cloche/version.rb

@@ -30,7 +30,7 @@ module Rufus
   #
   class Cloche
 
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-cloche
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-json