rufus-jig 0.1.8 → 0.1.9

data/CHANGELOG.txt

@@ -1,6 +1,12 @@
 
 = rufus-jig CHANGELOG.txt
 
+== rufus-jig - 0.1.9    released 2009/12/29
+
+- Couch now handling conflict re-get by itself
+- :re_put_ok => false option for Rufus::Jig::Couch
+  (refusing puts on deleted documents)
+
 
 == rufus-jig - 0.1.8    released 2009/12/25
 

data/lib/rufus/jig/couch.rb

@@ -49,16 +49,17 @@ module Rufus::Jig
         [ doc_or_path['_id'], doc_or_path ]
       end
 
-      #if opts[:update_rev] && payload.is_a?(Hash) && payload['_rev']
-      #  pre = get(path)
-      #  payload['_rev'] = prev['_rev']
-      #end
+      if @opts[:re_put_ok] == false && payload['_rev']
+        cur = get(path)
+        return true if cur.nil?
+        return cur if cur['_rev'] != payload['_rev']
+      end
 
       path = adjust(path)
 
       r = @http.put(path, payload, :content_type => :json, :cache => false)
 
-      return true if r == true
+      return @http.get(path) if r == true
         # conflict
 
       if opts[:update_rev] && doc_or_path.is_a?(Hash)

data/lib/rufus/jig/version.rb

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

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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-25}
+  s.date = %q{2009-12-29}
   s.description = %q{
     Json Internet Get.
 
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "test/couch_base.rb",
      "test/ct_0_couch.rb",
      "test/ct_1_couchdb.rb",
+     "test/ct_2_couchdb_options.rb",
      "test/server.rb",
      "test/test.rb",
      "test/ut_0_http_get.rb",

data/test/couch_base.rb

@@ -1,6 +1,6 @@
 
 lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$: << lib unless $:.include?(lib)
+$:.unshift(lib) unless $:.include?(lib)
 
 require 'rubygems'
 require 'yajl'

data/test/ct_1_couchdb.rb

@@ -33,7 +33,7 @@ class CtCouchDbTest < Test::Unit::TestCase
     @c.close
   end
 
-  def test_put_doc
+  def test_put
 
     r = @c.put('_id' => 'coffee0', 'type' => 'espresso')
 
@@ -44,11 +44,21 @@ class CtCouchDbTest < Test::Unit::TestCase
     assert_not_nil doc['_rev']
   end
 
-  def test_put_doc_fail
+  def test_put_fail
 
     r = @c.put('_id' => 'coffee1', 'type' => 'espresso')
 
-    assert_equal true, r
+    assert_match /^1-.+$/, r['_rev']
+  end
+
+  def test_put_conflict
+
+    r = @c.put(
+      '_id' => 'coffee1',
+      'type' => 'espresso',
+      '_rev' => '2-47844552aae09c41a0ffffffffffffff')
+
+    assert_match /^1-.+$/, r['_rev']
   end
 
   def test_put_update_rev
@@ -73,21 +83,35 @@ class CtCouchDbTest < Test::Unit::TestCase
     assert_not_equal rev, doc['_rev']
   end
 
-  def test_get_doc
+  def test_re_put
+
+    doc = @c.get('coffee1')
+    @c.delete(doc)
+
+    assert_nil @c.get('coffee1')
+
+    doc['whatever'] = 'else'
+
+    r = @c.put(doc)
+
+    assert_not_nil @c.get('coffee1')['_rev']
+  end
+
+  def test_get
 
     doc = @c.get('coffee1')
 
     assert_not_nil doc['_rev']
   end
 
-  def test_get_missing_doc
+  def test_get_404
 
     doc = @c.get('tea0')
 
     assert_nil doc
   end
 
-  def test_delete_doc
+  def test_delete
 
     doc = @c.get('coffee1')
 
@@ -99,7 +123,7 @@ class CtCouchDbTest < Test::Unit::TestCase
       Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/coffee1'))
   end
 
-  def test_delete_doc_2_args
+  def test_delete_2_args
 
     doc = @c.get('coffee1')
 
@@ -109,7 +133,7 @@ class CtCouchDbTest < Test::Unit::TestCase
       Rufus::Jig::Http.new('127.0.0.1', 5984).get('/rufus_jig_test/coffee1'))
   end
 
-  def test_delete_doc_fail
+  def test_delete_conflict
 
     doc = @c.get('coffee1')
 

data/test/ct_2_couchdb_options.rb

@@ -0,0 +1,51 @@
+
+#
+# testing rufus-jig
+#
+# Tue Dec 29 14:45:22 JST 2009
+#
+
+require File.join(File.dirname(__FILE__), 'couch_base')
+
+
+class CtCouchDbOptionsTest < Test::Unit::TestCase
+
+  def setup
+
+    h = Rufus::Jig::Http.new('127.0.0.1', 5984)
+
+    begin
+      h.delete('/rufus_jig_test')
+    rescue Exception => e
+      #p e
+    end
+
+    h.put('/rufus_jig_test', '')
+    h.put('/rufus_jig_test/coffee1', '{"_id":"coffee1","type":"ristretto"}')
+
+    h.close
+
+    @c = Rufus::Jig::Couch.new(
+      '127.0.0.1', 5984, 'rufus_jig_test', :re_put_ok => false)
+  end
+
+  def teardown
+
+    @c.close
+  end
+
+  def test_put_gone
+
+    doc = @c.get('coffee1')
+    @c.delete(doc)
+
+    assert_nil @c.get('coffee1')
+
+    doc['whatever'] = 'else'
+
+    r = @c.put(doc)
+
+    assert_equal true, r
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-jig
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 +09:00
+date: 2009-12-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - test/couch_base.rb
 - test/ct_0_couch.rb
 - test/ct_1_couchdb.rb
+- test/ct_2_couchdb_options.rb
 - test/server.rb
 - test/test.rb
 - test/ut_0_http_get.rb