lib/premailer-rails3/hook.rb in premailer-rails3-0.2 vs lib/premailer-rails3/hook.rb in premailer-rails3-1.0.0

@@ -1,19 +1,33 @@
 module PremailerRails
   class Hook
     def self.delivering_email(message)
-      premailer = Premailer.new(message.body.to_s)
+      # If the mail only has one part, it may be stored in message.body. In that
+      # case, if the mail content type is text/html, the body part will be the
+      # html body.
+      if message.html_part
+        html_body = message.html_part.body.to_s
+      elsif message.content_type =~ /text\/html/
+        html_body = message.body.to_s
+        message.body = nil
+      end
 
-      # reset the body and add two new bodies with appropriate types
-      message.body = nil
+      if html_body
+        premailer = Premailer.new(html_body)
+        charset   = message.charset
 
-      message.html_part do
-        content_type "text/html; charset=utf-8"
-        body premailer.to_inline_css
-      end
+        # IMPRTANT: Plain text part must be generated before CSS is inlined.
+        # Not doing so results in CSS declarations visible in the plain text
+        # part.
+        message.text_part do
+          content_type "text/plain; charset=#{charset}"
+          body premailer.to_plain_text
+        end unless message.text_part
 
-      message.text_part do
-        body premailer.to_plain_text
+        message.html_part do
+          content_type "text/html; charset=#{charset}"
+          body premailer.to_inline_css
+        end
       end
     end
   end
 end