couch_potato 1.4.0 → 1.6.3

data/lib/couch_potato/view/base_view_spec.rb

@@ -14,9 +14,11 @@ module CouchPotato
 
         assert_valid_view_parameters normalized_view_parameters
         @klass = klass
-        @design_document = translate_to_design_doc_name(klass.to_s, view_name, @list_name)
-        @view_name = view_name
         @options = options
+        @view_name = compute_view_name(view_name,
+          options.key?(:digest_view_name) ? options[:digest_view_name] : Config.digest_view_names)
+        @design_document = translate_to_design_doc_name(klass.to_s, @view_name, @list_name)
+        @list_params = normalized_view_parameters.delete :list_params
 
         @list_function = klass.lists(@list_name) if @list_name
         @view_parameters = {}
@@ -24,6 +26,7 @@ module CouchPotato
           @view_parameters[key] = options[key] if options.include?(key)
         end
         @view_parameters.merge!(normalized_view_parameters)
+        @view_parameters.merge!(@list_params) if @list_params
       end
 
       def process_results(results)
@@ -36,8 +39,15 @@ module CouchPotato
 
       private
 
+      def compute_view_name(view_name, digest)
+        if digest
+          "#{view_name}-#{Digest::MD5.hexdigest(map_function + reduce_function.to_s)}"
+        else
+          view_name
+        end
+      end
+
       def normalize_view_parameters(params)
-        normalized_params = params.dup
         hash = wrap_in_hash params
         remove_nil_stale(replace_range_key(hash))
       end
@@ -65,19 +75,19 @@ module CouchPotato
 
       def assert_valid_view_parameters(params)
         params.keys.each do |key|
-          raise ArgumentError.new("invalid view parameter: #{key}") unless valid_view_parameters.include?(key.to_s)
+          fail ArgumentError, "invalid view parameter: #{key}" unless valid_view_parameters.include?(key.to_s)
         end
       end
 
       def valid_view_parameters
-        %w(key keys startkey startkey_docid endkey endkey_docid limit stale descending skip group group_level reduce include_docs inclusive_end)
+        %w(list_params key keys startkey startkey_docid endkey endkey_docid limit stale descending skip group group_level reduce include_docs inclusive_end)
       end
 
       def translate_to_design_doc_name(klass_name, view_name, list_name)
         klass_name = klass_name.dup
-        klass_name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-        klass_name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-        klass_name.tr!("-", "_")
+        klass_name.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        klass_name.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        klass_name.tr!('-', '_')
         doc_name = klass_name.downcase
 
         if CouchPotato::Config.split_design_documents_per_view

data/lib/couch_potato/view/view_query.rb

@@ -20,7 +20,7 @@ module CouchPotato
         update_view unless view_has_been_updated?
         begin
           query_view parameters
-        rescue RestClient::ResourceNotFound
+        rescue CouchRest::NotFound
           update_view
           retry
         end
@@ -82,7 +82,7 @@ module CouchPotato
 
       def query_view(parameters)
         if @list_name
-          CouchRest.get CouchRest.paramify_url(CouchPotato.full_url_to_database + "/_design/#{@design_document_name}/_list/#{@list_name}/#{@view_name}", parameters)
+          @database.connection.get CouchRest.paramify_url("/#{@database.name}/_design/#{@design_document_name}/_list/#{@list_name}/#{@view_name}", parameters)
         else
           @database.view view_url, parameters
         end
@@ -91,7 +91,6 @@ module CouchPotato
       def view_url
         "#{@design_document_name}/#{@view_name}"
       end
-
     end
   end
 end

data/spec/attachments_spec.rb

@@ -5,7 +5,7 @@ describe CouchPotato, 'attachments' do
     comment = Comment.new :title => 'nil'
     comment._attachments['body'] = {'data' => 'a useful comment', 'content_type' => 'text/plain'}
     CouchPotato.database.save! comment
-    CouchPotato.couchrest_database.fetch_attachment(comment.to_hash, 'body').to_s.should == 'a useful comment'
+    expect(CouchPotato.couchrest_database.fetch_attachment(comment.to_hash, 'body').to_s).to eq('a useful comment')
   end
   
   it "should give me information about the attachments of a document" do
@@ -13,11 +13,11 @@ describe CouchPotato, 'attachments' do
     comment._attachments = {'body' => {'data' => 'a useful comment', 'content_type' => 'text/plain'}}
     CouchPotato.database.save! comment
     comment_reloaded = CouchPotato.database.load comment.id
-    comment_reloaded._attachments["body"].should include({"content_type" => "text/plain", "stub" => true, "length" => 16})
+    expect(comment_reloaded._attachments["body"]).to include({"content_type" => "text/plain", "stub" => true, "length" => 16})
   end
   
   it "should have an empty array for a new object" do
-    Comment.new._attachments.should == {}
+    expect(Comment.new._attachments).to eq({})
   end
   
 end

data/spec/callbacks_spec.rb

@@ -1,14 +1,12 @@
 require 'spec_helper'
 
-class CallbackRecorder
+class CallbackRecorderWithNoRequiredProperties
   include CouchPotato::Persistence
-  
+
   property :required_property
-  
-  validates_presence_of :required_property
-  
+
   [:before_validation, :before_validation_on_create,
-    :before_validation_on_save, :before_validation_on_update, 
+    :before_validation_on_save, :before_validation_on_update,
     :before_save, :before_create, :before_create,
     :after_save, :after_create, :after_create,
     :before_update, :after_update,
@@ -19,19 +17,23 @@ class CallbackRecorder
     end
     self.send callback, callback
   end
-  
+
   view :all, :key  => :required_property
-  
+
   def callbacks
     @callbacks ||= []
   end
-  
+
   private
-  
+
   def method_callback_with_argument(db)
     db.view CallbackRecorder.all
   end
-  
+
+end
+
+class CallbackRecorder < CallbackRecorderWithNoRequiredProperties
+  validates_presence_of :required_property
 end
 
 describe "multiple callbacks at once" do
@@ -39,224 +41,302 @@ describe "multiple callbacks at once" do
   class Monkey
     include CouchPotato::Persistence
     attr_accessor :eaten_banana, :eaten_apple
-    
+
     before_create :eat_apple, :eat_banana
-    
+
     private
-    
+
     def eat_banana
       self.eaten_banana = true
     end
-    
+
     def eat_apple
       self.eaten_apple = true
     end
   end
-  
+
   it "should run all callback methods given to the callback method call" do
     monkey = Monkey.new
     monkey.run_callbacks :create
-    monkey.eaten_banana.should be_true
-    monkey.eaten_apple.should be_true
+    expect(monkey.eaten_banana).to be_truthy
+    expect(monkey.eaten_apple).to be_truthy
   end
 end
 
 describe 'create callbacks' do
-  
+
   before(:each) do
     @recorder = CallbackRecorder.new
-    couchrest_database = stub 'couchrest_database', :save_doc => {'id' => '1', 'rev' => '2'}, :view => {'rows' => []}, :info => nil
+    couchrest_database = double 'couchrest_database', :save_doc => {'id' => '1', 'rev' => '2'}, :view => {'rows' => []}, :info => nil
     @db = CouchPotato::Database.new(couchrest_database)
   end
-  
+
   describe "successful create" do
     before(:each) do
        @recorder.required_property = 1
     end
-    
+
+    it "should call before_validation" do
+      @recorder.valid?
+      expect(@recorder.callbacks).to include(:before_validation)
+    end
+
+    it "should call before_validation_on_create" do
+      @db.save_document! @recorder
+      expect(@recorder.callbacks).to include(:before_validation_on_create)
+    end
+
+    it "should call before_validation_on_save" do
+      @db.save_document! @recorder
+      expect(@recorder.callbacks).to include(:before_validation_on_save)
+    end
+
+    it "should call before_save" do
+      @db.save_document! @recorder
+      expect(@recorder.callbacks).to include(:before_save)
+    end
+
+    it "should call after_save" do
+      @db.save_document! @recorder
+      expect(@recorder.callbacks).to include(:after_save)
+    end
+
+    it "should call before_create" do
+      @db.save_document! @recorder
+      expect(@recorder.callbacks).to include(:before_create)
+    end
+
+    it "should call after_create" do
+      @db.save_document! @recorder
+      expect(@recorder.callbacks).to include(:after_create)
+    end
+  end
+
+  describe "successful create with no changes (object not dirty)" do
+    before(:each) do
+       @recorder = CallbackRecorderWithNoRequiredProperties.new
+    end
+
     it "should call before_validation" do
       @recorder.valid?
-      @recorder.callbacks.should include(:before_validation)
+      expect(@recorder.callbacks).to include(:before_validation)
     end
-        
+
     it "should call before_validation_on_create" do
       @db.save_document! @recorder
-      @recorder.callbacks.should include(:before_validation_on_create)
+      expect(@recorder.callbacks).to include(:before_validation_on_create)
     end
-    
+
     it "should call before_validation_on_save" do
       @db.save_document! @recorder
-      @recorder.callbacks.should include(:before_validation_on_save)
+      expect(@recorder.callbacks).to include(:before_validation_on_save)
     end
-    
+
     it "should call before_save" do
       @db.save_document! @recorder
-      @recorder.callbacks.should include(:before_save)
+      expect(@recorder.callbacks).to include(:before_save)
     end
-    
+
     it "should call after_save" do
       @db.save_document! @recorder
-      @recorder.callbacks.should include(:after_save)
+      expect(@recorder.callbacks).to include(:after_save)
     end
-    
+
     it "should call before_create" do
       @db.save_document! @recorder
-      @recorder.callbacks.should include(:before_create)
+      expect(@recorder.callbacks).to include(:before_create)
     end
-    
+
     it "should call after_create" do
       @db.save_document! @recorder
-      @recorder.callbacks.should include(:after_create)
+      expect(@recorder.callbacks).to include(:after_create)
     end
-    
+
   end
-  
+
   describe "failed create" do
-    
+
     it "should call before_validation" do
       @recorder.valid?
-      @recorder.callbacks.should include(:before_validation)
+      expect(@recorder.callbacks).to include(:before_validation)
     end
-    
+
     it "should call before_validation_on_create" do
       @db.save_document @recorder
-      @recorder.callbacks.should include(:before_validation_on_create)
+      expect(@recorder.callbacks).to include(:before_validation_on_create)
     end
-    
+
     it "should call before_validation_on_save" do
       @db.save_document @recorder
-      @recorder.callbacks.should include(:before_validation_on_save)
+      expect(@recorder.callbacks).to include(:before_validation_on_save)
     end
-    
+
     it "should not call before_save" do
       @db.save_document @recorder
-      @recorder.callbacks.should_not include(:before_save)
+      expect(@recorder.callbacks).not_to include(:before_save)
     end
-    
+
     it "should not call after_save" do
       @db.save_document @recorder
-      @recorder.callbacks.should_not include(:after_save)
+      expect(@recorder.callbacks).not_to include(:after_save)
     end
-    
+
     it "should not call before_create" do
       @db.save_document @recorder
-      @recorder.callbacks.should_not include(:before_create)
+      expect(@recorder.callbacks).not_to include(:before_create)
     end
-    
+
     it "should not call after_create" do
       @db.save_document @recorder
-      @recorder.callbacks.should_not include(:after_create)
+      expect(@recorder.callbacks).not_to include(:after_create)
     end
   end
 end
 
 describe "update callbacks" do
-  
+
   before(:each) do
     @recorder = CallbackRecorder.new :required_property => 1
-    
-    couchrest_database = stub 'couchrest_database', :save_doc => {'id' => '1', 'rev' => '2'}, :view => {'rows' => []}, :info => nil
+
+    couchrest_database = double 'couchrest_database', :save_doc => {'id' => '1', 'rev' => '2'}, :view => {'rows' => []}, :info => nil
     @db = CouchPotato::Database.new(couchrest_database)
     @db.save_document! @recorder
-    
-    @recorder.required_property = 2
+
     @recorder.callbacks.clear
   end
-  
+
   describe "successful update" do
-    
+
     before(:each) do
+      @recorder.required_property = 2
       @db.save_document! @recorder
     end
-    
+
     it "should call before_validation" do
-      @recorder.callbacks.should include(:before_validation)
+      expect(@recorder.callbacks).to include(:before_validation)
     end
-    
+
     it "should call before_validation_on_update" do
-      @recorder.callbacks.should include(:before_validation_on_update)
+      expect(@recorder.callbacks).to include(:before_validation_on_update)
     end
-    
+
     it "should call before_validation_on_save" do
-      @recorder.callbacks.should include(:before_validation_on_save)
+      expect(@recorder.callbacks).to include(:before_validation_on_save)
     end
-    
+
     it "should call before_save" do
-      @recorder.callbacks.should include(:before_save)
+      expect(@recorder.callbacks).to include(:before_save)
     end
-    
+
     it "should call after_save" do
-      @recorder.callbacks.should include(:after_save)
+      expect(@recorder.callbacks).to include(:after_save)
     end
-    
+
     it "should call before_update" do
-      @recorder.callbacks.should include(:before_update)
+      expect(@recorder.callbacks).to include(:before_update)
     end
-    
+
     it "should call after_update" do
-      @recorder.callbacks.should include(:after_update)
+      expect(@recorder.callbacks).to include(:after_update)
     end
-    
+
   end
-  
+
+  describe "successful update with no changes (object is not dirty)" do
+
+    before(:each) do
+      @db.save_document! @recorder
+    end
+
+    it "should call before_validation" do
+      expect(@recorder.callbacks).to include(:before_validation)
+    end
+
+    it "should call before_validation_on_update" do
+      expect(@recorder.callbacks).to include(:before_validation_on_update)
+    end
+
+    it "should call before_validation_on_save" do
+      expect(@recorder.callbacks).to include(:before_validation_on_save)
+    end
+
+    it "should call before_save" do
+      expect(@recorder.callbacks).to include(:before_save)
+    end
+
+    it "should call after_save" do
+      expect(@recorder.callbacks).to include(:after_save)
+    end
+
+    it "should call before_update" do
+      expect(@recorder.callbacks).to include(:before_update)
+    end
+
+    it "should call after_update" do
+      expect(@recorder.callbacks).to include(:after_update)
+    end
+
+  end
+
+
   describe "failed update" do
-    
+
     before(:each) do
        @recorder.required_property = nil
        @db.save_document @recorder
     end
-    
+
     it "should call before_validation" do
-      @recorder.callbacks.should include(:before_validation)
+      expect(@recorder.callbacks).to include(:before_validation)
     end
-    
+
     it "should call before_validation_on_update" do
-      @recorder.callbacks.should include(:before_validation_on_update)
+      expect(@recorder.callbacks).to include(:before_validation_on_update)
     end
-    
+
     it "should call before_validation_on_save" do
-      @recorder.callbacks.should include(:before_validation_on_save)
+      expect(@recorder.callbacks).to include(:before_validation_on_save)
     end
-    
+
     it "should not call before_save" do
-      @recorder.callbacks.should_not include(:before_save)
+      expect(@recorder.callbacks).not_to include(:before_save)
     end
-    
+
     it "should not call after_save" do
-      @recorder.callbacks.should_not include(:after_save)
+      expect(@recorder.callbacks).not_to include(:after_save)
     end
-    
+
     it "should not call before_update" do
-      @recorder.callbacks.should_not include(:before_update)
+      expect(@recorder.callbacks).not_to include(:before_update)
     end
-    
+
     it "should not call after_update" do
-      @recorder.callbacks.should_not include(:after_update)
+      expect(@recorder.callbacks).not_to include(:after_update)
     end
-    
+
   end
-  
+
 end
 
 describe "destroy callbacks" do
-  
+
   before(:each) do
     @recorder = CallbackRecorder.new :required_property => 1
-    couchrest_database = stub 'couchrest_database', :save_doc => {'id' => '1', 'rev' => '2'}, :delete_doc => nil, :view => {'rows' => []}, :info => nil
+    couchrest_database = double 'couchrest_database', :save_doc => {'id' => '1', 'rev' => '2'}, :delete_doc => nil, :view => {'rows' => []}, :info => nil
     @db = CouchPotato::Database.new(couchrest_database)
     @db.save_document! @recorder
-    
+
     @recorder.callbacks.clear
   end
-  
+
   it "should call before_destroy" do
     @db.destroy_document @recorder
-    @recorder.callbacks.should include(:before_destroy)
+    expect(@recorder.callbacks).to include(:before_destroy)
   end
-  
+
   it "should call after_destroy" do
     @db.destroy_document @recorder
-    @recorder.callbacks.should include(:after_destroy)
+    expect(@recorder.callbacks).to include(:after_destroy)
   end
 end
 
@@ -275,24 +355,24 @@ describe "validation callbacks" do
 
   it "should keep error messages set in custom before_validation filters" do
     user = ValidatedUser.new(:name => "john")
-    user.valid?.should == false
-    user.errors[:name].should == ["should be Paul"]
+    expect(user.valid?).to eq(false)
+    expect(user.errors[:name]).to eq(["should be Paul"])
   end
 
   it "should combine the errors from validations and callbacks" do
     user = ValidatedUser.new(:name => nil)
-    user.valid?.should == false
-    user.errors[:name].any? {|msg| msg =~ /can't be (empty|blank)/ }.should == true
-    user.errors[:name].any? {|msg| msg == "should be Paul" }.should == true
-    user.errors[:name].size.should == 2
+    expect(user.valid?).to eq(false)
+    expect(user.errors[:name].any? {|msg| msg =~ /can't be (empty|blank)/ }).to eq(true)
+    expect(user.errors[:name].any? {|msg| msg == "should be Paul" }).to eq(true)
+    expect(user.errors[:name].size).to eq(2)
   end
 
   it "should clear the errors on subsequent calls to valid?" do
     user = ValidatedUser.new(:name => nil)
-    user.valid?.should == false
+    expect(user.valid?).to eq(false)
     user.name = 'Paul'
-    user.valid?.should == true
-    user.errors[:name].should == []
+    expect(user.valid?).to eq(true)
+    expect(user.errors[:name]).to eq([])
   end
 end
 
@@ -360,26 +440,26 @@ describe "validation callbacks and filter halt" do
 
   it "should keep error messages set in custom before_validation if an update filter returns false" do
     @user = FilterValidationUpdateUser.new(:name => "Paul")
-    @db.save_document(@user).should == true
+    expect(@db.save_document(@user)).to eq(true)
     @user.name = 'Bert'
-    @db.save_document(@user).should == false
+    expect(@db.save_document(@user)).to eq(false)
   end
 
   it "should keep error messages set in custom before_validation if a create filter returns false" do
     @user = FilterValidationCreateUser.new(:name => "Bert")
-    @db.save_document(@user).should == false
+    expect(@db.save_document(@user)).to eq(false)
   end
 
   it "should return false on saving a document when a before update filter returned false" do
     @user = FilterSaveUpdateUser.new(:name => "Paul")
-    @db.save_document(@user).should == true
+    expect(@db.save_document(@user)).to eq(true)
     @user.name = 'Bert'
-    @db.save_document(@user).should == false
+    expect(@db.save_document(@user)).to eq(false)
   end
 
   it "should return false on saving a document when a before save or before create filter returned false" do
     @user = FilterSaveCreateUser.new(:name => "Bert")
-    @db.save_document(@user).should == false
+    expect(@db.save_document(@user)).to eq(false)
   end
 
 end