couchrest_model 1.1.0.beta2 → 1.1.0.beta3

data/lib/couchrest/model/views.rb

@@ -2,7 +2,7 @@ module CouchRest
   module Model
     module Views
       extend ActiveSupport::Concern
-      
+
       module ClassMethods
         # Define a CouchDB view. The name of the view will be the concatenation
         # of <tt>by</tt> and the keys joined by <tt>_and_</tt>
@@ -81,7 +81,6 @@ module CouchRest
           end
           keys.push opts
           design_doc.view_by(*keys)
-          req_design_doc_refresh
         end
 
         # returns stored defaults if there is a view named this in the design doc
@@ -99,9 +98,9 @@ module CouchRest
         def view(name, query={}, &block)
           query = query.dup # Modifications made on copy!
           db = query.delete(:database) || database
-          refresh_design_doc(db)
           query[:raw] = true if query[:reduce]
           raw = query.delete(:raw)
+          save_design_doc(db)
           fetch_view_with_docs(db, name, query, raw, &block)
         end
 
@@ -140,23 +139,10 @@ module CouchRest
 
         def fetch_view(db, view_name, opts, &block)
           raise "A view needs a database to operate on (specify :database option, or use_database in the #{self.class} class)" unless db
-          retryable = true
-          begin
-            design_doc.view_on(db, view_name, opts, &block)
-            # the design doc may not have been saved yet on this database
-          rescue RestClient::ResourceNotFound => e
-            if retryable
-              save_design_doc(db)
-              retryable = false
-              retry
-            else
-              raise e
-            end
-          end
+          design_doc.view_on(db, view_name, opts, &block)
         end
-        
       end # module ClassMethods
-      
+
     end
   end
 end

data/lib/couchrest_model.rb

@@ -8,6 +8,7 @@ require "active_model/serialization"
 require "active_model/translation"
 require "active_model/validator"
 require "active_model/validations"
+require "active_model/dirty"
 
 require 'active_support/core_ext'
 require 'active_support/json'
@@ -26,10 +27,14 @@ require 'couchrest/model'
 require 'couchrest/model/errors'
 require "couchrest/model/persistence"
 require "couchrest/model/typecast"
+require "couchrest/model/casted_by"
+require "couchrest/model/dirty"
 require "couchrest/model/property"
 require "couchrest/model/property_protection"
-require "couchrest/model/casted_array"
 require "couchrest/model/properties"
+require "couchrest/model/casted_array"
+require "couchrest/model/casted_hash"
+require "couchrest/model/casted_model"
 require "couchrest/model/validations"
 require "couchrest/model/callbacks"
 require "couchrest/model/document_queries"
@@ -45,7 +50,8 @@ require "couchrest/model/designs"
 require "couchrest/model/designs/view"
 
 # Monkey patches applied to couchrest
-require "couchrest/model/support/couchrest"
+require "couchrest/model/support/couchrest_design"
+
 # Core Extensions
 require "couchrest/model/core_extensions/hash"
 require "couchrest/model/core_extensions/time_parsing"
@@ -53,7 +59,6 @@ require "couchrest/model/core_extensions/time_parsing"
 # Base libraries
 require "couchrest/model/casted_model"
 require "couchrest/model/base"
-
 # Add rails support *after* everything has loaded
 
 require "couchrest/railtie"

data/spec/couchrest/base_spec.rb

@@ -246,7 +246,6 @@ describe "Model Base" do
   
   describe "finding all instances of a model" do
     before(:all) do
-      WithTemplateAndUniqueID.req_design_doc_refresh
       WithTemplateAndUniqueID.all.map{|o| o.destroy}
       WithTemplateAndUniqueID.database.bulk_delete
       WithTemplateAndUniqueID.new('important-field' => '1').save
@@ -254,11 +253,6 @@ describe "Model Base" do
       WithTemplateAndUniqueID.new('important-field' => '3').save
       WithTemplateAndUniqueID.new('important-field' => '4').save
     end
-    it "should make the design doc" do
-      WithTemplateAndUniqueID.all
-      d = WithTemplateAndUniqueID.design_doc
-      d['views']['all']['map'].should include('WithTemplateAndUniqueID')
-    end
     it "should find all" do
       rs = WithTemplateAndUniqueID.all 
       rs.length.should == 4
@@ -268,7 +262,6 @@ describe "Model Base" do
   describe "counting all instances of a model" do
     before(:each) do
       @db = reset_test_db!
-      WithTemplateAndUniqueID.req_design_doc_refresh
     end
     
     it ".count should return 0 if there are no docuemtns" do
@@ -287,17 +280,11 @@ describe "Model Base" do
   describe "finding the first instance of a model" do
     before(:each) do      
       @db = reset_test_db!
-      # WithTemplateAndUniqueID.req_design_doc_refresh # Removed by Sam Lown, design doc should be loaded automatically
       WithTemplateAndUniqueID.new('important-field' => '1').save
       WithTemplateAndUniqueID.new('important-field' => '2').save
       WithTemplateAndUniqueID.new('important-field' => '3').save
       WithTemplateAndUniqueID.new('important-field' => '4').save
     end
-    it "should make the design doc" do
-      WithTemplateAndUniqueID.all
-      d = WithTemplateAndUniqueID.design_doc
-      d['views']['all']['map'].should include('WithTemplateAndUniqueID')
-    end
     it "should find first" do
       rs = WithTemplateAndUniqueID.first
       rs['important-field'].should == "1"
@@ -308,21 +295,6 @@ describe "Model Base" do
     end
   end
 
-  describe "lazily refreshing the design document" do
-    before(:all) do
-      @db = reset_test_db!
-      WithTemplateAndUniqueID.new('important-field' => '1').save
-    end
-    it "should not save the design doc twice" do
-      WithTemplateAndUniqueID.all
-      WithTemplateAndUniqueID.req_design_doc_refresh
-      WithTemplateAndUniqueID.refresh_design_doc
-      rev = WithTemplateAndUniqueID.design_doc['_rev']
-      WithTemplateAndUniqueID.req_design_doc_refresh
-      WithTemplateAndUniqueID.refresh_design_doc
-      WithTemplateAndUniqueID.design_doc['_rev'].should eql(rev)
-    end
-  end
   
   describe "getting a model with a subobject field" do
     before(:all) do
@@ -378,6 +350,7 @@ describe "Model Base" do
       foundart.created_at.should == foundart.updated_at
     end
     it "should set the time on update" do
+      @art.title = "new title"  # only saved if @art.changed? == true
       @art.save
       @art.created_at.should < @art.updated_at
     end

data/spec/couchrest/casted_model_spec.rb

@@ -160,7 +160,7 @@ describe CouchRest::Model::CastedModel do
     end
 
     it "should cast the array properly" do
-      @obj.keywords.should be_an_instance_of(Array)
+      @obj.keywords.should be_kind_of(Array)
       @obj.keywords.first.should == 'couch'
     end
   end

data/spec/couchrest/collection_spec.rb

@@ -5,7 +5,6 @@ describe "Collections" do
 
   before(:all) do
     reset_test_db!
-    Article.refresh_design_doc
     titles = ["very uniq one", "really interesting", "some fun",
       "really awesome", "crazy bob", "this rocks", "super rad"]
     titles.each_with_index do |title,i|

data/spec/couchrest/design_doc_spec.rb

@@ -0,0 +1,211 @@
+# encoding: utf-8
+
+require File.expand_path("../../spec_helper", __FILE__)
+require File.join(FIXTURE_PATH, 'base')
+require File.join(FIXTURE_PATH, 'more', 'article')
+
+describe "Design Documents" do
+
+  before :all do
+    reset_test_db!
+  end
+
+  describe "CouchRest Extension" do
+
+    it "should have created a checksum! method" do
+      ::CouchRest::Design.new.should respond_to(:checksum!)
+    end
+
+    it "should calculate a consistent checksum for model" do
+      WithTemplateAndUniqueID.design_doc.checksum!.should eql('ff6fa2eaf774397391942d51428c1fe2')
+    end
+
+    it "should calculate checksum for complex model" do
+      Article.design_doc.checksum!.should eql('fb65c06a76b6141529e31e894ad00b1a')
+    end
+
+    it "should cache the generated checksum value" do
+      Article.design_doc.checksum!
+      Article.design_doc['couchrest-hash'].should_not be_blank
+    end
+  end
+
+  describe "class methods" do
+
+    describe ".design_doc" do
+      it "should provide Design document" do
+        Article.design_doc.should be_a(::CouchRest::Design)
+      end
+    end
+
+    describe ".design_doc_id" do
+      it "should provide a reasonable id" do
+        Article.design_doc_id.should eql("_design/Article")
+      end
+    end
+
+    describe ".design_doc_slug" do
+      it "should provide slug part of design doc" do
+        Article.design_doc_slug.should eql('Article')
+      end
+    end
+
+    describe ".design_doc_uri" do
+      it "should provide complete url" do
+        Article.design_doc_uri.should eql("#{COUCHHOST}/#{TESTDB}/_design/Article")
+      end
+      it "should provide complete url for new DB" do
+        db = mock("Database")
+        db.should_receive(:root).and_return('db')
+        Article.design_doc_uri(db).should eql("db/_design/Article")
+      end
+    end
+
+    describe ".stored_design_doc" do
+      it "should load a stored design from the database" do
+        Article.by_date
+        Article.stored_design_doc['_rev'].should_not be_blank
+      end
+      it "should return nil if not already stored" do
+        WithDefaultValues.stored_design_doc.should be_nil
+      end
+    end
+
+    describe ".save_design_doc" do
+      it "should call up the design updater" do
+        Article.should_receive(:update_design_doc).with('db', false)
+        Article.save_design_doc('db')
+      end
+    end
+
+    describe ".save_design_doc!" do
+      it "should call save_design_doc with force" do
+        Article.should_receive(:save_design_doc).with('db', true)
+        Article.save_design_doc!('db')
+      end
+    end
+
+  end
+
+  describe "basics" do
+
+    before :all do
+      reset_test_db!
+    end
+
+    it "should have been instantiated with views" do
+      d = Article.design_doc
+      d['views']['all']['map'].should include('Article')
+    end
+
+    it "should not have been saved yet" do
+      lambda { Article.database.get(Article.design_doc.id) }.should raise_error(RestClient::ResourceNotFound)
+    end
+
+    describe "after requesting a view" do
+      before :each do
+        Article.all
+      end
+      it "should have saved the design doc after view request" do
+        Article.database.get(Article.design_doc.id).should_not be_nil
+      end
+    end
+
+    describe "model with simple views" do
+      before(:all) do
+        Article.all.map{|a| a.destroy(true)}
+        Article.database.bulk_delete
+        written_at = Time.now - 24 * 3600 * 7
+        @titles = ["this and that", "also interesting", "more fun", "some junk"]
+        @titles.each do |title|
+          a = Article.new(:title => title)
+          a.date = written_at
+          a.save
+          written_at += 24 * 3600
+        end
+      end
+
+      it "will send request for the saved design doc on view request" do
+        reset_test_db!
+        Article.should_receive(:stored_design_doc).and_return(nil)
+        Article.by_date
+      end
+
+      it "should have generated a design doc" do
+        Article.design_doc["views"]["by_date"].should_not be_nil
+      end
+      it "should save the design doc when view requested" do
+        Article.by_date
+        doc = Article.database.get Article.design_doc.id
+        doc['views']['by_date'].should_not be_nil
+      end
+      it "should save design doc if a view changed" do
+        Article.by_date
+        orig = Article.stored_design_doc
+        design = Article.design_doc
+        view = design['views']['by_date']['map']
+        design['views']['by_date']['map'] = view + '  ' # little bit of white space
+        Article.by_date
+        Article.stored_design_doc['_rev'].should_not eql(orig['_rev'])
+        orig['views']['by_date']['map'].should_not eql(Article.design_doc['views']['by_date']['map'])
+      end
+      it "should not save design doc if not changed" do
+        Article.by_date
+        orig = Article.stored_design_doc['_rev']
+        Article.by_date
+        Article.stored_design_doc['_rev'].should eql(orig)
+      end
+    end
+
+    describe "when auto_update_design_doc false" do
+  
+      before :all do
+        Article.auto_update_design_doc = false
+        Article.save_design_doc!
+      end
+
+      after :all do
+        Article.auto_update_design_doc = true
+      end
+
+      it "will not send a request for the saved design doc" do
+        Article.should_not_receive(:stored_design_doc)
+        Article.by_date
+      end
+
+      it "will not update stored design doc if view changed" do
+        Article.by_date
+        orig = Article.stored_design_doc
+        design = Article.design_doc
+        view = design['views']['by_date']['map']
+        design['views']['by_date']['map'] = view + '  '
+        Article.by_date
+        Article.stored_design_doc['_rev'].should eql(orig['_rev'])
+      end
+
+      it "will update stored design if forced" do
+        Article.by_date
+        orig = Article.stored_design_doc
+        design = Article.design_doc
+        view = design['views']['by_date']['map']
+        design['views']['by_date']['map'] = view + '  '
+        Article.save_design_doc!
+        Article.stored_design_doc['_rev'].should_not eql(orig['_rev'])
+      end
+    end
+  end
+
+  describe "lazily refreshing the design document" do
+    before(:all) do
+      @db = reset_test_db!
+      WithTemplateAndUniqueID.new('important-field' => '1').save
+    end
+    it "should not save the design doc twice" do
+      WithTemplateAndUniqueID.all
+      rev = WithTemplateAndUniqueID.design_doc['_rev']
+      WithTemplateAndUniqueID.design_doc['_rev'].should eql(rev)
+    end
+  end
+
+
+end

data/spec/couchrest/designs/view_spec.rb

@@ -74,7 +74,7 @@ describe "Design View" do
       it "should auto generate mapping from name" do
         lambda { @klass.create(DesignViewModel, 'by_title') }.should_not raise_error
         str = @design_doc['views']['by_title']['map']
-        str.should include("((doc['couchrest-type'] == 'DesignViewModel') && (doc['title'] != null))")
+        str.should include("((doc['model'] == 'DesignViewModel') && (doc['title'] != null))")
         str.should include("emit(doc['title'], 1);")
         str = @design_doc['views']['by_title']['reduce']
         str.should include("return sum(values);")
@@ -163,10 +163,17 @@ describe "Design View" do
         end
       end
 
+      describe "#length" do
+        it "should provide a length from the docs array" do
+          @obj.should_receive(:docs).and_return([1, 2, 3])
+          @obj.length.should eql(3)
+        end
+      end
+
       describe "#count" do
         it "should raise an error if view prepared for group" do
           @obj.should_receive(:query).and_return({:group => true})
-          lambda { @obj.count }.should raise_error
+          lambda { @obj.count }.should raise_error(/group/)
         end
 
         it "should return first row value if reduce possible" do
@@ -174,6 +181,8 @@ describe "Design View" do
           row = mock("Row")
           @obj.should_receive(:can_reduce?).and_return(true)
           @obj.should_receive(:reduce).and_return(view)
+          view.should_receive(:skip).with(0).and_return(view)
+          view.should_receive(:limit).with(1).and_return(view)
           view.should_receive(:rows).and_return([row])
           row.should_receive(:value).and_return(2)
           @obj.count.should eql(2)
@@ -182,6 +191,8 @@ describe "Design View" do
           view = mock("SubView")
           @obj.should_receive(:can_reduce?).and_return(true)
           @obj.should_receive(:reduce).and_return(view)
+          view.should_receive(:skip).with(0).and_return(view)
+          view.should_receive(:limit).with(1).and_return(view)
           view.should_receive(:rows).and_return([])
           @obj.count.should eql(0)
         end
@@ -375,6 +386,24 @@ describe "Design View" do
           @obj.should_receive(:update_query).with({:descending => true})
           @obj.descending
         end
+        it "should reverse start and end keys if given" do
+          @obj = @obj.startkey('a').endkey('z')
+          @obj = @obj.descending
+          @obj.query[:endkey].should eql('a')
+          @obj.query[:startkey].should eql('z')
+        end
+        it "should reverse even if start or end nil" do
+          @obj = @obj.startkey('a')
+          @obj = @obj.descending
+          @obj.query[:endkey].should eql('a')
+          @obj.query[:startkey].should be_nil
+        end
+        it "should reverse start_doc and end_doc keys if given" do
+          @obj = @obj.startkey_doc('a').endkey_doc('z')
+          @obj = @obj.descending
+          @obj.query[:endkey_docid].should eql('a')
+          @obj.query[:startkey_docid].should eql('z')
+        end
       end
 
       describe "#limit" do
@@ -528,6 +557,7 @@ describe "Design View" do
           # disable real execution!
           @design_doc = mock("DesignDoc")
           @design_doc.stub!(:view_on)
+          @obj.model.stub!(:save_design_doc)
           @obj.model.stub!(:design_doc).and_return(@design_doc)
         end
 
@@ -550,29 +580,19 @@ describe "Design View" do
           @obj.send(:execute)
         end
 
-        it "should populate the results" do
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @design_doc.should_receive(:view_on).and_return('foos')
+        it "should call to save the design document" do
+          @obj.should_receive(:can_reduce?).and_return(false)
+          @obj.model.should_receive(:save_design_doc).with(DB)
           @obj.send(:execute)
-          @obj.result.should eql('foos')
         end
 
-        it "should retry once on a resource not found error" do
+        it "should populate the results" do
           @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.model.should_receive(:save_design_doc)
-          @design_doc.should_receive(:view_on).ordered.and_raise(RestClient::ResourceNotFound)
-          @design_doc.should_receive(:view_on).ordered.and_return('foos')
+          @design_doc.should_receive(:view_on).and_return('foos')
           @obj.send(:execute)
           @obj.result.should eql('foos')
         end
 
-        it "should retry twice and fail on a resource not found error" do
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.model.should_receive(:save_design_doc)
-          @design_doc.should_receive(:view_on).twice.and_raise(RestClient::ResourceNotFound)
-          lambda { @obj.send(:execute) }.should raise_error(RestClient::ResourceNotFound)
-        end
-
         it "should remove nil values from query" do
           @obj.should_receive(:can_reduce?).and_return(true)
           @obj.stub!(:use_database).and_return('database')
@@ -772,6 +792,10 @@ describe "Design View" do
         docs[0].name.should eql("Judith")
         docs[1].name.should eql("Peter")
       end
+      it "should provide count even if limit or skip set" do
+        docs = DesignViewModel.by_name.limit(20).skip(2)
+        docs.count.should eql(5)
+      end
     end
 
     describe "pagination" do

data/spec/couchrest/designs_spec.rb

@@ -31,11 +31,6 @@ describe "Design" do
         DesignModel.design { foo }
       end
 
-      it "should request a design refresh" do
-        DesignModel.should_receive(:req_design_doc_refresh)
-        DesignModel.design() { }
-      end
-
       it "should work even if a block is not provided" do
         lambda { DesignModel.design }.should_not raise_error
       end