Fix rubocop lint issues

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

diff --git a/app/models/message.rb b/app/models/message.rb
index b05d005b04f95ea1eec343228744d744bc2a8935..65c2d29eddc9cafc9792ebb4dd385c0e44e2022b 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -6,7 +6,7 @@ class Message < ActiveRecord::Base
 
   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
 
   def self.from_mail(mail, from, to)
@@ -16,13 +16,13 @@ class Message < ActiveRecord::Base
       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
     end
 
-    message = Message.new(
+    Message.new(
       :sender => from,
       :recipient => to,
       :sent_on => mail.date.new_offset(0),