radiant-concurrent_draft-extension 1.0.5 → 1.0.6

data/README.textile

@@ -55,6 +55,10 @@ Scheduled times are dependent on the ActiveRecord time setting.  If you want to
 
 <pre>config.active_record.default_timezone = :local</pre>
 
+h2. To do
+
+* Add draft controls to Page Index view, probably in the Status column.
+
 h2. Acknowledgments
 
 * Andrew conceived of the ideas for this extension and its initial design,  and did model changes, migrations, and initial code for pages.

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/concurrent_draft/admin_controller_extensions.rb

@@ -29,24 +29,24 @@ module ConcurrentDraft::AdminControllerExtensions
     case params[:commit]
     when model_class.promote_now_text
       model.promote_draft!
-      flash[:notice] = "The existing draft #{model_class.to_s.downcase} has been promoted and is now live."
+      flash[:notice] = "Draft #{model_class.to_s.downcase} '#{model.display_name}' has been promoted and is now live."
     when model_class.schedule_promotion_text
       if model.update_attributes(params[model.class.name.underscore.intern])
-        flash[:notice] = "The draft #{model_class.to_s.downcase} will be promoted on #{model.draft_promotion_scheduled_at.to_s(:long_civilian)}."
+        flash[:notice] = "Draft #{model_class.to_s.downcase} '#{model.display_name}' will be promoted on #{model.draft_promotion_scheduled_at.to_s(:long_civilian)}."
       else
         flash[:error] = model.errors.full_messages.to_sentence
       end
     when model_class.cancel_promotion_text
       model.cancel_promotion!
-      flash[:notice] = "The scheduled draft #{model_class.to_s.downcase} promotion has been cancelled."
+      flash[:notice] = "Scheduled draft promotion of #{model_class.to_s.downcase} '#{model.display_name}' has been cancelled."
     end
-    redirect_to :action => "edit"
+    redirect_to :action => "index"
   end
 
   def unpublish
     self.model = model_class.find(params[:id])
     model.unpublish!
-    flash[:notice] = "#{model_class} has been unpublished and reset to draft mode -- no draft promotion scheduled."
-    redirect_to :action => "edit"
+    flash[:notice] = "#{model_class} '#{model.display_name}' has been unpublished and reset to draft mode."
+    redirect_to :action => "index"
   end
 end

data/radiant-concurrent_draft-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-concurrent_draft-extension}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew vonderLuft", "Sean Cribbs"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-07-06}
   s.description = %q{Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion.}
   s.email = %q{avonderluft@avlux.net}
   s.extra_rdoc_files = [
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://github.com/avonderluft/radiant-concurrent_draft-extension}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Concurrent Draft Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin_controller_extensions_spec.rb",

data/spec/controllers/admin_controller_extensions_spec.rb

@@ -22,6 +22,7 @@ shared_examples_for 'controller with scheduled draft promotion' do
 
     it "should load the model" do
       @klass.should_receive(:find).with('1').and_return(@object)
+      @object.should_receive(:display_name)
       login_as :admin
       do_post
       assigns[@model_symbol].should == @object
@@ -41,9 +42,10 @@ shared_examples_for 'controller with scheduled draft promotion' do
         end
       
         it "should allow #{user}" do
+          @object.should_receive(:display_name)
           do_post
           response.should be_redirect
-          response.should redirect_to(:action => "edit")
+          response.should redirect_to(:action => "index")
           flash[:error].should be_blank
         end
       end
@@ -71,10 +73,12 @@ shared_examples_for 'controller with scheduled draft promotion' do
 
     it "should promote the draft" do
       @object.should_receive(:promote_draft!)
+      @object.should_receive(:display_name)
       do_post
     end
 
     it "should set the flash message" do
+      @object.should_receive(:display_name)
       do_post
       flash[:notice].should match(/published|promoted/)
     end
@@ -105,6 +109,7 @@ shared_examples_for 'controller with scheduled draft promotion' do
 
     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)
+      @object.should_receive(:display_name)
       do_post
       flash[:notice].should match(/will be promoted/)
     end
@@ -118,6 +123,7 @@ shared_examples_for 'controller with scheduled draft promotion' do
 
   describe "cancelling promotion" do
     def do_post
+      @object.should_receive(:display_name)
       post :schedule_draft_promotion, :id => '1', :commit => @klass.cancel_promotion_text
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-concurrent_draft-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Andrew vonderLuft
@@ -16,11 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -37,6 +36,7 @@ dependencies:
         version: 1.0.0.rc2
   name: radiant
   version_requirements: *id001
+  prerelease: false
 description: Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion.
 email: avonderluft@avlux.net
 executables: []
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Concurrent Draft Extension for Radiant CMS