tb_blog 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGJkOWJmMDM3ZDBlYmIyZmM1Y2UyNTczNDNlYWExM2ZhMmVlZTkyMg==
+    N2FkN2RjOWZiYzA4OWRlMDUyYzgyMDQxNGYxMzY1M2JhODFmZmI1Yg==
   data.tar.gz: !binary |-
-    YzllNGI4MGQ3Mjg4OTAwOGViODcyMzc3NDRmMzU4ZGU5ZDE5NjcxNg==
+    MGY4YjRkMTAyY2U1MDlhZTBhMTQ1MzBiYmFmODlkNTJmMmI1OTY0NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzQwMDQyZGFhODU3NTU0MGE2ZjMzYTJjYzAyOTM1NDgxY2U2NzNiMGU1ZDFm
-    MWFkMjA0NDBiNjEzN2Y2NGNkZWY4N2M0YWIwZmMyZTk3MDE0MzM1Y2I0ZWQ2
-    ZWIwODRmNzgxOGQ0NWExOTExYWFkNDA1OTViZWE5NGQxMjg2OWQ=
+    MjUyMTkzNjJlYjNhYzY4MWE4NjYyYjljZjY5MzQ1ZmFmNjA3NzdmYzU5ZWIw
+    YmI5NzU3ZWIxMjY0ZDYzYzcyZmU4ZjUzMGE2ZGFiYjJhMTNjMzVhZDQ5MWM5
+    NTA1NTMyYjVlMDEwYzZjYzAxYWMyYTUwNmUyMjlhMWUxZGM1OWE=
   data.tar.gz: !binary |-
-    MzQ3ZDMzMDJiNWNiZWVmMzE5N2MzNTljMDhhMTAxYjA0ZTdmMWU1YmM4YzUw
-    N2RjYTExMmFjMGI1OWE5MjE3OTFlOTY2YzFkMThmZWUyNjk2MjU4ZjhjNjYy
-    MmNjOGVhZWZhYTEwNWM5ODI0MWJmOTAxNmZhYzg3NWRjZjIzMzc=
+    Yjk3ZmZlODRiYzhlYzhhYTdmZWIzZmExNDE5NmYxNzhjYWFlNTE1OWM3MTcw
+    MWQ3YzM4MGFkNmQwM2FhNjBhOTQwNzg3NzczYjc4MmNlN2I1MGM4MWY3Njhm
+    YzYyNmUzZDkzNTA4YWUwZTJkODRhNzc3M2E3ZTE0MDJhN2NhYzI=

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

@@ -0,0 +1,14 @@
+(function(){
+
+spud.admin.post_comments = {
+  index: function(){
+    $('body').on('click', '.blog-comment-content-toggle', clickedToggleCommentContent);
+  }
+};
+
+var clickedToggleCommentContent = function(e){
+  e.preventDefault();
+  $(this).next('.blog-comment-content-hidden').toggle();
+};
+
+})();

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

@@ -1,4 +1,5 @@
 //= require spud/admin/post_categories
+//= require spud/admin/post_comments
 
 spud = (typeof(spud) == 'undefined') ? {} : spud;
 spud.admin = (typeof(spud.admin) == 'undefined') ? {} : spud.admin;

data/app/assets/stylesheets/spud/admin/posts.css

@@ -106,8 +106,27 @@
 	display: none;
 }
 
-/*Comment Manager*/
+/* Comment Manager
+------------------ */
+.spud-post-comments-manage{
+	font-size: 12px;
+	font-style: italic;
+}
 .submitted-on {
 	display:block;
 	color:#555;
 }
+.blog-comment-content{
+
+}
+.blog-comment-content-toggle{
+	font-size: 12px;
+	display: block;
+}
+.blog-comment-content-hidden{
+	font-size: 12px;
+	margin: 4px 0 0;
+	padding: 4px 0 0;
+	border-top: 1px solid #666;
+	display: none;
+}

data/app/controllers/blog_controller.rb

@@ -3,7 +3,7 @@ class BlogController < ApplicationController
 	respond_to :html, :xml, :json, :rss
 	layout Spud::Blog.base_layout
 
-  before_filter :find_post, :only => :show
+  before_filter :find_post, :only => [:show, :create_comment]
 
   caches_action :show, :index,
     :expires => Spud::Blog.config.action_caching_duration,
@@ -27,14 +27,14 @@ class BlogController < ApplicationController
       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
+          redirect_to blog_path(:page => page), :status => :moved_permanently and return
         else
-          redirect_to blog_path(:page => nil),:status => :moved_permanently and return
+          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)
+    @posts = SpudPost.public_blog_posts(page, Spud::Blog.config.posts_per_page).includes(:categories, :author)
     if Spud::Core.config.multisite_mode_enabled
       @posts = @posts.for_spud_site(current_site_id)
     end
@@ -95,7 +95,7 @@ class BlogController < ApplicationController
 
   def show
     if @post.comments_enabled
-      @comment = SpudPostComment.new(:spud_post_id => params[:id])
+      @comment = SpudPostComment.new()
     end
   	respond_with @post
   end
@@ -105,20 +105,24 @@ class BlogController < ApplicationController
       render :nothing => true
       return
     end
-    @post = SpudPost.find(params[:id])
-    if @post.blank?
-      flash[:error] = "Post not found!"
-      redirect_to blog_path and return false
-    end
     @comment = @post.comments.new(params[:spud_post_comment])
     @comment.user_agent = request.env["HTTP_USER_AGENT"]
     @comment.user_ip = request.remote_ip
     @comment.referrer = request.referrer
-    @comment.approved = true
+    @comment.approved = Spud::Blog.default_comment_approval
     @comment.permalink = blog_post_url(@post.url_name)
-    flash[:notice] = 'Your comment has been posted.' if @comment.save
+    if @comment.save
+      if @comment.approved?
+        flash[:notice] = 'Your comment has been posted.'
+      else
+        flash[:notice] = 'Your comment has been saved and will appear after being reviewed by an administrator.'
+      end
+      @comment = SpudPostComment.new()
+    end
     respond_with @comment do |format|
-    	format.html { redirect_to blog_post_path(@post.url_name, :anchor => 'spud_post_comment_form') }
+    	format.html { 
+        render 'show'
+      }
     end
   end
 

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

@@ -7,15 +7,14 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 	add_breadcrumb 'Blog Posts', :spud_admin_posts_path
 	add_breadcrumb 'Comments', :spud_admin_post_comments_path
 
-
 	def index
 		@page_name = "Comments"
 		if params[:post_id]
-			@post_comments = SpudPost.find(params[:post_id]).comments
+			@post_comments = SpudPostComment.where(:spud_post_id => params[:post_id])
 		else
 			@post_comments = SpudPostComment
 		end
-		@post_comments = @post_comments.paginate :page => params[:page]
+		@post_comments = @post_comments.includes(:post).paginate(:page => params[:page], :per_page => 15)
 		respond_with @post_comments
 	end
 
@@ -36,11 +35,12 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 	end
 
 	def approve
-
 		if Spud::Blog.enable_rakismet && @post_comment.spam
 			@post_comment.ham!
 		end
-		@post_comment.update_attributes(:spam => false)
+		@post_comment.spam = false
+		@post_comment.approved = true
+		@post_comment.save()
 		redirect_to request.referer || spud_admin_post_comments_path
 	end
 
@@ -48,7 +48,9 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 		if Spud::Blog.enable_rakismet && !@post_comment.spam
 			@post_comment.spam!
 		end
-		@post_comment.update_attributes(:spam => true)
+		@post_comment.spam = true
+		@post_comment.approved = false
+		@post_comment.save()
 		redirect_to request.referer || spud_admin_post_comments_path
 	end
 

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

@@ -8,7 +8,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	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)
+		@posts = SpudPost.where(:is_news => false).order('published_at desc').includes(:pending_comments, :author).paginate(:page => params[:page], :per_page => 15)
 		respond_with @posts
 	end
 

data/app/helpers/spud/admin/post_comments_helper.rb

@@ -1,2 +1,3 @@
 module Spud::Admin::PostCommentsHelper
+
 end

data/app/models/spud_post.rb

@@ -6,8 +6,9 @@ class SpudPost < ActiveRecord::Base
 		:join_table => 'spud_post_categories_posts',
 		: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 :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 :spud_permalinks,:as => :attachment
 	has_many :spud_post_sites, :dependent => :destroy
@@ -29,7 +30,7 @@ class SpudPost < ActiveRecord::Base
 	end
 
 	def self.public_posts(page, per_page)
-		return where('visible = ? AND published_at <= ?', true,Time.now.utc).order('published_at desc').includes(:categories).paginate(:page => page, :per_page => per_page)
+		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)
@@ -136,6 +137,10 @@ class SpudPost < ActiveRecord::Base
 		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?
@@ -153,7 +158,7 @@ class SpudPost < ActiveRecord::Base
 		end
 	end
 
-	private
+private
 
 	def set_url_name
 		self.url_name = "#{self.published_at.strftime('%Y-%m-%d')}-#{self.title.parameterize}"

data/app/models/spud_post_comment.rb

@@ -1,18 +1,28 @@
 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
+	belongs_to :post, :class_name => 'SpudPost', :foreign_key => 'spud_post_id', :counter_cache => :comments_count, :inverse_of => :comments
 
-	attr_accessible :author,:content,:spud_post_id,:referrer,:spam,:user_agent,:user_ip,:permalink
+  def visible?
+    return approved && !spam
+  end
 
+private
 
   def rakismet_check_for_spam
-    self.spam = self.spam?
+    if self.spam?
+      self.spam = true
+      self.approved = false
+    else
+      self.spam = true
+    end
     return true
   end
 

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

@@ -1,4 +1,16 @@
-<%= form_for @comment, :url => blog_post_path(@post) do |f| %>
+<%= form_for @comment, :url => blog_post_path(@post.url_name, :anchor => 'comment_form') do |f| %>
+	
+	<% if @comment.errors.any? %>
+    <div class="comment_error_list">
+      <h4>Please correct the following <%= pluralize(@comment.errors.count, "error") %>:</h4>
+      <ul>
+        <% @comment.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+	<% end %>
+
 	<div>
 		<%= f.label :author %>
 		<%= f.text_field :author %>

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

@@ -17,7 +17,7 @@
 </div>
 
 <div id="spud_blog_posts">
-	<% if @posts.any? %>
+	<% if @posts.length > 0 %>
 		<% @posts.each do |post| %>
 			<div class="spud_blog_post">
 				<h3><%= link_to post.title, blog_post_path(post.url_name) %></h3>

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

@@ -18,21 +18,33 @@
       <% @post_comments.each do |comment| %>
         <tr>
           <td><%= comment.author %></td>
-          <td>
+          <td width="400" class="blog-comment-content">
             <span class='submitted-on'>Submitted: <%=timestamp(comment.created_at)%></span>
-            <%= comment.content %>
+            <%= truncate(comment.content, :length => 50) %>
+            <% if comment.content.length > 50 %>
+              <a href="#" class="blog-comment-content-toggle">Show/Hide</a>
+              <div class="blog-comment-content-hidden">
+                <%= comment.content %>
+              </div>
+            <% end %>
           </td>
           <td><%= link_to comment.post.title, blog_post_path(comment.post.url_name)%></td>
           <td>
             <% if comment.spam %>
               Spam
-            <% else %>
+            <% elsif comment.approved %>
               Approved
+            <% else %>
+              Pending
             <% end %>
           </td>
           <td align="right">
-            <%= link_to 'Approve', approve_spud_admin_post_comment_path(comment), :class => 'btn btn-success btn-small' %>
-            <%= link_to 'Spam', spam_spud_admin_post_comment_path(comment), :class => 'btn btn-warning btn-small' %>
+            <% if !comment.approved %>
+              <%= link_to 'Approve', approve_spud_admin_post_comment_path(comment), :class => 'btn btn-success btn-small' %>
+            <% end %>
+            <% if !comment.spam %>
+              <%= link_to 'Spam', spam_spud_admin_post_comment_path(comment), :class => 'btn btn-warning btn-small' %>
+            <% end %>
             <%= link_to 'Delete', spud_admin_post_comment_path(comment), :method => :delete, :confirm => 'Are you sure you want to delete this comment?', :class => 'btn btn-danger btn-small' %>
           </td>
         </tr>
@@ -43,5 +55,8 @@
     <%= will_paginate @post_comments%>
   </div>
 
+<script>
+  $(document).ready(spud.admin.post_comments.index);
+</script>
 
 <%end%>

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

@@ -11,7 +11,7 @@
 				<th>Title</th>
 				<th>Author</th>
 				<th>Published At</th>
-				<th>Comments</th>
+				<th>Comments Pending</th>
 				<th>&nbsp;</th>
 			</tr>
 		</thead>
@@ -29,9 +29,8 @@
 					<td><%= post.author.full_name %></td>
 					<td><%= link_to(post.published_at.strftime('%m/%d/%Y'), blog_post_path(post.url_name)) %></td>
 					<td>
-						Approved: <%=link_to post.visible_comments.count, spud_admin_post_post_comments_path(:post_id => post.id) %>
-						<br/>
-						Spam: <%=link_to post.spam_comments.count, spud_admin_post_post_comments_path(:post_id => post.id) %>
+						<%= post.pending_comments.length %>
+						<%= link_to "Manage", spud_admin_post_post_comments_path(:post_id => post.id), :class => 'spud-post-comments-manage' %>
 					</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' %>

data/lib/spud_blog/configuration.rb

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

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "1.0.2"
+	  VERSION = "1.0.3"
 	end
 end

data/spec/controllers/blog_controller_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe BlogController, :type => :controller do
+
+  before(:all) do
+
+  end
+
+  describe :index do
+    it "should display a list of posts" do
+      2.times { |i| FactoryGirl.create(:spud_post) }
+      get :index
+      assigns(:posts).count.should be > 1
+    end
+  end
+
+  describe :create_comment do
+    it "should create a comment" do
+      @post = FactoryGirl.create(:spud_post)
+      post :create_comment, :id => @post.url_name, :spud_post_comment => {:author => "Test User", :content => "Lorem Ipsum"}
+      @post.comments.length.should be > 0
+    end
+
+    it "should approve a comment by default if default_comment_approval is true" do
+      Spud::Blog.configure do |config|
+        config.default_comment_approval = true
+      end
+      @post = FactoryGirl.create(:spud_post)
+      post :create_comment, :id => @post.url_name, :spud_post_comment => {:author => "Test User", :content => "Lorem Ipsum"}
+      @post.comments.first.approved.should be_true
+    end
+
+    it "should not approve a comment by default if default_comment_approval is false" do
+      Spud::Blog.configure do |config|
+        config.default_comment_approval = false
+      end
+      @post = FactoryGirl.create(:spud_post)
+      post :create_comment, :id => @post.url_name, :spud_post_comment => {:author => "Test User", :content => "Lorem Ipsum"}
+      @post.comments.first.approved.should be_false
+    end
+  end
+
+end

data/spec/controllers/spud/admin/posts_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Spud::Admin::PostsController do
+
+end