radiant-comments-extension 0.0.6 → 0.0.8

data/.gitignore

@@ -1,3 +1,3 @@
 .DS_Store
 .svn
-pkg/*
+*.gem

data/CHANGELOG

@@ -1,5 +1,11 @@
 = Git
 
+= 0.0.7
+
+* Updated to use of the Mollom gem i.o. local copy [Benny Degezelle]
+* Updated to use mollom to it's full potential (show CAPTCHA when unsure) [Benny Degezelle]
+* Added r:comments:spam_message which only expands if a posted comment is thought to be spam [Benny Degezelle]
+
 = 0.0.6
 
 * Added spam_answer_tag for simple spam protection or CAPTCHA

data/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in comments-gem.gemspec
+gemspec

data/README.rdoc

@@ -15,6 +15,7 @@ If you want to contribute features or fixes please write your specs and code and
 * Requires will_paginate Rails plugin (http://github.com/mislav/will_paginate/tree/master)
 * Requires fastercsv 1.2.3 or greater.
 * Requires sanitize 1.0.8 or greater.
+* Requires mollom 0.2.2 or greater.
 
 == Installation 
 
@@ -24,6 +25,14 @@ To install Comments, run:
 
 This _WILL_ delete any snippets named 'comment', 'comments' and 'comment_form' if these exist.
 
+If you are upgrading from a previous version with out the sanitizer run:
+
+  rake radiant:extensions:comments:initialize
+
+or if you want to clean up your initializer for the sanitize gem run:
+
+  rake radiant:extensions:comments:forced_initialize
+
 == More Help
 
 See the included HELP docs here or read them in your Radiant interface with the Help extension installed.

data/Rakefile

@@ -1,19 +1,3 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "radiant-comments-extension"
-    gem.summary = %Q{Comments Extension for Radiant CMS}
-    gem.description = %Q{Adds blog-like comment functionality to Radiant.}
-    gem.email = "jim@saturnflyer.com"
-    gem.homepage = "http://github.com/saturnflyer/radiant-comments-extension"
-    gem.authors = ['Jim Gay', 'Ryan Heneise', 'Sean Cribbs','John Muhl', 'Sven Schwyn', 'Gerrit Kaiser', 'Stephen Lombardo', 'Benny Degezelle', 'Frank Louwers', 'Michael Hale', 'Nathaniel Talbott', 'John Croisant', 'Jon Leighton', 'Witter Cheng', 'Keith Bingman']
-    gem.add_development_dependency "radiant"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. This is only required if you plan to package dashboard as a gem."
-end
-
 # Determine where the RSpec plugin is by loading the boot
 unless defined? RADIANT_ROOT
   ENV["RAILS_ENV"] = "test"

data/TODO

@@ -3,4 +3,3 @@
 * Write better specs.
 * Move tests to specs.
 * Add user notification message when a comment is posted.
-* captcha mollom implementation

data/app/controllers/admin/comments_controller.rb

@@ -114,11 +114,7 @@ class Admin::CommentsController < ApplicationController
   end
 
   def clear_cache
-    if defined?(ResponseCache)
-      ResponseCache.instance.clear
-    else
-      Radiant::Cache.clear
-    end
+    Radiant::Cache.clear
   end
 
   def clear_single_page_cache(comment)

data/app/controllers/comments_controller.rb

@@ -24,13 +24,42 @@ class CommentsController < ApplicationController
       end
     end
     
-    flash[:selected_comment] = comment.id
-    redirect_to "#{@page.url}comments#comment-#{comment.id}"
+    if comment.approved?
+      redirect_to "#{@page.url}comments#comment-#{comment.id}"
+    elsif Comment.spam_filter == MollomSpamFilter && MollomSpamFilter.mollom_response(comment).to_s == 'unsure'
+      set_up_page_with_captcha(comment)
+      render :text => @page.render and return
+    else
+      @page.posted_comment_is_spam = true
+      #comment.destroy
+      render :text => @page.render
+    end
   rescue ActiveRecord::RecordInvalid
+    if comment.errors.on(:spam_answer)
+      @page.posted_comment_is_spam = true
+    end
     @page.last_comment = comment
     render :text => @page.render
- # rescue Comments::MollomUnsure
-    #flash, en render :text => @page.render
+  rescue SpamFilter::Spam
+    @page.posted_comment_is_spam = true
+    #comment.destroy
+    render :text => @page.render
+  end
+
+  def solve_captcha
+    comment = Comment.find_by_mollom_id(params[:comment_mollom_id])
+    answer = params[:captcha_answer]
+    mollom = Comment.spam_filter.mollom
+    if mollom.valid_captcha? :session_id => comment.mollom_id, :solution => answer
+      comment.approve!
+      redirect_to "#{@page.url}comments#comment-#{comment.id}"
+    else
+      set_up_page_with_captcha(comment)
+      render :text => @page.render
+    end
+  rescue Mollom::Error # when you don't provide 'correct' or 'incorrect' in mollom developer mode
+    set_up_page_with_captcha(comment)
+    render :text => @page.render
   end
   
   private
@@ -55,5 +84,18 @@ class CommentsController < ApplicationController
         end
       end
     end
+
+    def set_up_page_with_captcha(comment)
+      mollom = Comment.spam_filter.mollom
+      if comment.mollom_id.nil?
+        captcha = mollom.image_captcha
+        comment.update_attribute(:mollom_id, captcha['session_id'])
+      else
+        captcha = mollom.image_captcha(:session_id => comment.mollom_id)
+      end
+      @page.last_comment = comment
+      @page.captcha_url = captcha['url']
+      @page.comment_mollom_id = @page.captcha_url[/\/([a-z0-9]*).png/, 1]
+    end
   
 end

data/app/models/akismet_spam_filter.rb

@@ -10,7 +10,7 @@ class AkismetSpamFilter < SpamFilter
 
   def approved?(comment)
     (akismet.valid? && ham?(comment)) || raise(SpamFilter::Spam)
-  rescue
+  rescue StandardError, TimeoutError
     # Spam and anything raised by Net::HTTP, e.g. Errno, Timeout stuff
     false
   end

data/app/models/comment.rb

@@ -1,4 +1,5 @@
 require 'digest/md5'
+require 'sanitize' 
 class Comment < ActiveRecord::Base
   belongs_to :page, :counter_cache => true
 
@@ -35,8 +36,12 @@ class Comment < ActiveRecord::Base
     self.referrer = request.env['HTTP_REFERER']
   end
 
+  def is_ham?
+    spam_filter.valid?(self)
+  end
+
   def auto_approve?
-    Radiant::Config['comments.auto_approve'] == "true" && spam_filter.approved?(self)
+    Radiant::Config['comments.auto_approve'] == "true" && is_ham?
   end
 
   def unapproved?
@@ -75,6 +80,7 @@ class Comment < ActiveRecord::Base
     
     def auto_approve
       self.approved_at = Time.now if auto_approve?
+      true
     end
 
     def apply_filter

data/app/models/mollom_spam_filter.rb

@@ -8,9 +8,14 @@ class MollomSpamFilter < SpamFilter
     !Radiant::Config['comments.mollom_publickey'].blank?
   end
 
+  def valid?(comment)
+    approved?(comment)
+  rescue SpamFilter::Unsure
+  end
+  
   def approved?(comment)
     (mollom.key_ok? && ham?(comment)) || raise(SpamFilter::Spam)
-  rescue Mollom::Error, SpamFilter::Spam
+  rescue Mollom::Error, SpamFilter::Spam, TimeoutError
     false
   end
 
@@ -32,19 +37,24 @@ class MollomSpamFilter < SpamFilter
     end
   end
 
-  private
-  def ham?(comment)
-    response = mollom.check_content(
+  def mollom_response(comment)
+    mollom.check_content(
       :author_name => comment.author,            # author name
       :author_mail => comment.author_email,         # author email
       :author_url => comment.author_url,           # author url
-      :post_body => comment.content              # comment text
+      :post_body => comment.content,              # comment text
+      :author_ip => comment.author_ip
       )
-    comment.mollom_id = response.session_id
+  end
+  
+  private
+  
+  def ham?(comment)
+    response = mollom_response(comment)
     save_mollom_servers
     response.ham?
   end
-
+  
   def save_mollom_servers
     Rails.cache.write('MOLLOM_SERVER_CACHE', mollom.server_list.to_yaml) if mollom.key_ok?
   rescue Mollom::Error #TODO: something with this error...

data/app/models/spam_filter.rb

@@ -40,4 +40,5 @@ class SpamFilter
   end
   
   class Spam < ::StandardError; end
+  class Unsure < ::StandardError; end
 end

data/app/views/admin/comments/_comment.html.haml

@@ -0,0 +1,26 @@
+%tr{:id => dom_id(comment), :class => "comment comment-#{comment.ap_status}"}
+  %td.content{:title => comment.content.size >= 70 ? t('click_to_toggle') : "" }
+    %blockquote.short= escape_once(truncate(comment.content, :length => 70))
+    - if comment.content.size >= 70
+      %blockquote.expanded{:style => "display:none"}
+        = escape_once(comment.content)
+  %td.date-column
+    = comment.created_at.strftime("%b %e, %Y at %I:%M%p")
+  %td.author-column
+    = escape_once(comment.author)
+    - unless comment.author_email.blank?
+      = mail_to(comment.author_email, image_tag("admin/email.png"))
+    - unless comment.author_url.blank?
+      = link_to(image_tag("admin/link.png"), comment.author_url)
+  - unless @page
+    %td.page-column
+      = link_to truncate(comment.page.title, :length => 40), comment.page.url, :class => 'view-page'
+      = link_to image_tag("admin/page_white_edit.png"), edit_admin_page_path(comment.page), :title => t('edit_page')
+  %td.controls-column
+    - if comment.approved?
+      = link_to(image_tag('admin/error.png'), unapprove_admin_comment_path(comment), :method => :put, :title => t('unapprove_comment'))
+    - else
+      = link_to(image_tag('admin/accept.png'), approve_admin_comment_path(comment), :title => t('approve_comment'), :method => :put)
+    
+    = link_to image_tag("admin/delete.png"), admin_comment_path(comment), :method => :delete, :confirm => t('are_you_sure_you_want_to_delete_this_comment'), :title => t('delete_comment')
+    = link_to image_tag("admin/comment_edit.png"), edit_admin_comment_path(comment), :title => t('edit_comment')

data/app/views/admin/comments/_form.html.haml

@@ -0,0 +1,37 @@
+- if Comment.spam_filter == SimpleSpamFilter
+  %div{:style => "display:none"}
+    = f.hidden_field :spam_answer, :value => "hemidemisemiquaver"
+    = f.hidden_field :valid_spam_answer, :value => Digest::MD5.hexdigest("hemidemisemiquaver")
+
+#comment_form_container.form-area
+  .set
+    %p.title
+      = f.label :author, t('author')
+      = f.text_field :author
+    %p
+      = f.label :author_url, t('url')
+      = f.text_field :author_url
+    %p
+      = f.label :author_email, t('email')
+      = f.text_field :author_email
+  %p
+    %label{:for => "comment_content"}= t('comment')
+    %br/
+    = f.text_area :content, :rows => 10, :cols => 72, :class => "textarea"
+  %p
+    %label{:for => "comment_filter_id"}= t('filter')
+    = f.select :filter_id, [['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort
+  %p
+    Referred by:
+    = f.object.referrer
+  %p
+    Browser:
+    = f.object.user_agent
+  %p
+    Author's IP Address:
+    = f.object.author_ip
+
+%p.buttons
+  = save_model_button(@comment)
+  = t('or')
+  = link_to t('cancel'), :back

data/app/views/admin/comments/edit.html.haml

@@ -0,0 +1,4 @@
+%h1= "#{t('edit_comment_on')} #{escape_once(@comment.page.title)}"
+
+- form_for [:admin, @comment] do |f|
+  = render :partial => "form", :locals => {:f => f}

data/app/views/admin/comments/index.html.haml

@@ -0,0 +1,57 @@
+- content_for :page_scripts do
+  :plain
+    document.observe('dom:loaded', function(){
+      Event.addBehavior({
+        'tr.comment td.content': function(event){
+          $(this).observe('click', function(event){
+            if($(this).down('blockquote.expanded')){
+              $(this).down('blockquote.expanded').toggle();
+              $(this).down('blockquote.short').toggle();
+            }
+            event.stop();
+          });
+        }
+      });
+    });
+  
+- include_stylesheet 'admin/comments'
+
+.outset
+  #filters
+    %ul.comment-nav
+      - if @page
+        %li        
+          = "#{@page.comments.count.to_s} #{t("comment_states.#{params[:status]}")} " if params[:status] 
+          = "#{pluralize(@page.comments.count, 'Comment')} on #{link_to @page.title, edit_admin_page_path(@page)}"
+      %li.all
+        = link_or_span_unless_current(t('comment_states.all'), :status => 'all', :page_id => params[:page_id])
+      %li.approved
+        = link_or_span_unless_current(t('comment_states.approved'), :status => "approved", :page_id => params[:page_id])
+      %li.unapproved
+        = link_or_span_unless_current(t('comment_states.unapproved'), :status => "unapproved", :page_id => params[:page_id])
+
+
+  #comments_table
+    %table#comments.index
+      %thead
+        %tr
+          %th= t('content')
+          %th= t('date_string')
+          %th= t('author')
+          - unless @page
+            %th= t('page')
+          %th= t('actions')
+      %tbody
+        = render(:partial => "comment", :collection => @comments) || %Q[<tr><td class="note" colspan="#{@page ? 4 : 5}">No comments</td></tr>]
+  %p
+  %small.notice
+    = Comment.spam_filter.message
+
+
+#actions
+  = will_paginate @comments
+  %ul
+    %li
+      = link_to "#{image('table_save')} #{t('download_csv')}", :format => :csv
+    %li
+      = link_to "#{image('comments_delete')} #{t('delete_unapproved')}", destroy_unapproved_admin_comments_url, :class => 'delete-unapproved', :method => :delete, :confirm => 'Is it OK to delete ALL Unapproved Comments?'

data/app/views/admin/pages/_edit_comments_enabled.html.haml

@@ -0,0 +1,7 @@
+%p{:style => "clear:left"}
+  %label{:for => "page_enable_comments"}
+    = check_box "page", "enable_comments"
+    = t('allow_comments_on_page')
+  - unless @page.new_record? or @page.comments_count < 1
+    %small
+      = link_to t('currently_x_view_comments', :count => @page.comments_count), admin_page_comments_path(:page_id => @page.id)

data/app/views/admin/pages/_index_head_view_comments.html.haml

@@ -0,0 +1 @@
+%th.comments= t('comments')

data/app/views/admin/pages/_index_view_comments.html.haml

@@ -0,0 +1,7 @@
+%td.comment_link
+  - if page.respond_to?('enable_comments')
+    %small
+      - if page.enable_comments
+        = link_to "#{page.comments_count} comments", admin_page_comments_path(:page_id => page.id)
+      - else
+        = link_to "Enable", admin_page_enable_comments_path(:page_id => page.id), :method => :put

data/comments_extension.rb

@@ -1,28 +1,15 @@
+require File.expand_path("../lib/radiant-comments-extension/version", __FILE__)
 class CommentsExtension < Radiant::Extension
-  version "#{File.read(File.expand_path(File.dirname(__FILE__)) + '/VERSION')}"
+  version RadiantCommentsExtension::VERSION
   description "Adds blog-like comments and comment functionality to pages."
   url "http://github.com/saturnflyer/radiant-comments"
-
-  define_routes do |map|
-    map.namespace :admin do |admin|
-      admin.connect 'comments/:status', :controller => 'comments', :status => 'unapproved', :conditions => { :method => :get }, :requirements => { :status => /all|unapproved|approved/ }
-      admin.connect 'comments/:status.:format', :controller => 'comments', :status => /all|approved|unapproved/, :conditions => { :method => :get }
-      admin.resources :comments, :member => { :remove => :get, :approve => :put, :unapprove => :put }, :collection => {:destroy_unapproved => :delete}
-      admin.page_enable_comments '/pages/:page_id/comments/enable', :controller => 'comments', :action => 'enable', :conditions => {:method => :put}
-    end
-    map.with_options(:controller => 'admin/comments') do |comments|
-      comments.connect 'admin/pages/:page_id/comments/:status', :status => /all|approved|unapproved/, :conditions => { :method => :get }
-      comments.connect 'admin/pages/:page_id/comments/:status.:format', :status => /all|approved|unapproved/, :conditions => { :method => :get }
-      comments.admin_page_comments 'admin/pages/:page_id/comments/:action'
-      comments.admin_page_comment 'admin/pages/:page_id/comments/:id/:action'
-    end
-    # This needs to be last, otherwise it hoses the admin routes.
-    map.resources :comments, :name_prefix => "page_", :path_prefix => "*url", :controller => "comments"
+  
+  extension_config do |config|
+    config.gem 'sanitize'
+    config.gem 'mollom'
   end
 
   def activate
-    require 'sanitize'
-    
     Dir["#{File.dirname(__FILE__)}/app/models/*_filter.rb"].each do |file|
       require file
     end
@@ -37,14 +24,11 @@ class CommentsExtension < Radiant::Extension
       admin.page.index.add :sitemap_head, "index_head_view_comments"
       admin.page.index.add :node, "index_view_comments"
     end
-    
-    if self.respond_to? :tab
-      tab "Content" do
-        add_item('Comments', '/admin/comments')
-      end
-    else
-      admin.tabs.add "Comments", "/admin/comments", :visibility => [:all]
-    end
+
+    tab "Content" do
+    	add_item("Comments", "/admin/comments")
+    end.
+
     require "fastercsv"
 
     ActiveRecord::Base.class_eval do