vmail 0.2.5 → 0.2.6

data/lib/vmail/message_formatter.rb

@@ -85,7 +85,7 @@ module Vmail
     def format_text_body(part)
       text = part.body.decoded.gsub("\r", '')
       charset = part.content_type_parameters && part.content_type_parameters['charset']
-      if charset
+      if charset && charset != 'UTF-8'
         Iconv.conv('UTF-8//TRANSLIT//IGNORE', charset, text)
       else
         text
@@ -100,7 +100,11 @@ module Vmail
       stdin.close
       output = stdout.read
       charset = part.content_type_parameters && part.content_type_parameters['charset']
-      charset ?  Iconv.conv('UTF-8//TRANSLIT//IGNORE', charset, output) : output
+      if charset && charset != 'UTF-8'
+        Iconv.conv('UTF-8//TRANSLIT//IGNORE', charset, output) 
+      else
+        output
+      end
     end
 
     def extract_headers(mail = @mail)
@@ -127,7 +131,11 @@ module Vmail
     def utf8(string)
       return '' unless string
       return string unless encoding
-      Iconv.conv('UTF-8//TRANSLIT/IGNORE', encoding, string)
+      if encoding && encoding != 'UTF-8'
+        Iconv.conv('UTF-8//TRANSLIT/IGNORE', encoding, string)
+      else
+        string
+      end
     rescue
       puts $!
       string

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Daniel Choi