attachments 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/attachments/extract.rb

@@ -99,16 +99,24 @@ module Attachments
         filename = "#{@name}.#{uuid}"
         filepath = "/tmp/#{filename}" 
 
+
         body = case ct
                when "text/plain" then
                  m = mail.body.decoded
+                 if charset && charset.match(/charset=/i)
+                   charset.gsub!(/charset=/i, "")
+                   charset.strip!
+                 else
+                   charset = nil
+                 end
                  begin
+                   if charset
+                     m.force_encoding(charset)
+                   end
                    m.encode("utf-8")
                  rescue
                    # Ruby 1.8 doesn't know encode
-                   if charset && charset.match(/charset=/i)
-                     charset.gsub!(/charset=/i, "")
-                     charset.strip!
+                   if charset 
                      Iconv.conv("utf-8", charset, m)
                    else
                      m

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: attachments
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Rune Myrland