tb_blog 1.0.4 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTI0ODdlNDI3MjE3MWM4ZDIyMmNjOGU5NjZmOTE0ZGRkZjc0ZGJjMQ==
-  data.tar.gz: !binary |-
-    MzA5NmJjYjliNmZlYmU0ZjdiYThiYWU1ZTE4NDc0YWQwOWI0ZDVkMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGU5ZjJhZWU3NWJkNjNlMzU0YmJiYzQ0MDEyNDkyODc5NjdkMzQ2ODg3MzI1
-    YTI0YzU3ZDk2OTJmMjMxMjdiNTA4ZGZlYzVkOTBiOWQyYWI0OGFlNGZmYjAz
-    MTBmOWI3NGZhOTE3ODRkMzIzZmVhZDAwOTdiZDIyZGEzNmQ4YjA=
-  data.tar.gz: !binary |-
-    YWQzYmI5MmI2MzJiNzEwYmM4NTM4YzNmZjA0NDQ2OTAwM2Y2MDFmNTVmYTcz
-    YzhhM2EzNDZkZTU3NTllNmUwZGY1ZTMzYWEzOTcyYzllYmNlMGE4Nzg2NTc3
-    ODJhMzgxYmUzOWUzNDczOTgzOWIwMzYyY2JlMDhlMjJlYTMxMGE=
+SHA1:
+  metadata.gz: 0abb0b9fcb8a6000c80e57993fc82eec445d1621
+  data.tar.gz: adf69ebae439dcdac7a9b487c857814465dd9fa5
+SHA512:
+  metadata.gz: 5ce39a72962d7796bfb9e0c880abfe6bc6ca318f6e7edeed3f1da5740212d0a6693bc011a3b3e02e9b5f5f60fb356ba243db4f0b6c95ada6121ae3f10af7762b
+  data.tar.gz: 698bc9ebf8b2c7e878e7213f0814df54e8bda5f6f785793039314ccacfd11ac62301d4b70043fe41e3ca12e5a8335b2489a820fe5e26163592112a07b7e153d2

data/Readme.markdown

@@ -13,8 +13,8 @@ __NOTE:__ This project is still in its early infancy.
 
 1. In your Gemfile add the following
 
-		gem 'spud_core'
-		gem 'spud_blog'
+		gem 'tb_core'
+		gem 'tb_blog'
 
 2. Run bundle install
 3. Copy in database migrations to your new rails project
@@ -38,6 +38,7 @@ Spud Blog current accepts the following configuration options.
 	  config.has_custom_fields = true
 	  config.caching_enabled = true
 	  config.caching_expires_in = 1.hour
+	  config.default_comment_approval = true
 	end
 
 ## Customizing Views

data/app/assets/javascripts/admin/blog/application.js

@@ -0,0 +1 @@
+//= require_directory

data/app/assets/javascripts/{spud/admin → admin/blog}/post_categories.js

@@ -1,6 +1,3 @@
-spud = (typeof(spud) == 'undefined') ? {} : spud;
-spud.admin = (typeof(spud.admin) == 'undefined') ? {} : spud.admin;
-
 spud.admin.post_categories = new function(){
 
   var self = this;

data/app/assets/javascripts/{spud/admin → admin/blog}/posts.js

@@ -1,9 +1,3 @@
-//= require spud/admin/post_categories
-//= require spud/admin/post_comments
-
-spud = (typeof(spud) == 'undefined') ? {} : spud;
-spud.admin = (typeof(spud.admin) == 'undefined') ? {} : spud.admin;
-
 spud.admin.posts = new function(){
 
 	var self = this;

data/app/controllers/{spud/admin → admin}/news_posts_controller.rb

@@ -1,11 +1,9 @@
-class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
+class Admin::NewsPostsController < Admin::ApplicationController
 
-	layout 'spud/admin/detail'
 	respond_to :html, :xml, :json
 	before_filter :find_post, :only => [:show, :edit, :update, :destroy]
-	add_breadcrumb 'News Posts', :spud_admin_news_posts_path
+	add_breadcrumb 'News Posts', :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,10 +18,10 @@ 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
+    respond_with @post, :location => admin_news_posts_path
 	end
 
 	def new
@@ -35,28 +33,32 @@ 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
-    respond_with @post, :location => spud_admin_news_posts_path
+    respond_with @post, :location => admin_news_posts_path
 	end
 
 	def destroy
 		if @post.destroy
 	    flash[:notice] = 'News Post was successfully deleted.'
 		end
-    respond_with @post, :location => spud_admin_news_posts_path
+    respond_with @post, :location => admin_news_posts_path
 	end
 
-	private
+private
 
 	def find_post
 		@post = SpudPost.find(params[:id])
 		if @post.blank?
 			flash[:error] = 'News Post not found!'
-			redirect_to spud_admin_news_posts_path and return false
+			redirect_to admin_news_posts_path and return false
 		end
 	end
 
+	def post_params
+		params.require(:spud_post).permit(:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :category_ids => [], :spud_site_ids => [])
+	end
+
 end

data/app/controllers/{spud/admin → admin}/post_categories_controller.rb

@@ -1,10 +1,9 @@
-class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
+class Admin::PostCategoriesController < 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]
 
 	def index
 		@post_categories = SpudPostCategory.grouped
@@ -16,9 +15,9 @@ 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
+			respond_with @post_category, :location => admin_post_categories_path
 		else
 			render 'new', :status => 422
 		end
@@ -30,10 +29,10 @@ 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
+			respond_with @post_category, :location => admin_post_categories_path
 		else
 			render 'new', :status => 422
 		end
@@ -45,7 +44,7 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 			@post_categories = SpudPostCategory.grouped
 			render 'index'
 		else
-			respond_with @post_category, :location => spud_admin_post_categories_path
+			respond_with @post_category, :location => admin_post_categories_path
 		end
 	end
 
@@ -55,5 +54,8 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 		@post_category = SpudPostCategory.find(params[:id])
 	end
 
+	def category_params
+		params.require(:spud_post_category).permit(:name, :parent_id)
+	end
 
 end

data/app/controllers/{spud/admin → admin}/post_comments_controller.rb

@@ -1,11 +1,10 @@
-class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
+class Admin::PostCommentsController < Admin::ApplicationController
 
 	respond_to :html, :xml, :json
-	layout 'spud/admin/detail'
 	belongs_to_spud_app :blog_posts
 	before_filter :find_comment, :only => [:show, :edit, :update, :destroy, :approve, :spam]
-	add_breadcrumb 'Blog Posts', :spud_admin_posts_path
-	add_breadcrumb 'Comments', :spud_admin_post_comments_path
+	add_breadcrumb 'Blog Posts', :admin_posts_path
+	add_breadcrumb 'Comments', :admin_post_comments_path
 
 	def index
 		@page_name = "Comments"
@@ -41,7 +40,7 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 		@post_comment.spam = false
 		@post_comment.approved = true
 		@post_comment.save()
-		redirect_to request.referer || spud_admin_post_comments_path
+		redirect_to request.referer || admin_post_comments_path
 	end
 
 	def spam
@@ -51,14 +50,14 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 		@post_comment.spam = true
 		@post_comment.approved = false
 		@post_comment.save()
-		redirect_to request.referer || spud_admin_post_comments_path
+		redirect_to request.referer || admin_post_comments_path
 	end
 
 	def destroy
 		if !@post_comment.destroy
 			flash[:error] = "Whoops! Something odd happened while trying to delete that comment. Thats not fun. please try again."
 		end
-		respond_with @post_comment, :location => request.referer || spud_admin_post_comments_path
+		respond_with @post_comment, :location => request.referer || admin_post_comments_path
 	end
 
 	private

data/app/controllers/{spud/admin → admin}/posts_controller.rb

@@ -1,11 +1,9 @@
-class Spud::Admin::PostsController < Spud::Admin::ApplicationController
+class Admin::PostsController < Admin::ApplicationController
 
-	layout 'spud/admin/detail'
 	respond_to :html, :xml, :json
 	before_filter :find_post, :only => [:show, :edit, :update, :destroy]
-	add_breadcrumb 'Blog Posts', :spud_admin_posts_path
+	add_breadcrumb 'Blog Posts', :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(:pending_comments, :author).paginate(:page => params[:page], :per_page => 15)
@@ -20,10 +18,11 @@ 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])
+		params[:spud_post][:updated_at] = Time.now()
+		if @post.update_attributes(post_params)
 			flash[:notice] = 'Post was successfully updated.'
 		end
-    respond_with @post, :location => spud_admin_posts_path
+    respond_with @post, :location => admin_posts_path
 	end
 
 	def new
@@ -35,28 +34,32 @@ 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
-    respond_with @post, :location => spud_admin_posts_path
+    respond_with @post, :location => admin_posts_path
 	end
 
 	def destroy
 		if @post.destroy
 	    flash[:notice] = 'Post was successfully deleted.'
 		end
-    respond_with @post, :location => spud_admin_posts_path
+    respond_with @post, :location => admin_posts_path
 	end
 
-	private
+private
 
 	def find_post
 		@post = SpudPost.find(params[:id])
 		if @post.blank?
 			flash[:error] = "Post not found!"
-			redirect_to spud_admin_posts_path and return false
+			redirect_to admin_posts_path and return false
 		end
 	end
 
+	def post_params
+		params.require(:spud_post).permit(:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :category_ids => [], :spud_site_ids => [])
+	end
+
 end

data/app/controllers/blog/sitemaps_controller.rb

@@ -0,0 +1,10 @@
+class Blog::SitemapsController < Spud::ApplicationController
+	
+  respond_to :xml
+	
+  def show
+		@posts = SpudPost.publicly.all
+		respond_with @pages
+  end
+
+end

data/app/controllers/blog_controller.rb

@@ -5,36 +5,8 @@ class BlogController < ApplicationController
 
   before_filter :find_post, :only => [:show, :create_comment]
 
-  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
-
-  cache_sweeper :spud_post_comment_sweeper, :only => [:create_comment]
-
   def index
-    page = 1
-    if params[:page].blank? == false
-      page = params[:page].to_i
-      if page.to_s != params[:page].to_s
-        if(page > 1)
-          redirect_to blog_path(:page => page), :status => :moved_permanently and return
-        else
-          redirect_to blog_path(:page => nil), :status => :moved_permanently and return
-        end
-      end
-    end
-
-    @posts = SpudPost.public_blog_posts(page, Spud::Blog.config.posts_per_page).includes(:categories, :author)
+    @posts = SpudPost.visible.blog_posts.ordered.paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
     if Spud::Core.config.multisite_mode_enabled
       @posts = @posts.for_spud_site(current_site_id)
     end
@@ -69,9 +41,9 @@ class BlogController < ApplicationController
 
     if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
       if Spud::Core.config.multisite_mode_enabled
-        @posts = @post_category.posts_with_children.public_blog_posts(page, Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+        @posts = @post_category.posts_with_children.visible.blog_posts.for_spud_site(current_site_id).from_archive(params[:archive_date]).paginate(:page => page, :per_page => Spud::Blog.config.posts_per_page)
       else
-        @posts = @post_category.posts_with_children.public_blog_posts(page, Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+        @posts = @post_category.posts_with_children.visible.blog_posts.from_archive(params[:archive_date]).paginate(:page => page, :per_page => Spud::Blog.config.posts_per_page)
       end
     else
       redirect_to blog_path
@@ -84,9 +56,9 @@ class BlogController < ApplicationController
 
   def archive
     if Spud::Core.config.multisite_mode_enabled
-      @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+      @posts = SpudPost.visible.blog_posts.from_archive(params[:archive_date]).for_spud_site(current_site_id).paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
     else
-      @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+      @posts = SpudPost.visible.blog_posts.from_archive(params[:archive_date]).paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
     end
     respond_with @posts do |format|
       format.html { render 'index' }
@@ -105,7 +77,7 @@ class BlogController < ApplicationController
       render :nothing => true
       return
     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
@@ -136,4 +108,23 @@ class BlogController < ApplicationController
 		end
   end
 
+  def comment_params
+    params.require(:spud_post_comment).permit(:author, :content)
+  end
+
+  def get_page_number
+    page = 1
+    if params[:page].blank? == false
+      page = params[:page].to_i
+      if page.to_s != params[:page].to_s
+        if(page > 1)
+          redirect_to blog_path(:page => page), :status => :moved_permanently and return
+        else
+          redirect_to blog_path(:page => nil), :status => :moved_permanently and return
+        end
+      end
+    end
+    return page
+  end
+
 end

data/app/controllers/news_controller.rb

@@ -3,24 +3,8 @@ class NewsController < ApplicationController
 	respond_to :html, :xml, :json, :rss
 	layout Spud::Blog.news_layout
 
-  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 => true).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 => true).future_posts.count == 0)
-        c.cache_page(nil, nil, false)
-      end
-    end
-  end
-
-  cache_sweeper :spud_post_comment_sweeper, :only => [:create_comment]
-
   def index
-    @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page)
+    @posts = SpudPost.visible.news_posts.ordered.paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
     if Spud::Core.config.multisite_mode_enabled
       @posts = @posts.for_spud_site(current_site_id)
     end
@@ -43,9 +27,9 @@ class NewsController < ApplicationController
   def category
     if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
       if Spud::Core.config.multisite_mode_enabled
-        @posts = @post_category.posts_with_children.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+        @posts = @post_category.posts_with_children.visible.news_posts.for_spud_site(current_site_id).from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
       else
-        @posts = @post_category.posts_with_children.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+        @posts = @post_category.posts_with_children.visible.news_posts.from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
       end
     else
       redirect_to news_path
@@ -58,9 +42,9 @@ class NewsController < ApplicationController
 
   def archive
     if Spud::Core.config.multisite_mode_enabled
-      @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+      @posts = SpudPost.visible.news_posts.for_spud_site(current_site_id).from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
     else
-      @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+      @posts = SpudPost.visible.news_posts.from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
     end
     respond_with @posts do |format|
       format.html { render 'index' }

data/app/helpers/admin/news_posts_helper.rb

@@ -0,0 +1,2 @@
+module Admin::NewsPostsHelper
+end

data/app/helpers/admin/post_categories_helper.rb

@@ -0,0 +1,2 @@
+module Admin::PostCategoriesHelper
+end

data/app/helpers/admin/post_comments_helper.rb

@@ -0,0 +1,3 @@
+module Admin::PostCommentsHelper
+
+end

data/app/helpers/{spud/admin → admin}/posts_helper.rb

@@ -1,4 +1,4 @@
-module Spud::Admin::PostsHelper
+module Admin::PostsHelper
 
 	def options_for_parent_category(parent_id = 0)
 		if @categories[parent_id]

data/app/helpers/blog/sitemaps_helper.rb

@@ -0,0 +1,2 @@
+module Blog::SitemapsHelper
+end

data/app/helpers/blog_helper.rb

@@ -8,7 +8,6 @@ module BlogHelper
 	end
 
 	def spud_post_archive_select
-		dates = SpudPost.months_with_public_posts
 		return select_tag 'archive_date', options_for_select(SpudPost.months_with_public_posts.collect{ |d| 
 			[d.strftime('%B %Y'), d.strftime('%Y-%b').downcase]
 		}, params[:archive_date]), :include_blank => true, :rel => 'archive'

data/app/models/spud_post.rb

@@ -1,28 +1,34 @@
 class SpudPost < ActiveRecord::Base
 	spud_searchable
 
-	has_and_belongs_to_many :categories,
+	has_many :spud_post_categories_posts
+	has_many :categories,
 		:class_name => 'SpudPostCategory',
-		:join_table => 'spud_post_categories_posts',
-		:foreign_key => 'spud_post_id'
+		:through => :spud_post_categories_posts,
+		:source => :spud_post_category
+
 	belongs_to :author, :class_name => 'SpudUser', :foreign_key => 'spud_user_id'
 	has_many :comments, :class_name => 'SpudPostComment', :inverse_of => :post
-	has_many :pending_comments, :class_name => "SpudPostComment", :conditions => {:spam => [nil, false], :approved => false}
-	has_many :visible_comments, :class_name => 'SpudPostComment',:conditions => {:spam => [nil,false], :approved => true}
-	has_many :spam_comments, :class_name => "SpudPostComment", :conditions => {:spam => true}
+	has_many :pending_comments, ->{ where(:spam => [nil, false], :approved => false) }, :class_name => "SpudPostComment"
+	has_many :visible_comments, ->{ where(:spam => [nil,false], :approved => true) }, :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) }
+
+	scope :blog_posts, ->{ where(:is_news => false) }
+	scope :news_posts, ->{ where(:is_news => true) }
+	scope :visible, ->{ where('visible = true AND published_at <= ?', Time.now.utc) }
+	scope :ordered, ->{ order('published_at desc') }
+
 	validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
 	validates_uniqueness_of :url_name
 	before_validation :set_url_name
-	before_save :postprocess_content
-
 	after_save :set_spud_site_ids
+	acts_as_spud_liquid_content
 
-	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)
@@ -30,14 +36,17 @@ class SpudPost < ActiveRecord::Base
 	end
 
 	def self.public_posts(page, per_page)
+		ActiveSupport::Deprecation.warn "SpudPost.public_posts is deprecated. Please the :visible, and :ordered scopes instead.", caller
 		return where('visible = ? AND published_at <= ?', true,Time.now.utc).order('published_at desc').paginate(:page => page, :per_page => per_page)
 	end
 
 	def self.public_blog_posts(page, per_page)
+		ActiveSupport::Deprecation.warn "SpudPost.public_blog_posts is deprecated. Please the :blog_posts, :visible, and :ordered scopes instead.", caller
 		return self.public_posts(page, per_page).where(:is_news => false)
 	end
 
 	def self.public_news_posts(page, per_page)
+		ActiveSupport::Deprecation.warn "SpudPost.public_news_posts is deprecated. Please the :news_posts, :visible, and :ordered scopes instead.", caller
 		return self.public_posts(page, per_page).where(:is_news => true)
 	end
 
@@ -46,11 +55,11 @@ class SpudPost < ActiveRecord::Base
 	end
 
 	def self.recent_blog_posts(limit=5)
-		return self.recent_posts(limit).where(:is_news => false)
+		return self.blog_posts.recent_posts(limit)
 	end
 
 	def self.recent_news_posts(limit=5)
-		return self.recent_posts(limit).where(:is_news => true)
+		return self.news_posts.recent_posts(limit)
 	end
 
 	def self.from_archive(date_string)
@@ -102,16 +111,16 @@ 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
-		else
+		# 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
+		# else
 			template = Liquid::Template.parse(self.content)
 			self.content_processed = template.render()
-		end
+		# end
 	end
 
 	def content_processed

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, :touch => true
   belongs_to :spud_post_category
-end
+end

data/app/models/spud_post_category.rb

@@ -12,8 +12,8 @@ class SpudPostCategory < ActiveRecord::Base
 	before_validation :set_url_name
 
 	before_destroy :update_child_categories
-
-	attr_accessible :name, :url_name, :parent_id
+	after_update :touch_posts
+	after_destroy :touch_posts
 
 	# tell awesome_nested_set not to destroy descendants
 	def skip_before_destroy
@@ -67,4 +67,11 @@ class SpudPostCategory < ActiveRecord::Base
 		self.children.update_all(:parent_id => self.parent_id)
 		self.class.rebuild!
 	end
+
+	def touch_posts
+		if self.name_changed?
+			self.posts.update_all(:updated_at => Time.now)
+		end
+	end
+
 end

data/app/models/spud_post_comment.rb

@@ -1,14 +1,12 @@
 class SpudPostComment < ActiveRecord::Base
 
-  attr_accessible :author, :content, :spud_post_id, :referrer, :spam, :user_agent, :user_ip, :permalink
-
   if Spud::Blog.enable_rakismet
     include Rakismet::Model
     before_save :rakismet_check_for_spam
   end
 
 	validates_presence_of :author, :content
-	belongs_to :post, :class_name => 'SpudPost', :foreign_key => 'spud_post_id', :counter_cache => :comments_count, :inverse_of => :comments
+	belongs_to :post, :class_name => 'SpudPost', :foreign_key => 'spud_post_id', :counter_cache => :comments_count, :inverse_of => :comments, :touch => true
 
   def visible?
     return approved && !spam

data/app/models/spud_post_site.rb

@@ -1,5 +1,4 @@
 class SpudPostSite < ActiveRecord::Base
-  attr_accessible :spud_post_id, :spud_site_id
   belongs_to :spud_post
 
   def spud_site

data/app/views/admin/news_posts/edit.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @post, :url => admin_news_post_path(@post), :html => {:class => 'form-horizontal'} do |f| %>	
+	<%= render :partial => '/admin/posts/form', :locals => {:f => f} %>
+<% end %>