rufus-jig 0.1.9 → 0.1.10

data/CHANGELOG.txt

@@ -1,6 +1,14 @@
 
 = rufus-jig CHANGELOG.txt
 
+
+== rufus-jig - 0.1.10    released 2010/01/06
+
+- test/con to test/conc (win issue), thanks gauched
+- made net/http Http thread-safe (serialization through synchronization)
+- :re_put_ok => false rework (deleting at first)
+
+
 == rufus-jig - 0.1.9    released 2009/12/29
 
 - Couch now handling conflict re-get by itself

data/CREDITS.txt

@@ -8,3 +8,7 @@ Kenneth Kalmer - http://github.com/kennethkalmer
 
 Torsten Schoenebaum - http://github.com/tosch
 
+== feedback
+
+gauched - http://github.com/gauched
+

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/Rakefile

@@ -26,7 +26,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = 'An HTTP client, greedy with JSON content, GETting conditionally.'
 
   gem.description = %{
-    Json Internet Get.
+    Json Interwebs Get.
 
     An HTTP client, greedy with JSON content, GETting conditionally.
 

data/lib/rufus/jig/couch.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
@@ -50,9 +50,8 @@ module Rufus::Jig
       end
 
       if @opts[:re_put_ok] == false && payload['_rev']
-        cur = get(path)
-        return true if cur.nil?
-        return cur if cur['_rev'] != payload['_rev']
+        rr = delete(path, payload['_rev'])
+        return rr unless rr.nil?
       end
 
       path = adjust(path)
@@ -103,7 +102,16 @@ module Rufus::Jig
         @http.delete(path)
       end
 
-      r == true ? true : nil
+      if r == true # conflict
+
+        doc = @http.get(adjust(doc_or_path['_id']))
+        doc ? doc : true
+          # returns the doc if present or true if the doc is gone
+
+      else # delete is successful
+
+        nil
+      end
     end
 
     protected

data/lib/rufus/jig/http.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
@@ -167,7 +167,7 @@ module Rufus::Jig
 
         return Rufus::Jig.marshal_copy(cached.last) if r.status == 304
         return nil if method == :get && r.status == 404
-        return true if r.status == 409
+        return true if [ 404, 409 ].include?(r.status)
 
         raise @error_class.new(r.status, r.body) \
           if r.status >= 400 && r.status < 600
@@ -457,6 +457,7 @@ elsif defined?( EventMachine::HttpRequest )
 
 else
 
+  require 'thread'
   require 'net/http'
 
   class Rufus::Jig::HttpResponse
@@ -491,6 +492,8 @@ else
       @options[:user_agent] =
         opts[:user_agent] ||
         "#{self.class} #{Rufus::Jig::VERSION} (net/http)"
+
+      @mutex = Mutex.new
     end
 
     protected
@@ -517,16 +520,19 @@ else
 
     def do_request (method, path, data, opts)
 
-      path = '/' if path == ''
+      @mutex.synchronize do
+
+        path = '/' if path == ''
 
-      req = eval("Net::HTTP::#{method.to_s.capitalize}").new(path)
+        req = eval("Net::HTTP::#{method.to_s.capitalize}").new(path)
 
-      req['User-Agent'] = options[:user_agent]
-      opts.each { |k, v| req[k] = v if k.is_a?(String) }
+        req['User-Agent'] = options[:user_agent]
+        opts.each { |k, v| req[k] = v if k.is_a?(String) }
 
-      req.body = data ? data : ''
+        req.body = data ? data : ''
 
-      Rufus::Jig::HttpResponse.new(@http.start { @http.request(req) })
+        Rufus::Jig::HttpResponse.new(@http.start { |h| h.request(req) })
+      end
     end
   end
 

data/lib/rufus/jig/path.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

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end
 end
 

data/lib/rufus/jig.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

data/rufus-jig.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  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", "Kenneth Kalmer"]
-  s.date = %q{2009-12-29}
+  s.date = %q{2010-01-06}
   s.description = %q{
-    Json Internet Get.
+    Json Interwebs Get.
 
     An HTTP client, greedy with JSON content, GETting conditionally.
 
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/rufus/jig/version.rb",
      "rufus-jig.gemspec",
      "test/base.rb",
+     "test/conc/put_vs_delete.rb",
      "test/couch_base.rb",
      "test/ct_0_couch.rb",
      "test/ct_1_couchdb.rb",

data/test/conc/put_vs_delete.rb

@@ -0,0 +1,28 @@
+
+$:.unshift('lib')
+
+require 'patron'
+require 'yajl'
+require 'rufus/jig'
+
+C0 =  Rufus::Jig::Couch.new('127.0.0.1', 5984, 'test0', :re_put_ok => false)
+C1 =  Rufus::Jig::Couch.new('127.0.0.1', 5984, 'test0', :re_put_ok => false)
+
+d = C0.get('nada')
+C0.delete(d) if d
+
+C0.put({ '_id' => 'nada', 'where' => 'London' })
+d = C0.get('nada')
+
+t1 = Thread.new do
+  p [ Thread.current.object_id, :delete, d['_rev'], C1.delete(d) ]
+end
+t0 = Thread.new do
+  p [ Thread.current.object_id, :put, d['_rev'], C0.put(d) ]
+end
+
+sleep 0.500
+
+p C0.get('nada')
+p C1.get('nada')
+

data/test/ct_1_couchdb.rb

@@ -143,7 +143,7 @@ class CtCouchDbTest < Test::Unit::TestCase
 
     r = @c.delete(doc)
 
-    assert_equal true, r
+    assert_equal rev, r['_rev']
   end
 
   def test_get_doc_304

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-jig
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 +09:00
+date: 2010-01-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "\n    Json Internet Get.\n\n    An HTTP client, greedy with JSON content, GETting conditionally.\n\n    Uses Patron and Yajl-ruby whenever possible.\n  "
+description: "\n    Json Interwebs Get.\n\n    An HTTP client, greedy with JSON content, GETting conditionally.\n\n    Uses Patron and Yajl-ruby whenever possible.\n  "
 email: jmettraux@gmail.com
 executables: []
 
@@ -68,6 +68,7 @@ files:
 - lib/rufus/jig/version.rb
 - rufus-jig.gemspec
 - test/base.rb
+- test/conc/put_vs_delete.rb
 - test/couch_base.rb
 - test/ct_0_couch.rb
 - test/ct_1_couchdb.rb