rufus-cloche 1.0.2 → 1.0.3

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-cloche CHANGELOG.txt
 
 
+== rufus-cloche - 1.0.3    released 2013/02/21
+
+- fix issue when putting a just deleted doc
+- standardish (no space before "(" in method signature)
+
+
 == rufus-cloche - 1.0.2    released 2012/02/27
 
 - only making sure the .gemspec doesn't require any file

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2009-2012, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2009-2013, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -4,7 +4,8 @@ require 'rubygems/user_interaction' if Gem::RubyGemsVersion == '1.5.0'
 
 require 'rake'
 require 'rake/clean'
-require 'rake/rdoctask'
+
+require 'rdoc/task'
 
 
 #

data/lib/rufus/cloche/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2009-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ module Rufus
   #
   class Cloche
 
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end
 

data/lib/rufus/cloche.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2009-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,8 @@
 require 'thread'
 require 'fileutils'
 
-require 'rufus-json'
-Rufus::Json.detect_backend
+#require 'rufus-json/automatic'
+  # best left to the code using rufus-cloche, not to rufus-cloche itself
 
 require 'rufus/cloche/version'
 
@@ -53,7 +53,7 @@ module Rufus
     #
     # On the Windows platform, :nolock is set to true automatically.
     #
-    def initialize (opts={})
+    def initialize(opts={})
 
       @dir = File.expand_path(opts[:dir] || 'cloche')
       @mutex = Mutex.new
@@ -72,7 +72,7 @@ module Rufus
     #
     # If the put is successful, nil is returned.
     #
-    def put (doc, opts={})
+    def put(doc, opts={})
 
       opts = opts.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
 
@@ -91,24 +91,25 @@ module Rufus
         ArgumentError.new("values for '_rev' must be positive integers")
       ) if rev.class != Fixnum && rev.class != Bignum
 
-      lock(true, type, key) do |file|
+      r =
+        lock(rev == -1, type, key) do |file|
 
-        cur = do_get(file)
+          cur = do_get(file)
 
-        return cur if cur && cur['_rev'] != doc['_rev']
-        return true if cur.nil? && doc['_rev'] != -1
+          return cur if cur && cur['_rev'] != doc['_rev']
+          return true if cur.nil? && doc['_rev'] != -1
 
-        doc['_rev'] = doc['_rev'] + 1
+          doc['_rev'] += 1
 
-        File.open(file.path, 'wb') { |io| io.write(Rufus::Json.encode(doc)) }
-      end
+          File.open(file.path, 'wb') { |io| io.write(Rufus::Json.encode(doc)) }
+        end
 
-      nil
+      r == false ? true : nil
     end
 
     # Gets a document (or nil if not found (or corrupted)).
     #
-    def get (type, key)
+    def get(type, key)
 
       r = lock(false, type, key) { |f| do_get(f) }
 
@@ -126,7 +127,7 @@ module Rufus
     #
     # Returns true if the deletion failed.
     #
-    def delete (doc)
+    def delete(doc)
 
       drev = doc['_rev']
 
@@ -134,22 +135,23 @@ module Rufus
 
       type, key = doc['type'], doc['_id']
 
-      r = lock(false, type, key) do |f|
+      r =
+        lock(false, type, key) do |f|
 
-        cur = do_get(f)
+          cur = do_get(f)
 
-        return nil unless cur
-        return cur if cur['_rev'] != drev
+          return nil unless cur
+          return cur if cur['_rev'] != drev
 
-        begin
-          f.close
-          File.delete(f.path)
-          nil
-        rescue Exception => e
-          #p e
-          false
+          begin
+            f.close
+            File.delete(f.path)
+            nil
+          rescue Exception => e
+            #p e
+            false
+          end
         end
-      end
 
       r == false ? true : nil
     end
@@ -169,7 +171,7 @@ module Rufus
     # If :count => true, the query will simply return the number of documents
     # that matched.
     #
-    def get_many (type, regex=nil, opts={})
+    def get_many(type, regex=nil, opts={})
 
       opts = opts.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
 
@@ -186,10 +188,7 @@ module Rufus
       skip = opts['skip']
       count = opts['count'] ? 0 : nil
 
-      files = Dir[File.join(d, '**', '*.json')].sort { |p0, p1|
-        File.basename(p0) <=> File.basename(p1)
-      }
-
+      files = Dir[File.join(d, '**', '*.json')].sort_by { |f| File.basename(f) }
       files = files.reverse if opts['descending']
 
       files.each do |fn|
@@ -225,7 +224,7 @@ module Rufus
 
     # Removes entirely documents of a given type.
     #
-    def purge_type! (type)
+    def purge_type!(type)
 
       FileUtils.rm_rf(dir_for(type))
     end
@@ -234,10 +233,10 @@ module Rufus
     #
     # Warning : trusts the ids to be identical to the filenames
     #
-    def ids (type)
+    def ids(type)
 
-      Dir[File.join(dir_for(type), '**', '*.json')].collect { |p|
-        File.basename(p, '.json')
+      Dir[File.join(dir_for(type), '**', '*.json')].collect { |path|
+        File.basename(path, '.json')
       }.sort
     end
 
@@ -245,7 +244,7 @@ module Rufus
     #
     # Actually reads each file and returns the real _id list
     #
-    def real_ids (type)
+    def real_ids(type)
 
       Dir[File.join(dir_for(type), '**', '*.json')].inject([]) { |a, p|
         doc = do_get(p)
@@ -256,30 +255,30 @@ module Rufus
 
     protected
 
-    def match? (key, regexes)
+    def match?(key, regexes)
 
       regexes.first.is_a?(Regexp) ?
         regexes.find { |regex| regex.match(key) } :
         regexes.find { |s| key[-s.length..-1] == s }
     end
 
-    def self.neutralize (s)
+    def self.neutralize(s)
 
       s.to_s.strip.gsub(/[ \/:;\*\\\+\?]/, '_')
     end
 
-    def do_get (file)
+    def do_get(file)
 
       s = file.is_a?(File) ? file.read : File.read(file)
       Rufus::Json.decode(s) rescue nil
     end
 
-    def dir_for (type)
+    def dir_for(type)
 
       File.join(@dir, Cloche.neutralize(type || 'no_type'))
     end
 
-    def path_for (type, key)
+    def path_for(type, key)
 
       nkey = Cloche.neutralize(key)
 
@@ -288,7 +287,7 @@ module Rufus
       [ File.join(dir_for(type), subdir), "#{nkey}.json" ]
     end
 
-    def lock (create, type, key, &block)
+    def lock(create, type, key, &block)
 
       @mutex.synchronize do
         begin
@@ -296,16 +295,23 @@ module Rufus
           d, f = path_for(type, key)
           fn = File.join(d, f)
 
-          if create && ( ! File.exist?(fn))
-            FileUtils.mkdir_p(d) unless File.exist?(d)
-            FileUtils.touch(fn) unless File.exist?(fn)
-          end
+          FileUtils.mkdir_p(d) if create && ( ! File.exist?(d))
+          FileUtils.touch(fn) if create && ( ! File.exist?(fn))
 
           file = File.new(fn, 'r+') rescue nil
 
           return false if file.nil?
 
           file.flock(File::LOCK_EX) unless @nolock
+
+          7.times { return false unless File.exist?(fn) } unless create
+            #
+            # We got the lock, but is the file still here?
+            #
+            # Asking more than one time, since, at least on OSX snoleo,
+            # File.exist? might say yes for a file just deleted
+            # (by another process)
+
           block.call(file)
 
         ensure

data/rufus-cloche.gemspec

@@ -31,7 +31,7 @@ Strives to be process-safe and thread-safe.
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  s.add_runtime_dependency 'rufus-json', '>= 1.0.1'
+  s.add_runtime_dependency 'rufus-json', '>= 1.0.3'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'json'

data/test/conc/put_vs_delete.rb

@@ -1,7 +1,8 @@
 
 $:.unshift('lib')
 
-require 'rufus/cloche'
+require 'rufus-json/automatic'
+require 'rufus-cloche'
 
 workdir = File.join(File.dirname(__FILE__), '..', '..', 'tcloche')
 

data/test/ct_worker.rb

@@ -1,6 +1,8 @@
 
-require 'rubygems'
-require 'lib/rufus/cloche'
+$:.unshift(File.expand_path('../../lib', __FILE__))
+
+require 'rufus-json/automatic'
+require 'rufus-cloche'
 
 CLO = Rufus::Cloche.new(:dir => 'cloche')
 

data/test/ct_writer.rb

@@ -1,8 +1,14 @@
 
-require 'rubygems'
-require 'lib/rufus/cloche'
+$:.unshift(File.expand_path('../../lib', __FILE__))
+
+require 'rufus-json/automatic'
+require 'rufus-cloche'
 
 CLO = Rufus::Cloche.new(:dir => 'cloche')
+if doc = CLO.get('person', 'john')
+  CLO.delete(doc)
+end
+CLO.put('type' => 'person', '_id' => 'john')
 
 p $$
 

data/test/test.rb

@@ -7,19 +7,13 @@
 
 require 'rubygems'
 
-begin
-  require 'yajl'
-rescue
-  require 'json'
-end
-
-ROOT = File.join(File.dirname(__FILE__), '..')
-
 require 'test/unit'
+require 'rufus-json/automatic'
 
+ROOT = File.join(File.dirname(__FILE__), '..')
 $:.unshift(File.join(ROOT, 'lib'))
 
-require 'rufus/cloche'
+require 'rufus-cloche'
 
 
 class ClocheTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-cloche
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 +09:00
-default_executable: 
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-json
-  requirement: &2153411660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153411660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153411260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153411260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153410760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153410760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "\nA very stupid JSON hash store.\n\nIt's built on top of yajl-ruby
   and File.lock. Defaults to 'json' (or 'json_pure') if yajl-ruby is not present (it's
   probably just a \"gem install yajl-ruby\" away.\n\nStrives to be process-safe and
@@ -70,7 +84,6 @@ files:
 - LICENSE.txt
 - TODO.txt
 - README.rdoc
-has_rdoc: true
 homepage: http://ruote.rubyforge.org
 licenses: []
 post_install_message: 
@@ -91,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: an open source Ruby workflow engine