public/images/openid-large.png @@ -3,13 +3,15 @@ Collective A no-frills wiki built on Merb 0.9.x and DataMapper 0.9.x -Features/Problems +Features ----------------- * Versioned pages * Textile/Markdown content formatting * Pretty page urls * Custom theme support +* Integration with Defensio for Spam protection +* Trusted user system based on OpenID Take It For A Spin ------------------ README.markdown @@ -6,7 +6,7 @@ module NoSpamProtection # Accessed by: POST /pages def create(page, version) @page = Page.new(page) - @version = Version.new(version.merge(:user => @user)) + @version = Version.new(version.merge!(:user => @user)) if @page.valid? && @version.valid? @page.versions << @version @page.save @@ -19,7 +19,7 @@ module NoSpamProtection # Accessed by: PUT /pages/1 def update(id, version) @page = Page.by_slug(id) || raise(NotFound) - @page.versions << @version = Version.new(version.merge(:user => @user)) + @page.versions << @version = Version.new(version.merge!(:user => @user)) if @version.save redirect url(:page, @page) else lib/controller/no_spam_protection.rb @@ -48,22 +48,16 @@ private def check_comment_with_spam_engine(url, content) Viking.check_comment( - default_spam_engine_params.update( - :comment_content => content, - :comment_author => @user.name, - :user_ip => request.remote_ip, - :trusted_user => @user.trusted?, - :permalink => url - ) + :article_date => Time.now, + :comment_author => @user.name, + :comment_content => content, + :comment_type => 'comment', + :openid => @user.openid_url, + :permalink => url, + :trusted_user => @user.trusted?, + :user_ip => request.remote_ip, + :user_logged_in => true ) end - - def default_spam_engine_params - { - :comment_type => 'comment', - :article_date => Time.now, - :user_logged_in => false - } - end end \ No newline at end of file lib/controller/spam_protection.rb 9036fdea6617a3b8712d85022d8b293f090384bb Jed Hurt jedhurt@cableone.net http://github.com/meekish/collective/commit/a9d17e51f22a969bfcd3782b10e1927a152f3f1f a9d17e51f22a969bfcd3782b10e1927a152f3f1f 2008-09-03T21:48:16-07:00 2008-09-03T21:48:16-07:00 Updated the README. Refactored some controller code. 9529e097d30845375eb2f95d6f5543b6ff39bd46 Jed Hurt jedhurt@cableone.net