rufus-jig 0.1.11 → 0.1.12

data/CHANGELOG.txt

@@ -1,6 +1,10 @@
 
 = rufus-jig CHANGELOG.txt
 
+== rufus-jig - 0.1.12    released 2010/01/13
+
+- fixed bug with Couch and delete('missing')
+
 
 == rufus-jig - 0.1.11    released 2010/01/11
 

data/lib/rufus/jig/couch.rb

@@ -84,27 +84,34 @@ module Rufus::Jig
 
     def delete (doc_or_path, rev=nil)
 
-      doc_or_path = { '_id' => doc_or_path, '_rev' => rev } if rev
-
-      r = if doc_or_path.is_a?(String)
+      doc, path, rev = if rev
+        [ { '_id' => doc_or_path, '_rev' => rev }, doc_or_path ]
+      elsif doc_or_path.is_a?(String)
+        [ nil, doc_or_path ]
+      else
+        [ doc_or_path, doc_or_path['_id'] ]
+      end
 
-        @http.delete(adjust(doc_or_path))
+      path = adjust(path)
 
-      else
+      r = if doc
 
         raise(
           ArgumentError.new("cannot delete document without _rev")
-        ) unless doc_or_path['_rev']
+        ) unless doc['_rev']
+
+        rpath = Rufus::Jig::Path.add_params(path, :rev => doc['_rev'])
 
-        path = adjust(doc_or_path['_id'])
-        path = Rufus::Jig::Path.add_params(path, :rev => doc_or_path['_rev'])
+        @http.delete(rpath)
+
+      else
 
         @http.delete(path)
       end
 
       if r == true # conflict
 
-        doc = @http.get(adjust(doc_or_path['_id']))
+        doc = @http.get(path)
         doc ? doc : true
           # returns the doc if present or true if the doc is gone
 

data/lib/rufus/jig/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Jig
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end
 end
 

data/rufus-jig.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-jig}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-13}
   s.description = %q{
     Json Interwebs Get.
 

data/test/ct_1_couchdb.rb

@@ -154,5 +154,19 @@ class CtCouchDbTest < Test::Unit::TestCase
     doc = @c.get('coffee1')
     assert_equal 304, @c.http.last_response.status
   end
+
+  def test_delete_path
+
+    r = @c.delete('coffee1')
+
+    assert_equal(@c.get('coffee1'), r)
+  end
+
+  def test_delete_path_missing
+
+    r = @c.delete('missing')
+
+    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.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +09:00
+date: 2010-01-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency