radiant-concurrent_draft-extension 1.0.0

data/public/stylesheets/admin/concurrent_draft.css

@@ -0,0 +1,74 @@
+#draft-controls-container {
+  float: right;
+  margin: -12px 0 0 0;
+}
+
+#draft-controls {
+  position: relative;
+  border: 1px solid rgb(0, 92, 157);
+  background: white;
+  padding: 0px;
+  line-height: 20px;
+  width: 220px;
+  cursor: pointer;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+}
+
+#draft-controls .status {
+  margin: 5px;
+  padding: 0 5px 0 20px;
+  background: url(/images/admin/page_edit.png) left center no-repeat;
+  font-size: 80%;
+  color: black;
+}
+
+#draft-controls ul.dropdown {
+  position: absolute;
+  margin: -1px 0 0 -1px;
+  width: 210px;
+  top: 28px;
+  left: -1px;
+  border-width: 0 1px 1px 1px;
+  border-style: solid;
+  border-color: rgb(0, 92, 157);
+  display: none;
+  background-color: #eef;
+  padding: 5px;
+}
+
+#draft-controls > ul.dropdown {
+  top: auto;
+  left: auto;
+}
+
+#draft-controls.active ul.dropdown {
+  display: block;
+}
+
+#draft-controls ul.dropdown li {
+  margin-left: 10px;
+  list-style: none;
+  margin-bottom: 3px;
+  padding-right: 10px;
+  white-space: nowrap;
+}
+
+#draft-controls ul.dropdown a {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  padding-left: 20px;
+  background-position: left center;
+  background-repeat: no-repeat;
+}
+
+#draft-controls ul.dropdown a:hover {
+  text-decoration: underline;
+}
+
+#draft-controls .schedule_draft a { background-image: url(/images/admin/clock.png);}
+#draft-controls .publish a { background-image: url(/images/admin/tick.png);}
+#draft-controls .cancel a { background-image: url(/images/admin/cancel.png);}
+#draft-controls .revert a { background-image: url(/images/admin/page_refresh.png);}
+#draft-controls .unpublish a { background-image: url(/images/admin/page_delete.png);}

data/spec/controllers/admin_controller_extensions_spec.rb

@@ -0,0 +1,184 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+shared_examples_for 'controller with scheduled draft promotion' do
+  dataset :users
+
+  before :each do
+    create_user "Publisher", :publisher => true
+    # controller.cache.clear
+    @klass = controller.class.model_class
+    @model_symbol = @klass.name.symbolize
+    @object = mock_model(controller.class.model_class, :promote_draft! => nil, :save => true, :url => '')
+    @object.errors.stub!(:full_messages).and_return([])
+    @klass.stub!(:find).and_return(@object)
+    login_as :admin
+  end
+
+  describe "common actions" do
+
+    def do_post(options={})
+      post(:schedule_draft_promotion, {:id => '1', :commit => @klass.promote_now_text}.merge(options))
+    end
+
+    it "should load the model" do
+      @klass.should_receive(:find).with('1').and_return(@object)
+      login_as :admin
+      do_post
+      assigns[@model_symbol].should == @object
+    end
+
+    it "should redirect back to the edit screen" do
+      do_post
+      response.should be_redirect
+      response.should redirect_to(:action => "edit")
+    end
+
+    [:admin, :publisher].each do |user|
+      describe "#{user} user" do
+        before :each do
+          login_as user
+          #request.session[:user_id] = user_id(user)
+        end
+      
+        it "should allow #{user}" do
+          do_post
+          response.should be_redirect
+          response.should redirect_to(:action => "edit")
+          flash[:error].should be_blank
+        end
+      end
+    end
+    
+    [:designer, :existing].each do |user|
+      before :each do
+        login_as user
+      end
+      
+      it "should deny #{user}" do
+        do_post
+        response.should be_redirect
+        response.should redirect_to(:action => "edit")
+        flash[:error].should == 'You must have publisher privileges to execute this action.'
+      end
+    end
+  end
+
+  describe "promoting/publishing now" do
+
+    def do_post
+      post :schedule_draft_promotion, :id => '1', :commit => @klass.promote_now_text
+    end
+
+    it "should promote the draft" do
+      @object.should_receive(:promote_draft!)
+      do_post
+    end
+
+    it "should set the flash message" do
+      do_post
+      flash[:notice].should match(/published|promoted/)
+    end
+  end
+
+  describe "scheduling draft promotion" do
+    def do_post
+      post :schedule_draft_promotion, :id => '1',
+                                      @model_symbol => @post_attrs,
+                                      :commit => @klass.schedule_promotion_text
+    end
+
+    before :each do
+      @post_attrs = {'draft_promotion_scheduled_at' => 3.days.from_now}
+      @object.stub!(:update_attributes)
+      @object.stub!(:draft_promotion_scheduled_at).and_return(3.days.from_now)
+    end
+    
+    it "should not promote the draft" do
+      @object.should_not_receive(:promote_draft!)
+      do_post
+    end
+
+    it "should not cancel the draft" do
+      @object.should_not_receive(:cancel_draft!)
+      do_post
+    end
+
+    it "should set the flash notice message when the scheduled time is valid" do
+      @object.should_receive(:update_attributes).with(@post_attrs).and_return(true)
+      do_post
+      flash[:notice].should match(/will be promoted/)
+    end
+
+    it "should set the flash error message when the scheduled time is invalid" do
+      @object.should_receive(:update_attributes).with(@post_attrs).and_return(false)
+      do_post
+      flash[:error].should be
+    end
+  end
+
+  describe "cancelling promotion" do
+    def do_post
+      post :schedule_draft_promotion, :id => '1', :commit => @klass.cancel_promotion_text
+    end
+
+    before :each do
+      @object.stub!(:cancel_promotion!)
+    end
+
+    it "should cancel the draft promotion" do
+      @object.should_receive(:cancel_promotion!)
+      do_post
+    end
+
+    it "should set the flash message" do
+      do_post
+      flash[:notice].should match(/cancelled/)
+    end
+  end
+
+  describe "promotion in conjunction with saving" do
+    before :each do
+      controller.class.skip_before_filter :filter_chain
+      @klass.stub!(:find_by_id).and_return(@object)
+      controller.stub!(:handle_new_or_edit_post_without_promotion).and_return(false)
+    end
+    
+    def redirects_to_index
+      response.should be_redirect
+      response.should redirect_to(:action => :index)
+    end
+
+    it "should promote the draft when the 'Save & Promote Now' button was pushed" do
+      @object.should_receive(:promote_draft!).once
+      @object.should_receive(:update_attributes!).once
+      @object.should_receive(:index).once
+      put :update, :id => 1, :promote => 'Save & Promote Now'
+      redirects_to_index
+    end
+    
+    it "should not promote the draft when the 'Save & Promote Now' button was not pushed" do
+      @object.should_not_receive(:promote_draft!)
+      @object.should_receive(:update_attributes!).once
+      @object.should_receive(:index).once
+      put :update, :id => 1
+      redirects_to_index
+    end
+  end
+  
+  after :each do
+    logout
+  end
+end
+
+
+describe Admin::PagesController, "with concurrent_draft functions" do
+  it_should_behave_like 'controller with scheduled draft promotion'
+end
+
+describe Admin::SnippetsController, "with concurrent_draft functions" do
+  it_should_behave_like 'controller with scheduled draft promotion'
+end
+
+describe Admin::LayoutsController, "with concurrent_draft functions" do
+  it_should_behave_like 'controller with scheduled draft promotion'
+end

data/spec/controllers/site_controller_extensions_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'site_controller'
+SiteController.module_eval { def rescue_action(e); raise e; end }
+
+describe SiteController, "(Extended) - concurrent draft changes" do
+  dataset :users_and_pages
+  
+  before :each do
+    @page = mock_model(Page, :published? => false, :draft_should_be_promoted? => true, :process => nil, :update_attribute => nil)
+    Page.stub!(:find_by_url).and_return(@page)
+  end
+
+  it "should include the extension module" do
+    SiteController.included_modules.should include(ConcurrentDraft::SiteControllerExtensions)
+  end
+
+  it "should add the before filter" do
+    SiteController.before_filters.should be_any {|f| f == :publish_if_scheduled }
+  end
+  
+  it "should run the before filter" do
+    self.controller.should_receive(:publish_if_scheduled)
+    get :show_page, :url => '/'
+  end
+
+  it "should set the status to published if the draft should be promoted" do
+    Page.should_receive(:find_by_url).at_least(:once).and_return(@page)
+    @page.should_receive(:update_attribute).with('status_id', Status[:published].id)
+    get :show_page, :url => '/'
+  end
+end

data/spec/matchers/concurrent_draft_matcher.rb

@@ -0,0 +1,11 @@
+def have_draft
+  be_has_draft
+end
+
+def have_draft_promoted
+  be_has_draft_promoted
+end
+
+def have_draft_promotion_scheduled
+  be_has_draft_promotion_scheduled
+end

data/spec/models/model_extensions_spec.rb

@@ -0,0 +1,114 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+share_examples_for "model with concurrent draft" do
+  it "should be invalid with a draft promotion schedule date in the past" do
+    @object.draft_promotion_scheduled_at = 2.days.ago
+    @object.should_not be_valid
+    @object.should have(1).error_on(:draft_promotion_scheduled_at)
+  end
+
+  it "should be valid with a draft promotion schedule date in the future" do
+    @object.draft_promotion_scheduled_at = 1.day.from_now
+    @object.should be_valid
+    @object.should have(0).errors_on(:draft_promotion_scheduled_at)
+  end
+
+  describe "after draft promotion" do
+    before :each do
+      @object.promote_draft!
+    end
+
+    it "should have copied the content from the draft content" do
+      if @object.respond_to?(:content)
+        @object.content.should == @object.draft_content
+      end
+    end
+
+    it "should have set the promotion date/time" do
+      @object.draft_promoted_at.should be_close(Time.now, 10)
+    end
+
+    it "should have cleared the scheduled date" do
+      @object.draft_promotion_scheduled_at.should be_nil
+    end
+
+    it "should have promoted the draft" do
+      @object.should have_draft_promoted
+    end
+  end
+
+  it "should have the draft promotion scheduled if the date is in the future" do
+    @object.draft_promotion_scheduled_at = 1.day.from_now
+    @object.should have_draft_promotion_scheduled
+  end
+
+  it "should cancel the scheduled promotion" do
+    @object.draft_promotion_scheduled_at = 1.day.from_now
+    @object.cancel_promotion!
+    @object.draft_promotion_scheduled_at.should be_nil
+  end
+
+  it "should be promoted when the promotion time has past" do
+    @object.draft_promotion_scheduled_at = 1.minute.ago
+    @object.should be_draft_should_be_promoted
+  end
+  
+  it "should automatically promote the draft when necessary on load" do
+    @object.class.update_all({:draft_promotion_scheduled_at => 2.minutes.ago}, :id => @object.id)
+    new_object = @object.class.find(@object.id)
+    new_object.should have_draft_promoted
+  end
+end
+
+describe Snippet, "with concurrent draft" do
+  dataset :snippets
+  before :each do
+    @object = snippets(:first)
+    @object.update_attributes(:content => 'content test', :draft_content => 'draft content')
+  end
+  it "should not be publishable" do
+    @object.publishable?.should_not be_true
+  end
+  it_should_behave_like 'model with concurrent draft'
+end
+
+describe Layout, "with concurrent draft" do
+  dataset :layouts
+  before :each do
+    @object = layouts(:main)
+    @object.update_attributes(:content => 'content test', :draft_content => 'draft content')
+  end
+  it "should not be publishable" do
+    @object.publishable?.should_not be_true
+  end
+  it_should_behave_like 'model with concurrent draft'
+end
+
+describe PagePart, "with concurrent draft" do
+  dataset :pages
+  before :each do
+    @object = pages(:home).parts.first
+    @object.update_attributes(:content => 'content test', :draft_content => 'draft content')
+  end
+
+  describe "after draft promotion" do
+    before :each do
+      @object.promote_draft!
+    end
+
+    it "should have copied the content from the draft content" do
+      @object.content.should == @object.draft_content
+    end
+  end
+end
+
+describe Page, 'with concurrent draft' do
+  dataset :pages
+  before :each do
+    @object = pages(:home)
+  end
+  it "should be publishable" do
+    @object.publishable?.should be_true
+  end
+  it_should_behave_like 'model with concurrent draft'
+end

data/spec/models/page_extensions_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Page, "with concurrent draft" do
+  dataset :pages_with_layouts
+  before :each do
+    @page = pages(:home)
+  end
+  
+  it "should be publishable" do
+    @page.publishable?.should be_true
+  end
+
+  describe "when promoting" do
+  
+    it "should promote its page parts" do
+      @page.parts.should_receive(:reload).and_return(@page.parts)
+      @page.parts.each {|part| part.should_receive(:promote_draft!) }
+      @page.promote_draft!
+    end
+
+    it "should update its status to published" do
+      @page.update_attribute('status_id', Status[:draft].id)
+      @page.promote_draft!
+      @page.reload.status.should == Status[:published]
+      @page.published?.should be_true
+    end
+  end
+  
+  describe "when unpublishing" do
+    
+    before(:each) do
+      @page.promote_draft!
+      @page.unpublish!
+    end
+    
+    it "should set the content of its page parts to nil" do
+      @page.parts.each {|part| part.content.should be_nil}
+    end
+    
+    it "should retain its draft content" do
+      @page.part("body").should_not be_nil
+    end    
+  
+    it "should set published_at, draft_promoted_at and draft_promotion_scheduled_at dates to nil" do
+      @page.published_at.should be_nil
+      @page.draft_promoted_at.should be_nil
+      @page.draft_promotion_scheduled_at.should be_nil
+    end  
+    
+    it "should update its status to draft" do
+      @page.reload.status.should == Status[:draft]
+      @page.published?.should be_false
+    end
+  end
+  
+end