radiant-comments-extension 0.0.6 → 0.0.8

data/config/locales/en.yml

@@ -0,0 +1,26 @@
+en: 
+  actions: Actions
+  allow_comments_on_page: Allow Comments on this page?
+  author: Author
+  approve_comment: Approve comment
+  are_you_sure_you_want_to_delete_this_comment: Are you sure you want to delete this comment?
+  click_to_toggle: Click to toggle complete text
+  currently_x_view_comments: Currently {{count}} - show reactions
+  comment: Comment
+  comments: Comments
+  comment_form: Comment Form
+  comment_states:
+    all: All
+    unapproved: Unapproved
+    approved: Approved
+  date_string: Date
+  delete_comment: Delete comment
+  delete_unapproved: Delete unapproved comments
+  download_csv: Download CSV
+  edit_comment: Edit comment
+  edit_comment_on: Edit comment on
+  email: E-mail
+  message_unsure: Please type the letters that you see to prove that you are not a spambot
+  unapprove_comment: Unapprove comment
+  url: URL
+  your_name: Your Name (as you'd like it to appear on this comment)

data/config/locales/nl.yml

@@ -0,0 +1,26 @@
+nl: 
+  actions: Acties
+  allow_comments_on_page: Reacties toelaten?
+  author: Auteur
+  approve_comment: Reactie goedkeuren
+  are_you_sure_you_want_to_delete_this_comment: Ben je zeker dat je deze reactie wilt verwijderen?
+  click_to_toggle: Klik om de volledige reactie te tonen
+  currently_x_view_comments: Momenteel {{count}} - toon reacties
+  comment: Reactie
+  comments: Reacties
+  comment_form: Reactieformulier
+  comment_states:
+    all: Alle
+    unapproved: Te modereren
+    approved: Doorgelaten
+  date_string: Datum
+  delete_comment: Reactie verwijderen
+  delete_unapproved: Te modereren reacties verwijderen
+  download_csv: CSV downloaden
+  edit_comment: Wijzig reactie
+  edit_comment_on: Wijzig reactie op
+  email: E-mail
+  message_unsure: Vul onderstaande CAPTCHA in om te bewijzen dat je geen spam-bot bent
+  unapprove_comment: Reactie terug naar Te modereren
+  url: URL
+  your_name: Naam (die je bij deze reactie wilt tonen)

data/config/routes.rb

@@ -0,0 +1,16 @@
+ActionController::Routing::Routes.draw 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"
+end

data/db/migrate/002_create_snippets.rb

@@ -77,20 +77,20 @@ CONTENT
       <r:error><p style="color:red">Please correct the errors below.</p></r:error>
       <p><label for="comment_author">Your Name</label><br />
       <r:error on="author"><p style="color:red">Name <r:message /></p></r:error>
-      <r:text_field_tag name="author" id="author" class="required" /></p>
+      <p><r:text_field_tag name="author" id="author" class="required" /></p>
 
       <p><label for="comment_author_email">Your Email Address</label> (required, but not displayed)<br />
       <r:error on="author_email"><p style="color:red">Email <r:message /></p></r:error>
-      <r:text_field_tag name="author_email" class="required" /></p>
+      <p><r:text_field_tag name="author_email" class="required" /></p>
 
       <p><label for="comment_author_url">Your Web Address</label> (optional)<br />
       <r:error on="author_url"><p style="color:red">Web Address <r:message /></p></r:error>
-      <r:text_field_tag name="author_url" /></p>
+      <p><r:text_field_tag name="author_url" /></p>
 
       <p><label for="comment_content">Your Comment</label><br />
       <r:error on="content"><p style="color:red">Comment <r:message /></p></r:error>
       <label for="comment_filter_id">Filter: <r:filter_box_tag name="filter_id" value="Textile" /></label><br />
-      <r:text_area_tag name="content" class="required" rows="9" cols="40" /></p>
+      <p><r:text_area_tag name="content" class="required" rows="9" cols="40" /></p>
 
       <r:if_comments_simple_spam_filter_enabled>
         <r:snippet name="comment_spam_block" />

data/lib/comment_page_extensions.rb

@@ -6,6 +6,9 @@ module CommentPageExtensions
       has_many :comments, :dependent => :delete_all, :order => "created_at ASC"
       attr_accessor :last_comment
       attr_accessor :selected_comment
+      attr_accessor :captcha_url
+      attr_accessor :comment_mollom_id
+      attr_accessor :posted_comment_is_spam
     end
   end
 
@@ -29,13 +32,23 @@ module CommentPageExtensions
           absolute_url = "#{request.protocol}#{request.host_with_port}#{relative_url_for(url, request)}#comment-#{comment.id}"
           response.redirect(absolute_url, 303)
           return
-        else
-          self.selected_comment = comment
+        elsif Comment.spam_filter == MollomSpamFilter && MollomSpamFilter.mollom_response(comment).to_s == 'unsure'
+          self.last_comment = comment
+          captcha = MollomSpamFilter.mollom.image_captcha
+          comment.update_attribute(:mollom_id, captcha['session_id']) # because mollom does not guarantee the session_id will be kept when you pass one to mollom.image_captcha
+          self.captcha_url = captcha['url']
+          self.comment_mollom_id = captcha['session_id']
         end
+      rescue Mollom::NoAvailableServers
+        logger.error "*** Mollom was unavailable (Mollom::NoAvailableServers)"
       rescue ActiveRecord::RecordInvalid
         self.last_comment = comment
+      rescue SpamFilter::Spam
+        self.posted_comment_is_spam = true
+        comment.destroy
       end
     end
     process_without_comments(request, response)
   end
+  
 end

data/lib/comment_tags.rb

@@ -206,6 +206,61 @@ module CommentTags
   tag 'comments:error:message' do |tag|
     tag.locals.error_message
   end
+  
+  desc %{
+    Renders the nested content if the posted comment was found unsure by Mollom.
+  }
+  tag "comments:if_unsure" do |tag|
+    tag.expand if tag.locals.page.captcha_url
+  end
+  desc %{
+    Renders the nested content unless the posted comment was found unsure by Mollom.
+  }
+  tag "comments:unless_unsure" do |tag|
+    tag.expand unless tag.locals.page.captcha_url
+  end
+  
+  desc %{
+    Renders a CAPTCHA if the posted comment was found unsure by Mollom.
+    
+    *Usage:*
+    <r:comments:mollom_captcha [label="hey.. are you even human?"] />
+  }
+  tag "comments:mollom_captcha" do |tag|
+    if tag.locals.page.captcha_url
+      url = tag.locals.page.captcha_url
+      text = tag.attr['label']||I18n.t('message_unsure')
+      return %{
+        <div id="captcha_form">
+          <form method="post" action="#{tag.locals.page.url}comments/solve_captcha">
+          <label for="captcha_answer">#{text}</label>
+          <img src="#{url}" alt="Mollom image CAPTCHA" /><br />
+          <input type="text" name="captcha_answer" />
+          <input type="hidden" name="comment_mollom_id" value="#{tag.locals.page.comment_mollom_id}"/>
+          <input type="submit" />
+          </form>
+        </div>
+      }
+    end
+  end
+  
+  desc %{
+    Only expands if the posted comment is thought to be spam.
+    
+    *Usage:*
+    <pre><code><r:comments:if_spam message="we don't like your spamming around here.." /></code></pre>
+    or use a double tag to send your own content:
+    <pre><code><r:comments:if_spam>&lt;p class="error">...&lt;/p></r:comments:if_spam></code></pre>
+  }
+  tag "comments:if_spam" do |tag|
+    if tag.locals.page.posted_comment_is_spam == true
+      if tag.double?
+        tag.expand
+      else
+        tag.attr["message"]
+      end
+    end
+  end
 
   %w(text password hidden).each do |type|
     desc %{Builds a #{type} form field for comments.}

data/lib/radiant-comments-extension.rb

@@ -0,0 +1,2 @@
+module RadiantCommentsExtension
+end

data/lib/radiant-comments-extension/version.rb

@@ -0,0 +1,3 @@
+module RadiantCommentsExtension
+  VERSION = '0.0.8'
+end

data/public/stylesheets/admin/comments.css

@@ -1,41 +1,33 @@
-#comment-nav {
-  float: right;
+.comment-nav {
+  background: #ccc;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
   list-style: none;
-  margin: -42px 0 0 96px;
-  padding: 0; }
-  #comment-nav li {
+  margin: 0;
+  padding: 10px; }
+  .comment-nav li {
     display: inline;
     margin: 0 5px 0 0; }
-  #comment-nav a, #comment-nav span {
+  .comment-nav a, .comment-nav span {
     padding: 5px 5px 5px 25px;
     background-position: 5px center;
     background-repeat: no-repeat; }
-  #comment-nav a, #comment-nav a:visited {
+  .comment-nav a, .comment-nav a:visited {
     color: black; }
-  #comment-nav span {
-    border: 1px solid #ffa;
-    background-color: #ffd; }
-  #comment-nav li.all a, #comment-nav li.all span {
+  .comment-nav span {
+    border: 1px solid #e8e8e8;
+    background-color: #eee; }
+  .all span, .all a {
     background-image: url(/images/admin/comments.png); }
-  #comment-nav li.approved a, #comment-nav li.approved span {
+  .approved span, .approved a {
     background-image: url(/images/admin/accept.png); }
-  #comment-nav li.unapproved a, #comment-nav li.unapproved span {
+  .unapproved span, .unapproved a {
     background-image: url(/images/admin/error.png); }
-  #comment-nav li.csv a, #comment-nav li.csv span {
-    background-image: url(/images/admin/table_save.png); }
 
-html>body li.all a, html>body li.all span, html>body li.approved a, html>body li.approved span, html>body li.unapproved a, html>body li.unapproved span, html>body li.csv a, html>body li.csv span {
-  *display: inline-block; }
+#content .outset {
+  margin-bottom: 40px;
+}
 
-* html li.all a, * html li.all span, * html li.approved a, * html li.approved span, * html li.unapproved a, * html li.unapproved span, * html li.csv a, * html li.csv span {
-  display: inline-block; }
-
-#content tr.comment td.content { color: #333; padding-right: 8px; width: 45%; font-size: 75%; }
-#content tr.comment blockquote.short { display: inline; margin: 0 }
-#content tr.comment blockquote.expanded { display:block; margin: 0; padding: 4px; border: 1px solid #bbc; background-color: #eef; }
-#content tr.comment td.controls, #content tr.comment td.date { white-space: nowrap }
-#content tr.comment.approved { background-color: #efe; }
-#content tr.comment a { color: black; }
-#content tr.comment a:visited { color: black; }
-
-button.delete-unapproved { padding: 5px; font-size: 120%; }
+.controls-column, .date-column, .author-column { white-space: nowrap }
+.comment-unapproved { background-color: #ffe; }
+.comment a, .comment a:visited { color: black; }

data/radiant-comments-extension.gemspec

@@ -1,133 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/radiant-comments-extension/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-comments-extension}
-  s.version = "0.0.6"
+  s.version = RadiantCommentsExtension::VERSION
+  s.platform = Gem::Platform::RUBY
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = ">= 1.3.6"
   s.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"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-10-11}
+  s.summary = %q{Comments Extension for Radiant CMS}
   s.description = %q{Adds blog-like comment functionality to Radiant.}
   s.email = %q{jim@saturnflyer.com}
   s.extra_rdoc_files = [
     "README.rdoc",
      "TODO"
   ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "HELP_admin.markdown",
-     "HELP_designer.markdown",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "app/controllers/admin/comments_controller.rb",
-     "app/controllers/comments_controller.rb",
-     "app/helpers/admin/comments_helper.rb",
-     "app/models/akismet_spam_filter.rb",
-     "app/models/comment.rb",
-     "app/models/comment_mailer.rb",
-     "app/models/mollom_spam_filter.rb",
-     "app/models/simple_spam_filter.rb",
-     "app/models/spam_filter.rb",
-     "app/views/admin/comments/_comment.rhtml",
-     "app/views/admin/comments/_form.rhtml",
-     "app/views/admin/comments/edit.rhtml",
-     "app/views/admin/comments/index.rhtml",
-     "app/views/admin/pages/_comments.rhtml",
-     "app/views/admin/pages/_edit_comments_enabled.rhtml",
-     "app/views/admin/pages/_index_head_view_comments.rhtml",
-     "app/views/admin/pages/_index_view_comments.rhtml",
-     "app/views/comment_mailer/comment_notification.rhtml",
-     "app/views/comments/_comment.rhtml",
-     "app/views/comments/_form.rhtml",
-     "app/views/comments/_new.rhtml",
-     "autotest/discover.rb",
-     "comments_extension.rb",
-     "cucumber.yml",
-     "db/migrate/001_create_comments.rb",
-     "db/migrate/002_create_snippets.rb",
-     "db/migrate/003_change_filter_id_from_integer_to_string.rb",
-     "db/migrate/004_add_approval_columns.rb",
-     "db/migrate/005_add_mollomid_column.rb",
-     "db/migrate/006_move_config_to_migrations.rb",
-     "db/migrate/007_add_preference_for_simple_spamcheck.rb",
-     "features/support/env.rb",
-     "features/support/paths.rb",
-     "lib/akismet.rb",
-     "lib/comment_page_extensions.rb",
-     "lib/comment_tags.rb",
-     "lib/mollom.rb",
-     "lib/radiant-comments-extension.rb",
-     "lib/tasks/comments_extension_tasks.rake",
-     "public/images/admin/accept.png",
-     "public/images/admin/comment_edit.png",
-     "public/images/admin/comments.png",
-     "public/images/admin/comments_delete.png",
-     "public/images/admin/delete.png",
-     "public/images/admin/email.png",
-     "public/images/admin/error.png",
-     "public/images/admin/link.png",
-     "public/images/admin/page_white_edit.png",
-     "public/images/admin/table_save.png",
-     "public/images/admin/tick.png",
-     "public/stylesheets/admin/comments.css",
-     "radiant-comments-extension.gemspec",
-     "spec/controllers/admin/comments_controller_spec.rb",
-     "spec/controllers/admin/comments_routing_spec.rb",
-     "spec/controllers/page_postback_spec.rb",
-     "spec/datasets/comments_dataset.rb",
-     "spec/models/akismet_spam_filter_spec.rb",
-     "spec/models/comment_spec.rb",
-     "spec/models/comment_tags_spec.rb",
-     "spec/models/mollom_spam_filter_spec.rb",
-     "spec/models/simple_spam_filter_spec.rb",
-     "spec/models/spam_filter_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "test/fixtures/users.yml",
-     "test/integration/comment_enabling_test.rb",
-     "test/test_helper.rb",
-     "test/unit/comment_test.rb"
-  ]
+  s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/saturnflyer/radiant-comments-extension}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Comments Extension for Radiant CMS}
-  s.test_files = [
-    "spec/controllers/admin/comments_controller_spec.rb",
-     "spec/controllers/admin/comments_routing_spec.rb",
-     "spec/controllers/page_postback_spec.rb",
-     "spec/datasets/comments_dataset.rb",
-     "spec/models/akismet_spam_filter_spec.rb",
-     "spec/models/comment_spec.rb",
-     "spec/models/comment_tags_spec.rb",
-     "spec/models/mollom_spam_filter_spec.rb",
-     "spec/models/simple_spam_filter_spec.rb",
-     "spec/models/spam_filter_spec.rb",
-     "spec/spec_helper.rb",
-     "test/integration/comment_enabling_test.rb",
-     "test/test_helper.rb",
-     "test/unit/comment_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<radiant>, [">= 0"])
-    else
-      s.add_dependency(%q<radiant>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<radiant>, [">= 0"])
-  end
+  s.test_files = `git ls-files spec test`.split("\n")
 end
 

data/spec/controllers/page_postback_spec.rb

@@ -4,7 +4,8 @@ describe SiteController, "Comments form posting to page" do
   dataset :pages
   
   before :each do
-    Radiant::Config['comments.post_to_page?'] = true
+    Radiant::Config['comments.post_to_page?'] = 'true'
+    Radiant::Config['comments.auto_approve'] = 'true'
   end
   
   def do_post(comment_params={})

data/spec/models/comment_spec.rb

@@ -33,29 +33,18 @@ describe "Comment" do
       @comment.stub!(:using_logic_spam_filter?).and_return(false)
       Radiant::Config['comments.filters_enabled'] = "true"
     end
-    
-    it "should escape html for content_html when a filter is not selected" do
+        
+    it "should remove script elements from the content" do
       @comment.content = %{<script type="text/javascript">alert('hello')</script>}
-      @comment.save!  
-      @comment.content_html.should == %{<p>alert(&#39;hello&#39;)</p>}
-    end
-    it "should sanitize the content" do
-      @comment.content = %{*hello* <script type="text/javascript">alert('hello')</script>}
       @comment.save!
-      @comment.content_html.should_not include_text('script')
+      @comment.content_html.should_not =~ /script/
     end
-    it "should filter the content for content_html when a filter is selected" do
+    
+    it "should pass content for content_html through filter when one is selected" do
       @comment.filter_id = 'Textile'
-      @comment.content = %{*hello* <script type="text/javascript">alert('hello')</script>}
+      @comment.content = %{*hello*}
       @comment.save!
-      @comment.content_html.should match(/<strong>hello<\/strong>/)
-    end
-    it "should escape the content for content_html when a filter is not selected" do
-      Radiant::Config['comments.filters_enabled'] = 'true'
-      @comment.filter_id = ''
-      @comment.content = %{*hello* <script type="text/javascript">alert('hello')</script>}
-      @comment.save!
-      @comment.content_html.should_not include_text('script')
+      @comment.content_html.should == '<p><strong>hello</strong></p>'
     end
 
     it "should successfully create comment" do
@@ -63,11 +52,6 @@ describe "Comment" do
       lambda{@comment.save!}.should_not raise_error
     end
 
-    it "should set content_html with filter when saving" do
-      @comment.save
-      @comment.content_html.should eql("<p>That&#39;s all I have to say about that.</p>")
-    end
-
     it "should validate that author is supplied" do
       comment = create_comment(:author => nil)
       comment.valid?.should be_false