@@ -29,6 +29,7 @@ namespace :app do puts "* Creating data directory in " + Marley::DATA_DIRECTORY FileUtils.mkdir_p( Marley::DATA_DIRECTORY ) end + desc "Create database for comments" task :create_database_for_comments do puts "* Creating comments SQLite database in #{Marley::DATA_DIRECTORY}/comments.db" ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', Rakefile @@ -4,7 +4,7 @@ require 'yaml' # ... use YAML for configs and stuff ... require 'sinatra' # ... Classy web-development dressed in DSL, http://sinatrarb.heroku.com require 'activerecord' # ... or Datamapper? What? :) require 'rdiscount' # ... convert Markdown into HTML in blazing speed -require File.join(File.dirname(__FILE__), '..', 'vendor', 'antispammer') # ... disable comment spam +require File.join(File.dirname(__FILE__), '..', 'vendor', 'akismetor') # ... disable comment spam require File.join(File.dirname(__FILE__), '..', 'vendor', 'githubber') # ... get repo info # ... or alternatively, run Sinatra on edge ... @@ -104,7 +104,12 @@ end post '/:post_id/comments' do @post = Marley::Post[ params[:post_id] ] throw :halt, [404, not_found ] unless @post - params.merge!( { :ip => request.env['REMOTE_ADDR'], :user_agent => request.env['HTTP_USER_AGENT'] } ) + params.merge!( { + :ip => request.env['REMOTE_ADDR'].to_s, + :user_agent => request.env['HTTP_USER_AGENT'].to_s, + :referrer => request.env['REFERER'].to_s, + :permalink => "#{hostname}#{@post.permalink}" + } ) # puts params.inspect @comment = Marley::Comment.create( params ) if @comment.valid? app/marley.rb @@ -17,10 +17,13 @@ module Marley # See http://railscasts.com/episodes/65-stopping-spam-with-akismet def akismet_attributes { - :key => CONFIG['typekey_antispam']['key'], - :blog => CONFIG['typekey_antispam']['url'], + :key => CONFIG['akismet']['key'], + :blog => CONFIG['akismet']['url'], :user_ip => self.ip, :user_agent => self.user_agent, + :referrer => self.referrer, + :permalink => self.permalink, + :comment_type => 'comment', :comment_author => self.author, :comment_author_email => self.email, :comment_author_url => self.url, @@ -30,7 +33,7 @@ module Marley def check_spam self.checked = true - self.spam = !::Antispammer.spam?(akismet_attributes) + self.spam = Akismetor.spam?(akismet_attributes) true # return true so it doesn't stop save end app/marley/comment.rb @@ -34,6 +34,10 @@ module Marley def categories self.meta['categories'] if self.meta and self.meta['categories'] end + + def permalink + "/#{id}.html" + end private app/marley/post.rb @@ -19,7 +19,7 @@ module Marley end # "Stub" anti-spam library -class Antispammer +class Akismetor def self.spam?(attributes) rand > 0.5 ? true : false end app/test/marley_test.rb @@ -2,7 +2,7 @@ ActiveRecord::Schema.define(:version => 1) do create_table :comments do |t| t.string :post_id, :null => false - t.string :author, :email, :url, :ip, :referrer , :user_agent + t.string :author, :email, :url, :ip, :referrer , :user_agent, :referrer, :permalink, :comment_type t.text :body t.datetime :created_at, :default => 'NOW()' t.boolean :checked, :default => false config/db_create_comments.rb @@ -9,7 +9,7 @@ class Akismetor # Does a comment-check on Akismet with the submitted hash. # Returns true or false depending on response. def self.spam?(attributes) - self.new(attributes).execute('comment-check') != "false" + self.new(attributes).execute('comment-check') == "true" end # Does a submit-spam on Akismet with the submitted hash. @@ -39,7 +39,7 @@ private def http_headers { - 'User-Agent' => 'Akismetor Merb Library/1.0', + 'User-Agent' => 'Akismetor Ruby Library/1.0', 'Content-Type' => 'application/x-www-form-urlencoded' } end @@ -48,4 +48,4 @@ private result = attributes.map { |k, v| "#{k}=#{v}" }.join('&') URI.escape(result) end -end \ No newline at end of file +end vendor/akismetor.rb b6de7ceb85e04fafd234149cc7cb59189b72dd27 Karel Minarik karmi@karmi.cz http://github.com/lukeredpath/marley/commit/33eedf86d5a6a87aeb1960ffcfccd60bdfddd41d 33eedf86d5a6a87aeb1960ffcfccd60bdfddd41d 2008-11-28T04:04:03-08:00 2008-11-28T04:04:03-08:00 Make spam blocking with Akismet actually work. (You really must send all those fields :) IMPORTANT: You must upgrade your comments.db schema for this to work -- check commit message below. * Implemented Akismet spam blocking * Changed comments table schema to reflect this. You must change your schema with the following $sqlite3 /where/you/have/comments.db sqlite> ALTER TABLE comments ADD referrer varchar(255); sqlite> ALTER TABLE comments ADD permalink varchar(255); sqlite> ALTER TABLE comments ADD comment_type varchar(255); sqlite> .quit and you are done. Or just delete the comments.db in your installation and run Rake task `rake app:install:create_database_for_comments` 56d286f1736c8dd9e46a9736aa413fc16ac32648 Karel Minarik karmi@karmi.cz