governor_comments 0.1.2 → 0.2.0

data/Gemfile

@@ -2,12 +2,14 @@ source 'http://rubygems.org'
 
 gem 'rails', '~> 3.0.5'
 
-gem 'governor', '>= 0.2.2'
+gem 'governor', '>= 0.5.0'
 
 group :development, :test do
   gem 'jeweler', '~> 1.5.2'
   gem 'sqlite3'
   gem 'rspec-rails'
+  gem 'rcov'
+  gem 'webrat'
   gem 'mocha'
   gem 'factory_girl', '~> 2.0.0.beta'
   gem 'factory_girl_rails', '~> 1.1.beta'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    governor_comments (0.1.1)
+    governor_comments (0.1.2)
       governor (>= 0.2.2)
       rails (~> 3.0.5)
 
@@ -52,7 +52,7 @@ GEM
       factory_girl (~> 2.0.0.beta)
       rails (>= 3.0.0)
     git (1.2.5)
-    governor (0.2.2)
+    governor (0.5.0)
       rails (~> 3.0.5)
     i18n (0.5.0)
     jeweler (1.5.2)
@@ -66,6 +66,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -87,6 +88,7 @@ GEM
       thor (~> 0.14.4)
     rake (0.8.7)
     rakismet (1.0.1)
+    rcov (0.9.9)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -107,6 +109,10 @@ GEM
     tzinfo (0.3.24)
     warden (1.0.3)
       rack (>= 1.0.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
 
 PLATFORMS
   ruby
@@ -117,11 +123,13 @@ DEPENDENCIES
   dynamic_form
   factory_girl (~> 2.0.0.beta)
   factory_girl_rails (~> 1.1.beta)
-  governor (>= 0.2.2)
+  governor (>= 0.5.0)
   governor_comments!
   jeweler (~> 1.5.2)
   mocha
   rails (~> 3.0.5)
   rakismet
+  rcov
   rspec-rails
   sqlite3
+  webrat

data/README.rdoc

@@ -1,6 +1,6 @@
 = governor_comments
 
-*Governor[http://carpeliam.github.com/governor/]* (named after Rod
+<b>Governor[http://carpeliam.github.com/governor/]</b> (named after Rod
 Blagojevich) is the pluggable blogging platform for Rails, built for people
 who want to build their blog into their website, not build their website into
 their blog.
@@ -30,7 +30,10 @@ Once you've installed the gem into your app, you need to run the generator:
 
 If you've only created one type of resource (which is typical), then you won't
 need any arguments. Otherwise, you'll need to specify which model you want to
-add comments to. This will create a Comment class and associated migration.
+add comments to. This will create a Comment class and associated migration. If
+you've created multiple resource types and you'd like to use comments with
+multiple types, then specify <code>--polymorphic</code> as an option.
+
 Make sure to add the +name+, +email+, and +website+ fields to your User model
 if they don't exist already.
 

data/Rakefile

@@ -35,6 +35,7 @@ end
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = %w{--exclude gems\/,spec\/}
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/app/controllers/governor/comments_controller.rb

@@ -56,24 +56,12 @@ module Governor
     end
   
     def mark_spam
-      @comment.update_attribute(:hidden, true)
-      if @comment.respond_to?(:spam!)
-        @comment.spam!
-        flash[:notice] = 'That comment has been marked as spam, and will no longer be visible to other viewers. To remove it completely, you can delete it.'
-      else
-        flash[:warning] = 'Spam protection has not been installed. Please install and configure rakismet before continuing.'
-      end
+      @comment.mark_spam
       redirect_to resource
     end
   
     def not_spam
-      @comment.update_attribute(:hidden, false)
-      if @comment.respond_to?(:ham!)
-        @comment.ham!
-        flash[:notice] = 'That comment has been marked as not spam, and will now be visible to other viewers.'
-      else
-        flash[:warning] = 'Spam protection has not been installed. Please install and configure rakismet before continuing.'
-      end
+      @comment.not_spam
       redirect_to resource
     end
     

data/app/views/governor/articles/_comments.html.erb

@@ -2,16 +2,6 @@
     <p><%= link_to 'add a comment', '#new_comment' %></p>
     <% unless resource.comments.empty? %><ul><%= render resource.comments %></ul><% end %>
     <p><%= form_for [resource, resource.comments.new] do |f| %>
-      <%= f.error_messages %>
-      <% unless governor_logged_in? %>
-        <%= fields_for :commenter, Guest.new do |gf| %>
-          <%= gf.text_field :name %> <%= gf.label :name, 'Name (required)' %><br/>
-          <%= gf.text_field :email %> <%= gf.label :email, 'E-Mail (required, will not be published)' %><br/>
-          <%= gf.text_field :website %> <%= gf.label :website %><br/>
-        <% end %>
-      <% end %>
-    <%= f.text_field :title %> <%= f.label :title %><br/>
-    <%= f.text_area :content, :size => '50x7' %>
-    <p><%= f.submit 'New Comment' %></p>
+      <%= render :partial => 'governor/comments/form', :locals => {:f => f} %>
     <% end %></p>
 </div>

data/app/views/governor/articles/edit_comments.html.erb

@@ -0,0 +1,43 @@
+<h1>Comments Management</h1>
+
+<%= form_tag polymorphic_path(mapping.plural, :action => :update_comments), :method => :put do %>
+  <div class="bulkActions">
+    <% options = %w(mark_spam not_spam destroy).inject([]) {|a,action| a << [t("governor_comments.#{action}"), action] } %>
+    <%= select_tag :bulk_operation, options_for_select([['Action', ''], *options]) %>
+    <%= submit_tag t('governor_comments.submit') %>
+  </div>
+  <table class="comments">
+    <tr>
+      <th></th>
+      <th>Author</th>
+      <th>Comment</th>
+      <th>Article</th>
+    </tr>
+    <% @comments.each do |c| %>
+      <tr>
+        <td class="checkbox">
+          <%= check_box_tag "comments[#{c.id}]" %>
+        </td>
+        <td class="author">
+          <%= link_to_if c.commenter.website.present?, c.commenter.name, c.commenter.website %>
+          <% if c.commenter.email.present? %>
+            <br><%= mail_to c.commenter.email, 'Contact', :encode => :javascript %>
+          <% end %>
+        </td>
+        <td class="comment">
+          <% if c.title %><strong><%= c.title %></strong><br><% end -%>
+          <%= c.content %>
+          <div class="commentActions">
+            <%= link_to t('governor_comments.reply'), polymorphic_path(c.resource, :anchor => :new_comment) %> |
+            <%= link_to t('governor_comments.edit'), polymorphic_path([c.resource, c], :action => :edit) %> |
+            <% spam_action = (c.hidden? ? 'not' : 'mark') + '_spam' %>
+            <%= link_to t(spam_action, :scope => 'governor_comments'), polymorphic_path([c.resource, c], :action => spam_action), :method => :put %> |
+            <%= link_to t('governor_comments.destroy'), polymorphic_path([c.resource, c]), :method => :delete, :confirm => 'Are you sure you want to remove this comment? It has not been marked as spam.' %>
+          </div>
+        </td>
+        <td class="article"><%= link_to c.resource.title, c.resource %></td>
+      </tr>
+    <% end %>
+  </table>
+  
+<% end %>

data/app/views/governor/comments/_form.html.erb

@@ -0,0 +1,11 @@
+<%= f.error_messages %>
+<% if f.object.new_record? && !governor_logged_in? %>
+  <%= fields_for :commenter, Guest.new do |gf| %>
+    <%= gf.text_field :name %> <%= gf.label :name, 'Name (required)' %><br/>
+    <%= gf.text_field :email %> <%= gf.label :email, 'E-Mail (required, will not be published)' %><br/>
+    <%= gf.text_field :website %> <%= gf.label :website %><br/>
+  <% end %>
+<% end %>
+<%= f.text_field :title %> <%= f.label :title %><br/>
+<%= f.text_area :content, :size => '50x7' %>
+<p><%= f.submit "#{action_name.capitalize} Comment" %></p>

data/app/views/governor/comments/edit.html.erb

@@ -0,0 +1,4 @@
+<h1>edit comment</h1>
+<%= form_for [resource, @comment] do |f| %>
+  <% render :partial => 'governor/comments/form', :locals => {:f => f} %>
+<% end %>

data/config/locales/en.yml

@@ -2,5 +2,11 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
-  unauthorized_edit: "You're not allowed to edit this %{resource_type}."
+  governor_comments:
+    manage_comments: "Manage Comments"
+    reply: "Reply"
+    edit: "Edit"
+    mark_spam: "Mark as Spam"
+    not_spam: "Not Spam"
+    destroy: "Delete"
+    submit: "Apply"

data/governor_comments.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor_comments}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Liam Morley"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-05-05}
   s.description = %q{Comments plugin for the Rails 3-based Governor blogging system.}
   s.email = %q{liam@carpeliam.com}
   s.extra_rdoc_files = [
@@ -29,19 +29,26 @@ Gem::Specification.new do |s|
     "app/helpers/governor_comments_helper.rb",
     "app/views/governor/articles/_comment_link.html.erb",
     "app/views/governor/articles/_comments.html.erb",
+    "app/views/governor/articles/edit_comments.html.erb",
     "app/views/governor/comments/_comment.html.erb",
+    "app/views/governor/comments/_form.html.erb",
+    "app/views/governor/comments/edit.html.erb",
     "app/views/governor/comments/new.html.erb",
     "config/locales/en.yml",
     "governor_comments.gemspec",
+    "lib/generators/governor/add_assets_generator.rb",
     "lib/generators/governor/create_comments_generator.rb",
+    "lib/generators/governor/templates/assets/javascripts/governor-comments.js",
+    "lib/generators/governor/templates/assets/stylesheets/governor-comments.css",
     "lib/generators/governor/templates/migrations/create_comments.rb",
     "lib/generators/governor/templates/models/comment.rb",
     "lib/generators/governor/templates/models/guest.rb",
+    "lib/governor/controllers/methods.rb",
     "lib/governor_comments.rb",
     "lib/governor_comments/comment.rb",
     "lib/governor_comments/rails.rb",
-    "log/development.log",
     "script/rails",
+    "spec/controllers/governor/articles_controller_spec.rb",
     "spec/controllers/governor/comments_controller_spec.rb",
     "spec/governor_comments_spec.rb",
     "spec/models/article_spec.rb",
@@ -81,7 +88,7 @@ Gem::Specification.new do |s|
     "spec/rails_app/config/routes.rb",
     "spec/rails_app/db/migrate/20110329032256_devise_create_users.rb",
     "spec/rails_app/db/migrate/20110330020108_governor_create_articles.rb",
-    "spec/rails_app/db/migrate/20110405030324_governor_create_comments.rb",
+    "spec/rails_app/db/migrate/20110501055541_governor_create_comments.rb",
     "spec/rails_app/db/schema.rb",
     "spec/rails_app/db/seeds.rb",
     "spec/rails_app/lib/tasks/.gitkeep",
@@ -91,10 +98,7 @@ Gem::Specification.new do |s|
     "spec/rails_app/public/favicon.ico",
     "spec/rails_app/public/images/rails.png",
     "spec/rails_app/public/javascripts/application.js",
-    "spec/rails_app/public/javascripts/controls.js",
-    "spec/rails_app/public/javascripts/dragdrop.js",
-    "spec/rails_app/public/javascripts/effects.js",
-    "spec/rails_app/public/javascripts/prototype.js",
+    "spec/rails_app/public/javascripts/jquery.js",
     "spec/rails_app/public/javascripts/rails.js",
     "spec/rails_app/public/robots.txt",
     "spec/rails_app/public/stylesheets/.gitkeep",
@@ -102,7 +106,9 @@ Gem::Specification.new do |s|
     "spec/rails_app/spec/factories.rb",
     "spec/rails_app/vendor/plugins/.gitkeep",
     "spec/spec_helper.rb",
-    "spec/views/governor/articles/show.html.erb_spec.rb"
+    "spec/views/governor/articles/show.html.erb_spec.rb",
+    "spec/views/layouts/application.html.erb_spec.rb",
+    "tmp/.gitkeep"
   ]
   s.homepage = %q{http://carpeliam.github.com/governor}
   s.licenses = ["MIT"]
@@ -110,6 +116,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Comments plugin for the Rails 3-based Governor blogging system.}
   s.test_files = [
+    "spec/controllers/governor/articles_controller_spec.rb",
     "spec/controllers/governor/comments_controller_spec.rb",
     "spec/governor_comments_spec.rb",
     "spec/models/article_spec.rb",
@@ -138,12 +145,13 @@ Gem::Specification.new do |s|
     "spec/rails_app/config/routes.rb",
     "spec/rails_app/db/migrate/20110329032256_devise_create_users.rb",
     "spec/rails_app/db/migrate/20110330020108_governor_create_articles.rb",
-    "spec/rails_app/db/migrate/20110405030324_governor_create_comments.rb",
+    "spec/rails_app/db/migrate/20110501055541_governor_create_comments.rb",
     "spec/rails_app/db/schema.rb",
     "spec/rails_app/db/seeds.rb",
     "spec/rails_app/spec/factories.rb",
     "spec/spec_helper.rb",
-    "spec/views/governor/articles/show.html.erb_spec.rb"
+    "spec/views/governor/articles/show.html.erb_spec.rb",
+    "spec/views/layouts/application.html.erb_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -152,10 +160,12 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.5"])
-      s.add_runtime_dependency(%q<governor>, [">= 0.2.2"])
+      s.add_runtime_dependency(%q<governor>, [">= 0.5.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<webrat>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, ["~> 2.0.0.beta"])
       s.add_development_dependency(%q<factory_girl_rails>, ["~> 1.1.beta"])
@@ -166,10 +176,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rakismet>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.0.5"])
-      s.add_dependency(%q<governor>, [">= 0.2.2"])
+      s.add_dependency(%q<governor>, [">= 0.5.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<webrat>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<factory_girl>, ["~> 2.0.0.beta"])
       s.add_dependency(%q<factory_girl_rails>, ["~> 1.1.beta"])
@@ -181,10 +193,12 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.0.5"])
-    s.add_dependency(%q<governor>, [">= 0.2.2"])
+    s.add_dependency(%q<governor>, [">= 0.5.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<webrat>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<factory_girl>, ["~> 2.0.0.beta"])
     s.add_dependency(%q<factory_girl_rails>, ["~> 1.1.beta"])

data/lib/generators/governor/add_assets_generator.rb

@@ -0,0 +1,15 @@
+require 'rails/generators'
+module Governor
+  class AddAssetsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    desc 'Installs assets into your public directory.'
+    
+    def install_javascripts
+      copy_file 'assets/javascripts/governor-comments.js', 'public/javascripts/governor-comments.js'
+    end
+  
+    def install_stylesheets
+      copy_file 'assets/stylesheets/governor-comments.css', 'public/stylesheets/governor-comments.css'
+    end
+  end
+end

data/lib/generators/governor/create_comments_generator.rb

@@ -5,6 +5,8 @@ module Governor
     include Rails::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
     argument :resource, :type => :string, :default => Governor.default_resource.plural.to_s
+    class_option :polymorphic, :type => :boolean, :default => false, :desc => 'Set to true if you want to associate comments with multiple object types. False by default.'
+    desc 'Adds Comment and Guest models and accompanying migrations to your application.'
   
     def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations

data/lib/generators/governor/templates/assets/javascripts/governor-comments.js

@@ -0,0 +1,7 @@
+$(document).ready(function() {
+  $('td.comment').hover(function() {
+    $(this).children('.commentActions').show();
+  }, function() {
+    $(this).children('.commentActions').hide();
+  });
+});

data/lib/generators/governor/templates/assets/stylesheets/governor-comments.css

@@ -0,0 +1,18 @@
+table.comments th {
+  text-align: left;
+}
+table.comments td {
+  vertical-align: top;
+}
+
+.author {
+  width: 8em;
+}
+
+.comment {
+  width: 15em;
+}
+
+.comment .commentActions {
+  display: none;
+}

data/lib/generators/governor/templates/migrations/create_comments.rb

@@ -4,7 +4,7 @@ class GovernorCreateComments < ActiveRecord::Migration
       t.string      :title, :content
       t.boolean     :hidden, :default => false
       t.references  :commenter, :polymorphic => true
-      t.references  :<%= mapping.singular %>
+      t.references  :resource<%= ', :polymorphic => :true' if options[:polymorphic] %>
       t.timestamps
     end
   

data/lib/generators/governor/templates/models/comment.rb

@@ -1,3 +1,4 @@
 class Comment < ActiveRecord::Base
   include GovernorComments::Comment
+  belongs_to :resource, :<%= options[:polymorphic] ? 'polymorphic => :true' : %Q{class_name => "#{mapping.to.name}"} %>
 end

data/lib/governor/controllers/methods.rb

@@ -0,0 +1,18 @@
+module Governor
+  module Controllers
+    module Methods
+      def edit_comments
+        @comments = Comment.all(:include => [:resource, :commenter])
+      end
+      def update_comments
+        action = params[:bulk_operation]
+        ids = params[:comments].try(:keys) || []
+        result = true
+        Comment.all(:conditions => {:id => ids}).each do |comment|
+          result &= comment.send(action)
+        end
+        redirect_to mapping.plural
+      end
+    end
+  end
+end

data/lib/governor_comments/comment.rb

@@ -2,11 +2,6 @@ module GovernorComments
   module Comment
     require 'md5'
     def self.included(base)
-      if Governor.resources.size == 1
-        base.belongs_to Governor.default_resource.singular
-      else
-        base.belongs_to :resource, :polymorphic => true
-      end
       base.belongs_to :commenter, :polymorphic => true
       if defined?(Rakismet)
         base.send :include, Rakismet::Model
@@ -16,9 +11,22 @@ module GovernorComments
                             :comment_type => 'comment'
       end
       
+      base.scope :hidden, base.where(:hidden => true)
+      base.scope :public, base.where(:hidden => false)
+      
       base.validates_presence_of :content
     end
     
+    def mark_spam
+      update_attribute(:hidden, true)
+      spam! if respond_to?(:spam!)
+    end
+    
+    def not_spam
+      update_attribute(:hidden, false)
+      ham! if respond_to?(:ham!)
+    end
+    
     def gravatar_url(size = 48, default = "http://github.com/images/gravatars/gravatar-#{size}.png")
       if commenter.respond_to? :email
         hash = MD5::md5 commenter.email.downcase

data/lib/governor_comments/rails.rb

@@ -1,5 +1,7 @@
 module GovernorComments
   class Engine < ::Rails::Engine
-    
+    config.to_prepare do
+      Governor::ArticlesController.helper GovernorCommentsHelper
+    end
   end
 end

data/lib/governor_comments.rb

@@ -1,20 +1,29 @@
+require File.expand_path('../governor/controllers/methods.rb',  __FILE__)
 require 'governor_comments/comment'
 require 'governor_comments/rails'
 
 comments = Governor::Plugin.new('comments')
 comments.add_migration(File.join(File.dirname(__FILE__), 'templates', 'create_comments.rb'))
 comments.set_routes do
+  collection do
+    get 'edit_comments'
+    put 'update_comments'
+  end
   resources :comments, :module => :governor do
     member do
-      put 'mark_spam', 'not_spam'
+      post 'mark_spam', 'not_spam'
     end
   end
 end
 comments.register_model_callback do |base|
-  base.has_many :comments, :dependent => :destroy
+  association = Comment.reflect_on_association(:resource)
+  comment_args = (association.options[:polymorphic]) ? {:as => 'resource'} : {:foreign_key => 'resource_id'}
+  base.has_many :comments, comment_args.merge(:dependent => :destroy)
 end
-comments.add_helper "GovernorCommentsHelper"
 comments.register_partial :after_article_whole, 'articles/comments'
 comments.register_partial :after_article_description, 'articles/comment_link'
+comments.add_to_navigation do |resource|
+  concat(link_to(t('governor_comments.manage_comments'), polymorphic_path(resource, :action => :edit_comments)))
+end
 
 Governor::PluginManager.register comments

data/spec/controllers/governor/articles_controller_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Governor
+  describe ArticlesController do
+    include Devise::TestHelpers
+    render_views
+    
+    before(:each) do
+      @user = Factory(:user)
+      @article = Factory(:article, :author => @user)
+      @comments = [Factory(:comment, :resource => @article, :commenter => @user),
+                   Factory(:comment, :resource => @article, :commenter => @user),
+                   Factory(:comment, :resource => @article, :commenter => @user)]
+    end
+    
+    it "loads GovernorCommentsHelper" do
+      get :show, :governor_mapping => :articles, :id => @article.id
+      response.body.should =~ /3 comments/
+    end
+    
+    context "comments management" do
+      it "renders the form" do
+        get :edit_comments, :governor_mapping => :articles
+        response.body.should =~ /Comments Management/
+      end
+      
+      it "marks 2 comments as spam" do
+        post :update_comments, :governor_mapping => :articles, :bulk_operation => 'mark_spam',
+             :comments => {@comments[0].id.to_s => '1', @comments[2].id.to_s => '1'}
+        Comment.count.should == 3
+        Comment.hidden.count.should == 2
+      end
+      
+      it "unmarks all comments as spam" do
+        Comment.update_all(:hidden => true)
+        post :update_comments, :governor_mapping => :articles, :bulk_operation => 'not_spam',
+             :comments => {@comments[0].id.to_s => '1', @comments[1].id.to_s => '1', @comments[2].id.to_s => '1'}
+        Comment.public.count.should == 3
+      end
+      
+      it "deletes all comments" do
+        post :update_comments, :governor_mapping => :articles, :bulk_operation => 'destroy',
+             :comments => {@comments[0].id.to_s => '1', @comments[1].id.to_s => '1', @comments[2].id.to_s => '1'}
+        Comment.count.should == 0
+      end
+    end
+  end
+end

data/spec/controllers/governor/comments_controller_spec.rb

@@ -7,7 +7,7 @@ module Governor
     before(:each) do
       @user = Factory(:user)
       @article = Factory(:article, :author => @user)
-      @comment = Factory(:comment, :article => @article, :commenter => @user)
+      @comment = Factory(:comment, :resource => @article, :commenter => @user)
       sign_in @user
     end
     

data/spec/rails_app/Gemfile

@@ -9,7 +9,7 @@ gem 'sqlite3'
 
 gem 'devise'
 gem 'rakismet'
-gem 'governor', '>= 0.2.2'
+gem 'governor', :git => 'git://github.com/carpeliam/governor.git'
 gem 'governor_comments', :path => '../..'
 
 gem 'dynamic_form'

data/spec/rails_app/Gemfile.lock

@@ -1,8 +1,15 @@
+GIT
+  remote: git://github.com/carpeliam/governor.git
+  revision: 02e939cd0d8bb4c33549dc5c293996c049e37e6c
+  specs:
+    governor (0.4.0)
+      rails (~> 3.0.5)
+
 PATH
   remote: ../..
   specs:
-    governor_comments (0.1.0)
-      governor (>= 0.2.0)
+    governor_comments (0.1.2)
+      governor (>= 0.2.2)
       rails (~> 3.0.5)
 
 GEM
@@ -44,8 +51,6 @@ GEM
     dynamic_form (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    governor (0.2.2)
-      rails (~> 3.0.5)
     i18n (0.5.0)
     mail (2.2.15)
       activesupport (>= 2.3.6)
@@ -89,7 +94,7 @@ PLATFORMS
 DEPENDENCIES
   devise
   dynamic_form
-  governor (>= 0.2.2)
+  governor!
   governor_comments!
   rails (= 3.0.5)
   rakismet

data/spec/rails_app/app/models/comment.rb

@@ -1,3 +1,4 @@
 class Comment < ActiveRecord::Base
   include GovernorComments::Comment
+  belongs_to :resource, :class_name => "Article"
 end