couchrest_model 1.1.2 → 1.2.0.beta

data/spec/unit/proxyable_spec.rb

@@ -148,141 +148,101 @@ describe CouchRest::Model::Proxyable do
       @klass = CouchRest::Model::Proxyable::ModelProxy
     end
 
-    it "should initialize and set variables" do
-      @obj = @klass.new(Cat, 'owner', 'owner_name', 'database')
-      @obj.model.should eql(Cat)
-      @obj.owner.should eql('owner')
-      @obj.owner_name.should eql('owner_name')
-      @obj.database.should eql('database')
+    before :each do
+      @design_doc = mock('Design')
+      @design_doc.stub!(:view_names).and_return(['all', 'by_name'])
+      @model = mock('Cat')
+      @model.stub!(:design_docs).and_return([@design_doc])
+      @obj = @klass.new(@model, 'owner', 'owner_name', 'database')
     end
 
-    describe "instance" do
+    describe "initialization" do
 
-      before :each do
-        @obj = @klass.new(Cat, 'owner', 'owner_name', 'database')
+      it "should set base attributes" do
+        @obj.model.should eql(@model)
+        @obj.owner.should eql('owner')
+        @obj.owner_name.should eql('owner_name')
+        @obj.database.should eql('database')
       end
 
-      it "should proxy new call" do
-        @obj.should_receive(:proxy_block_update).with(:new, 'attrs', 'opts')
-        @obj.new('attrs', 'opts')
+      it "should create view methods" do
+        @obj.should respond_to('all')
+        @obj.should respond_to('by_name')
+        @obj.should respond_to('find_all')
+        @obj.should respond_to('find_by_name')
       end
 
-      it "should proxy build_from_database" do
-        @obj.should_receive(:proxy_block_update).with(:build_from_database, 'attrs', 'opts')
-        @obj.build_from_database('attrs', 'opts')
+      it "should create 'all' view method that forward to model's view with proxy" do
+        @model.should_receive(:all).with(:proxy => @obj).and_return(nil)
+        @obj.all
       end
 
-      describe "#method_missing" do
-        it "should return design view object" do
-          m = "by_some_property"
-          inst = mock('DesignView')
-          inst.stub!(:proxy).and_return(inst)
-          @obj.should_receive(:has_view?).with(m).and_return(true)
-          Cat.should_receive(:respond_to?).with(m).and_return(true)
-          Cat.should_receive(:send).with(m).and_return(inst)
-          @obj.method_missing(m).should eql(inst)
-        end
+      it "should create 'by_name' view method that forward to model's view with proxy" do
+        @model.should_receive(:by_name).with(:proxy => @obj).and_return(nil)
+        @obj.by_name
+      end
 
-        it "should call view if necessary" do
-          m = "by_some_property"
-          @obj.should_receive(:has_view?).with(m).and_return(true)
-          Cat.should_receive(:respond_to?).with(m).and_return(false)
-          @obj.should_receive(:view).with(m, {}).and_return('view')
-          @obj.method_missing(m).should eql('view')
-        end
+      it "should create 'find_by_name' view that forwards to normal view" do
+        view = mock('view')
+        view.should_receive('key').with('name').and_return(view)
+        view.should_receive('first').and_return(nil)
+        @obj.should_receive(:by_name).and_return(view)
+        @obj.find_by_name('name')
+      end
 
-        it "should provide wrapper for #first_from_view" do
-          m = "find_by_some_property"
-          view = "by_some_property"
-          @obj.should_receive(:has_view?).with(m).and_return(false)
-          @obj.should_receive(:has_view?).with(view).and_return(true)
-          @obj.should_receive(:first_from_view).with(view).and_return('view')
-          @obj.method_missing(m).should eql('view')    
-        end
+    end
 
+    describe "instance" do
+
+      it "should proxy new call" do
+        @obj.should_receive(:proxy_block_update).with(:new, 'attrs', 'opts')
+        @obj.new('attrs', 'opts')
       end
 
-      it "should proxy #all" do
-        Cat.should_receive(:all).with({:database => 'database'})
-        @obj.should_receive(:proxy_update_all)
-        @obj.all
+      it "should proxy build_from_database" do
+        @obj.should_receive(:proxy_block_update).with(:build_from_database, 'attrs', 'opts')
+        @obj.build_from_database('attrs', 'opts')
       end
-  
+
       it "should proxy #count" do
-        Cat.should_receive(:all).with({:database => 'database', :raw => true, :limit => 0}).and_return({'total_rows' => 3})
-        @obj.count.should eql(3)
+        view = mock('View')
+        view.should_receive(:count).and_return(nil)
+        @model.should_receive(:all).and_return(view)
+        @obj.count
       end
 
       it "should proxy #first" do
-        Cat.should_receive(:first).with({:database => 'database'})
-        @obj.should_receive(:proxy_update)
+        view = mock('View')
+        view.should_receive(:first).and_return(nil)
+        @model.should_receive(:all).and_return(view)
         @obj.first
       end
 
       it "should proxy #last" do
-        Cat.should_receive(:last).with({:database => 'database'})
-        @obj.should_receive(:proxy_update)
+        view = mock('View')
+        view.should_receive(:last).and_return(nil)
+        @model.should_receive(:all).and_return(view)
         @obj.last
       end
 
       it "should proxy #get" do
-        Cat.should_receive(:get).with(32, 'database')
+        @model.should_receive(:get).with(32, 'database')
         @obj.should_receive(:proxy_update)
         @obj.get(32)
       end
       it "should proxy #find" do
-        Cat.should_receive(:get).with(32, 'database')
+        @model.should_receive(:get).with(32, 'database')
         @obj.should_receive(:proxy_update)
         @obj.find(32)
       end
 
-      it "should proxy #has_view?" do
-        Cat.should_receive(:has_view?).with('view').and_return(false)
-        @obj.has_view?('view')
-      end
-
-      it "should proxy #view_by" do
-        Cat.should_receive(:view_by).with('name').and_return(false)
-        @obj.view_by('name')
-      end
-
-      it "should proxy #view" do
-        Cat.should_receive(:view).with('view', {:database => 'database'})
-        @obj.should_receive(:proxy_update_all)
-        @obj.view('view')
-      end
-
-      it "should proxy #first_from_view" do
-        Cat.should_receive(:first_from_view).with('view', {:database => 'database'})
-        @obj.should_receive(:proxy_update)
-        @obj.first_from_view('view')
-      end
-
-      it "should proxy design_doc" do
-        Cat.should_receive(:design_doc)
-        @obj.design_doc
-      end
-
-      describe "#save_design_doc" do
-        it "should be proxied without args" do
-          Cat.should_receive(:save_design_doc).with('database')
-          @obj.save_design_doc
-        end
-
-        it "should be proxied with database arg" do
-          Cat.should_receive(:save_design_doc).with('db')
-          @obj.save_design_doc('db')
-        end
-      end
-
-      
 
       ### Updating methods
 
       describe "#proxy_update" do
         it "should set returned doc fields" do
           doc = mock(:Document)
-          doc.should_receive(:is_a?).with(Cat).and_return(true)
+          doc.should_receive(:is_a?).with(@model).and_return(true)
           doc.should_receive(:database=).with('database')
           doc.should_receive(:model_proxy=).with(@obj)
           doc.should_receive(:send).with('owner_name=', 'owner')
@@ -291,7 +251,7 @@ describe CouchRest::Model::Proxyable do
 
         it "should not set anything if matching document not provided" do
           doc = mock(:DocumentFoo)
-          doc.should_receive(:is_a?).with(Cat).and_return(false)
+          doc.should_receive(:is_a?).with(@model).and_return(false)
           doc.should_not_receive(:database=)
           doc.should_not_receive(:model_proxy=)
           doc.should_not_receive(:owner_name=)
@@ -343,13 +303,12 @@ describe CouchRest::Model::Proxyable do
           view :by_total
         end
       end
-
-
       @company = ProxyableCompany.create(:slug => 'samco')
     end
 
     it "should create the new database" do
-      @company.proxyable_invoices.all.should be_empty
+      view = @company.proxyable_invoices.all
+      view.should be_empty
       TEST_SERVER.databases.find{|db| db =~ /#{TESTDB}-samco/}.should_not be_nil
     end
 

data/spec/unit/subclass_spec.rb

@@ -17,13 +17,17 @@ end
 
 class OnlineCourse < Course
   property :url
-  view_by :url
+  design do
+    view :by_url
+  end
 end
 
 class Animal < CouchRest::Model::Base
   use_database TEST_SERVER.default_database
   property :name
-  view_by :name
+  design do
+    view :by_name
+  end
 end
 
 class Dog < Animal; end
@@ -67,19 +71,24 @@ describe "Subclassing a Model" do
   end
 
   it "should have a design doc slug based on the subclass name" do
-    OnlineCourse.design_doc_slug.should =~ /^OnlineCourse/
+    OnlineCourse.design_doc['_id'].should =~ /OnlineCourse$/
   end
 
   it "should not add views to the parent's design_doc" do
     Course.design_doc['views'].keys.should_not include('by_url')
   end
 
-  it "should not add the parent's views to its design doc" do
-    OnlineCourse.design_doc['views'].keys.should_not include('by_title')
+  it "should add the parent's views to its design doc" do
+    OnlineCourse.design_doc['views'].keys.should include('by_title')
+  end
+
+  it "should add the parent's views but alter the model names in map function" do
+    OnlineCourse.design_doc['views']['by_title']['map'].should =~ /doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'/
   end
 
   it "should have an all view with a guard clause for model == subclass name in the map function" do
     OnlineCourse.design_doc['views']['all']['map'].should =~ /if \(doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'\)/
   end
+
 end
 

data/spec/unit/validations_spec.rb

@@ -10,7 +10,7 @@ describe CouchRest::Model::Validations do
       end
 
       it "should create a new view if none defined before performing" do
-        WithUniqueValidation.has_view?(:by_title).should be_true
+        WithUniqueValidation.design_doc.has_view?(:by_title).should be_true
       end
 
       it "should validate a new unique document" do
@@ -49,16 +49,14 @@ describe CouchRest::Model::Validations do
 
       it "should not try to create a defined view" do
         WithUniqueValidationView.validates_uniqueness_of :title, :view => 'fooobar'
-        WithUniqueValidationView.has_view?('fooobar').should be_false
-        WithUniqueValidationView.has_view?('by_title').should be_false
+        WithUniqueValidationView.design_doc.has_view?('fooobar').should be_false
+        WithUniqueValidationView.design_doc.has_view?('by_title').should be_false
       end
 
 
       it "should not try to create new view when already defined" do
         @obj = @objs[1]
-        @obj.class.should_not_receive('view_by')
-        @obj.class.should_receive('has_view?').and_return(true)
-        @obj.class.should_receive('view').and_return({'rows' => [ ]})
+        @obj.class.design_doc.should_not_receive('create_view')
         @obj.valid?
       end
     end
@@ -66,7 +64,7 @@ describe CouchRest::Model::Validations do
     context "with a proxy parameter" do
 
       it "should create a new view despite proxy" do
-        WithUniqueValidationProxy.has_view?(:by_title).should be_true
+        WithUniqueValidationProxy.design_doc.has_view?(:by_title).should be_true
       end
 
       it "should be used" do
@@ -77,19 +75,23 @@ describe CouchRest::Model::Validations do
 
       it "should allow specific view" do
         @obj = WithUniqueValidationProxy.new(:title => 'test 7')
-        @obj.class.should_not_receive('view_by')
+        @obj.class.should_not_receive('by_title')
+        view = mock('View')
+        view.stub!(:rows).and_return([])
         proxy = mock('Proxy')
+        proxy.should_receive('by_title').and_return(view)
+        proxy.should_receive('respond_to?').with('by_title').and_return(true)
         @obj.should_receive('proxy').and_return(proxy)
-        proxy.should_receive('has_view?').and_return(true)
-        proxy.should_receive('view').and_return({'rows' => [ ]})
         @obj.valid?
       end
     end
 
     context "when proxied" do
       it "should lookup the model_proxy" do
+        view = mock('View')
+        view.stub!(:rows).and_return([])
         mp = mock(:ModelProxy)
-        mp.should_receive(:view).and_return({'rows' => []})
+        mp.should_receive(:by_title).and_return(view)
         @obj = WithUniqueValidation.new(:title => 'test 8')
         @obj.stub!(:model_proxy).twice.and_return(mp)
         @obj.valid?
@@ -103,7 +105,7 @@ describe CouchRest::Model::Validations do
       end
 
       it "should create the view" do
-        @objs.first.class.has_view?('by_parent_id_and_title')
+        @objs.first.class.design_doc.has_view?('by_parent_id_and_title')
       end
 
       it "should validate unique document" do