db/migrate/20090608144306_add_defensio_columns_to_comments.rb vendor/plugins/defensio/README vendor/plugins/defensio/Rakefile vendor/plugins/defensio/example/article.rb vendor/plugins/defensio/example/comment.rb vendor/plugins/defensio/example/comments_controller.rb vendor/plugins/defensio/example/defensio.yml vendor/plugins/defensio/generators/defensio_migration/defensio_migration_generator.rb vendor/plugins/defensio/generators/defensio_migration/templates/migration.rb vendor/plugins/defensio/init.rb vendor/plugins/defensio/install.rb vendor/plugins/defensio/lib/defensio.rb vendor/plugins/defensio/lib/defensio/acts_as.rb vendor/plugins/defensio/lib/defensio/client.rb vendor/plugins/defensio/test/acts_as_test.rb vendor/plugins/defensio/test/client_test.rb vendor/plugins/defensio/test/config_example.yml vendor/plugins/defensio/test/test_helper.rb vendor/plugins/defensio/uninstall.rb @@ -28,7 +28,7 @@ class CommentsController < ApplicationController def create @comment = Comment.new((session[:pending_comment] || params[:comment] || {}).reject {|key, value| !Comment.protected_attribute?(key) }) @comment.post = @post - + @comment.env = request.env session[:pending_comment] = nil unless @comment.requires_openid_authentication? @@ -52,6 +52,11 @@ class CommentsController < ApplicationController end if session[:pending_comment].nil? && @comment.save + if @comment.spam + flash[:notice] = 'Your comment has been marked for review' + else + flash[:notice] = 'Comment created' + end redirect_to post_path(@post) else render :template => 'posts/show' app/controllers/comments_controller.rb @@ -4,6 +4,8 @@ class Comment < ActiveRecord::Base attr_accessor :openid_error attr_accessor :openid_valid + acts_as_defensio_comment :fields => {:content => :body, :article => :post} + belongs_to :post before_save :apply_filter app/models/comment.rb @@ -3,8 +3,10 @@ class Post < ActiveRecord::Base acts_as_taggable + acts_as_defensio_article :fields => {:content => :body_html, :permalink => :slug} + has_many :comments, :dependent => :destroy - has_many :approved_comments, :class_name => 'Comment' + has_many :approved_comments, :class_name => 'Comment', :conditions => {:spam => false} before_validation :generate_slug before_validation :set_dates @@ -19,6 +21,15 @@ class Post < ActiveRecord::Base end attr_accessor :minor_edit + + def author + "Christopher Redinger" + end + + def author_email + "info@agiledisciple.com" + end + def minor_edit @minor_edit ||= "1" end app/models/post.rb @@ -5,6 +5,7 @@ <% content_for(:page_title) do -%> <%=h post_title(@post) -%> <% end -%> +<% if flash[:notice] %><p><%= flash[:notice] %></p><% end %> <%= render :partial => 'posts/post', :locals => {:post => @post} %> <ol class="commentlist"> <% @post.approved_comments.each do |comment| -%> app/views/posts/show.html.erb @@ -1,7 +1,3 @@ database.yml defensio.yml -<<<<<<< HEAD:config/.gitignore newrelic.yml -======= -newrelic.yml ->>>>>>> 5e29f7f21b667ccc8f30e0e679fbe8f4033f38d5:config/.gitignore config/.gitignore 31ef043e415ca75d77f5cfe450debf19167038ec Christopher Redinger redinger@gmail.com http://github.com/redinger/enki/commit/8282ec8c1e06d7d0a98e387c4de96958476e8584 8282ec8c1e06d7d0a98e387c4de96958476e8584 2009-06-08T08:38:13-07:00 2009-06-08T08:38:13-07:00 defensio! 78f41b211b8b7dba0951fcdd2748eadae2c65822 Christopher Redinger redinger@gmail.com