gom-couchdb-adapter 0.3.0 → 0.3.1

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

@@ -24,19 +24,22 @@ class GOM::Storage::CouchDB::Adapter < GOM::Storage::Adapter
   def store(draft)
     saver = GOM::Storage::CouchDB::Saver.new @database, draft, revisions, configuration.name
     saver.perform
-    saver.id
+    saver.object_id
   end
 
   def remove(id)
-    remover = GOM::Storage::CouchDB::Remover.new @database, id, revisions
-    remover.perform
+    GOM::Storage::CouchDB::Remover.new(@database, id, revisions).perform
+  end
+
+  def count
+    GOM::Storage::CouchDB::Counter.new(@database).perform
   end
 
   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
-    GOM::Object::Collection.new fetcher
+    GOM::Object::Collection.new fetcher, configuration.name
   end
 
   def revisions

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

@@ -0,0 +1,27 @@
+
+# Fetches the databases document count.
+class GOM::Storage::CouchDB::Counter
+
+  attr_accessor :database
+
+  def initialize(database)
+    @database = database
+  end
+
+  def perform
+    fetch_information
+    fetch_count
+    @count
+  end
+
+  private
+
+  def fetch_information
+    @information = @database.information
+  end
+
+  def fetch_count
+    @count = @information["doc_count"]
+  end
+
+end

data/lib/gom/storage/couchdb/draft/builder.rb

@@ -8,7 +8,7 @@ class GOM::Storage::CouchDB::Draft::Builder
 
   def draft
     initialize_draft
-    set_id
+    set_object_id
     set_class
     set_properties_and_relations
     @draft
@@ -20,8 +20,8 @@ class GOM::Storage::CouchDB::Draft::Builder
     @draft = GOM::Object::Draft.new
   end
 
-  def set_id
-    @draft.id = @document.id
+  def set_object_id
+    @draft.object_id = @document.id
   end
 
   def set_class
@@ -50,7 +50,7 @@ class GOM::Storage::CouchDB::Draft::Builder
   end
 
   def relation_key?(key)
-    key =~ /.+_id$/
+    !!(key =~ /.+_id$/)
   end
 
 end

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

@@ -2,10 +2,10 @@
 # Saves the given draft to a CouchDB document.
 class GOM::Storage::CouchDB::Saver
 
-  attr_reader :id
+  attr_reader :object_id
 
-  def initialize(database, draft, revisions, relation_storage_name)
-    @database, @draft, @revisions, @relation_storage_name = database, draft, revisions, relation_storage_name
+  def initialize(database, draft, revisions, storage_name)
+    @database, @draft, @revisions, @storage_name = database, draft, revisions, storage_name
   end
 
   def perform
@@ -20,8 +20,11 @@ class GOM::Storage::CouchDB::Saver
 
   def initialize_document
     @document = ::CouchDB::Document.new @database
-    draft_id = @draft.id
-    @document.id = draft_id if draft_id
+    object_id = @draft.object_id
+    if object_id
+      @document.id = object_id
+      @document.rev = @revisions[object_id]
+    end
     @document["model_class"] = @draft.class_name
   end
 
@@ -37,7 +40,7 @@ class GOM::Storage::CouchDB::Saver
       @document["#{key}_id"] = if id
                                  id.to_s
                                else
-                                 GOM::Storage.store object, @relation_storage_name
+                                 GOM::Storage.store object, @storage_name
                                  GOM::Object.id object
                                end
     end
@@ -45,7 +48,7 @@ class GOM::Storage::CouchDB::Saver
 
   def save_document
     @document.save
-    @id = @document.id
+    @object_id = @document.id
   end
 
   def store_revision

data/lib/gom/storage/couchdb.rb

@@ -3,6 +3,7 @@ module GOM::Storage::CouchDB
 
   autoload :Adapter, File.join(File.dirname(__FILE__), "couchdb", "adapter")
   autoload :Collection, File.join(File.dirname(__FILE__), "couchdb", "collection")
+  autoload :Counter, File.join(File.dirname(__FILE__), "couchdb", "counter")
   autoload :Fetcher, File.join(File.dirname(__FILE__), "couchdb", "fetcher")
   autoload :Draft, File.join(File.dirname(__FILE__), "couchdb", "draft")
   autoload :Saver, File.join(File.dirname(__FILE__), "couchdb", "saver")

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

@@ -114,9 +114,9 @@ describe GOM::Storage::CouchDB::Adapter do
 
       @draft = mock GOM::Object::Draft
       @revisions = @adapter.send :revisions
-      @id = "test_object_1"
+      @object_id = "object_1"
 
-      @saver = mock GOM::Storage::CouchDB::Saver, :perform => nil, :id => @id
+      @saver = mock GOM::Storage::CouchDB::Saver, :perform => nil, :object_id => @object_id
       GOM::Storage::CouchDB::Saver.stub(:new).and_return(@saver)
     end
 
@@ -131,7 +131,7 @@ describe GOM::Storage::CouchDB::Adapter do
     end
 
     it "should return the draft" do
-      @adapter.store(@draft).should == @id
+      @adapter.store(@draft).should == @object_id
     end
 
   end
@@ -160,6 +160,32 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
+  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)
+    end
+
+    it "should initialize the counter" do
+      GOM::Storage::CouchDB::Counter.should_receive(:new).with(@database).and_return(@counter)
+      @adapter.count
+    end
+
+    it "should perform a count" do
+      @counter.should_receive(:perform)
+      @adapter.count
+    end
+
+    it "should return the count" do
+      count = @adapter.count
+      count.should == 1
+    end
+
+  end
+
   describe "collection" do
 
     before :each do
@@ -196,7 +222,7 @@ describe GOM::Storage::CouchDB::Adapter do
     end
 
     it "should initialize a collection with the fetcher" do
-      GOM::Object::Collection.should_receive(:new).with(@fetcher).and_return(@collection)
+      GOM::Object::Collection.should_receive(:new).with(@fetcher, "test_storage").and_return(@collection)
       @adapter.collection :test_view, @options
     end
 

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

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::CouchDB::Counter do
+
+  before :each do
+    @database = mock CouchDB::Database, :information => { "doc_count" => 1 }
+
+    @counter = described_class.new @database
+  end
+
+  describe "perform" do
+
+    it "should fetch database information" do
+      @counter.perform
+    end
+
+    it "should return the document count" do
+      count = @counter.perform
+      count.should == 1
+    end
+
+  end
+
+end

data/spec/lib/gom/storage/couchdb/draft/builder_spec.rb

@@ -10,9 +10,9 @@ describe GOM::Storage::CouchDB::Draft::Builder do
 
   describe "draft" do
 
-    it "should set the id" do
+    it "should set the object id" do
       draft = @builder.draft
-      draft.id.should == "test_document_1"
+      draft.object_id.should == "test_document_1"
     end
 
     it "should set the class" do

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

@@ -4,17 +4,17 @@ describe GOM::Storage::CouchDB::Saver do
 
   before :each do
     @database = mock CouchDB::Database
-    @draft = GOM::Object::Draft.new "test_object_1"
-    @revisions = mock Hash, :[]= => nil
-    @relation_storage_name = "test_storage"
+    @draft = GOM::Object::Draft.new "object_1"
+    @revisions = { "object_1" => 1 }
+    @storage_name = "test_storage"
 
-    @saver = described_class.new @database, @draft, @revisions, @relation_storage_name
+    @saver = described_class.new @database, @draft, @revisions, @storage_name
   end
 
   describe "perform" do
 
     before :each do
-      @document = mock CouchDB::Document, :[]= => nil, :id= => nil, :save => true, :id => "test_object_1", :rev => 1
+      @document = mock CouchDB::Document, :[]= => nil, :id= => nil, :save => true, :id => "object_1", :rev => 2, :rev= => nil
       CouchDB::Document.stub(:new).and_return(@document)
     end
 
@@ -23,6 +23,38 @@ describe GOM::Storage::CouchDB::Saver do
       @saver.perform
     end
 
+    it "should set the id" do
+      @document.should_receive(:id=).with("object_1")
+      @saver.perform
+    end
+
+    it "should set the revision" do
+      @document.should_receive(:rev=).with(1)
+      @saver.perform
+    end
+
+    it "should not set the id or revision if not included in the draft" do
+      @document.should_not_receive(:id=)
+      @document.should_not_receive(:rev=)
+      @draft.object_id = nil
+      @saver.perform
+    end
+
+    it "should save the document" do
+      @document.should_receive(:save).and_return(true)
+      @saver.perform
+    end
+
+    it "should store the revision" do
+      @saver.perform
+      @revisions.should == { "object_1" => 2 }
+    end
+
+    it "should return the (new) object id" do
+      @saver.perform
+      @saver.object_id.should == "object_1"
+    end
+
     context "draft with properties" do
 
       before :each do
@@ -40,7 +72,7 @@ describe GOM::Storage::CouchDB::Saver do
 
       before :each do
         @related_object = Object.new
-        @related_object_id = mock GOM::Object::Id, :to_s => "test_storage:test_object_2"
+        @related_object_id = mock GOM::Object::Id, :to_s => "test_storage:object_2"
         @related_object_proxy = mock GOM::Object::Proxy, :id => @related_object_id, :object => @related_object
 
         GOM::Storage.stub(:store)
@@ -50,7 +82,7 @@ describe GOM::Storage::CouchDB::Saver do
       end
 
       it "should set the relations" do
-        @document.should_receive(:[]=).with("related_object_id", "test_storage:test_object_2")
+        @document.should_receive(:[]=).with("related_object_id", "test_storage:object_2")
         @saver.perform
       end
 
@@ -66,32 +98,6 @@ describe GOM::Storage::CouchDB::Saver do
 
     end
 
-    it "should set the id" do
-      @document.should_receive(:id=).with("test_object_1")
-      @saver.perform
-    end
-
-    it "should not set the id if not included in the draft" do
-      @document.should_not_receive(:id=)
-      @draft.id = nil
-      @saver.perform
-    end
-
-    it "should save the document" do
-      @document.should_receive(:save).and_return(true)
-      @saver.perform
-    end
-
-    it "should store the revision" do
-      @revisions.should_receive(:[]=).with("test_object_1", 1)
-      @saver.perform
-    end
-
-    it "should return the (new) object id" do
-      @saver.perform
-      @saver.id.should == "test_object_1"
-    end
-
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -86,32 +86,34 @@ files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/gom/couchdb-adapter.rb
-- lib/gom/storage.rb
-- lib/gom/storage/couchdb.rb
-- lib/gom/storage/couchdb/fetcher.rb
-- lib/gom/storage/couchdb/draft/builder.rb
+- lib/gom/storage/couchdb/adapter.rb
+- lib/gom/storage/couchdb/view/builder.rb
+- lib/gom/storage/couchdb/view/pusher.rb
+- lib/gom/storage/couchdb/counter.rb
 - lib/gom/storage/couchdb/view.rb
 - lib/gom/storage/couchdb/saver.rb
+- lib/gom/storage/couchdb/fetcher.rb
+- lib/gom/storage/couchdb/draft/builder.rb
+- lib/gom/storage/couchdb/draft.rb
 - lib/gom/storage/couchdb/remover.rb
 - lib/gom/storage/couchdb/collection/fetcher.rb
 - lib/gom/storage/couchdb/collection.rb
-- lib/gom/storage/couchdb/view/pusher.rb
-- lib/gom/storage/couchdb/view/builder.rb
-- lib/gom/storage/couchdb/draft.rb
-- lib/gom/storage/couchdb/adapter.rb
-- spec/storage.configuration
+- lib/gom/storage/couchdb.rb
+- lib/gom/couchdb-adapter.rb
+- lib/gom/storage.rb
+- spec/lib/gom/storage/couchdb/fetcher_spec.rb
+- spec/lib/gom/storage/couchdb/view/pusher_spec.rb
+- spec/lib/gom/storage/couchdb/view/builder_spec.rb
 - spec/lib/gom/storage/couchdb/draft/builder_spec.rb
+- spec/lib/gom/storage/couchdb/counter_spec.rb
 - spec/lib/gom/storage/couchdb/collection/fetcher_spec.rb
-- spec/lib/gom/storage/couchdb/adapter_spec.rb
-- spec/lib/gom/storage/couchdb/view/builder_spec.rb
-- spec/lib/gom/storage/couchdb/view/pusher_spec.rb
-- spec/lib/gom/storage/couchdb/fetcher_spec.rb
-- spec/lib/gom/storage/couchdb/saver_spec.rb
 - spec/lib/gom/storage/couchdb/remover_spec.rb
-- spec/acceptance/adapter_spec.rb
-- spec/acceptance/map_reduce_spec.rb
+- spec/lib/gom/storage/couchdb/saver_spec.rb
+- spec/lib/gom/storage/couchdb/adapter_spec.rb
+- spec/storage.configuration
 - spec/spec_helper.rb
+- spec/acceptance/map_reduce_spec.rb
+- spec/acceptance/adapter_spec.rb
 has_rdoc: true
 homepage: http://github.com/phifty/gom-couchdb-adapter
 licenses: []
@@ -145,13 +147,14 @@ signing_key:
 specification_version: 3
 summary: CouchDB storage adapter for the General Object Mapper.
 test_files: 
+- spec/lib/gom/storage/couchdb/fetcher_spec.rb
+- spec/lib/gom/storage/couchdb/view/pusher_spec.rb
+- spec/lib/gom/storage/couchdb/view/builder_spec.rb
 - spec/lib/gom/storage/couchdb/draft/builder_spec.rb
+- spec/lib/gom/storage/couchdb/counter_spec.rb
 - spec/lib/gom/storage/couchdb/collection/fetcher_spec.rb
-- spec/lib/gom/storage/couchdb/adapter_spec.rb
-- spec/lib/gom/storage/couchdb/view/builder_spec.rb
-- spec/lib/gom/storage/couchdb/view/pusher_spec.rb
-- spec/lib/gom/storage/couchdb/fetcher_spec.rb
-- spec/lib/gom/storage/couchdb/saver_spec.rb
 - spec/lib/gom/storage/couchdb/remover_spec.rb
-- spec/acceptance/adapter_spec.rb
+- spec/lib/gom/storage/couchdb/saver_spec.rb
+- spec/lib/gom/storage/couchdb/adapter_spec.rb
 - spec/acceptance/map_reduce_spec.rb
+- spec/acceptance/adapter_spec.rb