beef-articles 0.3.35 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.35
+0.4.0

data/app/controllers/admin/comments_controller.rb

@@ -20,6 +20,9 @@ class Admin::CommentsController < Admin::BaseController
 
   def destroy
     @comment = Comment.find(params[:id])
+    if spam_markable? and params[:spam]
+      Viking.mark_as_spam(@comment.spam_signature)
+    end
     @comment.destroy
     flash[:notice] = 'Comment was successfully deleted.'
 
@@ -28,4 +31,11 @@ class Admin::CommentsController < Admin::BaseController
       format.xml  { head :ok }
     end
   end
+  
+protected
+  
+  def spam_markable?
+    @spam_markable ||= defined?( Viking ) and Comment.new.respond_to?(:spam_signature)
+  end
+  helper_method :spam_markable?
 end

data/app/controllers/comments_controller.rb

@@ -8,9 +8,8 @@ class CommentsController < ApplicationController
     
     @comment = @commentable.comments.build(params[:comment])
     
-    if defined?( Viking ) and !Settings.defensio_api_key.blank? 
-      viking = Viking.connect(:defensio, :api_key => Settings.defensio_api_key, :blog => root_url)
-      viking_response = viking.check_comment( :user_ip => request.remote_ip,
+    if defined?( Viking )
+      viking_response = Viking.check_comment( :user_ip => request.remote_ip,
                                               :article_date => @commentable.published_at,
                                               :comment_author => @comment.name,
                                               :comment_type => 'comment',
@@ -20,9 +19,14 @@ class CommentsController < ApplicationController
                                               :referrer => request.referer,
                                               :permalink => @commentable )
                                               
-                                              
-      logger.info "VIKING RESPONSE: #{viking_response.inspect}"
-      @comment.spam_filter = !viking_response[:spam]
+      if viking_response                                        
+        logger.info "VIKING RESPONSE: #{viking_response.inspect}"
+        @comment.spam_filter = !viking_response[:spam]
+        @comment.spam_signature = viking_response[:signature] if @comment.respond_to?(:spam_signature)
+      else
+        logger.warn "VIKING OPTIONS INCORRECT"
+        @comment.spam_filter = true
+      end
     else
       @comment.spam_filter = true
     end

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

@@ -9,7 +9,7 @@
       <%= sortable_table_header :name => "Name",  :sort => "name" %>
       <%= sortable_table_header :name => "Comment",  :sort => "comment" %>
       <%= sortable_table_header :name => "Created",  :sort => "created_at" %>
-      <th>Actions</th>
+      <th colspan="<% spam_markable? ? 3 : 2 %>">Actions</th>
     </tr>
   </thead>
   <tbody>
@@ -21,19 +21,22 @@
       <td><%= mail_to comment.email, comment.name %></td>
       <td><%=h comment.comment %></td>
       <td class="date"><%= comment.created_at.to_formatted_s(:short) %></td>
-      <td><%= link_to 'Destroy', admin_comment_path(comment), :confirm => 'Are you sure?', :method => :delete, :class => 'delete' %></td>
+<% if spam_markable? %>
+      <td><%= link_to 'Spam', admin_comment_path(comment, :spam => true), :confirm => 'Are you sure you want to delete this comment and mark it as spam?', :method => :delete, :class => 'spam' %></td>
+<% end -%>
+      <td><%= link_to 'Destroy', admin_comment_path(comment), :confirm => 'Are you sure you want to delete this comment?', :method => :delete, :class => 'delete' %></td>
     </tr>
 <% end %>
   </tbody>
   <tfoot>
     <tr>
-<% if @commentable.nil? -%>
+<% if spam_markable? -%>
       <th>Article</th>
 <% end -%>
       <%= sortable_table_header :name => "Name",  :sort => "name" %>
       <%= sortable_table_header :name => "Comment",  :sort => "comment" %>
       <%= sortable_table_header :name => "Created",  :sort => "created_at" %>
-      <th>Actions</th>
+      <th colspan="<% spam_markable? ? 3 : 2 %>">Actions</th>
     </tr>
   </tfoot>
 </table>

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

@@ -4,7 +4,7 @@
 
 <h1>Articles</h1>
 
-<%= link_to ('RSS', {:tag => params[:tag], :page => nil, :format => 'rss'}, :class => 'rss') unless params[:year] %>
+<%= link_to('RSS', {:tag => params[:tag], :page => nil, :format => 'rss'}, :class => 'rss') unless params[:year] %>
 
 
 <!-- so:main-content -->

data/generators/articles_migration/templates/migration.rb

@@ -30,6 +30,7 @@ class CreateArticlesCategoriesAndComments < ActiveRecord::Migration
       t.string :website, :default => ""
       t.string :name, :default => ""
       t.string :email, :default => ""
+      t.string :spam_signature
       t.timestamps
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  version: 0.3.35
+  version: 0.4.0
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 +00:00
+date: 2009-11-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,5 +110,5 @@ specification_version: 3
 summary: Article/Blogging engine
 test_files: 
 - test/articles_test.rb
-- test/test_helper.rb
 - test/schema.rb
+- test/test_helper.rb