Merge branch 'develop' into rails-3-spike

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/general_controller.rb
	app/controllers/track_controller.rb
	app/models/outgoing_message.rb
	app/models/public_body.rb
	app/models/user.rb
	app/views/general/frontpage.rhtml
	config/environment.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	db/migrate/094_remove_old_tags_foreign_key.rb
	lib/timezone_fixes.rb
	spec/models/request_mailer_spec.rb
	spec/views/request/list.rhtml_spec.rb

1 files changed, 21 insertions, 18 deletions

diff --git a/app/models/comment.rb b/app/models/comment.rb
index bcd1efca8..70f3ba00d 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -24,13 +24,13 @@ class Comment < ActiveRecord::Base
     strip_attributes!
 
     belongs_to :user
-    #validates_presence_of :user # breaks during construction of new ones :(
-
-    validates_inclusion_of :comment_type, :in => [ 'request' ]
     belongs_to :info_request
-
     has_many :info_request_events # in practice only ever has one
 
+    #validates_presence_of :user # breaks during construction of new ones :(
+    validates_inclusion_of :comment_type, :in => [ 'request' ]
+    validate :body_of_comment
+
     def body
         ret = read_attribute(:body)
         if ret.nil?
@@ -40,6 +40,7 @@ class Comment < ActiveRecord::Base
         ret = ret.gsub(/(?:\n\s*){2,}/, "\n\n") # remove excess linebreaks that unnecessarily space it out
         ret
     end
+
     def raw_body
         read_attribute(:body)
     end
@@ -52,16 +53,6 @@ class Comment < ActiveRecord::Base
         end
     end
 
-    # Check have edited comment
-    def validate
-        if self.body.empty? || self.body =~ /^\s+$/
-            errors.add(:body, _("Please enter your annotation"))
-        end
-        if !MySociety::Validate.uses_mixed_capitals(self.body)
-            errors.add(:body, _('Please write your annotation using a mixture of capital and lower case letters. This makes it easier for others to read.'))
-        end
-    end
-
     # Return body for display as HTML
     def get_body_for_html_display
         text = self.body.strip
@@ -82,9 +73,21 @@ class Comment < ActiveRecord::Base
             return Comment.find(:first, :conditions => [ "info_request_id = ? and body = ?", info_request_id, body ])
         end
     end
-  def for_admin_column
-    self.class.content_columns.each do |column|
-      yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
+
+    def for_admin_column
+        self.class.content_columns.each do |column|
+            yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
+        end
+    end
+
+  private
+
+    def body_of_comment
+        if self.body.empty? || self.body =~ /^\s+$/
+            errors.add(:body, _("Please enter your annotation"))
+        end
+        if !MySociety::Validate.uses_mixed_capitals(self.body)
+            errors.add(:body, _('Please write your annotation using a mixture of capital and lower case letters. This makes it easier for others to read.'))
+        end
     end
-  end
 end