mail-jenc 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ccae9e4e2f5a00fb507ba9aad493b525a570787bb477bfddc0c85cfc91264e
-  data.tar.gz: 78a3509aca7bb5d9d259bee3a2e555a7dc8f6954e997f044b87c298e855108d4
+  metadata.gz: 32da2bde725e3d20eab75a686cc14d111d9be8c01f5ab2b54fbd2fa57e8b9ad0
+  data.tar.gz: 65503198ba6b1e3ddcfd27c495614e003c1e368ae6ec2b2935da219e9e3d6d2b
 SHA512:
-  metadata.gz: 71f6f52c5deab29db6167f6ae53a9ee47c0bfe0f7edd267cd1ec3fbaa377130ce9f621d5bcf5214eb3ca13438c4aabe39d82e0ba81a4026db3c8cf710d306e16
-  data.tar.gz: c1190431e2fbd9d635b1de0d426d5e22f6c645ff9357526a2e8ff7d2203b24a79dec745632cc72bc9befd49c67ca10fd55ecdc3d6ba62cd687785aec9e09764c
+  metadata.gz: dd7a383c86ccfbccd98f10f7ad2b0c517afa1b2588bdbe5cf3401d3dd24c633847f11d2c5cbd2e9461d163a565aa28911e21d9de58018a4e685b03bc2042e3e8
+  data.tar.gz: 142b1c5a9ed24ed17f0f1ee3b0ab6a141d61156f1b824130d93a3ed8e19d6643e17c75929a235389d957993a7127e959ace8a97b7b1013f7f5400a8b87b4953f

data/lib/mail/jenc/attachments_list_patch.rb

@@ -6,7 +6,7 @@ module Mail
           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
+            if value.key?(:rfc2231) ? value[:rfc2231] : Jenc.rfc2231
               encoded = RFC2231Encoder.encode(transcoded, charset: charset)
               value[:content_disposition] ||= %Q|#{@content_disposition_type}; #{encoded}|
               encoded = Mail::Encodings.b_value_encode(transcoded)

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? && value.encoding == Encoding::UTF_8 && charset && charset != 'utf-8'
+          if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset.downcase != '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,7 +3,7 @@ module Mail
     module UnstructuredFieldPatch
       def initialize(name, value, charset = nil)
         if Jenc.enabled?
-          if value.is_a?(String) && value.encoding == Encoding::UTF_8 && charset && charset != 'utf-8'
+          if value.is_a?(String) && value.encoding == Encoding::UTF_8 && charset && charset.downcase != 'utf-8'
             if !value.ascii_only?
               value = Mail::Encodings.b_value_encode(
                 Mail::Encodings.transcode_charset(value, value.encoding, charset)

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? && value.encoding == Encoding::UTF_8 && charset && charset != 'utf-8' && @transport_encoding.to_s != '8bit'
+          if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset.downcase != '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.3'
+    VERSION = '1.0.4'
   end
 end

data/lib/mail/jenc.rb

@@ -25,7 +25,7 @@ module Mail
     end
 
     self.enable
-    self.rfc2231 = true
+    self.rfc2231 = false
     self.preferred_charsets = {
       'iso-2022-jp' => 'cp50221',
       'shift_jis' => 'cp932'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jenc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail