gom-couchdb-adapter 0.4.0 → 0.4.1

data/lib/gom/storage/couchdb/adapter.rb

@@ -38,7 +38,7 @@ class GOM::Storage::CouchDB::Adapter < GOM::Storage::Adapter
   def collection(name, options = { })
     view = @design.views[name.to_s]
     raise ViewNotFoundError, "there are no view with the name #{name}" unless view
-    fetcher = GOM::Storage::CouchDB::Collection::Fetcher.new view, options
+    fetcher = GOM::Storage::CouchDB::Collection::Fetcher.new view, revisions, options
     GOM::Object::Collection.new fetcher, configuration.name
   end
 
@@ -46,6 +46,10 @@ class GOM::Storage::CouchDB::Adapter < GOM::Storage::Adapter
     @revisions ||= { }
   end
 
+  def clear_revisions!
+    @revisions = nil
+  end
+
   private
 
   def initialize_server

data/lib/gom/storage/couchdb/collection/fetcher.rb

@@ -2,8 +2,8 @@
 # Fetches a result-set of a CouchDB view and provides it to a GOM collection.
 class GOM::Storage::CouchDB::Collection::Fetcher
 
-  def initialize(view, options)
-    @view, @options = view, options
+  def initialize(view, revisions, options)
+    @view, @revisions, @options = view, revisions, options
   end
 
   def drafts
@@ -26,8 +26,13 @@ class GOM::Storage::CouchDB::Collection::Fetcher
 
   def fetch_drafts
     @drafts = @collection.documents.map do |document|
+      set_revision document
       GOM::Storage::CouchDB::Draft::Builder.new(document).draft
     end
   end
 
+  def set_revision(document)
+    @revisions[document.id] = document.rev
+  end
+
 end

data/spec/acceptance/map_spec.rb

@@ -0,0 +1,64 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "gom", "couchdb-adapter"))
+
+describe "couchdb adapter map collection" do
+
+  before :all do
+    GOM::Storage.setup
+  end
+
+  before :each do
+    @object_one = GOM::Spec::Object.new
+    @object_one.number = 11
+    GOM::Storage.store @object_one, :test_storage
+
+    @object_two = GOM::Spec::Object.new
+    @object_two.number = 18
+    GOM::Storage.store @object_two, :test_storage
+  end
+
+  after :each do
+    GOM::Storage.remove @object_one
+    GOM::Storage.remove @object_two
+  end
+
+  describe "first" do
+
+    before :each do
+      @collection = GOM::Storage.collection :test_storage, :test_map_view
+    end
+
+    it "should return an object" do
+      object = @collection.first
+      object.should be_instance_of(GOM::Spec::Object)
+    end
+
+    it "should return a row with the correct result" do
+      object = @collection.first
+      object.number.should == 11
+    end
+
+  end
+
+  describe "updating a collection object" do
+
+    before :each do
+      # clear all revisions and re-fetch object two to restore that revision
+      GOM::Storage::Configuration[:test_storage].adapter.clear_revisions!
+      GOM::Storage.fetch GOM::Object.id(@object_two)
+
+      @collection = GOM::Storage.collection :test_storage, :test_map_view
+
+      @object = @collection.first
+      @object.number = 21
+      GOM::Storage.store @object
+    end
+
+    it "should have the new values if fetched again" do
+      object = GOM::Storage.fetch GOM::Object.id(@object)
+      object.number.should == 21
+    end
+
+  end
+
+end

data/spec/lib/gom/storage/couchdb/adapter_spec.rb

@@ -4,14 +4,14 @@ describe GOM::Storage::CouchDB::Adapter do
 
   before :each do
     @server = mock CouchDB::Server
-    CouchDB::Server.stub(:new).and_return(@server)
+    CouchDB::Server.stub :new => @server
 
     @database = mock CouchDB::Database, :delete_if_exists! => nil, :create_if_missing! => nil
-    CouchDB::Database.stub(:new).and_return(@database)
+    CouchDB::Database.stub :new => @database
 
     @configuration = mock GOM::Storage::Configuration, :name => "test_storage", :views => :test_views
     @configuration.stub(:[]).with(:database).and_return("test")
-    @configuration.stub(:values_at) do |*arguments|
+    @configuration.stub :values_at do |*arguments|
       result = nil
       result = [ "host", 1234 ] if arguments == [ :host, :port ]
       result = [ true, true ] if arguments == [ :delete_database_if_exists, :create_database_if_missing ]
@@ -20,7 +20,7 @@ describe GOM::Storage::CouchDB::Adapter do
 
     @design = mock CouchDB::Design
     @pusher = mock GOM::Storage::CouchDB::View::Pusher, :perform => nil, :design => @design
-    GOM::Storage::CouchDB::View::Pusher.stub(:new).and_return(@pusher)
+    GOM::Storage::CouchDB::View::Pusher.stub :new => @pusher
 
     @adapter = described_class.new @configuration
   end
@@ -29,7 +29,7 @@ describe GOM::Storage::CouchDB::Adapter do
     GOM::Storage::Adapter[:couchdb].should == GOM::Storage::CouchDB::Adapter
   end
 
-  describe "setup" do
+  describe "#setup" do
 
     it "should initialize a server" do
       CouchDB::Server.should_receive(:new).with("host", 1234).and_return(@server)
@@ -63,7 +63,7 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
-  describe "teardown" do
+  describe "#teardown" do
 
     before :each do
       @adapter.setup
@@ -83,7 +83,7 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
-  describe "fetch" do
+  describe "#fetch" do
 
     before :each do
       @adapter.setup
@@ -93,7 +93,7 @@ describe GOM::Storage::CouchDB::Adapter do
       @draft = mock GOM::Object::Draft
 
       @fetcher = mock GOM::Storage::CouchDB::Fetcher, :draft => @draft
-      GOM::Storage::CouchDB::Fetcher.stub(:new).and_return(@fetcher)
+      GOM::Storage::CouchDB::Fetcher.stub :new => @fetcher
     end
 
     it "should initialize the fetcher" do
@@ -107,7 +107,7 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
-  describe "store" do
+  describe "#store" do
 
     before :each do
       @adapter.setup
@@ -117,7 +117,7 @@ describe GOM::Storage::CouchDB::Adapter do
       @object_id = "object_1"
 
       @saver = mock GOM::Storage::CouchDB::Saver, :perform => nil, :object_id => @object_id
-      GOM::Storage::CouchDB::Saver.stub(:new).and_return(@saver)
+      GOM::Storage::CouchDB::Saver.stub :new => @saver
     end
 
     it "should initialize the saver" do
@@ -136,7 +136,7 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
-  describe "remove" do
+  describe "#remove" do
 
     before :each do
       @adapter.setup
@@ -145,7 +145,7 @@ describe GOM::Storage::CouchDB::Adapter do
       @revisions = @adapter.send :revisions
 
       @remover = mock GOM::Storage::CouchDB::Remover, :perform => nil
-      GOM::Storage::CouchDB::Remover.stub(:new).and_return(@remover)
+      GOM::Storage::CouchDB::Remover.stub :new => @remover
     end
 
     it "should initialize the remover" do
@@ -160,13 +160,13 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
-  describe "count" do
+  describe "#count" do
 
     before :each do
       @adapter.setup
 
       @counter = mock GOM::Storage::CouchDB::Counter, :perform => 1
-      GOM::Storage::CouchDB::Counter.stub(:new).and_return(@counter)
+      GOM::Storage::CouchDB::Counter.stub :new => @counter
     end
 
     it "should initialize the counter" do
@@ -186,22 +186,22 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
-  describe "collection" do
+  describe "#collection" do
 
     before :each do
       @adapter.setup
 
       @view = mock CouchDB::Design::View
       @views = mock Hash, :[] => @view
-      @design.stub(:views).and_return(@views)
+      @design.stub :views => @views
 
       @options = mock Hash
 
       @fetcher = mock GOM::Storage::CouchDB::Collection::Fetcher
-      GOM::Storage::CouchDB::Collection::Fetcher.stub(:new).and_return(@fetcher)
+      GOM::Storage::CouchDB::Collection::Fetcher.stub :new => @fetcher
 
       @collection = mock GOM::Object::Collection
-      GOM::Object::Collection.stub(:new).and_return(@collection)
+      GOM::Object::Collection.stub :new => @collection
     end
 
     it "should select the right view" do
@@ -210,14 +210,14 @@ describe GOM::Storage::CouchDB::Adapter do
     end
 
     it "should raise #{described_class::ViewNotFoundError} if the view name is invalid" do
-      @views.stub(:[]).and_return(nil)
+      @views.stub :[] => nil
       lambda do
         @adapter.collection :test_view, @options
       end.should raise_error(described_class::ViewNotFoundError)
     end
 
     it "should initialize a collection fetcher" do
-      GOM::Storage::CouchDB::Collection::Fetcher.should_receive(:new).with(@view, @options).and_return(@fetcher)
+      GOM::Storage::CouchDB::Collection::Fetcher.should_receive(:new).with(@view, @adapter.revisions, @options).and_return(@fetcher)
       @adapter.collection :test_view, @options
     end
 
@@ -233,4 +233,17 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
+  describe "#clear_revisions" do
+
+    before :each do
+      @adapter.revisions[:test] = "value"
+    end
+
+    it "should clear the revisions hash" do
+      @adapter.clear_revisions!
+      @adapter.revisions.should be_empty
+    end
+
+  end
+
 end

data/spec/lib/gom/storage/couchdb/collection/fetcher_spec.rb

@@ -3,21 +3,23 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe GOM::Storage::CouchDB::Collection::Fetcher do
 
   before :each do
-    @document = mock CouchDB::Document
+    @document = mock CouchDB::Document, :id => "document_id", :rev => "document_rev"
     @documents = [ @document ]
     @collection = mock CouchDB::Collection, :documents => @documents
     @view = mock CouchDB::Design::View, :reduce => nil, :collection => @collection
     @options = mock Hash
 
+    @revisions = { }
+
     @draft = mock GOM::Object::Draft
 
     @builder = mock GOM::Storage::CouchDB::Draft::Builder, :draft => @draft
-    GOM::Storage::CouchDB::Draft::Builder.stub(:new).and_return(@builder)
+    GOM::Storage::CouchDB::Draft::Builder.stub :new => @builder
 
-    @fetcher = described_class.new @view, @options
+    @fetcher = described_class.new @view, @revisions, @options
   end
 
-  describe "drafts" do
+  describe "#drafts" do
 
     context "with a view that don't has a reduce function" do
 
@@ -31,6 +33,11 @@ describe GOM::Storage::CouchDB::Collection::Fetcher do
         @fetcher.drafts
       end
 
+      it "should set the revisions" do
+        @fetcher.drafts
+        @revisions["document_id"].should == "document_rev"
+      end
+
       it "should return an array of drafts" do
         drafts = @fetcher.drafts
         drafts.should == [ @draft ]
@@ -41,7 +48,7 @@ describe GOM::Storage::CouchDB::Collection::Fetcher do
     context "with a view that has a reduce function" do
 
       before :each do
-        @view.stub(:reduce).and_return(:test_reduce_function)
+        @view.stub :reduce => :test_reduce_function
       end
 
       it "should return nil" do
@@ -53,7 +60,7 @@ describe GOM::Storage::CouchDB::Collection::Fetcher do
 
   end
 
-  describe "rows" do
+  describe "#rows" do
 
     it "should return the original couchdb collection" do
       rows = @fetcher.rows

metadata

@@ -2,7 +2,7 @@
 name: gom-couchdb-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +02:00
+date: 2011-05-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - spec/lib/gom/storage/couchdb/saver_spec.rb
 - spec/lib/gom/storage/couchdb/adapter_spec.rb
 - spec/spec_helper.rb
+- spec/acceptance/map_spec.rb
 - spec/acceptance/map_reduce_spec.rb
 - spec/acceptance/adapter_spec.rb
 has_rdoc: true
@@ -134,5 +135,6 @@ test_files:
 - spec/lib/gom/storage/couchdb/remover_spec.rb
 - spec/lib/gom/storage/couchdb/saver_spec.rb
 - spec/lib/gom/storage/couchdb/adapter_spec.rb
+- spec/acceptance/map_spec.rb
 - spec/acceptance/map_reduce_spec.rb
 - spec/acceptance/adapter_spec.rb