mailcvt 0.2.35 → 0.2.36

data/lib/encoded_word.rb

@@ -174,22 +174,22 @@ class EncodedWord
     end
 
     def word_decode(input, out_charset = 'utf-8')
-            u8 = input.encode('utf-8', @u8_enc, :undef=>:replace, :invalid=>:replace)
-            parts = u8.scan(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/).first
-            return input unless parts and parts.length == 3
-            charset = parts[0]
-            enc = parts[1].upcase
-            wd = parts[2].unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
+        u8 = input.encode('utf-8', @u8_enc, :undef=>:replace, :invalid=>:replace)
+        parts = u8.scan(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/).first
+        return input unless parts and parts.length == 3
+        charset = parts[0]
+        enc = parts[1].upcase
+        wd = parts[2].unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
+        begin
+            return wd.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
+        rescue => e
+            puts "Cannot encode #{input} because #{e}, try iconv..."
             begin
                 return Iconv.conv(out_charset + "//IGNORE", charset, wd)
             rescue => e
-                puts "Cannot iconv #{input} because #{e}, try encode."
-                begin
-                    return wd.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
-                rescue => e
-                    puts "Cannot encode #{input} because #{e}"
-                end
+                puts "iconv failed too because #{e}."
                 return ''
             end
+        end
     end
 end

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.2.35'
+  VERSION = '0.2.36'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
   prerelease: 
 platform: ruby
 authors: