radiant-comments-extension 0.0.6 → 0.0.8

data/spec/models/mollom_spam_filter_spec.rb

@@ -65,6 +65,11 @@ describe MollomSpamFilter do
       MollomSpamFilter.should be_approved(@comment)
     end
     
+    it "should not be approved when the API is unreachable" do
+      @mollom.stub!(:check_content).and_raise(TimeoutError)
+      MollomSpamFilter.should_not be_approved(@comment)
+    end
+    
     it "should cache the Mollom server list after a successful response" do
       Rails.cache.should_receive(:write).with('MOLLOM_SERVER_CACHE', anything())
       MollomSpamFilter.should be_approved(@comment)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-comments-extension
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jim Gay
@@ -28,21 +29,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: radiant
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 description: Adds blog-like comment functionality to Radiant.
 email: jim@saturnflyer.com
 executables: []
@@ -55,13 +45,13 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - CHANGELOG
+- Gemfile
 - 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
@@ -71,20 +61,20 @@ files:
 - 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/admin/comments/_comment.html.haml
+- app/views/admin/comments/_form.html.haml
+- app/views/admin/comments/edit.html.haml
+- app/views/admin/comments/index.html.haml
+- app/views/admin/pages/_comments.html.haml
+- app/views/admin/pages/_edit_comments_enabled.html.haml
+- app/views/admin/pages/_index_head_view_comments.html.haml
+- app/views/admin/pages/_index_view_comments.html.haml
 - 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
+- config/locales/en.yml
+- config/locales/nl.yml
+- config/routes.rb
 - cucumber.yml
 - db/migrate/001_create_comments.rb
 - db/migrate/002_create_snippets.rb
@@ -98,8 +88,8 @@ files:
 - lib/akismet.rb
 - lib/comment_page_extensions.rb
 - lib/comment_tags.rb
-- lib/mollom.rb
 - lib/radiant-comments-extension.rb
+- lib/radiant-comments-extension/version.rb
 - lib/tasks/comments_extension_tasks.rake
 - public/images/admin/accept.png
 - public/images/admin/comment_edit.png
@@ -140,23 +130,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Comments Extension for Radiant CMS
@@ -171,7 +167,9 @@ test_files:
 - 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

data/VERSION

@@ -1 +0,0 @@
-0.0.6

data/app/views/admin/comments/_comment.rhtml

@@ -1,34 +0,0 @@
-<tr id="<%= dom_id(comment) %>" class="comment<%= " approved" if comment.approved? %>">
-  <td class="content" <% if comment.content.size >= 70 -%>title="Click to toggle complete text"<% end-%>>
-    <blockquote class="short"><%= escape_once(truncate(comment.content, :length => 70)) %></blockquote>
-    <% if comment.content.size >= 70 %>
-    <blockquote class="expanded" style="display:none"><%= escape_once(comment.content) %></blockquote>
-    <% end %>
-  </td>
-  <td class="date">
-    <%= comment.created_at.strftime("%b %e, %Y at %I:%M%p") %>
-  </td>
-  <td class="author">
-    by <%= escape_once(comment.author) %>
-    <% unless comment.author_email.blank? %><%= mail_to(comment.author_email, image_tag("admin/email.png"))%><% end %>
-    <% unless comment.author_url.blank? %><%= link_to(image_tag("admin/link.png"), comment.author_url) %><% end %>
-  </td>
-  <% unless @page %>
-    <td class="page">
-      on
-      <%= 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 => "Edit page" %>
-    </td>
-  <% end %>
-  <td class="controls">
-    <%= link_to(image_tag('admin/accept.png'), approve_admin_comment_path(comment),
-          :title => "Approve comment", :method => :put) unless comment.approved? %>
-    <%= link_to(image_tag('admin/error.png'), unapprove_admin_comment_path(comment),
-          :method => :put, :title => "Unapprove comment") if comment.approved? %>
-    <%= link_to image_tag("admin/delete.png"), admin_comment_path(comment),
-          :method => :delete, :confirm => "Are you sure you want to delete this comment?", :title => "Delete comment" %>
-    <%= link_to image_tag("admin/comment_edit.png"), edit_admin_comment_path(comment),
-          :title => "Edit comment" %>
-  </td>
-</tr>

data/app/views/admin/comments/_form.rhtml

@@ -1,36 +0,0 @@
-<% 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") %>
-  </div>
-<% end %>
-<div id="comment_form_container" class="form-area">
-  <div class="row">
-    <p>
-      <label for="comment_author">Author</label><br/>
-      <%= f.text_field :author %>
-    </p>
-    <p>
-      <label for="comment_author_url">URL</label><br/>
-      <%= f.text_field :author_url %>
-    </p>
-  </div>
-  <br style="clear: both" />
-  <p>
-    <label for="comment_author_email">Email</label><br/>
-    <%= f.text_field :author_email %>
-  </p>
-  <p>
-    <label for="comment_content">Comment</label><br />
-    <%= f.text_area :content, :rows => 10, :cols => 72, :class => "textarea"%>
-  </p>
-  <p>
-    <label for="comment_filter_id">Filter</label>
-    <%= f.select :filter_id, [['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort %>
-  </p>
-</div>
-<p class="buttons">
-  <%= save_model_button(@comment) %>
-  or
-  <%= link_to "Cancel", :back %>
-</p>

data/app/views/admin/comments/edit.rhtml

@@ -1,5 +0,0 @@
-<h1>Edit Comment on "<%= escape_once(@comment.page.title) %>"</h1>
-
-<% form_for [:admin, @comment] do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
-<% end %>

data/app/views/admin/comments/index.rhtml

@@ -1,55 +0,0 @@
-<% content_for :page_scripts do -%>
-  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();
-        });
-      }
-    });
-  });
-<% end %>
-<%- include_stylesheet 'admin/comments' %>
-<h1>
-  <% if @page -%>
-    <%= @page.comments.count %> <%= "#{params[:status].titleize} " if params[:status] %><%= pluralize(@page.comments.count, 'Comment') %> on <%= link_to @page.title, edit_admin_page_path(@page) %>
-  <% else -%>
-    <%= params[:status].titleize if params[:status] %> Comments
-  <% end -%>
-</h1>
-
-<ul id="comment-nav">
-  <li class="all"><%= link_or_span_unless_current("All", :status => 'all', :page_id => params[:page_id]) %></li>
-  <li class="approved"><%= link_or_span_unless_current("Approved", :status => "approved", :page_id => params[:page_id]) %></li>
-  <li class="unapproved"><%= link_or_span_unless_current("Unapproved", :status => "unapproved", :page_id => params[:page_id]) %></li>
-  <li class="csv"><%= link_to "Download CSV", :format => :csv %></li>
-</ul>
-
-<%= will_paginate @comments %>
-
-<table id="comments" class="index" border="0" cellspacing="0" cellpadding="0">
-  <thead>
-    <tr>
-      <th>Content</th>
-      <th>Date</th>
-      <th>Author</th>
-      <% unless @page %><th>Page</th><% end %>
-      <th>Actions</th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render(:partial => "comment", :collection => @comments) || %Q[<tr><td class="note" colspan="#{@page ? 4 : 5}">No comments</td></tr>] %>
-  </tbody>
-</table>
-
-<%= will_paginate @comments %>
-
-<% form_tag destroy_unapproved_admin_comments_url, :method => :delete do %>
-<p><button type="submit" class="delete-unapproved"><%= image_tag("admin/comments_delete.png") %> Delete All Unapproved</button></p>
-<% end %>
-
-<p><small class="notice"><%= Comment.spam_filter.message %></small></p>

data/app/views/admin/pages/_edit_comments_enabled.rhtml

@@ -1,8 +0,0 @@
-<p style="clear:left">
-  <label for="page_enable_comments">Allow Comments on this page?</label> 
-  <%= check_box "page", "enable_comments" %>
-  
-  <small>
-    <%= link_to "Currently #{@page.comments_count} &mdash; View comments", admin_page_comments_path(:page_id => @page.id) unless @page.new_record? or @page.comments_count < 1 %>
-  </small>
-</p>

data/app/views/admin/pages/_index_head_view_comments.rhtml

@@ -1 +0,0 @@
-      <th class="comments">Comments</th>

data/app/views/admin/pages/_index_view_comments.rhtml

@@ -1,11 +0,0 @@
-<td class="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 %>
-    <% end %>
-  </small>
-  <% end %>
-</td>

data/app/views/comments/_comment.rhtml

@@ -1 +0,0 @@
-<%= comment.inspect %>

data/app/views/comments/_form.rhtml

@@ -1,23 +0,0 @@
-<h1>Comment Form</h1>
-
-<div id="comment_form_container">
-
-<fieldset class="comment_form">
-  
-  <a name="comment_form"></a>
-  
-  <%= f.text_field :author, :label => "Your Name (as you'd like it to appear on this comment)", :class => "regular" %>
-  
-  <%= f.text_field :author_url %>
-  
-  <%= f.text_field :author_email %>
-  
-  <%= f.text_area :content, :label => "Your comment", :rows => 5, :class => "regular" %>
-  
-  <%= submit_tag("Save comment", :class => "button", :id => "comment_submit_button") %> 
-  
-  <%= f.hidden_field :page_id %>
-  
-</fieldset>
-
-</div>

data/app/views/comments/_new.rhtml

@@ -1,5 +0,0 @@
-<h1>Comment Form</h1>
-
-<% form_for :comment, @comment, :url => {:controller => :comments, :action => :create} do |f| %>
-  <%= render :partial => "comments/form", :locals => {:f => f} %>
-<% end %>

data/lib/mollom.rb

@@ -1,246 +0,0 @@
-require 'xmlrpc/client'
-require 'openssl'
-require 'base64'
-
-# Mollom API requires this to change, but this gives a warning!
-# XMLRPC::Client::USER_AGENT = "Ruby Mollom/0.1"
-
-class Mollom
-  API_VERSION = '1.0'
-  STATIC_SERVER_LIST = [{:proto => 'http', :host => 'xmlrpc3.mollom.com'},
-                        {:proto => 'http', :host => 'xmlrpc2.mollom.com'},
-                        {:proto => 'http', :host => 'xmlrpc1.mollom.com'}].freeze
-  
-  module Errors
-    Standard = 1000
-    Refresh = 1100
-    TooBusy = 1200
-  end
-
-  attr_accessor :private_key, :public_key
-
-  # Creates a new Mollom object. Takes +private_key+ and +public_key+ as keys.
-  # 
-  #   Mollom.new(:private_key => 'qopzalnzanzajlazjna', :public_key => 'aksakzaddazidzaodjaz')
-  #   # => #<Mollom:0x5b6454 @public_key="aksakzaddazidzaodjaz", @private_key="qopzalnzanzajlazjna">
-  
-  def initialize(options = {})
-    @private_key = options[:private_key]
-    @public_key = options[:public_key]
-  end
-
-  # Checks the content whether it is spam, ham (not spam), or undecided, and gives a quality assessment of the content.
-  # Possible content keys are:
-  #  session_id     # => If you allready have a session_id
-  #  post_title     # => The title
-  #  post_body      # => The main content of the post.
-  #  author_name    # => The name of the post author
-  #  author_url     # => The url the author enters
-  #  author_mail    # => The author's email address
-  #  author_ip      # => The author's IP address
-  #  author_openid  # => The author's OpenID
-  #  author_id      # => The author's ID
-  #
-  # Only the +post_body+ key is required, all other keys are optional.
-  # This function returns a ContentResponse object.
-  #
-  #  response = mollom.check_content :post_title => 'Mollom rules!', 
-  #                                  :post_body => 'I think that mollom is so cool!', 
-  #                                  :author_name => 'Jan De Poorter', 
-  #                                  :author_url => 'http://www.openminds.be'
-  #  response.spam? # => false
-  #  response.ham?  # => true
-  def check_content(content = {})
-    return ContentResponse.new(send_command('mollom.checkContent', content))
-  end
-
-  # Requests an Image captcha from Mollom. It takes the optional <tt>session_id</tt> and <tt>author_ip</tt> keys, if you allready have a session.
-  # It returns a hash with the URL where the captcha can be found, and the session_id, to keep track of the current session (Needed later in <tt>Mollom#check_captcha</tt>)
-  #
-  #  captcha = mollom.image_captcha :author_ip => '172.16.0.1'
-  #  captcha['url']        # => http://xmlrpc1.mollom.com:80/a9616e6b4cd6a81ecdd509fa624d895d.png
-  #  captcha['session_id'] # => a9616e6b4cd6a81ecdd509fa624d895d
-  def image_captcha(info = {})
-    return send_command('mollom.getImageCaptcha', info)
-  end
-
-  # Requests an Audio captcha from Mollom. It takes the optional +session_id+ and +author_ip+ keys, if you allready have a session.
-  # It returns a hash with the URL where the captcha can be found, and the session_id, to keep track of the current session (Needed later in <tt>Mollom#check_captcha</tt>)
-  #
-  #  captcha = mollom.audio_captcha :author_ip => '172.16.0.2', :session_id => 'a9616e6b4cd6a81ecdd509fa624d895d'
-  #  captcha['url']        # => http://xmlrpc1.mollom.com:80/a9616e6b4cd6a81ecdd509fa624d895d.mp3
-  #  captcha['session_id'] # => a9616e6b4cd6a81ecdd509fa624d895d
-  def audio_captcha(info = {})
-    return send_command('mollom.getAudioCaptcha', info)
-  end
-
-  # Checks with mollom if the given captcha (by the user) is correct. Takes +session_id+ and +solution+ keys. Both keys are required.
-  # Returns true if the captcha is valid, false if it is incorrect
-  #
-  #  captcha = mollom.image_captcha :author_ip => '172.16.0.1'
-  #  # show to user... input from user
-  #  return = mollom.valid_captcha? :session_id => captcha['session_id'], :solution => 'abcDe9'
-  #  return # => true
-  def valid_captcha?(info = {})
-    return send_command('mollom.checkCaptcha', info)
-  end
-
-  # Standard check to see if your public/private keypair are recognized. Takes no options
-  def key_ok?
-    return send_command('mollom.verifyKey')
-  rescue
-    return false
-  end
-
-  # Gets some statistics from Mollom about your site.
-  #
-  # The type has to be passed. Possible types:
-  #  total_days
-  #  total_accepted
-  #  total_rejected
-  #  yesterday_accepted
-  #  yesterday_rejected
-  #  today_accepted
-  #  today_rejected
-  #
-  #  mollom.statistics :type => 'total_accepted' # => 123
-  def statistics(options = {})
-    return send_command('mollom.getStatistics', options)
-  end
-
-  # Send feedback to Mollom about a certain content. Required keys are +session_id+ and +feedback+. 
-  # 
-  # Feedback can be any of
-  #  spam
-  #  profanity
-  #  low-quality
-  #  unwanted
-  #
-  #  mollom.send_feedback :session_id => 'a9616e6b4cd6a81ecdd509fa624d895d', :feedback => 'unwanted'
-  def send_feedback(feedback = {})
-    return send_command('mollom.sendFeedback', feedback)
-  end
-
-  # Gets a list of servers from Mollom. You should cache this information in your application in a temporary file or in a database. You can set this with Mollom#server_list=
-  # 
-  # Takes an optional parameter +refresh+, which resets the cached value.
-  #
-  #  mollom.server_list
-  #  # => [{:proto=>"http", :host=>"88.151.243.81"}, {:proto=>"http", :host=>"82.103.131.136"}]
-  def server_list(refresh = false)
-    return @server_list if @server_list && !refresh
-    STATIC_SERVER_LIST.each do |static_server|
-      @server_list = get_server_list_from(static_server)
-      return @server_list if @server_list
-    end
-    # Should have returned a server_list here..
-    raise(Error.new("Can't get mollom server-list"))
-  end
-  
-  # Sets the server list used to contact Mollom. This should be used to set the list of cached servers.
-  #
-  # If you try to set a faulty server list, the function will silently fail, so we can get the server-list from Mollom.
-  def server_list=(list)
-    # Check if we get an actual serverlist-array
-    if list.is_a?(Array) && list.all? {|hash| hash.has_key?(:host) && hash.has_key?(:proto) } 
-      @server_list = list
-    end
-  end
-
-  private
-  def get_server_list_from(server)
-    XMLRPC::Client.new(server[:host], "/#{API_VERSION}").call('mollom.getServerList', authentication_hash).collect do |server| 
-        proto, ip = server.split('://')
-        {:proto => proto, :host => ip}
-    end
-  rescue
-    nil
-  end
-  
-  def send_command(command, data = {})
-    server_list.each do |server|
-      begin
-        return XMLRPC::Client.new(server[:host], "/#{API_VERSION}").call(command, data.merge(authentication_hash))
-      # TODO: Rescue more stuff (Connection Timeout and such)
-      rescue XMLRPC::FaultException => error
-        case error.faultCode
-        when Errors::Standard
-          raise Error.new(error.faultString)
-        when Errors::Refresh # Refresh server list please!
-          # we take this one out of our loop
-          raise
-        when Errors::TooBusy # Server is too busy, take the next one
-          next
-        else
-          next
-        end
-      end
-    end
-    raise Mollom::NoAvailableServers
-  rescue XMLRPC::FaultException
-    # We know it is Errors::Refresh
-    server_list(true)
-    retry
-  end
-  
-  # Creates a HMAC-SHA1 Hash with the current timestamp, a nonce, and your private key.
-  def authentication_hash
-    now = Time.now.gmtime.strftime('%Y-%m-%dT%H:%M:%S.000+0000')
-    nonce = Kernel.rand(2**31) # Random signed int
-
-    hash = Base64.encode64(
-      OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, @private_key, "#{now}:#{nonce}:#{@private_key}")
-    ).chomp
-
-    return :public_key=> @public_key, :time => now, :hash => hash, :nonce => nonce
-  end
-
-  class ContentResponse
-    attr_reader :session_id, :quality
-
-    Unknown = 0
-    Ham  = 1
-    Unsure = 2
-    Spam = 3
-
-    # This class should only be initialized from within the +check_content+ command.
-    def initialize(hash)
-      @spam_response = hash["spam"]
-      @session_id = hash["session_id"]
-      @quality = hash["quality"]
-    end
-
-    # Is the content Spam?
-    def spam?
-      @spam_response == Spam
-    end
-
-    # Is the content Ham?
-    def ham?
-      @spam_response == Ham
-    end
-
-    # is Mollom unsure about the content?
-    def unsure?
-      @spam_response == Unsure
-    end
-
-    # is the content unknown?
-    def unknown?
-      @spam_response == Unknown
-    end
-    
-    # Returns 'unknown', 'ham', 'unsure' or 'spam', depending on what the content is.
-    def to_s
-      case @spam_response
-      when Unknown: 'unknown'
-      when Ham: 'ham'
-      when Unsure: 'unsure'
-      when Spam: 'spam'
-      end
-    end
-  end
-  
-  class Error < StandardError; end
-  class NoAvailableServers < Error; end
-end