spud_blog 0.9.11 → 1.0.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 77a728504b7102e5895987df422949e3bead587b
+  data.tar.gz: 2f0b881a34f6c85002262f1fefac96c6cab7d4e8
+SHA512:
+  metadata.gz: 8bfd01e3fd6a66af57ce7020627196353e4e602c7e8bc0fe2c75a6883aed05407b1067b2587584dbd770c08f0cae5dd97201762b4976f8d7002440fcd0f61914
+  data.tar.gz: f41987a796f9fe647814ca7d5a0cd6df19bdabaee85de4c2f59f3943d516d875644755db82be3b8461864b3e09f3eb5ff810e48cfce3e80a894ba7e9e7a90b4c

data/app/assets/javascripts/spud/admin/posts.js

@@ -8,7 +8,7 @@ spud.admin.posts = new function(){
 	var self = this;
 
 	this.edit = function(){
-		initDatePicker();
+		spud.admin.date_picker.init()
 
 		$('body').on('click', '.spud_post_add_category', self.clickedPostAddCategory);
 		$('body').on('click', '.save_post_category_button', self.submittedPostCategoryForm);

data/app/controllers/blog_controller.rb

@@ -1,25 +1,24 @@
 class BlogController < ApplicationController
-
+  # include ActionController::Caching::Sweeping
 	respond_to :html, :xml, :json, :rss
 	layout Spud::Blog.base_layout
 
   before_filter :find_post, :only => :show
 
-  caches_action :show, :index,
-    :expires => Spud::Blog.config.action_caching_duration,
-    :if => Proc.new{ |c|
-      Spud::Blog.cache_mode == :action && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => false).future_posts.count == 0)
-    }
+  # caches_action :show, :index,
+  #   :expires => Spud::Blog.config.action_caching_duration,
+  #   :if => Proc.new{ |c|
+  #     Spud::Blog.cache_mode == :action && !(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.cache_mode == :full_page && !(c.params[:page] && c.params[:page].to_i > 1)
-      if (SpudPost.where(:is_news => false).future_posts.count == 0)
-        c.cache_page(nil, nil, false)
-      end
-    end
-  end
+  # after_filter :only => [:show, :index] do |c|
+  #   if Spud::Blog.cache_mode == :full_page && !(c.params[:page] && c.params[:page].to_i > 1)
+  #     if (SpudPost.where(:is_news => false).future_posts.count == 0)
+  #       c.cache_page(nil, nil, false)
+  #     end
+  #   end
+  # end
 
-  cache_sweeper :spud_post_comment_sweeper, :only => [:create_comment]
 
   def index
     page = 1
@@ -110,7 +109,7 @@ class BlogController < ApplicationController
       flash[:error] = "Post not found!"
       redirect_to blog_path and return false
     end
-    @comment = @post.comments.new(params[:spud_post_comment])
+    @comment = @post.comments.new(comment_params)
     @comment.user_agent = request.env["HTTP_USER_AGENT"]
     @comment.user_ip = request.remote_ip
     @comment.referrer = request.referrer
@@ -122,7 +121,7 @@ class BlogController < ApplicationController
     end
   end
 
-  private
+private
 
   def find_post
   	@post = SpudPost.find_by_url_name(params[:id])
@@ -132,4 +131,8 @@ class BlogController < ApplicationController
 		end
   end
 
+  def comment_params
+    params.require(:spud_post_comment).permit(:author,:content)
+  end
+
 end

data/app/controllers/spud/admin/news_posts_controller.rb

@@ -5,7 +5,6 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 	before_filter :find_post, :only => [:show, :edit, :update, :destroy]
 	add_breadcrumb 'News Posts', :spud_admin_news_posts_path
 	belongs_to_spud_app :news_posts
-	cache_sweeper :spud_post_sweeper, :only => [:create, :update, :destroy]
 
 	def index
 		@posts = SpudPost.where(:is_news => true).order('published_at desc').includes(:comments).paginate(:page => params[:page], :per_page => 15)
@@ -20,7 +19,7 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 	def update
 		@categories = SpudPostCategory.grouped
 		params[:spud_post][:spud_site_ids] ||= []
-		if @post.update_attributes(params[:spud_post])
+		if @post.update_attributes(post_params)
 	    flash[:notice] = 'News Post was successfully updated.'
 		end
     respond_with @post, :location => spud_admin_news_posts_path
@@ -35,7 +34,7 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 	def create
 		@categories = SpudPostCategory.grouped
 		params[:spud_post][:spud_site_ids] ||= []
-		@post = SpudPost.new(params[:spud_post])
+		@post = SpudPost.new(post_params)
 		if @post.save
     	flash[:notice] = 'News Post was successfully created.'
 		end
@@ -59,4 +58,8 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 		end
 	end
 
+	def post_params
+		params.require(:spud_post).permit(:is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,{:category_ids => []}, {:spud_site_ids => []}, :content_format)
+	end
+
 end

data/app/controllers/spud/admin/post_categories_controller.rb

@@ -1,10 +1,13 @@
+require 'actionpack/action_caching'
+require 'actionpack/page_caching'
+
 class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 
 	layout false
 	respond_to :html, :json
 
 	before_filter :find_category, :only => [:show, :edit, :update, :destroy]
-	cache_sweeper :spud_post_category_sweeper, :only => [:create, :update, :destroy]
+	# cache_sweeper :spud_post_category_sweeper, :only => [:create, :update, :destroy]
 
 	def index
 		@post_categories = SpudPostCategory.grouped
@@ -16,7 +19,7 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		if @post_category.update_attributes(params[:spud_post_category])
+		if @post_category.update_attributes(category_params)
 			flash[:notice] = 'Post Category was successfully updated'
 			respond_with @post_category, :location => spud_admin_post_categories_path
 		else
@@ -30,7 +33,7 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 	end
 
 	def create
-		@post_category = SpudPostCategory.new(params[:spud_post_category])
+		@post_category = SpudPostCategory.new(category_params)
 		if @post_category.save
 			flash[:notice] = 'Post Category was successfully created'
 			respond_with @post_category, :location => spud_admin_post_categories_path
@@ -49,11 +52,13 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 		end
 	end
 
-	private
+private
 
 	def find_category
 		@post_category = SpudPostCategory.find(params[:id])
 	end
 
-
+	def category_params
+		params.require(:spud_post_category).permit(:name, :url_name, :parent_id)
+	end
 end

data/app/controllers/spud/admin/post_comments_controller.rb

@@ -1,3 +1,4 @@
+
 class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 
 	respond_to :html, :xml, :json

data/app/controllers/spud/admin/posts_controller.rb

@@ -1,3 +1,5 @@
+
+
 class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 
 	layout 'spud/admin/detail'
@@ -5,7 +7,6 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	before_filter :find_post, :only => [:show, :edit, :update, :destroy]
 	add_breadcrumb 'Blog Posts', :spud_admin_posts_path
 	belongs_to_spud_app :blog_posts
-	cache_sweeper :spud_post_sweeper, :only => [:create, :update, :destroy]
 
 	def index
 		@posts = SpudPost.where(:is_news => false).order('published_at desc').includes(:visible_comments, :spam_comments, :author).paginate(:page => params[:page], :per_page => 15)
@@ -20,7 +21,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	def update
 		@categories = SpudPostCategory.grouped
 		params[:spud_post][:spud_site_ids] ||= []
-		if @post.update_attributes(params[:spud_post])
+		if @post.update_attributes(post_params)
 			flash[:notice] = 'Post was successfully updated.'
 		end
     respond_with @post, :location => spud_admin_posts_path
@@ -35,7 +36,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	def create
 		@categories = SpudPostCategory.grouped
 		params[:spud_post][:spud_site_ids] ||= []
-		@post = SpudPost.new(params[:spud_post])
+		@post = SpudPost.new(post_params)
 		if @post.save
 	    flash[:notice] = 'Post was successfully created.'
 		end
@@ -49,7 +50,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
     respond_with @post, :location => spud_admin_posts_path
 	end
 
-	private
+private
 
 	def find_post
 		@post = SpudPost.find(params[:id])
@@ -59,4 +60,9 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 		end
 	end
 
+
+	def post_params
+		params.require(:spud_post).permit(:is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,{:category_ids => []}, {:spud_site_ids => []}, :content_format)
+	end
+
 end

data/app/controllers/spud/blog/sitemaps_controller.rb

@@ -1,7 +1,5 @@
 class Spud::Blog::SitemapsController < Spud::ApplicationController
 	respond_to :xml
-	caches_action :show, :expires_in => 1.day, :if => Proc.new{ |c| Spud::Blog.cache_mode == :action }
-	caches_page :show, :if => Proc.new{ |c| Spud::Blog.cache_mode == :full_page }
 	def show
 		@posts = SpudPost.publicly.all
 		respond_with @pages

data/app/models/spud_post.rb

@@ -7,13 +7,13 @@ class SpudPost < ActiveRecord::Base
 		:foreign_key => 'spud_post_id'
 	belongs_to :author, :class_name => 'SpudUser', :foreign_key => 'spud_user_id'
 	has_many :comments, :class_name => 'SpudPostComment'
-	has_many :visible_comments, :class_name => 'SpudPostComment',:conditions => {:spam => [nil,false]}
-	has_many :spam_comments, :class_name => "SpudPostComment", :conditions => {:spam => true}
+	has_many :visible_comments, -> { where spam: [nil,false]}, :class_name => 'SpudPostComment'
+	has_many :spam_comments, -> { where spam: true }, :class_name => "SpudPostComment"
 	has_many :spud_permalinks,:as => :attachment
 	has_many :spud_post_sites, :dependent => :destroy
 
-	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)
+	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
@@ -21,7 +21,6 @@ class SpudPost < ActiveRecord::Base
 
 	after_save :set_spud_site_ids
 
-	attr_accessible :is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,:category_ids, :spud_site_ids, :content_format
 	attr_accessor :spud_site_ids
 
 	def self.for_spud_site(spud_site_id)
@@ -101,12 +100,10 @@ class SpudPost < ActiveRecord::Base
 	end
 
 	def postprocess_content
-		if self.content_format == 'Markdown'
-			require 'redcarpet'
-	    renderer = Redcarpet::Render::HTML.new
-	    extensions = {fenced_code_blocks: true}
-	    redcarpet = Redcarpet::Markdown.new(renderer, extensions)
-	    self.content_processed = redcarpet.render self.content
+		rendererClass = Spud::Core.renderer(self.content_format)
+		if rendererClass
+			renderer = rendererClass.new()
+			self.content_processed = renderer.render self.content
 		else
 			self.content_processed = content
 		end

data/app/models/spud_post_categories_post.rb

@@ -1,5 +1,4 @@
 class SpudPostCategoriesPost < ActiveRecord::Base
-  attr_accessible :spud_post_id, :spud_post_category_id
-  belongs_to :spud_post
-  belongs_to :spud_post_category
-end
+  belongs_to :spud_post,:touch => true
+  belongs_to :spud_post_category,:touch => true
+end

data/app/models/spud_post_category.rb

@@ -1,7 +1,8 @@
 class SpudPostCategory < ActiveRecord::Base
 	spud_searchable
 	acts_as_nested_set
-
+	has_many :spud_post_categories_posts
+	# has_many :posts, :class_name => "SpudPost", :through => :spud_post_categories_posts
 	has_and_belongs_to_many :posts,
 		:class_name => 'SpudPost',
 		:join_table => 'spud_post_categories_posts',
@@ -13,7 +14,6 @@ class SpudPostCategory < ActiveRecord::Base
 
 	before_destroy :update_child_categories
 
-	attr_accessible :name, :url_name, :parent_id
 
 	# tell awesome_nested_set not to destroy descendants
 	def skip_before_destroy

data/app/models/spud_post_comment.rb

@@ -6,9 +6,9 @@ class SpudPostComment < ActiveRecord::Base
 
 
 	validates_presence_of :author, :content
-	belongs_to :post, :class_name => 'SpudPost', :foreign_key => 'spud_post_id', :counter_cache => :comments_count
+	belongs_to :post, :class_name => 'SpudPost', :foreign_key => 'spud_post_id', :counter_cache => :comments_count, :touch => true
 
-	attr_accessible :author,:content,:spud_post_id,:referrer,:spam,:user_agent,:user_ip,:permalink
+	# attr_accessible :author,:content,:spud_post_id,:referrer,:spam,:user_agent,:user_ip,:permalink
 
 
   def rakismet_check_for_spam

data/app/models/spud_post_site.rb

@@ -1,9 +1,9 @@
 class SpudPostSite < ActiveRecord::Base
-  attr_accessible :spud_post_id, :spud_site_id
-  belongs_to :spud_post
+  # attr_accessible :spud_post_id, :spud_site_id
+  belongs_to :spud_post, :touch => :true
 
   def spud_site
     return Spud::Core.site_config_for_id(spud_site_id)
   end
-  
+
 end

data/app/views/blog/_comment.html.erb

@@ -1,4 +1,4 @@
 <li>
 	<h6>Posted by: <%= comment.author %></h6>
 	<p><%= comment.content %></p>
-</li>
+</li>

data/app/views/blog/_post.html.erb

@@ -0,0 +1,9 @@
+<% cache ["blog/index",post] do%>
+	<div class="spud_blog_post">
+		<h3><%= link_to post.title, blog_post_path(post.url_name) %></h3>
+		<h4>Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
+		<div class="spud_blog_post_content">
+			<%= truncate_html post.content_processed.html_safe, :length => 250 %>
+		</div>
+	</div>
+<%end%>

data/app/views/blog/index.html.erb

@@ -18,15 +18,7 @@
 
 <div id="spud_blog_posts">
 	<% if @posts.any? %>
-		<% @posts.each do |post| %>
-			<div class="spud_blog_post">
-				<h3><%= link_to post.title, blog_post_path(post.url_name) %></h3>
-				<h4>Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
-				<div class="spud_blog_post_content">
-					<%= truncate_html post.content_processed.html_safe, :length => 250 %>
-				</div>
-			</div>
-		<% end %>
+		<%= render :partial => "post", :collection => @posts %>
 	<% else %>
 		<p>No posts were found in this category</p>
 	<% end %>

data/app/views/blog/show.html.erb

@@ -12,26 +12,28 @@
 	<% end %>
 <% end %>
 
-<div class="spud_blog_post">
-	<h3><%= @post.title %></h3>
-	<h4>Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
-	<% if @post.categories.any? %>
-	<p id="spud_blog_post_categories">
-		Filed under
-		<%= raw(@post.categories.collect{ |c| link_to c.name, blog_category_path(c.url_name) }.join(', ')) %>
-	</p>
-	<% end %>
-	<div id="spud_blog_post_content">
-		<%= raw @post.content_processed %>
+<%cache ['blog/show', @post] do%>
+	<div class="spud_blog_post">
+		<h3><%= @post.title %></h3>
+		<h4>Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
+		<% if @post.categories.any? %>
+		<p id="spud_blog_post_categories">
+			Filed under
+			<%= raw(@post.categories.collect{ |c| link_to c.name, blog_category_path(c.url_name) }.join(', ')) %>
+		</p>
+		<% end %>
+		<div id="spud_blog_post_content">
+			<%= raw @post.content_processed %>
+		</div>
 	</div>
-</div>
 
-<% if @post.comments_enabled %>
-	<div class="spud_blog_post_comment">
-		<h5>Post a Comment:</h5>
-		<%= render 'comment_form' %>
-	</div>
-	<ul id="spud_blog_post_comments">
-		<%= render :partial => 'comment', :collection => @post.visible_comments %>
-	</ul>
-<% end %>
+	<% if @post.comments_enabled %>
+		<div class="spud_blog_post_comment">
+			<h5>Post a Comment:</h5>
+			<%= render 'comment_form' %>
+		</div>
+		<ul id="spud_blog_post_comments">
+			<%= render :partial => 'comment', :collection => @post.visible_comments %>
+		</ul>
+	<% end %>
+<%end%>

data/app/views/news/_post.html.erb

@@ -0,0 +1,9 @@
+<% cache ["news/index",post] do%>
+	<div class="spud_news_post">
+		<h3><%= link_to post.title, news_post_path(post.url_name) %></h3>
+		<h4>Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
+		<div class="spud_news_post_content">
+			<%= truncate_html post.content_processed.html_safe, :length => 250 %>
+		</div>
+	</div>
+<%end%>

data/app/views/news/index.html.erb

@@ -18,15 +18,7 @@
 
 <div id="spud_news_posts">
 	<% if @posts.any? %>
-		<% @posts.each do |post| %>
-			<div class="spud_news_post">
-				<h3><%= link_to post.title, news_post_path(post.url_name) %></h3>
-				<h4>Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
-				<div class="spud_news_post_content">
-					<%= truncate_html post.content_processed.html_safe, :length => 250 %>
-				</div>
-			</div>
-		<% end %>
+		<%= render :partial => "post", :collection => @posts %>
 	<% else %>
 		<p>No posts were found in this category</p>
 	<% end %>

data/app/views/news/show.html.erb

@@ -12,16 +12,18 @@
 	<% end %>
 <% end %>
 
-<div class="spud_news_post">
-	<h3><%= @post.title %></h3>
-	<h4>Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
-	<% if @post.categories.any? %>
-	<p id="spud_news_post_categories">
-		Filed under
-		<%= raw(@post.categories.collect{ |c| link_to c.name, news_category_path(c.url_name) }.join(', ')) %>
-	</p>
-	<% end %>
-	<div id="spud_news_post_content">
-		<%= raw @post.content_processed %>
+<%cache ['news/show', @post] do%>
+	<div class="spud_news_post">
+		<h3><%= @post.title %></h3>
+		<h4>Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
+		<% if @post.categories.any? %>
+		<p id="spud_news_post_categories">
+			Filed under
+			<%= raw(@post.categories.collect{ |c| link_to c.name, news_category_path(c.url_name) }.join(', ')) %>
+		</p>
+		<% end %>
+		<div id="spud_news_post_content">
+			<%= raw @post.content_processed %>
+		</div>
 	</div>
-</div>
+<%end%>

data/app/views/spud/admin/posts/_form.html.erb

@@ -6,15 +6,13 @@
   <%= f.text_field :title, :class => "full-width",:placeholder=>"Enter title here" %>
 	</div>
 </fieldset>
-<%if Spud::Blog.config.enable_markdown%>
 	<div class="control-group">
 		<div class="controls">
-			<%=f.select :content_format,[["HTML"],["Markdown"]], {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_post_content"%>
+			<%=f.select :content_format,Spud::Core.renderers.collect { |k,v| [v[:description] || k, k]}, {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_post_content"%>
 		</div>
 	</div>
-<%end%>
 <div style="clear:both;">
-	<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width', "data-format" => f.object.content_format%>
+	<%= f.text_area :content,:style => "width:100%;", :class => 'spud-formatted-editor full-width', "data-format" => f.object.content_format %>
 </div>
 
 <% if Spud::Blog.config.has_custom_fields %>

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

@@ -34,7 +34,7 @@
 						Spam: <%=link_to post.spam_comments.count, spud_admin_post_post_comments_path(:post_id => post.id) %>
 					</td>
 					<td align="right">
-						<%= link_to 'Delete', spud_admin_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'btn btn-danger' %>
+						<%= link_to 'Delete', spud_admin_post_path(post), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this post?'}, :class => 'btn btn-danger' %>
 					</td>
 				</tr>
 			<%end%>

data/config/routes.rb

@@ -20,7 +20,7 @@ Rails.application.routes.draw do
   end
 
   if Spud::Blog.config.blog_enabled
-    scope Spud::Blog.config.blog_path do
+    scope (Spud::Blog.config.blog_path == '/' ? 'blog' : Spud::Blog.config.blog_path) do
 
       # Blog Post Categories
       get 'category/:category_url_name(/page/:page)',
@@ -57,7 +57,7 @@ Rails.application.routes.draw do
   end
 
   if Spud::Blog.config.news_enabled
-    scope Spud::Blog.config.news_path do
+    scope (Spud::Blog.config.news_path == '/' ? 'news' : Spud::Blog.config.news_path) do
 
       # News Post Categories
       get 'category/:category_url_name(/page/:page)',
@@ -91,4 +91,9 @@ Rails.application.routes.draw do
     end
   end
 
+  if Spud::Blog.config.blog_path == '/'
+    root 'blog#index'
+  elsif Spud::Blog.config.news_path == '/'
+    root 'news#index'
+  end
 end

data/lib/spud_blog/configuration.rb

@@ -5,8 +5,8 @@ module Spud
       :base_layout, :news_layout, :blog_enabled,
       :news_enabled, :posts_per_page, :blog_path,
       :news_path, :enable_sitemap, :has_custom_fields,
-      :cache_mode, :action_caching_duration,
-      :enable_rakismet, :enable_markdown
+      :action_caching_duration,
+      :enable_rakismet
     )
     self.base_layout = 'application'
     self.news_layout = nil
@@ -17,9 +17,8 @@ module Spud
     self.news_path = 'news'
     self.enable_sitemap = true
     self.has_custom_fields = false
-    self.cache_mode = nil #options :full_page, :action
+    # self.cache_mode = nil #options :full_page, :action #deprecated
     self.action_caching_duration = 3600
     self.enable_rakismet = false
-    self.enable_markdown = false
   end
 end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.9.11"
+	  VERSION = "1.0.0.rc1"
 	end
 end

metadata

@@ -1,164 +1,186 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.9.11
-  prerelease: 
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: spud_core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack-page_caching
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack-action_caching
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.14
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,67 +195,45 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 1.0.0.RC1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 1.0.0.RC1
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.14.0
 description: Spud blogging/news and rss engine.
 email:
 - greg@westlakedesign.com
@@ -270,16 +269,15 @@ files:
 - app/models/spud_post.rb
 - app/models/spud_post_categories_post.rb
 - app/models/spud_post_category.rb
-- app/models/spud_post_category_sweeper.rb
 - app/models/spud_post_comment.rb
-- app/models/spud_post_comment_sweeper.rb
 - app/models/spud_post_site.rb
-- app/models/spud_post_sweeper.rb
 - app/views/blog/_comment.html.erb
 - app/views/blog/_comment_form.html.erb
+- app/views/blog/_post.html.erb
 - app/views/blog/index.html.erb
 - app/views/blog/index.rss.builder
 - app/views/blog/show.html.erb
+- app/views/news/_post.html.erb
 - app/views/news/index.html.erb
 - app/views/news/index.rss.builder
 - app/views/news/show.html.erb
@@ -327,33 +325,26 @@ files:
 - test/unit/spud_post_site_test.rb
 homepage: http://github.com/davydotcom/spud_blog
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3315726289214796166
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3315726289214796166
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Spud Blog Engine.
 test_files:
 - test/fixtures/spud_post_sites.yml

data/app/models/spud_post_category_sweeper.rb

@@ -1,41 +0,0 @@
-class SpudPostCategorySweeper < ActionController::Caching::Sweeper
-
-  observe SpudPostCategory
-
-  def after_save(record)
-    expire_cache_for(record)
-  end
-
-  def after_destroy(record)
-    expire_cache_for(record)
-  end
-
-  private
-
-  def expire_cache_for(record)
-    if Spud::Blog.config.cache_mode = :action
-      SpudPost.find_each do |p|
-        if p.is_news && Spud::Blog.config.news_enabled
-          expire_action news_post_url(p.url_name)
-        elsif Spud::Blog.config.blog_enabled
-          expire_action blog_post_url(p.url_name)
-        end
-      end
-      expire_action news_url if Spud::Blog.config.news_enabled
-      expire_action blog_url if Spud::Blog.config.blog_enabled
-      expire_action spud_blog_sitemap_url
-    end
-    if Spud::Blog.config.cache_mode = :full_page
-      SpudPost.find_each do |p|
-        if p.is_news && Spud::Blog.config.news_enabled
-          expire_page news_post_path(p.url_name)
-        elsif Spud::Blog.config.blog_enabled
-          expire_page blog_post_path(p.url_name)
-        end
-      end
-      expire_page news_path if Spud::Blog.config.news_enabled
-      expire_page blog_path if Spud::Blog.config.blog_enabled
-      expire_page spud_blog_sitemap_path(:format => :xml)
-    end
-  end
-end

data/app/models/spud_post_comment_sweeper.rb

@@ -1,33 +0,0 @@
-class SpudPostCommentSweeper < ActionController::Caching::Sweeper
-
-  observe SpudPostComment
-
-  def after_save(record)
-    expire_cache_for(record)
-  end
-
-  def after_destroy(record)
-    expire_cache_for(record)
-  end
-
-  private
-
-  def expire_cache_for(record)
-    unless record.post.nil?
-      if Spud::Blog.config.cache_mode == :action
-        if record.post.is_news
-          expire_action news_post_url(record.post.url_name)
-        else
-          expire_action blog_post_url(record.post.url_name)
-        end
-      end
-      if Spud::Blog.config.cache_mode == :full_page
-        if record.post.is_news
-          expire_page news_post_path(record.post.url_name)
-        else
-          expire_page blog_post_path(record.post.url_name)
-        end
-      end
-    end
-  end
-end

data/app/models/spud_post_sweeper.rb

@@ -1,47 +0,0 @@
-class SpudPostSweeper < ActionController::Caching::Sweeper
-
-  observe SpudPost
-
-  def after_create(record)
-    expire_cache_for(record)
-  end
-
-  def before_update(record)
-    expire_cache_for(record)
-  end
-
-  def after_destroy(record)
-    expire_cache_for(record)
-  end
-
-  private
-
-  def expire_cache_for(record)
-    if Spud::Blog.config.cache_mode == :action
-      expire_action spud_blog_sitemap_url
-      if !record.is_news && Spud::Blog.config.blog_enabled
-        expire_action blog_url
-        expire_action blog_url(:format => :rss)
-        expire_action blog_post_url(record.url_name)
-      elsif Spud::Blog.config.news_enabled
-        expire_action news_url
-        expire_action news_url(:format => :rss)
-        expire_action news_post_url(record.url_name)
-      end
-    end
-    if Spud::Blog.config.cache_mode == :full_page
-      expire_page spud_blog_sitemap_path(:format => :xml)
-      if record.is_news && Spud::Blog.config.news_enabled
-        expire_page news_path
-        expire_page news_path(:format => :rss)
-        expire_page news_post_path(record.url_name)
-      elsif Spud::Blog.config.blog_enabled
-        expire_page blog_path
-        expire_page blog_path(:format => :rss)
-        expire_page blog_post_path(record.url_name)
-      end
-    end
-    # expire_page spud_sitemap_path(:format => :xml)
-  end
-
-end