adapter-couch 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adapter-couch (0.1.1)
+    adapter-couch (0.1.2)
       adapter (~> 0.5.1)
       couchrest (~> 1.1.0.pre2)
 

data/examples/couch.rb

@@ -7,7 +7,7 @@ $:.unshift(lib_path)
 
 require 'adapter/couch'
 
-client  = Couch::Connection.new.db('adapter')['testing']
+client  = CouchRest.database!("http://127.0.0.1:5984/adapter-couch-testing")
 adapter = Adapter[:couch].new(client)
 adapter.clear
 

data/lib/adapter/couch.rb

@@ -8,6 +8,7 @@ module Adapter
     def read(key)
       begin
         if doc = client.get(key_for(key))
+          rev_map[key_for(key)] = doc.delete("_rev")
           decode(doc)
         end
       rescue RestClient::ResourceNotFound => e
@@ -16,8 +17,11 @@ module Adapter
     end
 
     def write(key, value)
-      doc = client.save_doc({"_id" => key_for(key)}.merge(encode(value)))
-      doc
+      doc = {"_id" => key_for(key)}.merge(encode(value))
+      doc["_rev"] = rev_map[key_for(key)] if rev_map[key_for(key)]
+      status = client.save_doc(doc)
+      rev_map[key_for(key)] = status["rev"]
+      value
     end
 
     def delete(key)
@@ -42,6 +46,15 @@ module Adapter
       return if value.nil?
       value.key?(NonHashValueKeyName) ? value[NonHashValueKeyName] : value
     end
+    
+    private
+      
+      # we want to hide couchdb's concept of revs behind the scenes. 
+      # This is probably not the best way of doing it and we should clear it out after each request like
+      # ToyStore's identity map
+      def rev_map
+        Thread.current[:couch_adapter_rev_map] ||= {}
+      end
 
   end
 end

data/lib/adapter/couch/version.rb

@@ -1,5 +1,5 @@
 module Adapter
   module Couch
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/couch_spec.rb

@@ -14,8 +14,18 @@ describe "Couch adapter" do
   it_should_behave_like 'a couch adapter'
 
   it "stores hashes right in document" do
-    doc = adapter.write('foo', 'steak' => 'bacon')
-    client.get('foo').should == {'_id' => 'foo', '_rev' => doc['rev'], 'steak' => 'bacon'}
+    adapter.write('foo', 'steak' => 'bacon')
+    client.get('foo').should == {'_id' => 'foo', '_rev' => adapter.send(:rev_map)['foo'], 'steak' => 'bacon'}
+  end
+  
+  it "should save with rev" do
+    adapter.write('foo', 'steak' => 'bacon')
+    lambda { adapter.write('foo', 'steak' => 'ham')}.should_not raise_error(RestClient::Conflict)
+  end
+  
+  it "should load existing and save" do
+    client.save_doc("_id"=>"foo", "steak" => "bacon")
+    doc = adapter.get('foo')
+    lambda { adapter.write('foo', 'steak' => 'ham')}.should_not raise_error(RestClient::Conflict)
   end
-
 end

data/spec/helper.rb

@@ -23,9 +23,9 @@ shared_examples_for "a couch adapter" do
 
   Adapter::Spec::Types.each do |type, (key, key2)|
     it "writes Object values to keys that are #{type}s like a Hash" do
-      v = adapter.write(key, {:foo => :bar})
+      adapter.write(key, {:foo => :bar})
       # couch knows hashes
-      adapter[key].should == {'_id' => 'key', 'foo' => 'bar', '_rev' => v['rev']}
+      adapter[key].should == {'_id' => 'key', 'foo' => 'bar'}
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: adapter-couch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -04:00
+date: 2011-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency