spud_blog 0.9.9 → 0.9.10

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

@@ -104,4 +104,10 @@
 }
 .spud_blog_manage_categories_save, .spud_blog_manage_categories_back{
 	display: none;
-}
+}
+
+/*Comment Manager*/
+.submitted-on {
+	display:block;
+	color:#555;
+}

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

@@ -1,14 +1,21 @@
 class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 
 	respond_to :html, :xml, :json
-	before_filter :find_comment, :only => [:show, :edit, :update, :destroy]
+	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
+
 
 	def index
+		@page_name = "Comments"
 		if params[:post_id]
 			@post_comments = SpudPost.find(params[:post_id]).comments
 		else
-			@post_comments = SpudPost.all
+			@post_comments = SpudPostComment
 		end
+		@post_comments = @post_comments.paginate :page => params[:page]
 		respond_with @post_comments
 	end
 
@@ -21,15 +28,35 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		
+
 	end
 
 	def create
 
 	end
 
-	def destroy
+	def approve
+
+		if Spud::Blog.enable_rakismet && @post_comment.spam
+			@post_comment.ham!
+		end
+		@post_comment.update_attributes(:spam => false)
+		redirect_to request.referer || spud_admin_post_comments_path
+	end
 
+	def spam
+		if Spud::Blog.enable_rakismet && !@post_comment.spam
+			@post_comment.spam!
+		end
+		@post_comment.update_attributes(:spam => true)
+		redirect_to request.referer || spud_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
 	end
 
 	private
@@ -38,4 +65,4 @@ class Spud::Admin::PostCommentsController < Spud::Admin::ApplicationController
 		@post_comment = SpudPostComment.find(params[:id])
 	end
 
-end
+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(:comments, :author).paginate(:page => params[:page], :per_page => 15)
+		@posts = SpudPost.where(:is_news => false).order('published_at desc').includes(:visible_comments, :spam_comments, :author).paginate(:page => params[:page], :per_page => 15)
 		respond_with @posts
 	end
 

data/app/models/spud_post.rb

@@ -8,6 +8,7 @@ class SpudPost < ActiveRecord::Base
 	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 :spud_permalinks,:as => :attachment
 	has_many :spud_post_sites, :dependent => :destroy
 
@@ -77,6 +78,7 @@ class SpudPost < ActiveRecord::Base
 			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
 

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

@@ -0,0 +1,47 @@
+<%= content_for :data_controls do %>
+
+<% end %>
+
+<%=content_for :detail do %>
+  <table class="admin-table">
+    <thead>
+      <tr>
+
+        <th>Author</th>
+        <th>Comment</th>
+        <th>Attached To</th>
+        <th>Status</th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @post_comments.each do |comment| %>
+        <tr>
+          <td><%= comment.author %></td>
+          <td>
+            <span class='submitted-on'>Submitted: <%=timestamp(comment.created_at)%></span>
+            <%= comment.content %>
+          </td>
+          <td><%= link_to comment.post.title, blog_post_path(comment.post.url_name)%></td>
+          <td>
+            <% if comment.spam %>
+              Spam
+            <% else %>
+              Approved
+            <% 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' %>
+            <%= 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>
+      <%end%>
+    </tbody>
+  </table>
+  <div class="spud_admin_pagination">
+    <%= will_paginate @post_comments%>
+  </div>
+
+
+<%end%>

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

@@ -1,5 +1,6 @@
 <%= content_for :data_controls do %>
 	<%= link_to "Manage Categories", spud_admin_post_categories_path, :class => 'btn spud_blog_manage_categories', :title => 'Manage Categories' %>
+	<%= link_to "Manage Comments", spud_admin_post_comments_path, :class => 'btn', :title => 'Manage Comments' %>
 	<%= link_to "New Post", new_spud_admin_post_path, :class => "btn btn-primary", :title => "New Post" %>
 <% end %>
 
@@ -12,7 +13,7 @@
 				<th>Published At</th>
 				<th>Comments</th>
 				<th>&nbsp;</th>
-			</tr>			
+			</tr>
 		</thead>
 		<tbody>
 			<% @posts.each do |post| %>
@@ -27,7 +28,11 @@
 					</td>
 					<td><%= post.author.full_name %></td>
 					<td><%= link_to(post.published_at.strftime('%m/%d/%Y'), blog_post_path(post.url_name)) %></td>
-					<td><%= post.comments.size %></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) %>
+					</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' %>
 					</td>

data/config/routes.rb

@@ -6,7 +6,12 @@ Rails.application.routes.draw do
       	resources :post_comments, :path => 'comments', :only => :index
       end
       resources :news_posts
-      resources :post_comments, :except => :new
+      resources :post_comments, :except => [:new, :create, :edit, :update] do
+        member do
+          get 'approve'
+          get 'spam'
+        end
+      end
       resources :post_categories
     end
     namespace :blog do
@@ -18,21 +23,21 @@ Rails.application.routes.draw do
     scope Spud::Blog.config.blog_path do
 
       # Blog Post Categories
-      get 'category/:category_url_name(/page/:page)', 
-        :controller => 'blog', 
-        :action => 'category',  
+      get 'category/:category_url_name(/page/:page)',
+        :controller => 'blog',
+        :action => 'category',
         :as => 'blog_category',
         :defaults => {:page => 1}
-      get 'category/:category_url_name/:archive_date(/page/:page)', 
-        :controller => 'blog', 
-        :action => 'category', 
+      get 'category/:category_url_name/:archive_date(/page/:page)',
+        :controller => 'blog',
+        :action => 'category',
         :as => 'blog_category_archive',
         :defaults => {:page => 1}
 
       # Blog Post Archives
-      get 'archive/:archive_date(/page/:page)', 
-        :controller => 'blog', 
-        :action => 'archive', 
+      get 'archive/:archive_date(/page/:page)',
+        :controller => 'blog',
+        :action => 'archive',
         :as => 'blog_archive',
         :defaults => {:page => 1}
 
@@ -40,8 +45,8 @@ Rails.application.routes.draw do
       post '/', :controller => 'blog', :action => 'filter'
 
       # Blog Posts
-      get '/(page/:page)', 
-        :controller => 'blog', 
+      get '/(page/:page)',
+        :controller => 'blog',
         :action => 'index',
         :as => 'blog',
         :defaults => {:page => 1}
@@ -55,35 +60,35 @@ Rails.application.routes.draw do
     scope Spud::Blog.config.news_path do
 
       # News Post Categories
-      get 'category/:category_url_name(/page/:page)', 
-        :controller => 'news', 
+      get 'category/:category_url_name(/page/:page)',
+        :controller => 'news',
         :action => 'category',
         :as => 'news_category',
         :defaults => {:page => 1}
-      get 'category/:category_url_name/:archive_date(/page/:page)', 
-        :controller => 'news', 
-        :action => 'category', 
+      get 'category/:category_url_name/:archive_date(/page/:page)',
+        :controller => 'news',
+        :action => 'category',
         :as => 'news_category_archive',
         :defaults => {:page => 1}
-      
+
       # News Post Archives
-      get 'archive/:archive_date(/page/:page)', 
+      get 'archive/:archive_date(/page/:page)',
         :controller => 'news',
-        :action => 'archive', 
+        :action => 'archive',
         :as => 'news_archive',
         :defaults => {:page => 1}
 
       # Category/Archive filtering
       post '/', :controller => 'news', :action => 'filter'
-      
+
       # News Posts
-      get '/(page/:page)', 
-        :controller => 'news', 
-        :action => 'index', 
+      get '/(page/:page)',
+        :controller => 'news',
+        :action => 'index',
         :as => 'news',
         :defaults => {:page => 1}
       resources :news_posts, :path => '/', :controller => 'news', :only => [:show]
     end
   end
 
-end
+end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.9.9"
+	  VERSION = "0.9.10"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,6 +291,7 @@ files:
 - app/views/spud/admin/post_categories/edit.html.erb
 - app/views/spud/admin/post_categories/index.html.erb
 - app/views/spud/admin/post_categories/new.html.erb
+- app/views/spud/admin/post_comments/index.html.erb
 - app/views/spud/admin/posts/_category.html.erb
 - app/views/spud/admin/posts/_form.html.erb
 - app/views/spud/admin/posts/edit.html.erb
@@ -338,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2302805393296962866
+      hash: -4012554368175872547
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -347,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2302805393296962866
+      hash: -4012554368175872547
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24