spud_blog 0.8.8 → 0.8.11

data/app/controllers/blog_controller.rb

@@ -6,12 +6,14 @@ class BlogController < ApplicationController
   caches_action :show, :index,
     :expires => Spud::Blog.config.action_caching_duration,
     :if => Proc.new{ |c|
-      Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1)
+      Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => false).future_posts.count == 0)
     }
 
   after_filter :only => [:show, :index] do |c|
     if Spud::Blog.enable_full_page_caching && !(c.params[:page] && c.params[:page].to_i > 1)
-      c.cache_page(nil, nil, false)
+      if (SpudPost.where(:is_news => false).future_posts.count == 0)
+        c.cache_page(nil, nil, false)
+      end
     end
   end
 

data/app/controllers/news_controller.rb

@@ -6,12 +6,14 @@ class NewsController < ApplicationController
   caches_action :show, :index,
     :expires => Spud::Blog.config.action_caching_duration,
     :if => Proc.new{ |c|
-      Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1)
+      Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => true).future_posts.count == 0)
     }
 
   after_filter :only => [:show, :index] do |c|
     if Spud::Blog.enable_full_page_caching && !(c.params[:page] && c.params[:page].to_i > 1)
-      c.cache_page(nil, nil, false)
+      if (SpudPost.where(:is_news => true).future_posts.count == 0)
+        c.cache_page(nil, nil, false)
+      end
     end
   end
 

data/app/models/spud_post.rb

@@ -10,6 +10,7 @@ class SpudPost < ActiveRecord::Base
 	has_many :spud_permalinks,:as => :attachment
 
 	scope :publicly, where('visible = true AND published_at <= ?', Time.now.utc).order('published_at desc')
+	scope :future_posts, where('visible = true AND published_at > ?', Time.now.utc)
 	validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
 	validates_uniqueness_of :url_name
 	before_validation :set_url_name

data/app/views/spud/admin/news_posts/index.html.erb

@@ -17,7 +17,7 @@
 				<tr>
 
 					<td>
-						<%= link_to edit_spud_admin_news_path(post) do %>
+						<%= link_to edit_spud_admin_news_post_path(post) do %>
 							<%=post.title%>
 							<%if !post.visible%>
 								<span class="badge">Draft</span>

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.8.8"
+	  VERSION = "0.8.11"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70330527319860 !ruby/object:Gem::Requirement
+  requirement: &70099588378700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70330527319860
+  version_requirements: *70099588378700
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70330527319340 !ruby/object:Gem::Requirement
+  requirement: &70099588378180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330527319340
+  version_requirements: *70099588378180
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70330527313740 !ruby/object:Gem::Requirement
+  requirement: &70099588377460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70330527313740
+  version_requirements: *70099588377460
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70330527313100 !ruby/object:Gem::Requirement
+  requirement: &70099588377020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330527313100
+  version_requirements: *70099588377020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330527312380 !ruby/object:Gem::Requirement
+  requirement: &70099588376440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330527312380
+  version_requirements: *70099588376440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70330527311760 !ruby/object:Gem::Requirement
+  requirement: &70099588372700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330527311760
+  version_requirements: *70099588372700
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70330527310940 !ruby/object:Gem::Requirement
+  requirement: &70099588371480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -90,10 +90,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70330527310940
+  version_requirements: *70099588371480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70330527310200 !ruby/object:Gem::Requirement
+  requirement: &70099588370680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70330527310200
+  version_requirements: *70099588370680
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70330527309480 !ruby/object:Gem::Requirement
+  requirement: &70099588370020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,7 +112,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70330527309480
+  version_requirements: *70099588370020
 description: Spud blogging/news and rss engine.
 email:
 - greg@westlakedesign.com
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3292979416074427203
+      hash: -1742732038736838628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3292979416074427203
+      hash: -1742732038736838628
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15