mail-jenc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a854118202e49e07a327bfd1e4ed4e4454d3106cb11d2bf37862511bd995f18
-  data.tar.gz: 2d0df7569232ed77e15c42e0ce0ed7ccadbbec2a1f80e3e2a8ad1365ccbd0910
+  metadata.gz: e140c1e45145fbf1c219c7bca0c4a801ad982280d5aaba37443b382167fe6d91
+  data.tar.gz: f5717cc3b954715d8be121a43c2e848cc1243719f400de7b02f39f987bc0414a
 SHA512:
-  metadata.gz: 0fb0376402c784705aae16a7a7e836c6c8aa1f8555a002b924dc1154b46ca3c98287558c9a028127c7505f485e991d0786f075e8c67f6cdf05e5390968f3f472
-  data.tar.gz: 1186fe098ff229094d78b8ae72abdd5a49a837397c5bc71f7922a60ce8c6918a61a67969c9ad59a9e6800111f72f897181d224af3de7cff5427fdd57a82dd33c
+  metadata.gz: 668fe75df11e6b5f24bdc08ed0c2ccd71c515d1b0c19ad206a9f42d863d0c34f27f34eb5b0d99e0c10ad7a5e39042fdb133af12e57d62830746fead256967d39
+  data.tar.gz: ee12e8dd7fbe04b13e4e3e7814f68cc41110fc5c8b2d89153e1b0c04efc336623e028b6ae8770adb2ae0f69605320d2e65ac505909121207147fdb1041cfe476

data/lib/mail/jenc/attachments_list_patch.rb

@@ -3,7 +3,7 @@ module Mail
     module AttachmentsListPatch
       def []=(name, value)
         if Jenc.enabled?
-          if name && !name.ascii_only? && value.is_a?(Hash) && (charset = value.delete(:header_charset))
+          if name && !name.ascii_only? && name.encoding == Encoding::UTF_8 && value.is_a?(Hash) && (charset = value.delete(:header_charset))
             mime_type = set_mime_type(name)
             transcoded = Mail::Encodings.transcode_charset(name, name.encoding, charset)
             if Jenc.rfc2231

data/lib/mail/jenc/fields/address_field_patch.rb

@@ -3,7 +3,7 @@ module Mail
     module AddressFieldPatch
       def initialize(value, charset = nil)
         if Jenc.enabled?
-          if value.is_a?(String) && !value.ascii_only? && charset && charset != 'utf-8'
+          if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset != 'utf-8'
             list = Mail::AddressList.new(value)
             list.addresses.each do |addr|
               if addr.display_name && !addr.display_name.ascii_only?

data/lib/mail/jenc/fields/unstructured_field_patch.rb

@@ -3,15 +3,10 @@ module Mail
     module UnstructuredFieldPatch
       def initialize(name, value, charset = nil)
         if Jenc.enabled?
-          if value.is_a?(String)
-            if value.ascii_only?
-              charset = 'us-ascii'
-              value.force_encoding('us-ascii')
-            elsif charset && charset != 'utf-8'
-              value = Mail::Encodings.b_value_encode(
-                Mail::Encodings.transcode_charset(value, value.encoding, charset)
-              )
-            end
+          if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset != 'utf-8'
+            value = Mail::Encodings.b_value_encode(
+              Mail::Encodings.transcode_charset(value, value.encoding, charset)
+            )
           end
         end
         super

data/lib/mail/jenc/message_patch.rb

@@ -3,7 +3,7 @@ module Mail
     module MessagePatch
       def body=(value)
         if Jenc.enabled?
-          if value.is_a?(String) && !value.ascii_only? && charset && charset != 'utf-8' && @transport_encoding.to_s != '8bit'
+          if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset != 'utf-8' && @transport_encoding.to_s != '8bit'
             value = Mail::Encodings.transcode_charset(value, value.encoding, charset)
             value.force_encoding('us-ascii') if @transport_encoding.to_s == '7bit'
             value = @transport_encoding.encode(value)

data/lib/mail/jenc/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Jenc
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-jenc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta