loudmouth 0.2.0 → 0.2.1

data/README.md

@@ -45,7 +45,7 @@ If you want to render comments in-line on Articles#show
     
 or to render a new comment form
 
-    render_comment_form_for(@article)
+    render_comment_form_for(@article, @user)
     
 ## Advanced Usage
 
@@ -65,7 +65,7 @@ Any loudmouth method can be overridden.  And hey...there's a generator for that!
 
     rails g loudmouth:override_controller
     
-This will install a loudmouth override controller into your application (into app/controllers).
+This will install a loudmouth override controller into your application (app/controllers/comments_controller.rb).
 
 To activate the override controller, make sure to update all of your comments_on calls in your routes.rb file:
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/controllers/loudmouth/comments_controller.rb

@@ -3,7 +3,7 @@ class Loudmouth::CommentsController < ApplicationController
   before_filter :authenticate_user!, :except => [ :index ]
   
   helper_method :topic, :topic_c, :topic_comment, :topic_comment_c, :user, :user_c
-  helper_method :new_comment_content, :validate_create, :validate_destroy
+  helper_method :new_comment_content, :validate_create, :validate_update, :validate_destroy
 
   def index
     @topic = topic_c.find(params[topic.foreign_key.to_sym])
@@ -19,6 +19,7 @@ class Loudmouth::CommentsController < ApplicationController
   
   def edit
     @comment = topic_c.find(params[:id])
+    redirect_to :back unless validate_update(@comment)
   end
 
   def create
@@ -46,6 +47,7 @@ class Loudmouth::CommentsController < ApplicationController
 
   def update
     @comment = topic_comment_c.find(params[:id])
+    redirect_to :back unless validate_update(@comment)
 
     if @comment.update_attributes(params[topic_comment.to_sym])
       flash[:success] = 'Comment successfully updated.'
@@ -129,7 +131,7 @@ class Loudmouth::CommentsController < ApplicationController
   
   # The path the user is redirected to after a successful creation of a comment
   def after_create_path
-    url_for(@user)
+    url_for(@topic)
   end
   
   # The path the user is redirected to after a successful destroy of a comment
@@ -146,11 +148,16 @@ class Loudmouth::CommentsController < ApplicationController
   def validate_create(topic)
     true
   end
+  
+  # Used to validate that the current user can update an existing comment
+  # Override to provide application specific commenting validation
+  def validate_update(comment)
+    true
+  end
 
   # Used to validate that the current user can destroy the comment.
   # Override to provide application specific validation
   def validate_destroy(comment)
-    
     # Check if there are corresponding instance variables for
     # topic and user.  If so attempt to validate with those.
     # Otherwise, this function can be overridden.

data/lib/extensions/active_record.rb

@@ -5,7 +5,8 @@ module LoudmouthExtension
   
   module ClassMethods
     def loudmouths_can_comment(options = {})
-      has_many :comments, :class_name => "#{self.name}Comment", :dependent => :destroy, :order => 'created_at DESC'
+      has_many :comments, :class_name => "#{self.name}Comment", :include => [ :author ], 
+                    :dependent => :destroy, :order => 'created_at DESC'
       send :include, InstanceMethods
     end   
   end  

data/lib/generators/loudmouth/templates/comments_controller.rb

@@ -6,8 +6,8 @@ class CommentsController < Loudmouth::CommentsController
 
   #
   # You can override any method in the Loudmouth::CommentsController.
-  # Here we override index to locate and declare additional instance variables
-  # and then call super to pass control to the original index method.
+  # As an example, here we override index to locate and declare additional instance variables
+  # and then call super to pass control to the original loudmouth index method.
   #
   # def index
   #   if topic.to_sym == :game
@@ -34,14 +34,14 @@ class CommentsController < Loudmouth::CommentsController
   # Paths
   ################
   
-  # The path the user is redirected to after a successful update of a comment
-  # def after_update_path
+  # The path the user is redirected to after a successful creation of a comment
+  # def after_create_path
   #   url_for(@topic)
   # end
   
-  # The path the user is redirected to after a successful creation of a comment
-  # def after_create_path
-  #   url_for(@user)
+  # The path the user is redirected to after a successful update of a comment
+  # def after_update_path
+  #   url_for(@topic)
   # end
   
   # The path the user is redirected to after a successful destroy of a comment
@@ -56,7 +56,19 @@ class CommentsController < Loudmouth::CommentsController
   # Used to validate that the current user can comment on topic.
   # Override to provide application specific commenting validation
   # def validate_create(topic)
-  #   true
+  #   [ code to determine if the current user is authorized to comment on 'topic' ]
+  #   [ set a flash message to diplay to the user in fail conditions ]
+  #   flash[:error] = 'You're not authorized to comment here.'
+  #   return true/false
+  # end
+  
+  # Used to validate that the current user can update an existing comment
+  # Override to provide application specific commenting validation
+  # def validate_update(comment)
+  #   [ code to determine if the current user is authorized to update 'comment' ]
+  #   [ set a flash message to diplay to the user in fail conditions ]
+  #   flash[:error] = 'You're not authorized to edit this comment.'
+  #  return true/false
   # end
 
   # Used to validate that the current user can destroy the comment.
@@ -64,15 +76,17 @@ class CommentsController < Loudmouth::CommentsController
   # Return true or false to indicate whether the current user is authorized to do so.
   #
   # def validate_destroy(comment)
-  #   [ code to determine if the current user is authorized to destroy comment ]
+  #   [ code to determine if the current user is authorized to destroy 'comment' ]
+  #   [ set a flash message to diplay to the user in fail conditions ]
+  #   flash[:error] = 'You're not authorized to delete this comment.'
   #   return true/false
   # end
 
   ######################
-  # Validation Routines
+  # Other Routines
   ######################
   #
-  # You can have a dynamic layout specified under the conditions defined below.
+  # You can have a dynamic layout specified under the conditions you define below.
   #
   # def determine_layout
   #   if params.has_key?(:profile_id)

data/lib/generators/loudmouth/templates/comments_migration.rb

@@ -2,14 +2,20 @@ class Create<%= topic_model.camelize %>Comments < ActiveRecord::Migration
   def self.up
     create_table :<%= topic_model.downcase %>_comments do |t|
       t.references :parent
-      t.integer :<%= topic_model.downcase %>_id
-      t.integer :author_<%= user_model.downcase %>_id
+      t.integer :<%= topic_model.downcase.foreign_key %>
+      t.integer :author_<%= user_model.downcase.foreign_key %>
       t.text :content
       t.timestamps
     end
+    add_index :<%= topic_model.downcase %>_comments, :<%= topic_model.downcase.foreign_key %>
+    add_index :<%= topic_model.downcase %>_comments, :author_<%= user_model.downcase.foreign_key %>
+    add_index :<%= topic_model.downcase %>_comments, :parent_id
   end
 
   def self.down
+    remove_index :<%= topic_model.downcase %>_comments, :parent_id
+    remove_index :<%= topic_model.downcase %>_comments, :author_<%= user_model.downcase.foreign_key %>
+    remove_index :<%= topic_model.downcase %>_comments, :<%= topic_model.downcase.foreign_key %>
     drop_table :<%= topic_model.downcase %>_comments
   end
 end

data/lib/generators/loudmouth/templates/loudmouth_initializer.rb

@@ -5,5 +5,11 @@ Loudmouth.setup do |config|
   
   # Default comment text for the new comment form
   config.new_comment_content = "Enter new Comment..."
+  
+  # How many minutes before a user can post a subsequent comment (rate limiting)
+  config.rate_limit_cooldown = 1
+  
+  # Allow anonymous commenting?
+  config.allow_anonymous = false
 end
 

data/lib/loudmouth.rb

@@ -12,14 +12,20 @@ module Loudmouth
     end
   end
   
+  mattr_accessor :treasure_map
+  @@treasure_map = {}
+  
   mattr_accessor :use_layout
   @@use_layout = ''
   
   mattr_accessor :new_comment_content
   @@new_comment_content = ''
+  
+  mattr_accessor :allow_anonymous
+  @@allow_anonymous = false
 
-  mattr_accessor :treasure_map
-  @@treasure_map = {}
+  mattr_accessor :rate_limit_cooldown
+  @@rate_limit_cooldown = 1
 
   def self.setup
     yield self

data/loudmouth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loudmouth}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Peter Giacomo Lombardo}]
-  s.date = %q{2011-06-16}
+  s.date = %q{2011-06-20}
   s.description = %q{Loudmouth adds commenting to one or many of your models.}
   s.email = %q{pglombardo@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loudmouth
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Peter Giacomo Lombardo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 Z
+date: 2011-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_tree