governor_comments 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ./
   specs:
-    governor_comments (0.1.0)
-      governor (>= 0.2.0)
+    governor_comments (0.1.1)
+      governor (>= 0.2.2)
       rails (~> 3.0.5)
 
 GEM

data/{README.markdown → README.rdoc}

@@ -1,48 +1,45 @@
-governor_comments
-=================
+= governor_comments
 
-**[Governor](http://carpeliam.github.com/governor/)** (named after Rod
+*Governor[http://carpeliam.github.com/governor/]* (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.
 
-**governor_comments** is a plugin for Governor, allowing users and guests to
+*governor_comments* is a plugin for Governor, allowing users and guests to
 comment on your blog.
 
-Dependencies
-------------
+== Dependencies
 
-* Governor, version 0.2.0 or higher. In addition, it requires that your User
-  class (or whatever classes can be associated with an article) have `name`,
-  `email`, and `website` fields.
+* Governor, version 0.2.2 or higher. In addition, it requires that your User
+  class (or whatever classes can be associated with an article) have +name+,
+  +email+, and +website+ fields.
 * ActiveRecord
-* Optional: [Rakismet](https://github.com/joshfrench/rakismet/) to integrate
+* Optional: Rakismet[https://github.com/joshfrench/rakismet/] to integrate
   Akismet spam filtering.
 
-Setting Up
-----------
+== Setting Up
 
-First, install [Governor](http://carpeliam.github.com/governor/). Then, in
+First, install Governor[http://carpeliam.github.com/governor/]. Then, in
 your Gemfile, add the following:
 
     gem 'governor_comments'
 
 Once you've installed the gem into your app, you need to run the generator:
 
-    rails generate governor:create_comments
+    rails generate governor:create_comments [RESOURCE]
 
-This will create a Comment class and associated migration. Make sure to add
-the `name`, `email`, and `website` fields to your User model if they don't
-exist already.
+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.
+Make sure to add the +name+, +email+, and +website+ fields to your User model
+if they don't exist already.
 
-Usage
------
+== Usage
 
 Now, when you browse to an article, you'll see places to add comments right in
 the page. You really don't have to do anything special at this point.
 
-Contributing to governor_comments
----------------------------------
+== Contributing to governor_comments
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -52,8 +49,6 @@ Contributing to governor_comments
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-Copyright
----------
-
-Copyright © 2011 Liam Morley. See LICENSE.txt for further details.
+== Copyright
 
+Copyright (c) 2011 Liam Morley. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/governor_comments.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor_comments}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Liam Morley"]
-  s.date = %q{2011-04-11}
+  s.date = %q{2011-04-12}
   s.description = %q{Comments plugin for the Rails 3-based Governor blogging system.}
   s.email = %q{liam@carpeliam.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.markdown"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.markdown",
+    "README.rdoc",
     "Rakefile",
     "VERSION",
     "app/controllers/governor/comments_controller.rb",
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "script/rails",
     "spec/controllers/governor/comments_controller_spec.rb",
     "spec/governor_comments_spec.rb",
+    "spec/models/article_spec.rb",
     "spec/rails_app/.gitignore",
     "spec/rails_app/Gemfile",
     "spec/rails_app/Gemfile.lock",
@@ -111,6 +112,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/controllers/governor/comments_controller_spec.rb",
     "spec/governor_comments_spec.rb",
+    "spec/models/article_spec.rb",
     "spec/rails_app/app/controllers/application_controller.rb",
     "spec/rails_app/app/controllers/home_controller.rb",
     "spec/rails_app/app/helpers/application_helper.rb",

data/lib/generators/governor/create_comments_generator.rb

@@ -4,6 +4,7 @@ module Governor
   class CreateCommentsGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
+    argument :resource, :type => :string, :default => Governor.default_resource.plural.to_s
   
     def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations
@@ -21,5 +22,10 @@ module Governor
     def create_migration_file
       migration_template 'migrations/create_comments.rb', "db/migrate/governor_create_comments.rb", :skip => true
     end
+    
+    private
+    def mapping
+      Governor.resources[resource.pluralize.to_sym]
+    end
   end
 end

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  :<%= article %>
+      t.references  :<%= mapping.singular %>
       t.timestamps
     end
   

data/lib/governor_comments.rb

@@ -4,12 +4,15 @@ 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
-  resources :comments do
+  resources :comments, :module => :governor do
     member do
       put 'mark_spam', 'not_spam'
     end
   end
 end
+comments.register_model_callback do |base|
+  base.has_many :comments, :dependent => :destroy
+end
 comments.add_helper "GovernorCommentsHelper"
 comments.register_partial :after_article_whole, 'articles/comments'
 comments.register_partial :after_article_description, 'articles/comment_link'

data/spec/governor_comments_spec.rb

@@ -5,12 +5,5 @@ module Governor
     it "registers the plugin" do
       Governor::PluginManager.plugins.size == 1
     end
-  
-    it "registers one child resource" do
-      PluginManager.resources(:child_resources).size.should == 1
-      options = PluginManager.resources(:child_resources)[:comments]
-      options.keys.should == [:block]
-      options[:block].should be_a Proc
-    end
   end
 end

data/spec/models/article_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Article do
+  it "has many comments" do
+    Article.instance_methods.should include 'comments'
+    Article.new.comments.should be_an Array
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: governor_comments
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -04:00
+date: 2011-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -219,14 +219,14 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.markdown
+- README.rdoc
 files: 
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.markdown
+- README.rdoc
 - Rakefile
 - VERSION
 - app/controllers/governor/comments_controller.rb
@@ -248,6 +248,7 @@ files:
 - script/rails
 - spec/controllers/governor/comments_controller_spec.rb
 - spec/governor_comments_spec.rb
+- spec/models/article_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile
 - spec/rails_app/Gemfile.lock
@@ -343,6 +344,7 @@ summary: Comments plugin for the Rails 3-based Governor blogging system.
 test_files: 
 - spec/controllers/governor/comments_controller_spec.rb
 - spec/governor_comments_spec.rb
+- spec/models/article_spec.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/controllers/home_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb