loudmouth 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/app/controllers/loudmouth/comments_controller.rb

@@ -1,4 +1,5 @@
 class Loudmouth::CommentsController < ApplicationController
+  include ActionView::Helpers::SanitizeHelper
   layout Loudmouth.use_layout if Loudmouth.use_layout.length > 0
   before_filter :authenticate_user!, :except => [ :index ]
   
@@ -25,11 +26,20 @@ class Loudmouth::CommentsController < ApplicationController
   def create
     @topic = topic_c.find(params[topic_comment.to_sym][topic.foreign_key.to_sym])
 
-    redirect_to :back unless validate_create(@topic)
+    # Run create validations
+    redirect_to :back and return unless validate_create(@topic)
+    
+    # Sanitize comment content
+    params[topic_comment.to_sym][:content] = sanitize params[topic_comment.to_sym][:content]
     
     @comment = topic_comment_c.new(params[topic_comment.to_sym])
+    
+    # Run comment validations
+    redirect_to :back and return unless validate_comment(@comment)
+    
     @user = user_c.find(params[topic_comment.to_sym][('author_' + user.foreign_key).to_sym])
     
+    # Make sure the default comment text isn't being posted
     if params[topic_comment.to_sym][:content] == new_comment_content()
       flash[:error] = new_comment_content().
       redirect_to :back
@@ -48,6 +58,11 @@ class Loudmouth::CommentsController < ApplicationController
   def update
     @comment = topic_comment_c.find(params[:id])
     redirect_to :back unless validate_update(@comment)
+    
+    @topic = topic_c.find(params[topic_comment.to_sym][topic.foreign_key.to_sym])
+    
+    tmp_comment = topic_comment_c.new(params[topic_comment.to_sym])
+    redirect_to :back unless validate_comment(tmp_comment)
 
     if @comment.update_attributes(params[topic_comment.to_sym])
       flash[:success] = 'Comment successfully updated.'
@@ -60,6 +75,7 @@ class Loudmouth::CommentsController < ApplicationController
 
   def destroy
     @comment = topic_comment_c.find(params[:id])
+    @topic = topic_c.find(params[topic.foreign_key.to_sym])
     
     if validate_destroy(@comment)
       @comment.destroy
@@ -142,6 +158,22 @@ class Loudmouth::CommentsController < ApplicationController
   ######################
   # Validation Routines
   ######################
+  
+  # Used to validate comments
+  # Override to provide application specific comment validation
+  def validate_comment(comment)
+    if comment.content.length < Loudmouth.min_comment_length
+      flash[:error] = "Comments must be at least #{Loudmouth.min_comment_length} characters in length."
+      return false
+    end
+    
+    if Loudmouth.max_comment_length > 0 and
+         comment.content.length > Loudmouth.max_comment_length
+      flash[:error] = "Comments cannot be more than #{Loudmouth.max_comment_length} characters in length."
+      return false
+    end
+    true
+  end
 
   # Used to validate that the current user can comment on topic.
   # Override to provide application specific commenting validation

data/app/helpers/comments_helper.rb

@@ -1,6 +1,2 @@
 module CommentsHelper
-  
-  def topic_comment_path(topic, comment)
-    self.send(topic + '_comment_path', topic, comment)
-  end
 end

data/app/views/loudmouth/comments/_comment.html.haml

@@ -1,9 +1,7 @@
 %table{ :style => 'background: #fff; border: 1px solid #ccc;' }
   %tr{ :style => 'border: 1px solid #ccc; padding: 5px;' }
     %td{ :style => 'border: 1px solid #ccc; padding: 5px;' }
-      - cc = sanitize(cc)
-      - cc = simple_format(comment.content)
-      = auto_link(cc).html_safe
+      = simple_format auto_link sanitize comment.content
   %tr{ :style => 'border: 1px solid #ccc; padding: 5px;' }
     %th{ :style => 'background: #eee; text-align: right; font-size: 80%;' }
       == Posted #{time_ago_in_words(comment.created_at)} ago

data/lib/extensions/helper.rb

@@ -21,8 +21,9 @@ module Loudmouth
         unless Loudmouth.treasure_map.has_key?(topic.class.name.underscore.to_sym)
           raise "loudmouth not setup for #{topic.class.name.underscore.downcase.to_sym}"
         end
-
-        render :partial => 'loudmouth/comments/comment', :collection => topic.comments, :as => :comment
+        
+        render :partial => 'loudmouth/comments/comment', :collection => topic.comments, 
+                  :locals => { :topic => topic }
       end
       
       def topic_comment_path(topic)

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

@@ -53,6 +53,15 @@ class CommentsController < Loudmouth::CommentsController
   # Validation Routines
   ######################
 
+  # Used to validate comments
+  # Override to provide application specific comment validation
+  # def validate_comment(comment)
+  #   [ code to determine if the comment is valid ]
+  #   [ set a flash message to diplay to the user in fail conditions ]
+  #   flash[:error] = 'Comment cannot be...'
+  #   return true/false
+  # end
+
   # Used to validate that the current user can comment on topic.
   # Override to provide application specific commenting validation
   # def validate_create(topic)

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

@@ -11,5 +11,15 @@ Loudmouth.setup do |config|
   
   # Allow anonymous commenting?
   config.allow_anonymous = false
+  
+  # Smallest comment length allowed
+  # 0 for unlimited
+  config.min_comment_length = 2
+  
+  # Largest comment length allowed
+  # 0 for unlimited
+  config.max_comment_length = 0
+
+  
 end
 

data/lib/loudmouth.rb

@@ -26,6 +26,12 @@ module Loudmouth
 
   mattr_accessor :rate_limit_cooldown
   @@rate_limit_cooldown = 1
+  
+  mattr_accessor :min_comment_length
+  @@min_comment_length = 2
+  
+  mattr_accessor :max_comment_length
+  @@max_comment_length = 0
 
   def self.setup
     yield self

data/loudmouth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loudmouth}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Peter Giacomo Lombardo}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loudmouth
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Peter Giacomo Lombardo