tb_blog 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb52356b1361df2ea2c5b8515243e4d0d18ae05
-  data.tar.gz: a829255d1eee53d9fbb9a45fa9b2777e9037b144
+  metadata.gz: 6985b911d99d89f62668336b020afd530179731b
+  data.tar.gz: a6670c45aae3e10bc112844326cc78ef64310003
 SHA512:
-  metadata.gz: 65552c98ad3fc18794c29b3670d7d70d2d4d4b3886fddaff570dbef7befd9a7f9c815b3df5f8b23a49ddd1f8af435e63db6ce5a13762240a69aba861a23ea846
-  data.tar.gz: 46262bed323d60ec7084cecded595c9b91461d85f462bf55c731f68142d0e79a01cdb679d3b4e3bff91462dd0bb13a0838de32297c8a50b7273d3d8291a9baa8
+  metadata.gz: 51fe31feee68e1f6191a5ac9eaa80a6d00454ada4b96089c3c8aee56d5a6550acf17405758ba8234de8c11f14af9735fd5aa4046c3ee6c60661029ee6bedce7e
+  data.tar.gz: 96ae50f8a8e5393e3c03194e6e4b41302ee2bb3efc3c5509d6159fe447dce89c02646302cf3067658a9271d5bd89e937236e8a7b905a8bed38c8731f0d680e8b

data/Readme.md

@@ -28,9 +28,6 @@ TB Blog current accepts the following configuration options.
 	  config.blog_path = 'blog'
 	  config.news_path = 'news'
 	  config.posts_per_page = 5
-	  config.has_custom_fields = true
-	  config.caching_enabled = true
-	  config.caching_expires_in = 1.hour
 	  config.default_comment_approval = true
 	end
 
@@ -48,46 +45,63 @@ TB Blog includes a small, unobtrusive javascript driver that adds functionality
 
 	<%= javascript_include_tag 'spud/blog' %>
 
+## Access Control
+
+TB Blog offers a mechanism for limitting who can see what posts. Supply a lambda to the `query_for_user` config, which takes a single `user` argument. The value you return will be supplied directly to the `where()` query used to find posts.
+
+The example below is from an application that allows subscribers to view subscriber-only content. 
+
+	Spud::Blog.query_for_user = ->(user){
+    	if user.present? && user.has_paid_subscription?
+      		{}
+    	else
+      		{:requires_subscription => false}
+    	end
+	}
+
+*See the section on Custom Fields to see how you might go about adding such a field to your model.*
+
 ## Custom Fields
 
 You may find that your blog requires a field that isn't included in the default `spud_post` model. Adding custom fields is easy.
 
-1. Set `has_custom_fields` to true in your TB Blog configuration
-2. Create a migration adding the necessary column(s) to your database
+1. Create a migration adding the necessary column(s) to your database
 
 		class AddCaptionToPosts < ActiveRecord::Migration
 		  def change
-		    add_column :spud_posts, :caption, :string
+		    add_column :spud_posts, :requires_subscription, :boolean, :default => false
 		  end
 		end
 
-3. Save a view partial at `app/views/spud/admin/posts/_custom_fields.html.erb` with the desired inputs
+2. Save a view partial at `app/views/admin/posts/_custom_fields.html.erb` with the desired inputs
 
+		<h4>My Custom Fields</h4>
+		<div class="spud_post_form_row">
+		  <%= f.label :requires_subscription, 'Require subscription' %>
+		  <%= f.check_box :requires_subscription %>
+		</div>
 
-		  <div class="control-group">
-		    <%= f.label :caption, 'Caption',:class => "control-label" %>
-		    <div class="controls">
-		    	<%= f.text_field :caption %>
-		    </div>
-		  </div>
+3. Finally, add the field to your `permitted_attributes` array. This is to satisfy the [Strong Parameters](http://guides.rubyonrails.org/action_controller_overview.html#strong-parameters) in the admin controller.
+
+		Spud::Blog.configure do |config|
+			config.permitted_attributes = [:requires_subscription]
+		end
 
 ## Extending the Post Model
 
-Rails engines allow you to extend or even completely override classes by adding them to your local application. Source files found in your local app's path will take precedence over those found within the TB Blog gem. Lets say you wanted to extend the SpudPost model.
+You might want to add custom methods or attributes to the Post model. Create a file at `app/models/spud_post.rb` and add the following code:
 
-1. Create a file at `app/models/spud_post.rb`
-2. Add the following code:
+	class SpudPost < Spud::SpudPostModel
+		# custom methods here!
+		def hello_world
+			return "Hello, World!"
+		end
+	end
 
-		# Use this helper method to pull in the SpudPost source code from the engine
-		Spud::Blog::Engine.require_model('spud_post')
+That's it! You may now begin customizing the post class.
 
-		# Add your own methods to SpudPost
-		class SpudPost
-			attr_accessible :caption
-			def byline
-				return "'#{self.title}' was posted by #{self.author.full_name} on #{self.display_date}"
-			end
-		end
+	p = SpudPost.first
+	puts p.hello_world # outputs "Hello, World!"
 
 ## Akismet Support
 

data/app/controllers/admin/news_posts_controller.rb

@@ -11,12 +11,12 @@ class Admin::NewsPostsController < Admin::ApplicationController
 	end
 
 	def edit
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		respond_with @post
 	end
 
 	def update
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		params[:spud_post][:spud_site_ids] ||= []
 		if @post.update_attributes(post_params)
 	    flash[:notice] = 'News Post was successfully updated.'
@@ -25,13 +25,13 @@ class Admin::NewsPostsController < Admin::ApplicationController
 	end
 
 	def new
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id, :is_news => true, :comments_enabled => false, :spud_site_ids => [current_site_id])
 		respond_with @post
 	end
 
 	def create
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		params[:spud_post][:spud_site_ids] ||= []
 		@post = SpudPost.new(post_params)
 		@post.is_news = true
@@ -59,9 +59,11 @@ private
 	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 => []
-		)
+		permitted = [:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :category_ids => [], :spud_site_ids => []]
+		if Spud::Blog.permitted_attributes.present?
+			permitted = permitted + Spud::Blog.permitted_attributes
+		end
+		params.require(:spud_post).permit(permitted)
 	end
 
 end

data/app/controllers/admin/post_categories_controller.rb

@@ -6,7 +6,7 @@ class Admin::PostCategoriesController < Admin::ApplicationController
 	before_filter :find_category, :only => [:show, :edit, :update, :destroy]
 
 	def index
-		@post_categories = SpudPostCategory.grouped
+		@post_categories = SpudPostCategory.ordered
 		respond_with @post_categories
 	end
 
@@ -41,7 +41,7 @@ class Admin::PostCategoriesController < Admin::ApplicationController
 	def destroy
 		if @post_category.destroy
 			flash[:notice] = 'Post Category was successfully deleted'
-			@post_categories = SpudPostCategory.grouped
+			@post_categories = SpudPostCategory.ordered
 			render 'index'
 		else
 			respond_with @post_category, :location => admin_post_categories_path
@@ -55,7 +55,7 @@ class Admin::PostCategoriesController < Admin::ApplicationController
 	end
 
 	def category_params
-		params.require(:spud_post_category).permit(:name, :parent_id)
+		params.require(:spud_post_category).permit(:name)
 	end
 
 end

data/app/controllers/admin/posts_controller.rb

@@ -11,12 +11,12 @@ class Admin::PostsController < Admin::ApplicationController
 	end
 
 	def edit
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		respond_with @post
 	end
 
 	def update
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		params[:spud_post][:spud_site_ids] ||= []
 		params[:spud_post][:updated_at] = Time.now()
 		if @post.update_attributes(post_params)
@@ -26,13 +26,13 @@ class Admin::PostsController < Admin::ApplicationController
 	end
 
 	def new
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id, :spud_site_ids => [session[:admin_site] || 0])
 		respond_with @post
 	end
 
 	def create
-		@categories = SpudPostCategory.grouped
+		@categories = SpudPostCategory.ordered
 		params[:spud_post][:spud_site_ids] ||= []
 		@post = SpudPost.new(post_params)
 		if @post.save
@@ -59,7 +59,11 @@ private
 	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 => [])
+		permitted = [:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :category_ids => [], :spud_site_ids => []]
+		if Spud::Blog.permitted_attributes.present?
+			permitted = permitted + Spud::Blog.permitted_attributes
+		end
+		params.require(:spud_post).permit(permitted)
 	end
 
 end

data/app/controllers/blog/sitemaps_controller.rb

@@ -3,7 +3,7 @@ class Blog::SitemapsController < Spud::ApplicationController
   respond_to :xml
 	
   def show
-		@posts = SpudPost.publicly.all
+		@posts = SpudPost.visible.ordered.all
 		respond_with @pages
   end
 

data/app/controllers/blog_controller.rb

@@ -6,7 +6,7 @@ class BlogController < ApplicationController
   before_filter :find_post, :only => [:show, :create_comment]
 
   def index
-    @posts = SpudPost.visible.blog_posts.ordered.paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
+    @posts = SpudPost.for_user(current_user).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
@@ -41,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.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)
+        @posts = @post_category.posts.for_user(current_user).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.visible.blog_posts.from_archive(params[:archive_date]).paginate(:page => page, :per_page => Spud::Blog.config.posts_per_page)
+        @posts = @post_category.posts.for_user(current_user).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
@@ -56,9 +56,9 @@ class BlogController < ApplicationController
 
   def archive
     if Spud::Core.config.multisite_mode_enabled
-      @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)
+      @posts = SpudPost.for_user(current_user).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.visible.blog_posts.from_archive(params[:archive_date]).paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
+      @posts = SpudPost.for_user(current_user).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' }
@@ -101,10 +101,9 @@ class BlogController < ApplicationController
   private
 
   def find_post
-  	@post = SpudPost.find_by_url_name(params[:id])
+    @post = SpudPost.for_user(current_user).where(:url_name => params[:id]).first
 		if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
-			flash[:error] = "Post not found!"
-			redirect_to blog_path and return false
+			raise Spud::NotFoundError.new(:item => 'post')
 		end
   end
 

data/app/controllers/news_controller.rb

@@ -3,8 +3,10 @@ class NewsController < ApplicationController
 	respond_to :html, :xml, :json, :rss
 	layout Spud::Blog.news_layout
 
+  before_filter :find_post, :only => [:show]
+
   def index
-    @posts = SpudPost.visible.news_posts.ordered.paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
+    @posts = SpudPost.for_user(current_user).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
@@ -27,9 +29,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.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)
+        @posts = @post_category.posts.for_user(current_user).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.visible.news_posts.from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
+        @posts = @post_category.posts.for_user(current_user).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
@@ -42,9 +44,9 @@ class NewsController < ApplicationController
 
   def archive
     if Spud::Core.config.multisite_mode_enabled
-      @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)
+      @posts = SpudPost.for_user(current_user).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.visible.news_posts.from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
+      @posts = SpudPost.for_user(current_user).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' }
@@ -52,13 +54,16 @@ class NewsController < ApplicationController
   end
 
   def show
-  	@post = SpudPost.find_by_url_name(params[:id])
-		if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
-			flash[:error] = "Post not found!"
-			redirect_to news_path and return false
-		else
-			respond_with @post
-		end
+		respond_with @post
+  end
+
+private
+
+  def find_post
+    @post = SpudPost.for_user(current_user).where(:url_name => params[:id]).first
+    if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
+      raise Spud::NotFoundError.new(:item => 'post')
+    end
   end
 
 end

data/app/helpers/blog_helper.rb

@@ -2,7 +2,7 @@ module BlogHelper
 
 	def spud_post_category_select
 		return select_tag 'category_url_name', 
-			options_for_select(SpudPostCategory.options_for_categories(:value => :url_name), params[:category_url_name]), 
+			options_for_select(SpudPostCategory.options_for_categories(), params[:category_url_name]), 
 			:include_blank => true,
 			:rel => 'category'
 	end

data/app/models/spud/spud_post_model.rb

@@ -0,0 +1,193 @@
+class Spud::SpudPostModel < ActiveRecord::Base
+  self.table_name = 'spud_posts'
+
+  spud_searchable
+
+  has_many :spud_post_categories_posts, :foreign_key => 'spud_post_id'
+  has_many :categories,
+    :class_name => 'SpudPostCategory',
+    :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, :foreign_key => 'spud_post_id'
+  has_many :pending_comments, ->{ where(:spam => [nil, false], :approved => false) }, :class_name => "SpudPostComment", :foreign_key => 'spud_post_id'
+  has_many :visible_comments, ->{ where(:spam => [nil,false], :approved => true) }, :class_name => 'SpudPostComment', :foreign_key => 'spud_post_id'
+  has_many :spam_comments, ->{ where(:spam => true) }, :class_name => "SpudPostComment", :foreign_key => 'spud_post_id'
+  has_many :spud_permalinks,:as => :attachment
+  has_many :spud_post_sites, :dependent => :destroy
+
+  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') }
+
+  scope :for_user, ->(user){
+    if Spud::Blog.query_for_user.present?
+      where(Spud::Blog.query_for_user.call(user))
+    else
+      where({})
+    end
+  }
+
+  validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
+  validates_uniqueness_of :url_name
+  before_validation :set_url_name
+  after_save :set_spud_site_ids
+
+  acts_as_spud_liquid_content
+
+  attr_accessor :spud_site_ids
+
+  def self.for_spud_site(spud_site_id)
+    return joins(:spud_post_sites).where(:spud_post_sites => {:spud_site_id => spud_site_id})
+  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
+
+  def self.recent_posts(limit=5)
+    return where('visible = ? AND published_at <= ?', true, Time.now.utc).order('published_at desc').limit(limit)
+  end
+
+  def self.recent_blog_posts(limit=5)
+    return self.blog_posts.recent_posts(limit)
+  end
+
+  def self.recent_news_posts(limit=5)
+    return self.news_posts.recent_posts(limit)
+  end
+
+  def self.from_archive(date_string)
+    begin
+      date = Date.strptime(date_string, "%Y-%b")
+      return where(:published_at => date..date.end_of_month)
+    rescue
+      return all
+    end
+  end
+
+  #def self.posts_for_category_archive(category, )
+
+  # Returns an array of Date objects for months with public posts
+  def self.months_with_public_posts
+    # Select
+    #   Month(published_at) as published_month,
+    #   Year(published_at) as published_year
+    # From spud_posts
+    # Where visible = 1
+    # And published_at < '2012-01-30'
+    # Group By published_month, published_year
+    # Order By published_year desc, published_month desc
+    records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ?', true, DateTime.now).group('published_month, published_year').order('published_year desc, published_month desc')
+    begin
+      return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
+    rescue Exception => e
+      logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
+      return []
+    end
+  end
+
+  def self.months_with_public_news_posts
+    records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ? AND is_news = ?', true, DateTime.now, true).group('published_month, published_year').order('published_year desc, published_month desc')
+    begin
+      return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
+    rescue Exception => e
+      logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
+    end
+  end
+
+  def self.months_with_public_blog_posts
+    records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ? AND is_news = ?', true, DateTime.now, false).group('published_month, published_year').order('published_year desc, published_month desc')
+    begin
+      return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
+    rescue Exception => e
+      logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
+    end
+  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
+      template = Liquid::Template.parse(self.content)
+      self.content_processed = template.render()
+    # end
+  end
+
+  def content_processed
+    if read_attribute(:content_processed).blank?
+      postprocess_content
+    end
+    read_attribute(:content_processed)
+  end
+
+  def content_processed=(content)
+    write_attribute(:content_processed,content)
+  end
+
+  def display_date
+    return published_at.strftime("%b %d, %Y")
+  end
+
+  def is_public?
+    return (published_at < DateTime.now) && visible
+  end
+
+  def is_private?
+    return !is_public?
+  end
+
+  def category_names
+    return self.categories.collect{ |c| c.name }.join(', ')
+  end
+
+  # Spud site ids getter
+  def spud_site_ids
+    if @spud_site_ids.nil?
+      @spud_site_ids = spud_post_sites.collect{ |site| site.spud_site_id }
+    end
+    return @spud_site_ids
+  end
+
+  # Spud site ids setter
+  def spud_site_ids=(site_ids)
+    if site_ids.is_a?(Array)
+      @spud_site_ids = site_ids.collect{ |id| id.to_i }
+    else
+      raise 'Site ids must be an Array'
+    end
+  end
+
+private
+
+  def set_url_name
+    self.url_name = "#{self.published_at.strftime('%Y-%m-%d')}-#{self.title.parameterize}"
+  end
+
+  def set_spud_site_ids
+    if Spud::Core.multisite_mode_enabled
+      _spud_post_sites = []
+      self.spud_site_ids.each do |site_id|
+        _spud_post_sites << SpudPostSite.new(:spud_post_id => id, :spud_site_id => site_id)
+      end
+      self.spud_post_sites = _spud_post_sites
+    end
+  end
+end

data/app/models/spud_post.rb

@@ -1,186 +1,3 @@
-class SpudPost < ActiveRecord::Base
-	spud_searchable
-
-	has_many :spud_post_categories_posts
-	has_many :categories,
-		:class_name => 'SpudPostCategory',
-		: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, ->{ 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 :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
-	after_save :set_spud_site_ids
-
-	acts_as_spud_liquid_content
-
-	attr_accessor :spud_site_ids
-
-	def self.for_spud_site(spud_site_id)
-		return joins(:spud_post_sites).where(:spud_post_sites => {:spud_site_id => spud_site_id})
-	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
-
-	def self.recent_posts(limit=5)
-		return where('visible = ? AND published_at <= ?', true, Time.now.utc).order('published_at desc').limit(limit)
-	end
-
-	def self.recent_blog_posts(limit=5)
-		return self.blog_posts.recent_posts(limit)
-	end
-
-	def self.recent_news_posts(limit=5)
-		return self.news_posts.recent_posts(limit)
-	end
-
-	def self.from_archive(date_string)
-		begin
-			date = Date.strptime(date_string, "%Y-%b")
-			return where(:published_at => date..date.end_of_month)
-		rescue
-			return all
-		end
-	end
-
-	#def self.posts_for_category_archive(category, )
-
- 	# Returns an array of Date objects for months with public posts
-	def self.months_with_public_posts
-		# Select
-		# 	Month(published_at) as published_month,
-		# 	Year(published_at) as published_year
-		# From spud_posts
-		# Where visible = 1
-		# And published_at < '2012-01-30'
-		# Group By published_month, published_year
-		# Order By published_year desc, published_month desc
-		records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ?', true, DateTime.now).group('published_month, published_year').order('published_year desc, published_month desc')
-		begin
-			return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
-		rescue Exception => e
-			logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
-			return []
-		end
-	end
-
-	def self.months_with_public_news_posts
-		records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ? AND is_news = ?', true, DateTime.now, true).group('published_month, published_year').order('published_year desc, published_month desc')
-		begin
-			return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
-		rescue Exception => e
-			logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
-		end
-	end
-
-	def self.months_with_public_blog_posts
-		records = SpudPost.select('Extract(Month from published_at) as published_month, Extract(Year from published_at) as published_year').where('visible = ? AND published_at < ? AND is_news = ?', true, DateTime.now, false).group('published_month, published_year').order('published_year desc, published_month desc')
-		begin
-			return records.collect{ |r| Date.new(r[:published_year].to_i, r[:published_month].to_i) }
-		rescue Exception => e
-			logger.fatal "Exception occurred while fetching post archive dates:\n #{e.to_s}"
-		end
-	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
-			template = Liquid::Template.parse(self.content)
-			self.content_processed = template.render()
-		# end
-	end
-
-	def content_processed
-		if read_attribute(:content_processed).blank?
-			postprocess_content
-		end
-		read_attribute(:content_processed)
-	end
-
-	def content_processed=(content)
-		write_attribute(:content_processed,content)
-	end
-
-	def display_date
-		return published_at.strftime("%b %d, %Y")
-	end
-
-	def is_public?
-		return (published_at < DateTime.now) && visible
-	end
-
-	def is_private?
-		return !is_public?
-	end
-
-	def category_names
-		return self.categories.collect{ |c| c.name }.join(', ')
-	end
-
-	# Spud site ids getter
-	def spud_site_ids
-		if @spud_site_ids.nil?
-			@spud_site_ids = spud_post_sites.collect{ |site| site.spud_site_id }
-		end
-		return @spud_site_ids
-	end
-
-	# Spud site ids setter
-	def spud_site_ids=(site_ids)
-		if site_ids.is_a?(Array)
-			@spud_site_ids = site_ids.collect{ |id| id.to_i }
-		else
-			raise 'Site ids must be an Array'
-		end
-	end
-
-private
-
-	def set_url_name
-		self.url_name = "#{self.published_at.strftime('%Y-%m-%d')}-#{self.title.parameterize}"
-	end
-
-	def set_spud_site_ids
-		if Spud::Core.multisite_mode_enabled
-			_spud_post_sites = []
-			self.spud_site_ids.each do |site_id|
-				_spud_post_sites << SpudPostSite.new(:spud_post_id => id, :spud_site_id => site_id)
-			end
-			self.spud_post_sites = _spud_post_sites
-		end
-	end
+class SpudPost < Spud::SpudPostModel
+	# Copy this file to your app to extend the base SpudPost model
 end

data/app/models/spud_post_category.rb

@@ -1,6 +1,5 @@
 class SpudPostCategory < ActiveRecord::Base
 	spud_searchable
-	acts_as_nested_set
 
 	has_and_belongs_to_many :posts,
 		:class_name => 'SpudPost',
@@ -11,63 +10,21 @@ class SpudPostCategory < ActiveRecord::Base
 	validates_uniqueness_of :name, :url_name
 	before_validation :set_url_name
 
-	before_destroy :update_child_categories
 	after_update :touch_posts
 	after_destroy :touch_posts
 
-	# tell awesome_nested_set not to destroy descendants
-	def skip_before_destroy
-		return true
-	end
-
-	def self.grouped
-		return all.group_by(&:parent_id)
-	end
-
-	# Returns an array of categories in order of heirarchy
-	# 	:fitler Filters out a category by ID, and all of its children
-	#   :value Pick an attribute to be used in the value field, defaults to ID
-	def self.options_for_categories(config={})
-		collection = config[:collection] || self.grouped
-		level 		 = config[:level] 		 || 0
-		parent_id  = config[:parent_id]  || nil
-		filter 		 = config[:filter] 		 || nil
-		value      = config[:value]			 || :id
-		list 			 = []
-		if collection[parent_id]
-			collection[parent_id].each do |c|
-				if c.id != filter
-					list << [level.times.collect{ '- ' }.join('') + c.name, c[value]]
-					list += self.options_for_categories({:collection => collection, :parent_id => c.id, :level => level+1, :filter => filter, :value => value})
-				end
-			end
-		end
-		return list
-	end
+	scope :ordered, ->{ order('name asc') }
 
-	def posts_with_children
-		category_ids = self.self_and_ancestors.collect{ |category| category.id }
-		post_ids = SpudPostCategoriesPost.where(:spud_post_category_id => category_ids).collect{ |it| it.spud_post_id  }
-		return SpudPost.where(:id => post_ids)
+	def self.options_for_categories()
+		return ordered.select(:name, :url_name).collect{ |c| [c.name, c.url_name] }
 	end
 
-	private
+private
 
 	def set_url_name
 		self.url_name = self.name.parameterize
 	end
 
-	def parent_is_valid
-		if parent_id == self.id
-			errors.add :base, 'Category cannot be its own parent'
-		end
-	end
-
-	def update_child_categories
-		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)

data/app/views/admin/post_categories/_form.html.erb

@@ -9,15 +9,6 @@
 				<%= f.text_field :name %>
 			</div>
 		</div>
-		<div class="control-group">
-			<%= label_tag :parent,'Parent',:class => "control-label" %>
-			<div class="controls">
-				<select name="spud_post_category[parent_id]">
-					<option value="">No Parent</option>
-					<%= options_for_select(SpudPostCategory.options_for_categories(:filter => @post_category.id), @post_category.parent_id) %>
-				</select>
-			</div>
-		</div>
 	</fieldset>
 
 <% end %>

data/app/views/admin/post_categories/index.html.erb

@@ -4,6 +4,6 @@
     <% if @post_categories.length == 0 %>
       <li class="spud_blog_category_manager_empty">You do not have any Post Categories at this time.</li>
     <% end %> 
-		<%= render :partial => 'category', :collection => @post_categories[nil] %>
+		<%= render :partial => 'category', :collection => @post_categories %>
 	</ul>
 </div>

data/app/views/admin/posts/_category.html.erb

@@ -1,9 +1,4 @@
 <%= content_tag :li, :class => 'spud_post_form_category', 'data-id' => category.id do %>
 	<%= check_box_tag 'spud_post[category_ids][]', category.id, @post.category_ids.include?(category.id), :id => "spud_post_category_#{category.id}" %>
 	<%= label_tag "spud_post_category_#{category.id}", category.name %>
-  <ul>
-    <% if @categories[category.id] %>
-      <%= render :partial => '/admin/posts/category', :collection => @categories[category.id] %>
-  	<% end %>
-  </ul>
-<% end %>
+<% end %>

data/app/views/admin/posts/_custom_fields.html.erb

@@ -0,0 +1,9 @@
+<!-- 
+  override me to supply custom form fields!
+  app/views/admin/posts/_custom_fields.html.erb
+  
+  <h4>My Fields</h4>
+  <div class="spud_post_form_row">
+    ...etc
+  </div>
+-->

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

@@ -17,17 +17,12 @@
 	<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width', "data-format" => f.object.content_format%>
 </div>
 
-<% if Spud::Blog.config.has_custom_fields %>
-<fieldset>
-	<legend>Custom Fields</legend>
-	<%= render :partial => '/admin/posts/custom_fields', :locals => {:f => f} %>
-</fieldset>
-<% end %>
-
 <fieldset class="spud_post_form_fieldset">
 	<legend>Advanced</legend>
 
 		<div class="spud_post_form_col">
+			<%= render :partial => '/admin/posts/custom_fields', :locals => {:f => f} %>
+			
 			<h4>Meta Data</h4>
 
 			<div class="spud_post_form_row">
@@ -101,7 +96,7 @@
 			<%= link_to 'Add Category', new_admin_post_category_path, :class => 'btn btn-mini spud_post_add_category' %>
 			<input type="hidden" name="spud_post[category_ids][]" value="" />
 			<ul class="spud_post_categories_form">
-				<%= render :partial => '/admin/posts/category', :collection => @categories[nil] %>
+				<%= render :partial => '/admin/posts/category', :collection => @categories %>
 			</ul>
 		</div>
 

data/app/views/blog/index.rss.builder

@@ -8,7 +8,7 @@ xml.rss :version => "2.0" do
     for article in @posts
       xml.item do
         xml.title article.title
-        xml.description article.content_processed
+        xml.description strip_tags(article.content_truncated).truncate(250)
         xml.pubDate article.created_at.to_s(:rfc822)
         xml.link blog_post_url(article.url_name)
         xml.guid blog_post_url(article.url_name)

data/app/views/news/index.rss.builder

@@ -8,11 +8,11 @@ xml.rss :version => "2.0" do
     for article in @posts
       xml.item do
         xml.title article.title
-        xml.description article.content
+        xml.description strip_tags(article.content_processed).truncate(250)
         xml.pubDate article.created_at.to_s(:rfc822)
         xml.link news_post_url(article.url_name)
         xml.guid news_post_url(article.url_name)
       end
     end
   end
-end
+end

data/db/migrate/20140508200730_remove_awesome_nested_set_columns_from_spud_post_categories.rb

@@ -0,0 +1,15 @@
+class RemoveAwesomeNestedSetColumnsFromSpudPostCategories < ActiveRecord::Migration
+  def up
+    change_table :spud_post_categories do |t|
+      t.remove :lft, :rgt, :depth, :parent_id
+    end
+  end
+  def down
+    change_table :spud_post_categories do |t|
+      t.integer :lft
+      t.integer :rgt
+      t.integer :depth
+      t.inreger :parent_id
+    end
+  end
+end

data/lib/spud_blog/configuration.rb

@@ -5,7 +5,7 @@ module Spud
       :base_layout, :news_layout, :blog_enabled,
       :news_enabled, :posts_per_page, :blog_path,
       :news_path, :enable_sitemap, :has_custom_fields,
-      :cache_mode,
+      :cache_mode, :permitted_attributes, :query_for_user,
       :enable_rakismet, :enable_markdown, :default_comment_approval
     )
     self.base_layout = 'application'
@@ -21,5 +21,7 @@ module Spud
     self.enable_rakismet = false
     self.enable_markdown = false
     self.default_comment_approval = true
+    self.permitted_attributes = []
+    self.query_for_user = nil
   end
 end

data/lib/spud_blog/engine.rb

@@ -1,17 +1,12 @@
 require 'tb_core'
 require 'tb_permalinks'
 require 'tb_liquid'
-require 'awesome_nested_set'
 require 'truncate_html'
 
 module Spud
   module Blog
     class Engine < Rails::Engine
 
-      def self.require_model(model_name)
-        require "#{root}/app/models/#{model_name}"
-      end
-
       def self.require_controller(controller_name)
         require "#{root}/app/controllers/#{controller_name}"
       end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "1.1.2"
+	  VERSION = "1.1.3"
 	end
 end

data/spec/controllers/blog_controller_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe BlogController, :type => :controller do
 
-  before(:all) do
-
+  before(:each) do
+    activate_authlogic
   end
 
   describe :index do
@@ -12,6 +12,19 @@ describe BlogController, :type => :controller do
       get :index
       assigns(:posts).count.should be > 1
     end
+
+    it "should not display any posts" do
+      Spud::Blog.config.query_for_user = ->(user){
+        if user.blank?
+          '1=0'
+        else
+          {}
+        end
+      }
+      get :index
+      assigns(:posts).count.should be 0
+      Spud::Blog.config.query_for_user = nil
+    end
   end
 
   describe :create_comment do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < ActionController::Base
+class ApplicationController < Spud::ApplicationController
   protect_from_forgery
 end

data/spec/dummy/db/migrate/20140730131549_add_primary_key_to_spud_post_categories_posts.tb_blog.rb

@@ -0,0 +1,6 @@
+# This migration comes from tb_blog (originally 20140406182651)
+class AddPrimaryKeyToSpudPostCategoriesPosts < ActiveRecord::Migration
+  def change
+    add_column :spud_post_categories_posts, :id, :primary_key
+  end
+end

data/spec/dummy/db/migrate/20140730131550_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb

@@ -0,0 +1,16 @@
+# This migration comes from tb_blog (originally 20140508200730)
+class RemoveAwesomeNestedSetColumnsFromSpudPostCategories < ActiveRecord::Migration
+  def up
+    change_table :spud_post_categories do |t|
+      t.remove :lft, :rgt, :depth, :parent_id
+    end
+  end
+  def down
+    change_table :spud_post_categories do |t|
+      t.integer :lft
+      t.integer :rgt
+      t.integer :depth
+      t.inreger :parent_id
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140113162805) do
+ActiveRecord::Schema.define(version: 20140730131550) do
 
   create_table "spud_liquid_tags", force: true do |t|
     t.integer  "attachment_id"
@@ -49,17 +49,12 @@ ActiveRecord::Schema.define(version: 20140113162805) do
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "parent_id",  default: 0
     t.string   "url_name"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "depth"
   end
 
-  add_index "spud_post_categories", ["parent_id"], name: "index_spud_post_categories_on_parent_id", using: :btree
   add_index "spud_post_categories", ["url_name"], name: "index_spud_post_categories_on_url_name", using: :btree
 
-  create_table "spud_post_categories_posts", id: false, force: true do |t|
+  create_table "spud_post_categories_posts", force: true do |t|
     t.integer "spud_post_id"
     t.integer "spud_post_category_id"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_blog
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_nested_set
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc.3
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +203,6 @@ files:
 - Rakefile
 - Readme.md
 - app/assets/images/spud/admin/news_thumb.png
-- app/assets/images/spud/admin/news_thumb@2x.png
 - app/assets/images/spud/admin/posts_thumb.png
 - app/assets/javascripts/admin/blog/application.js
 - app/assets/javascripts/admin/blog/post_categories.js
@@ -238,6 +223,7 @@ files:
 - app/helpers/blog/sitemaps_helper.rb
 - app/helpers/blog_helper.rb
 - app/helpers/news_helper.rb
+- app/models/spud/spud_post_model.rb
 - app/models/spud_post.rb
 - app/models/spud_post_categories_post.rb
 - app/models/spud_post_category.rb
@@ -253,6 +239,7 @@ files:
 - app/views/admin/post_categories/new.html.erb
 - app/views/admin/post_comments/index.html.erb
 - app/views/admin/posts/_category.html.erb
+- app/views/admin/posts/_custom_fields.html.erb
 - app/views/admin/posts/_form.html.erb
 - app/views/admin/posts/edit.html.erb
 - app/views/admin/posts/index.html.erb
@@ -282,6 +269,7 @@ files:
 - db/migrate/20130120151857_add_content_format_to_spud_posts.rb
 - db/migrate/20130121130612_add_content_processed_to_spud_post.rb
 - db/migrate/20140406182651_add_primary_key_to_spud_post_categories_posts.rb
+- db/migrate/20140508200730_remove_awesome_nested_set_columns_from_spud_post_categories.rb
 - lib/generators/spud/blog/random_posts_generator.rb
 - lib/generators/spud/blog/views_generator.rb
 - lib/spud_blog/configuration.rb
@@ -341,6 +329,8 @@ files:
 - spec/dummy/db/migrate/20140110180430_add_content_format_to_spud_posts.tb_blog.rb
 - spec/dummy/db/migrate/20140110180431_add_content_processed_to_spud_post.tb_blog.rb
 - spec/dummy/db/migrate/20140113162805_create_tb_liquid_spud_liquid_tags.tb_liquid.rb
+- spec/dummy/db/migrate/20140730131549_add_primary_key_to_spud_post_categories_posts.tb_blog.rb
+- spec/dummy/db/migrate/20140730131550_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -425,6 +415,8 @@ test_files:
 - spec/dummy/db/migrate/20140110180430_add_content_format_to_spud_posts.tb_blog.rb
 - spec/dummy/db/migrate/20140110180431_add_content_processed_to_spud_post.tb_blog.rb
 - spec/dummy/db/migrate/20140113162805_create_tb_liquid_spud_liquid_tags.tb_liquid.rb
+- spec/dummy/db/migrate/20140730131549_add_primary_key_to_spud_post_categories_posts.tb_blog.rb
+- spec/dummy/db/migrate/20140730131550_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html