vmail 1.6.2 → 1.6.3

data/lib/vmail/message_formatter.rb

@@ -86,11 +86,12 @@ module Vmail
     def format_text_body(part)
       text = part.body.decoded.gsub("\r", '')
       charset = (part.content_type_parameters && part.content_type_parameters['charset']) || encoding
-      if (charset && charset != 'UTF-8') || (text.encoding != 'UTF-8')
-        Iconv.conv('UTF-8//TRANSLIT//IGNORE', charset, text)
+      if (charset && charset != 'UTF-8') 
+        text.force_encoding(charset)
       else
         text
       end
+      text.encode("UTF-8", undef: :replace, replace: "??", invalid: :replace)
     end
 
     # depend on lynx or whatever is set by the VMAIL_HTML_PART_READER

data/lib/vmail/reply_template.rb

@@ -20,9 +20,11 @@ module Vmail
       date = @orig_headers['date'].is_a?(String) ? Time.parse(@orig_headers['date']) : @orig_headers['date']
       quote_header = date ? "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n" : "#{sender} wrote:\n\n"
       body = quote_header + formatter.process_body
-      body.encode("UTF-8", undef: :replace, replace: "??")
-      body.force_encoding("UTF-8")
-      body = body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
+      begin
+        body = body.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
+      rescue
+        body = Iconv.conv(body, "US-ASCII//TRANSLIT//IGNORE", "UTF-8").gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ")
+      end
       {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
     end
 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 2
-  version: 1.6.2
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Daniel Choi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency