features/spam.feature features/steps/spam.rb @@ -10,6 +10,7 @@ class Comment property :text, Text, :nullable => false property :html_text, Text property :created_at, DateTime + property :spam, Boolean, :default => false # ==== Associations belongs_to :entry app/models/comment.rb @@ -59,6 +59,25 @@ class Entry Entry.all(:order => [:created_at.desc], :limit => 10) end + # Returns a list of comments, which are per default not spam + # + # ==== Parameters + # display_spam<Boolean>:: + # Flag which indicates whether spammy comments should be displayed or not + # + # ==== Returns + # Array[Comment]:: + # A list of comments is returned, which are not spam per default + # --- + # @public + def public_comments(display_spam=false) + if display_spam + self.comments + else + self.comments.all(:spam => false) + end + end + private # Groups the sorted_array by the given block # app/models/entry.rb @@ -3,6 +3,11 @@ <h4><%= comment_title(comment) %></h4> <%= comment.html_text %> <% admin do %> + <%= form_for(comment, :action => url(:entry_comment, comment.entry_id, comment.id), :class => "comment_form") do %> + <%= check_box :spam, :label => "Spam" %> + <br style="clear: both;"/> + <%= submit 'Update' %> + <% end =%> <a id="commment_<%= comment.id %>_edit" href="<%= url(:edit_entry_comment, comment.entry_id, comment.id) %>" app/views/entries/_comment.html.erb @@ -1,4 +1,4 @@ -<i><%= entry.created_at.strftime("%m.%d.%Y %H:%M") %> | Comments (<%= entry.comments.size %>)</i> +<i><%= entry.created_at.strftime("%m.%d.%Y %H:%M") %> | Comments (<%= entry.public_comments(logged_in?).size %>)</i> <h2><a href="<%= url(:permalink_entry, entry.id, entry.permalink) %>" id="entry_<%= entry.id %>"><%= entry.title %></a></h2> <div class="entry"> <%= entry.html_text %> app/views/entries/_entry.html.erb @@ -1,6 +1,6 @@ <%= partial 'entry', :with => @entry %> <div id="comments"> - <%= partial 'comment', :with => @entry.comments %> + <%= partial 'comment', :with => @entry.public_comments(logged_in?) %> <br /> <br /> <%= error_messages_for :comment %> app/views/entries/show.html.erb @@ -134,6 +134,8 @@ function insert_preview(elem) { } function ajaxify_create(elem) { + var f = $$('#comments form').first(); + if (f.getAttribute('class') == 'comment_form') return; insert_preview(elem); Event.observe(elem, 'click', function(e) { var form = $$('#comments form')[0]; @@ -154,6 +156,27 @@ function ajaxify_create(elem) { }) } +function ajaxify_check_box(form) { + $(form).select('input[type="submit"]').each(function(e) { + e.hide(); + }); + + var link = form.getAttribute('action'); + $(form).select('input[type="checkbox"]').each(function(e) { + Event.observe(e, 'click', function(ev) { + var content = Form.serialize(form); + new Ajax.Request(form.getAttribute('action') + '.js', { + method: 'put', + parameters: content, + evalJS: false, + onSuccess: function(result) { + new Effect.Highlight(form); + } + }); + }); + }); +} + Event.observe(window, 'load', function() { $$('.delete').each(function(elem) { Event.observe(elem, 'click', function(e) { @@ -175,5 +198,6 @@ Event.observe(window, 'load', function() { $$('#comments input[type="submit"]').each(ajaxify_create); $$('#comments a').each(ajaxify_edit); + $$('.comment_form').each(ajaxify_check_box); }); public/javascripts/application.js 61a4cb84c916738561ce66061c2c7d33e4dfa9a0 Michael Opitz opitz.michael@gmail.com http://github.com/mop/mini-blog/commit/4f0ba8ae89ae4ebb94ee5c878328509e31a7f11f 4f0ba8ae89ae4ebb94ee5c878328509e31a7f11f 2009-02-13T12:34:07-08:00 2009-02-13T12:34:07-08:00 Implemented GUI for marking elements as spam d36f155d02a44570508852b3ed1f6afb69beaa07 Michael Opitz opitz.michael@gmail.com