Fix most auto-correctable rubocop issues

[rails.git] / app / models / message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index b51c59f4359d950bd614be043ad2bf79e2174ddb..8ca1dc5bc581b38cccefbebda82335f02a04822f 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -6,11 +6,9 @@ class Message < ActiveRecord::Base
 
   validates_presence_of :title, :body, :sent_on, :sender, :recipient
   validates_length_of :title, :within => 1..255
 
   validates_presence_of :title, :body, :sent_on, :sender, :recipient
   validates_length_of :title, :within => 1..255

-  validates_inclusion_of :message_read, :in => [ true, false ]
+  validates_inclusion_of :message_read, :in => [true, false]

   validates_as_utf8 :title
 
   validates_as_utf8 :title
 

-  after_initialize :set_defaults
-

   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part
   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part


@@ -18,7 +16,7 @@ class Message < ActiveRecord::Base
       elsif mail.html_part
         body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded))
       end
       elsif mail.html_part
         body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded))
       end

-    elsif mail.text? and mail.sub_type == "html"
+    elsif mail.text? && mail.sub_type == "html"

       body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded))
     else
       body = mail.decoded
       body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded))
     else
       body = mail.decoded


@@ -47,10 +45,4 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
     md5 << body
     md5.hexdigest
   end

-
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end

 end
 end