gom-couchdb-adapter 0.1.0 → 0.2.0

data/README.rdoc

@@ -83,6 +83,10 @@ Since lazy loading is supported, the author will just be fetched on the first ac
 
 ... will invoke another fetch of the author's object.
 
+== Views
+
+This adapter currently supports class and map/reduce views. For documentation see http://github.com/phifty/gom.
+
 == Development
 
 Development has been done test-driven and the code follows at most the Clean Code paradigms. Code smells has been

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

@@ -5,23 +5,22 @@ module GOM
 
     module CouchDB
 
-      # The couchdb storage adapter
+      # The couchdb storage adapter.
       class Adapter < GOM::Storage::Adapter
 
         def setup
           initialize_server
           initialize_database
           setup_database
+          push_design
         end
 
         def fetch(id)
-          fetcher = Fetcher.new @database, id, revisions
-          fetcher.perform
-          fetcher.object_hash
+          Fetcher.new(@database, id, revisions).draft
         end
 
-        def store(object_hash)
-          saver = Saver.new @database, object_hash, revisions, configuration.name
+        def store(draft)
+          saver = Saver.new @database, draft, revisions, configuration.name
           saver.perform
           saver.id
         end
@@ -31,6 +30,13 @@ module GOM
           remover.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 = Collection::Fetcher.new view, options
+          GOM::Object::Collection.new fetcher
+        end
+
         def revisions
           @revisions ||= { }
         end
@@ -51,6 +57,12 @@ module GOM
           @database.create_if_missing! if create_database_if_missing
         end
 
+        def push_design
+          pusher = View::Pusher.new @database, configuration.views
+          pusher.perform
+          @design = pusher.design
+        end
+
       end
 
     end

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

@@ -0,0 +1,49 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module Collection
+
+        # Fetches a result-set of a CouchDB view and provides it to a GOM collection.
+        class Fetcher
+
+          def initialize(view, options)
+            @view, @options = view, options
+          end
+
+          def drafts
+            return nil if @view.reduce
+            fetch_collection
+            fetch_drafts
+            @drafts
+          end
+
+          def rows
+            fetch_collection
+            @collection
+          end
+
+          private
+
+          def fetch_collection
+            @collection = @view.collection @options
+          end
+
+          def fetch_drafts
+            @drafts = @collection.documents.map do |document|
+              GOM::Storage::CouchDB::Draft::Builder.new(document).draft
+            end
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,18 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module Collection
+
+        autoload :Fetcher, File.join(File.dirname(__FILE__), "collection", "fetcher")
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,72 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module Draft
+
+        # Builds a draft out of a CouchDB document.
+        class Builder
+
+          def initialize(document)
+            @document = document
+          end
+
+          def draft
+            initialize_draft
+            set_id
+            set_class
+            set_properties_and_relations
+            @draft
+          end
+
+          private
+
+          def initialize_draft
+            @draft = GOM::Object::Draft.new
+          end
+
+          def set_id
+            @draft.id = @document.id
+          end
+
+          def set_class
+            @draft.class_name = @document["model_class"]
+          end
+
+          def set_properties_and_relations
+            @document.each do |key, value|
+              set_property key, value if property_key?(key)
+              set_relation key, value if relation_key?(key)
+            end
+          end
+
+          def set_property(key, value)
+            @draft.properties[key.to_sym] = value
+          end
+
+          def set_relation(key, value)
+            name = key.sub /_id$/, ""
+            id = GOM::Object::Id.new value
+            @draft.relations[name.to_sym] = GOM::Object::Proxy.new id
+          end
+
+          def property_key?(key)
+            !relation_key?(key) && ![ "_id", "_rev", "model_class" ].include?(key)
+          end
+
+          def relation_key?(key)
+            key =~ /.+_id$/
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,18 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module Draft
+
+        autoload :Builder, File.join(File.dirname(__FILE__), "draft", "builder")
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -5,21 +5,24 @@ module GOM
 
     module CouchDB
 
-      # Fetches a CouchDB document with the given id and returns an object hash.
+      # Fetches a CouchDB document with the given id and returns a draft.
       class Fetcher
 
-        attr_reader :object_hash
+        attr_accessor :database
+        attr_accessor :id
+        attr_accessor :revisions
 
         def initialize(database, id, revisions)
           @database, @id, @revisions = database, id, revisions
         end
 
-        def perform
+        def draft
           initialize_document
           load_document
-          return unless has_object_hash?
-          transfer_properties
-          transfer_class
+          build_draft
+          @draft
+        rescue ::CouchDB::Document::NotFoundError
+          nil
         end
 
         private
@@ -31,49 +34,15 @@ module GOM
 
         def load_document
           @document.load
-          @object_hash = { :id => @document.id }
           set_revision
-        rescue ::CouchDB::Document::NotFoundError
-          @object_hash = nil
         end
 
         def set_revision
           @revisions[@document.id] = @document.rev
         end
 
-        def has_object_hash?
-          !!@object_hash
-        end
-
-        def transfer_properties
-          @document.each do |key, value|
-            set_property key, value if property_key?(key)
-            set_relation key, value if relation_key?(key)
-          end
-        end
-
-        def transfer_class
-          @object_hash[:class] = @document["model_class"]
-        end
-
-        def property_key?(key)
-          !relation_key?(key) && ![ "_id", "_rev", "model_class" ].include?(key)
-        end
-
-        def relation_key?(key)
-          key =~ /.+_id$/
-        end
-
-        def set_property(key, value)
-          @object_hash[:properties] ||= { }
-          @object_hash[:properties][key.to_sym] = value
-        end
-
-        def set_relation(key, value)
-          name = key.sub /_id$/, ""
-          id = GOM::Object::Id.new value
-          @object_hash[:relations] ||= { }
-          @object_hash[:relations][name.to_sym] = GOM::Object::Proxy.new id
+        def build_draft
+          @draft = GOM::Storage::CouchDB::Draft::Builder.new(@document).draft
         end
 
       end

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

@@ -5,13 +5,13 @@ module GOM
 
     module CouchDB
 
-      # Saves the given object hash to a CouchDB document.
+      # Saves the given draft to a CouchDB document.
       class Saver
 
         attr_reader :id
 
-        def initialize(database, object_hash, revisions, relation_storage_name)
-          @database, @object_hash, @revisions, @relation_storage_name = database, object_hash, revisions, relation_storage_name
+        def initialize(database, draft, revisions, relation_storage_name)
+          @database, @draft, @revisions, @relation_storage_name = database, draft, revisions, relation_storage_name
         end
 
         def perform
@@ -26,18 +26,18 @@ module GOM
 
         def initialize_document
           @document = ::CouchDB::Document.new @database
-          @document.id = @object_hash[:id] if @object_hash.has_key?(:id)
-          @document["model_class"] = @object_hash[:class]
+          @document.id = @draft.id if @draft.id
+          @document["model_class"] = @draft.class_name
         end
 
         def set_properties
-          (@object_hash[:properties] || { }).each do |key, value|
+          @draft.properties.each do |key, value|
             @document[key.to_s] = value
           end
         end
 
         def set_relations
-          (@object_hash[:relations] || { }).each do |key, object_proxy|
+          @draft.relations.each do |key, object_proxy|
             id, object = object_proxy.id, object_proxy.object
             @document["#{key}_id"] = if id
                                        id.to_s

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

@@ -0,0 +1,32 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module View
+
+        # Builds a javascript map-reduce-view out of a class view.
+        class Builder
+
+          def initialize(class_view)
+            @class_view = class_view
+          end
+
+          def map_reduce_view
+            GOM::Storage::Configuration::View::MapReduce.new(
+              "function(document) {\n  if (document['model_class'] == '#{@class_view.class_name}') {\n    emit(document['_id'], null);\n  }\n}",
+              nil
+            )
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/gom/storage/couchdb/view/pusher.rb

@@ -0,0 +1,67 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module View
+
+        # A helper to push design documents to the CouchDB server.
+        class Pusher
+
+          attr_reader :design
+
+          def initialize(database, view_hash)
+            @database, @view_hash = database, view_hash
+          end
+
+          def perform
+            initialize_design
+            add_views
+            push_design
+          end
+
+          private
+
+          def initialize_design
+            @design = ::CouchDB::Design.new @database, "gom"
+          end
+
+          def add_views
+            @view_hash.each do |name, view|
+              add_view name.to_s, view
+            end
+          end
+
+          def push_design
+            @design.save
+          end
+
+          def add_view(name, view)
+            case view.class.to_s
+              when "GOM::Storage::Configuration::View::Class"
+                add_view_by_class_view name, view
+              when "GOM::Storage::Configuration::View::MapReduce"
+                add_view_by_map_reduce_view name, view
+            end
+          end
+
+          def add_view_by_class_view(name, class_view)
+            map_reduce_view = Builder.new(class_view).map_reduce_view
+            @design.views << ::CouchDB::Design::View.new(@design, name, map_reduce_view.map, map_reduce_view.reduce)
+          end
+
+          def add_view_by_map_reduce_view(name, map_reduce_view)
+            @design.views << ::CouchDB::Design::View.new(@design, name, map_reduce_view.map, map_reduce_view.reduce)
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,19 @@
+
+module GOM
+
+  module Storage
+
+    module CouchDB
+
+      module View
+
+        autoload :Builder, File.join(File.dirname(__FILE__), "view", "builder")
+        autoload :Pusher, File.join(File.dirname(__FILE__), "view", "pusher")
+
+      end
+
+    end
+
+  end
+
+end

data/lib/gom/storage/couchdb.rb

@@ -6,9 +6,12 @@ module GOM
     module CouchDB
 
       autoload :Adapter, File.join(File.dirname(__FILE__), "couchdb", "adapter")
+      autoload :Collection, File.join(File.dirname(__FILE__), "couchdb", "collection")
       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")
       autoload :Remover, File.join(File.dirname(__FILE__), "couchdb", "remover")
+      autoload :View, File.join(File.dirname(__FILE__), "couchdb", "view")
 
     end
 

data/spec/acceptance/map_reduce_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "couchdb-adapter"))
+
+GOM::Storage::Configuration.read File.join(File.dirname(__FILE__), "..", "storage.configuration")
+
+describe "couchdb adapter map reduce collection" do
+
+  before :all do
+    GOM::Storage.setup
+  end
+
+  before :each do
+    @object_one = Object.new
+    @object_one.instance_variable_set :@number, 11
+    GOM::Storage.store @object_one, :test_storage
+
+    @object_two = Object.new
+    @object_two.instance_variable_set :@number, 18
+    GOM::Storage.store @object_two, :test_storage
+
+    @collection = GOM::Storage.collection :test_storage, :test_map_reduce_view
+  end
+
+  after :each do
+    GOM::Storage.remove @object_one
+    GOM::Storage.remove @object_two
+  end
+
+  describe "first" do
+
+    it "should return a row" do
+      row = @collection.first
+      row.should be_instance_of(CouchDB::Row)
+    end
+
+    it "should return a row with the correct result" do
+      row = @collection.first
+      row.value.should == 29
+    end
+
+  end
+
+end

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

@@ -9,7 +9,7 @@ describe GOM::Storage::CouchDB::Adapter do
     @database = mock CouchDB::Database, :delete_if_exists! => nil, :create_if_missing! => nil
     CouchDB::Database.stub(:new).and_return(@database)
 
-    @configuration = mock GOM::Storage::Configuration, :name => "test_storage"
+    @configuration = mock GOM::Storage::Configuration, :name => "test_storage", :views => :test_views
     @configuration.stub(:[]).with(:database).and_return("test")
     @configuration.stub(:values_at) do |*arguments|
       result = nil
@@ -18,6 +18,10 @@ describe GOM::Storage::CouchDB::Adapter do
       result
     end
 
+    @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)
+
     @adapter = described_class.new @configuration
   end
 
@@ -47,6 +51,16 @@ describe GOM::Storage::CouchDB::Adapter do
       @adapter.setup
     end
 
+    it "should initialize the view pusher" do
+      GOM::Storage::CouchDB::View::Pusher.should_receive(:new).with(@database, :test_views).and_return(@pusher)
+      @adapter.setup
+    end
+
+    it "should push the views" do
+      @pusher.should_receive(:perform)
+      @adapter.setup
+    end
+
   end
 
   describe "fetch" do
@@ -56,9 +70,9 @@ describe GOM::Storage::CouchDB::Adapter do
 
       @id = "test_object_1"
       @revisions = @adapter.send :revisions
-      @object_hash = mock Hash
+      @draft = mock GOM::Object::Draft
 
-      @fetcher = mock GOM::Storage::CouchDB::Fetcher, :perform => nil, :object_hash => @object_hash
+      @fetcher = mock GOM::Storage::CouchDB::Fetcher, :draft => @draft
       GOM::Storage::CouchDB::Fetcher.stub(:new).and_return(@fetcher)
     end
 
@@ -67,13 +81,8 @@ describe GOM::Storage::CouchDB::Adapter do
       @adapter.fetch @id
     end
 
-    it "should perform a fetch" do
-      @fetcher.should_receive(:perform)
-      @adapter.fetch @id
-    end
-
-    it "should return the object_hash" do
-      @adapter.fetch(@id).should == @object_hash
+    it "should return the draft" do
+      @adapter.fetch(@id).should == @draft
     end
 
   end
@@ -83,7 +92,7 @@ describe GOM::Storage::CouchDB::Adapter do
     before :each do
       @adapter.setup
 
-      @object_hash = mock Hash
+      @draft = mock GOM::Object::Draft
       @revisions = @adapter.send :revisions
       @id = "test_object_1"
 
@@ -92,17 +101,17 @@ describe GOM::Storage::CouchDB::Adapter do
     end
 
     it "should initialize the saver" do
-      GOM::Storage::CouchDB::Saver.should_receive(:new).with(@database, @object_hash, @revisions, "test_storage").and_return(@saver)
-      @adapter.store @object_hash
+      GOM::Storage::CouchDB::Saver.should_receive(:new).with(@database, @draft, @revisions, "test_storage").and_return(@saver)
+      @adapter.store @draft
     end
 
     it "should perform a fetch" do
       @saver.should_receive(:perform)
-      @adapter.store @object_hash
+      @adapter.store @draft
     end
 
-    it "should return the object_hash" do
-      @adapter.store(@object_hash).should == @id
+    it "should return the draft" do
+      @adapter.store(@draft).should == @id
     end
 
   end
@@ -131,4 +140,51 @@ describe GOM::Storage::CouchDB::Adapter do
 
   end
 
+  describe "collection" do
+
+    before :each do
+      @adapter.setup
+
+      @view = mock CouchDB::Design::View
+      @views = mock Hash, :[] => @view
+      @design.stub(:views).and_return(@views)
+
+      @options = mock Hash
+
+      @fetcher = mock GOM::Storage::CouchDB::Collection::Fetcher
+      GOM::Storage::CouchDB::Collection::Fetcher.stub(:new).and_return(@fetcher)
+
+      @collection = mock GOM::Object::Collection
+      GOM::Object::Collection.stub(:new).and_return(@collection)
+    end
+
+    it "should select the right view" do
+      @views.should_receive(:[]).with("test_view").and_return(@view)
+      @adapter.collection :test_view, @options
+    end
+
+    it "should raise #{described_class::ViewNotFoundError} if the view name is invalid" do
+      @views.stub(:[]).and_return(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)
+      @adapter.collection :test_view, @options
+    end
+
+    it "should initialize a collection with the fetcher" do
+      GOM::Object::Collection.should_receive(:new).with(@fetcher).and_return(@collection)
+      @adapter.collection :test_view, @options
+    end
+
+    it "should return the collection" do
+      collection = @adapter.collection :test_view, @options
+      collection.should == @collection
+    end
+
+  end
+
 end

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

@@ -0,0 +1,65 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::CouchDB::Collection::Fetcher do
+
+  before :each do
+    @document = mock CouchDB::Document
+    @documents = [ @document ]
+    @collection = mock CouchDB::Collection, :documents => @documents
+    @view = mock CouchDB::Design::View, :reduce => nil, :collection => @collection
+    @options = mock Hash
+
+    @draft = mock GOM::Object::Draft
+
+    @builder = mock GOM::Storage::CouchDB::Draft::Builder, :draft => @draft
+    GOM::Storage::CouchDB::Draft::Builder.stub(:new).and_return(@builder)
+
+    @fetcher = described_class.new @view, @options
+  end
+
+  describe "drafts" do
+
+    context "with a view that don't has a reduce function" do
+
+      it "should pass the options to the collection of the view" do
+        @view.should_receive(:collection).with(@options).and_return(@collection)
+        @fetcher.drafts
+      end
+
+      it "should initialize the draft builder of each document" do
+        GOM::Storage::CouchDB::Draft::Builder.should_receive(:new).with(@document).and_return(@builder)
+        @fetcher.drafts
+      end
+
+      it "should return an array of drafts" do
+        drafts = @fetcher.drafts
+        drafts.should == [ @draft ]
+      end
+
+    end
+
+    context "with a view that has a reduce function" do
+
+      before :each do
+        @view.stub(:reduce).and_return(:test_reduce_function)
+      end
+
+      it "should return nil" do
+        drafts = @fetcher.drafts
+        drafts.should be_nil
+      end
+
+    end
+
+  end
+
+  describe "rows" do
+
+    it "should return the original couchdb collection" do
+      rows = @fetcher.rows
+      rows.should == @collection
+    end
+
+  end
+
+end

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

@@ -0,0 +1,37 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::CouchDB::Draft::Builder do
+
+  before :each do
+    @document = mock CouchDB::Document, :id => "test_document_1", :[] => "Object", :each => nil
+
+    @builder = described_class.new @document
+  end
+
+  describe "draft" do
+
+    it "should set the id" do
+      draft = @builder.draft
+      draft.id.should == "test_document_1"
+    end
+
+    it "should set the class" do
+      draft = @builder.draft
+      draft.class_name.should == "Object"
+    end
+
+    it "should transfer each property" do
+      @document.stub(:each).and_yield("test", "test value")
+      draft = @builder.draft
+      draft.properties.should == { :test => "test value" }
+    end
+
+    it "should transfer each relation" do
+      @document.stub(:each).and_yield("test_id", "test_storage:test_object_2")
+      draft = @builder.draft
+      draft.relations[:test].should be_instance_of(GOM::Object::Proxy)
+    end
+
+  end
+
+end

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

@@ -7,68 +7,47 @@ describe GOM::Storage::CouchDB::Fetcher do
     @id = "test_object_1"
     @revisions = mock Hash, :[]= => nil
 
+    @document = mock CouchDB::Document, :id= => nil, :id => @id, :rev => 1, :load => true
+    CouchDB::Document.stub(:new).and_return(@document)
+
+    @draft = mock GOM::Object::Draft
+    @builder = mock GOM::Storage::CouchDB::Draft::Builder, :draft => @draft
+    GOM::Storage::CouchDB::Draft::Builder.stub(:new).and_return(@builder)
+
     @fetcher = described_class.new @database, @id, @revisions
   end
 
-  describe "perform" do
-
-    before :each do
-      @document = mock CouchDB::Document, :id => "test_object_1", :id= => nil, :rev => 1, :[] => "Object", :load => true
-      @document.stub(:each).and_yield("test", "test value")
-      CouchDB::Document.stub(:new).and_return(@document)
-    end
+  describe "draft" do
 
     it "should initialize a document" do
       CouchDB::Document.should_receive(:new).with(@database).and_return(@document)
-      @fetcher.perform
-    end
-
-    it "should set the id" do
-      @document.should_receive(:id=).with("test_object_1")
-      @fetcher.perform
+      @fetcher.draft
     end
 
     it "should load the document" do
       @document.should_receive(:load).and_return(true)
-      @fetcher.perform
+      @fetcher.draft
     end
 
     it "should store the fetched revision" do
       @revisions.should_receive(:[]=).with(@id, 1)
-      @fetcher.perform
-    end
-
-    it "should transfer the class" do
-      @document.stub(:[]).with("model_class").and_return("Object")
-      @fetcher.perform
-      @fetcher.object_hash.should include(:class => "Object")
-    end
-
-    it "should transfer each property" do
-      @fetcher.perform
-      @fetcher.object_hash.should include(:properties => { :test => "test value" })
+      @fetcher.draft
     end
 
-    it "should transfer each relation" do
-      @document.stub(:each).and_yield("test_id", "test_storage:test_object_2")
-      @fetcher.perform
-      @fetcher.object_hash[:relations][:test].should be_instance_of(GOM::Object::Proxy)
+    it "should initialize the draft builder" do
+      GOM::Storage::CouchDB::Draft::Builder.should_receive(:new).with(@document).and_return(@builder)
+      @fetcher.draft
     end
 
-    it "should return the correct object hash" do
-      @fetcher.perform
-      object_hash = @fetcher.object_hash
-      object_hash.should == {
-        :id => "test_object_1",
-        :class => "Object",
-        :properties => { :test => "test value" }
-      }
+    it "should return the correct draft" do
+      draft = @fetcher.draft
+      draft.should == @draft
     end
 
-    it "should set object hash to nil if document couldn't be loaded" do
+    it "should return nil if document couldn't be loaded" do
       @document.stub(:load).and_raise(CouchDB::Document::NotFoundError)
-      @fetcher.perform
-      @fetcher.object_hash.should be_nil
+      draft = @fetcher.draft
+      draft.should be_nil
     end
 
   end

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

@@ -4,11 +4,11 @@ describe GOM::Storage::CouchDB::Saver do
 
   before :each do
     @database = mock CouchDB::Database
-    @object_hash = { :id => "test_object_1" }
+    @draft = GOM::Object::Draft.new "test_object_1"
     @revisions = mock Hash, :[]= => nil
     @relation_storage_name = "test_storage"
 
-    @saver = described_class.new @database, @object_hash, @revisions, @relation_storage_name
+    @saver = described_class.new @database, @draft, @revisions, @relation_storage_name
   end
 
   describe "perform" do
@@ -23,10 +23,10 @@ describe GOM::Storage::CouchDB::Saver do
       @saver.perform
     end
 
-    context "object hash with properties" do
+    context "draft with properties" do
 
       before :each do
-        @object_hash.merge! :properties => { :test => "test value" }
+        @draft.properties = { :test => "test value" }
       end
 
       it "should set the properties" do
@@ -36,7 +36,7 @@ describe GOM::Storage::CouchDB::Saver do
 
     end
 
-    context "object hash with relations" do
+    context "draft with relations" do
 
       before :each do
         @related_object = Object.new
@@ -46,7 +46,7 @@ describe GOM::Storage::CouchDB::Saver do
         GOM::Storage.stub(:store)
         GOM::Object.stub(:id).and_return(@related_object_id)
 
-        @object_hash.merge! :relations => { :related_object => @related_object_proxy }
+        @draft.relations = { :related_object => @related_object_proxy }
       end
 
       it "should set the relations" do
@@ -71,9 +71,9 @@ describe GOM::Storage::CouchDB::Saver do
       @saver.perform
     end
 
-    it "should not set the id if not included in the object hash" do
+    it "should not set the id if not included in the draft" do
       @document.should_not_receive(:id=)
-      @object_hash.delete :id
+      @draft.id = nil
       @saver.perform
     end
 

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

@@ -0,0 +1,22 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::CouchDB::View::Builder do
+
+  before :each do
+    @class_view = mock GOM::Storage::Configuration::View::Class, :class_name => "Object"
+
+    @builder = described_class.new @class_view
+  end
+
+  describe "map_reduce_view" do
+
+    it "should return a map reduce view that emits all the documents of the given model class" do
+      view = @builder.map_reduce_view
+      view.should be_instance_of(GOM::Storage::Configuration::View::MapReduce)
+      view.map.should == "function(document) {\n  if (document['model_class'] == 'Object') {\n    emit(document['_id'], null);\n  }\n}"
+      view.reduce.should be_nil
+    end
+
+  end
+
+end

data/spec/lib/gom/storage/couchdb/view/pusher_spec.rb

@@ -0,0 +1,64 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::CouchDB::View::Pusher do
+
+  before :each do
+    @database = mock CouchDB::Database
+
+    @class_view = GOM::Storage::Configuration::View::Class.new "Object"
+    @map_reduce_view = GOM::Storage::Configuration::View::MapReduce.new "function(document) { }", "function(key, values) { }"
+    @view_hash = { "test_class_view" => @class_view, "test_map_reduce_view" => @map_reduce_view }
+
+    @pusher = described_class.new @database, @view_hash
+  end
+
+  describe "perform" do
+
+    before :each do
+      @design = mock CouchDB::Design, :views => mock(CouchDB::Design::ViewsProxy, :<< => nil), :save => true
+      CouchDB::Design.stub(:new).and_return(@design)
+
+      @view = mock CouchDB::Design::View
+      CouchDB::Design::View.stub(:new).and_return(@view)
+
+      @class_map_reduce_view = mock GOM::Storage::Configuration::View::MapReduce,
+        :map => "function(document) { }", :reduce => nil
+      @builder = mock GOM::Storage::CouchDB::View::Builder, :map_reduce_view => @class_map_reduce_view
+      GOM::Storage::CouchDB::View::Builder.stub(:new).and_return(@builder)
+    end
+
+    it "should initialize the design document" do
+      CouchDB::Design.should_receive(:new).with(@database, "gom").and_return(@design)
+      @pusher.perform
+    end
+
+    it "should initialize the builder with the class view" do
+      GOM::Storage::CouchDB::View::Builder.should_receive(:new).with(@class_view).and_return(@builder)
+      @pusher.perform
+    end
+
+    it "should use the builder to create a map reduce view out of the class view" do
+      @builder.should_receive(:map_reduce_view).and_return(@class_map_reduce_view)
+      @pusher.perform
+    end
+
+    it "should initialize the created map reduce view" do
+      CouchDB::Design::View.should_receive(:new).with(@design, "test_class_view", "function(document) { }", nil).once.and_return(@view)
+      CouchDB::Design::View.should_receive(:new).once.and_return(@view)
+      @pusher.perform
+    end
+
+    it "should initialize the map reduce view" do
+      CouchDB::Design::View.should_receive(:new).once.and_return(@view)
+      CouchDB::Design::View.should_receive(:new).with(@design, "test_map_reduce_view", "function(document) { }", "function(key, values) { }").and_return(@view)
+      @pusher.perform
+    end
+
+    it "should push the design document" do
+      @design.should_receive(:save).and_return(true)
+      @pusher.perform
+    end
+
+  end
+
+end

data/spec/storage.configuration

@@ -4,3 +4,27 @@ test_storage:
   database: test
   delete_database_if_exists: true
   create_database_if_missing: true
+  views:
+    test_object_class_view:
+      type: class
+      class: Object
+    test_map_view:
+      type: map_reduce
+      map:
+        function(document) {
+          if (document['number'] == 11) {
+            emit(document['_id'], null);
+          }
+        }
+    test_map_reduce_view:
+      type: map_reduce
+      map:
+        function(document) {
+          if (document['number']) {
+            emit(document['_id'], document['number']);
+          }
+        }
+      reduce:
+        function(keys, values, rereduce) {
+          return sum(values);
+        }

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -87,18 +87,30 @@ files:
 - LICENSE
 - Rakefile
 - lib/gom/storage/couchdb/adapter.rb
+- lib/gom/storage/couchdb/view/builder.rb
+- lib/gom/storage/couchdb/view/pusher.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.rb
 - lib/gom/storage.rb
 - lib/couchdb-adapter.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/collection/fetcher_spec.rb
 - 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/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
@@ -134,7 +146,12 @@ 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/collection/fetcher_spec.rb
 - 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_reduce_spec.rb
 - spec/acceptance/adapter_spec.rb