test/helpers/caching_test_helper.rb test/helpers/page_part_test_helper.rb test/helpers/page_test_helper.rb @@ -6,6 +6,7 @@ The _ConcurrentDraft_ extension enables default draft versions of pages, snippet h3. Version History +* 1.1 - Upgrade to Radiant 0.7.x compatibility * 1.0 - Initial Release - Radiant 0.6.9 compatible h3. Requirements README.textile @@ -13,7 +13,7 @@ - else %em Draft promotion unscheduled %ul.dropdown - - if current_user.admin? || current_user.publisher? + - if @controller.authorized_user? %li.schedule_draft= link_to 'Schedule promotion', '#schedule-draft-popup' %li.publish= link_to 'Promote now', {:action => 'schedule_draft_promotion', :commit => @controller.model_class.promote_now_text}, :method => :post - if @controller.model.has_draft_promotion_scheduled? @@ -24,7 +24,7 @@ %li.revert= link_to 'Revert draft', '#' - content_for :popups do - - if current_user.admin? || current_user.publisher? + - if @controller.authorized_user? #schedule-draft-popup.popup{:style => 'display:none'} %h3 Schedule draft promotion - form_for @controller.model, :url => {:action => 'schedule_draft_promotion'}, :html => {:method => :post} do |f| app/views/admin/_draft_controls.html.haml @@ -4,7 +4,7 @@ %p.buttons = save_model_and_continue_editing_button(@controller.model) = save_model_button(@controller.model) - - if current_user.admin? || current_user.publisher? + - if @controller.authorized_user? = save_model_and_promote_button(@controller.model) or = link_to 'Cancel', :action => 'index' \ No newline at end of file app/views/admin/_edit_buttons.html.haml @@ -2,18 +2,18 @@ require_dependency 'application' class ConcurrentDraftExtension < Radiant::Extension - version "1.0" + version "1.1" description "Enables default draft versions of pages, snippets and layouts, which can be scheduled for promotion to Production" url "http://github.com/avonderluft/concurrent_draft/tree/master" define_routes do |map| - map.page_schedule_draft_promotion 'admin/pages/schedule_draft_promotion/:id', + map.page_schedule_draft_promotion 'admin/pages/:id/schedule_draft_promotion', :controller => 'admin/pages', :action => 'schedule_draft_promotion' - map.snippet_schedule_draft_promotion 'admin/snippet/schedule_draft_promotion/:id', + map.snippet_schedule_draft_promotion 'admin/snippet/:id/schedule_draft_promotion', :controller => 'admin/snippets', :action => 'schedule_draft_promotion' - map.layout_schedule_draft_promotion 'admin/layout/schedule_draft_promotion/:id', + map.layout_schedule_draft_promotion 'admin/layout/:id/schedule_draft_promotion', :controller => 'admin/layouts', :action => 'schedule_draft_promotion' - map.page_unpublish 'admin/pages/unpublish/:id', :controller => 'admin/pages', :action => 'unpublish' + map.page_unpublish 'admin/pages/:id/unpublish', :controller => 'admin/pages', :action => 'unpublish' end def activate concurrent_draft_extension.rb @@ -1,22 +1,26 @@ module ConcurrentDraft::AdminControllerExtensions def self.included(base) base.class_eval do - # helper_method :model - # helper_method :model_class - # public :model, :model_class - # alias_method_chain :handle_new_or_edit_post, :promotion + helper_method :model + helper_method :model_class + public :model, :model_class only_allow_access_to :schedule_draft_promotion, :unpublish, :when => [:publisher, :admin], :denied_message => "You must have publisher privileges to execute this action.", :denied_url => {:action => 'edit'} + after_filter :check_for_promote_now, :only => :update end end - # def handle_new_or_edit_post_with_promotion(options = {}) - # returning handle_new_or_edit_post_without_promotion(options) do |result| - # model.promote_draft! if params[:promote] && !result && (current_user.publisher? || current_user.admin?) - # end - # end + def authorized_user? + (current_user.publisher? || current_user.admin?) + end + + def check_for_promote_now + model.promote_draft! if params[:promote] && authorized_user? + flash[:notice] = "The existing draft #{model_class.to_s.downcase} has been saved and promoted, and is now live." + flash.keep + end def schedule_draft_promotion self.model = model_class.find(params[:id]) @@ -36,12 +40,12 @@ module ConcurrentDraft::AdminControllerExtensions end redirect_to :action => "edit" end - + def unpublish self.model = model_class.find(params[:id]) - model.unpublish + model.unpublish! flash[:notice] = "#{model_class} has been unpublished and reset to draft mode -- no draft promotion scheduled." redirect_to :action => "edit" end - -end \ No newline at end of file + +end lib/concurrent_draft/admin_controller_extensions.rb @@ -21,7 +21,7 @@ module ConcurrentDraft::HelperExtensions %{<p class="clear">&nbsp;</p>} end end - + def save_model_button(_model) label = _model.new_record? ? "Create" : "Save" submit_tag "#{label} and Exit", :class => 'button' lib/concurrent_draft/helper_extensions.rb @@ -5,7 +5,6 @@ module ConcurrentDraft::ModelExtensions base.class_eval do validate :promotion_date_in_future end - end module ClassMethods @@ -45,7 +44,7 @@ module ConcurrentDraft::ModelExtensions update_attributes("draft_promotion_scheduled_at" => nil, "draft_promoted_at" => Time.now) if respond_to?(:draft_promoted_at) end - def unpublish + def unpublish! update_attributes("content" => nil) if respond_to?(:content) && respond_to?(:draft_content) update_attributes("draft_promotion_scheduled_at" => nil, "draft_promoted_at" => nil) if respond_to?(:draft_promoted_at) end lib/concurrent_draft/model_extensions.rb @@ -6,8 +6,8 @@ module ConcurrentDraft::PageExtensions super end - def unpublish - parts.each(&:unpublish) + def unpublish! + parts.each(&:unpublish!) update_attributes('published_at' => nil, 'status_id' => Status[:draft].id) super end lib/concurrent_draft/page_extensions.rb @@ -8,7 +8,7 @@ shared_examples_for 'controller with scheduled draft promotion' do controller.cache.clear login_as :admin @klass = controller.class.model_class - @model_symbol = controller.send(:model_symbol) + @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) @@ -21,6 +21,8 @@ shared_examples_for 'controller with scheduled draft promotion' do it "should load the model" do @klass.should_receive(:find).with('1').and_return(@object) + puts @object.class + @object.should be_a(@object.class) do_post assigns[@model_symbol].should == @object end @@ -33,13 +35,15 @@ shared_examples_for 'controller with scheduled draft promotion' do [:admin, :publisher].each do |user| before :each do - login_as user + request.session[:user_id] = user_id(user) + rputs *User.all end it "should allow #{user}" do do_post response.should be_redirect response.should redirect_to(:action => "edit") + puts flash[:error] flash[:error].should be_blank end end @@ -50,11 +54,10 @@ shared_examples_for 'controller with scheduled draft promotion' do end it "should deny #{user}" do - pending "LoginSystem + RSpec wonkiness again makes these fail... works in dev/prod mode" do_post response.should be_redirect response.should redirect_to(:action => "edit") - flash[:error].should == 'You must have publishing privileges to execute this action.' + flash[:error].should == 'You must have publisher privileges to execute this action.' end end end @@ -135,7 +138,7 @@ shared_examples_for 'controller with scheduled draft promotion' do describe "promotion in conjunction with saving" do before :each do @klass.stub!(:find_by_id).and_return(@object) - controller.stub!(:handle_new_or_edit_post_without_promotion).and_return(false) + # controller.stub!(:handle_new_or_edit_post_without_promotion).and_return(false) end it "should promote the draft when the 'Save & Promote Now' button was pushed" do spec/controllers/admin_controller_extensions_spec.rb @@ -12,7 +12,9 @@ end require "#{RADIANT_ROOT}/spec/spec_helper" Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets") - +if File.directory?(File.dirname(__FILE__) + "/scenarios") + Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios" +end if File.directory?(File.dirname(__FILE__) + "/matchers") Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file } end spec/spec_helper.rb b53003cf2e6ed98402eafc0dfe7dc6a4176fae84 Andrew vonderLuft avonderluft@avlux.net http://github.com/avonderluft/radiant-concurrent_draft-extension/commit/5331982e2f73d95a66cb4115d41df1f353b93192 5331982e2f73d95a66cb4115d41df1f353b93192 2009-04-14T16:20:54-07:00 2009-04-14T16:20:54-07:00 updates for 0.7.1 - Save and Promote Now using after_filter in admin_controller_extensions; other minor changes; updated README and specs; some specs still failing. dbba062d82cd881991daebde7f8b02597049f8e5 Andrew vonderLuft avonderluft@avlux.net