rufus-cloche 0.1.9 → 0.1.10

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-cloche CHANGELOG.txt
 
 
+== rufus-cloche - 0.1.10    released 2010/01/03
+
+- increased mutex coverage (though flock matters more)
+- now put doesn't touch passed doc unless :update_rev => true
+
+
 == rufus-cloche - 0.1.9    released 2009/12/29
 
 - put returns true when document is gone

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2009-2009, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2009-2010, 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/lib/rufus/cloche.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2009, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2009-2010, 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
@@ -31,6 +31,7 @@ rescue LoadError
   require 'json'
 end
 require 'rufus/json'
+Rufus::Json.detect_backend
 
 
 module Rufus
@@ -42,7 +43,7 @@ module Rufus
   #
   class Cloche
 
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
 
     attr_reader :dir
 
@@ -65,7 +66,10 @@ module Rufus
     #
     # If the put is successful, nil is returned.
     #
-    def put (doc)
+    def put (doc, opts={})
+
+      doc = Rufus::Json.dup(doc) unless opts[:update_rev]
+        # work with a copy, don't touch orgiinal
 
       type, key = doc['type'], doc['_id']
 
@@ -73,19 +77,13 @@ module Rufus
         ArgumentError.new("missing values for keys 'type' and/or '_id'")
       ) if type.nil? || key.nil?
 
-      d, f = path_for(type, key)
-      fn = File.join(d, f)
-
       rev = (doc['_rev'] ||= -1)
 
       raise(
         ArgumentError.new("values for '_rev' must be positive integers")
       ) if rev.class != Fixnum && rev.class != Bignum
 
-      FileUtils.mkdir_p(d) unless File.exist?(d)
-      FileUtils.touch(fn) unless File.exist?(fn)
-
-      lock(fn) do |file|
+      lock(true, type, key) do |file|
 
         cur = do_get(file)
 
@@ -104,8 +102,9 @@ module Rufus
     #
     def get (type, key)
 
-      r = lock(type, key) { |f| do_get(f) }
-      r == true ? nil : r
+      r = lock(false, type, key) { |f| do_get(f) }
+
+      r == false ? nil : r
     end
 
     # Attempts at deleting a document. You have to pass the current version
@@ -127,7 +126,7 @@ module Rufus
 
       type, key = doc['type'], doc['_id']
 
-      lock(type, key) do |f|
+      r = lock(false, type, key) do |f|
 
         cur = do_get(f)
 
@@ -138,9 +137,11 @@ module Rufus
           File.delete(f.path)
           nil
         rescue
-          true
+          false
         end
       end
+
+      r == false ? true : nil
     end
 
     # Given a type, this method will return an array of all the documents for
@@ -217,36 +218,35 @@ module Rufus
       [ File.join(dir_for(type), subdir), "#{nkey}.json" ]
     end
 
-    def file_for (type_or_doc, key)
+    def lock (create, type, key, &block)
 
-      fn = if key
-        File.join(*path_for(type_or_doc, key))
-      elsif type_or_doc.is_a?(String)
-        type_or_doc
-      else # it's a doc (Hash)
-        File.join(*path_for(type_or_doc['type'], type_or_doc['_id']))
-      end
+      @mutex.synchronize do
+        begin
 
-      File.exist?(fn) ? (File.new(fn) rescue nil) : nil
-    end
+          d, f = path_for(type, key)
+          fn = File.join(d, f)
 
-    def lock (type_or_doc, key=nil, &block)
+          if create && ( ! File.exist?(fn))
+            FileUtils.mkdir_p(d) unless File.exist?(d)
+            FileUtils.touch(fn) unless File.exist?(fn)
+          end
 
-      file = file_for(type_or_doc, key)
+          file = File.new(fn) rescue nil
 
-      return true if file.nil?
+          return false if file.nil?
 
-      begin
-        file.flock(File::LOCK_EX)
-        @mutex.synchronize { block.call(file) }
-      ensure
-        begin
-          file.flock(File::LOCK_UN)
-        rescue Exception => e
-          #p [ :lock, @fpath, e ]
-          #e.backtrace.each { |l| puts l }
+          file.flock(File::LOCK_EX)
+          block.call(file)
+
+        ensure
+          begin
+            file.flock(File::LOCK_UN)
+          rescue Exception => e
+            #p [ :lock, @fpath, e ]
+            #e.backtrace.each { |l| puts l }
+          end
+          file.close rescue nil
         end
-        file.close rescue nil
       end
     end
   end

data/rufus-cloche.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-cloche}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2009-12-29}
+  s.date = %q{2010-01-03}
   s.description = %q{
 A very stupid JSON hash store.
 
@@ -33,6 +33,7 @@ Strives to be process-safe and thread-safe.
      "lib/rufus/cloche.rb",
      "rufus-cloche.gemspec",
      "test/bm/bm0.rb",
+     "test/con/put_vs_delete.rb",
      "test/ct_worker.rb",
      "test/ct_writer.rb",
      "test/test.rb"

data/test/con/put_vs_delete.rb

@@ -0,0 +1,31 @@
+
+$:.unshift('lib')
+
+require 'rufus/cloche'
+
+workdir = File.join(File.dirname(__FILE__), '..', '..', 'tcloche')
+
+FileUtils.rm_rf(workdir) rescue nil
+
+C = Rufus::Cloche.new(:dir => workdir)
+
+d = C.get('whatever', 'nada')
+C.delete(d) if d
+
+C.put({ '_id' => 'nada', 'where' => 'London', 'type' => 'whatever' })
+$d = C.get('whatever', 'nada')
+
+Thread.abort_on_exception = true
+
+t1 = Thread.new do
+  p [ Thread.current.object_id, :delete, $d['_rev'], C.delete($d) ]
+end
+t0 = Thread.new do
+  p [ Thread.current.object_id, :put, $d['_rev'], C.put($d) ]
+end
+
+sleep 0.100
+
+p C.get('whatever', 'nada')
+p C.get('whatever', 'nada')
+

data/test/test.rb

@@ -35,9 +35,12 @@ class ClocheTest < Test::Unit::TestCase
 
   def test_put
 
-    r = @c.put({ '_id' => 'john', 'type' => 'person', 'eyes' => 'green' })
+    doc = { '_id' => 'john', 'type' => 'person', 'eyes' => 'green' }
+
+    r = @c.put(doc)
 
     assert_nil r
+    assert_nil doc['_rev']
 
     h = fetch('person', 'john')
     assert_equal 0, h['_rev']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-cloche
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 +09:00
+date: 2010-01-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/rufus/cloche.rb
 - rufus-cloche.gemspec
 - test/bm/bm0.rb
+- test/con/put_vs_delete.rb
 - test/ct_worker.rb
 - test/ct_writer.rb
 - test/test.rb