mail-jenc 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb05b511c576b2f913b39c322c3954f9dc6d9cd76ee7b18690f8a8b3e540bfd2
-  data.tar.gz: e4b8f8576ec61dc116676e219286b834a180e0429a915f4025e54105402a89ca
+  metadata.gz: ce87dd8df9f740e8fa733161962382dd20924534f720769c4efe0b0bc91a22db
+  data.tar.gz: 1755e999ed838155ed411e3703250ad61634176f0a8299796040ff19f2fe859b
 SHA512:
-  metadata.gz: 9d59ef6e391d7a2da7b06a4943284e3e85d09937ba73acd47bf85f0e54d7cb42d1cec0fd50918193f547a1253706aec5eb3b2666769ab9f1790f3949c1a0f7f4
-  data.tar.gz: 140f4e85e8d84bc1c5d5a3a12235a1d73b8c8177ea41d41a17f30ca54621fb3cda31ac4f2b99cb08e2dcc290ee5bd04102579a4acbef4448180b7562d9bad660
+  metadata.gz: 55b29a387293f1af1b37066621967d1a6fc3143649866b438560f386e909500fa1f2a602f37f536477fc84189fbe8dbf5dc06a6d86f332cc0c6e15d1ae3f20d4
+  data.tar.gz: 172ee348a7e0611d9fb0416f5a87b0cce1c3e461ded1cf628b72c8127e8ea7234b3af2404f901ebe5ca5dc16da78a8e73029689239ff415b5a0cf51232a0b811

data/lib/mail/jenc/attachments_list_patch.rb

@@ -2,10 +2,13 @@ module Mail
   module Jenc
     module AttachmentsListPatch
       def []=(name, value)
-        if Jenc.enabled?
-          if name && !name.ascii_only? && name.encoding == Encoding::UTF_8 && value.is_a?(Hash) && (charset = value.delete(:header_charset))
+        if Jenc.enabled? && value.is_a?(Hash)
+          charset = value.delete(:header_charset)
+          rfc2231 = value.key?(:rfc2231) ? value.delete(:rfc2231) : Jenc.rfc2231
+
+          if name && name.encoding == Encoding::UTF_8 && charset
             mime_type = set_mime_type(name)
-            if (value.key?(:rfc2231) ? value.delete(:rfc2231) : Jenc.rfc2231)
+            if rfc2231
               encoded = RFC2231Encoder.encode(name, charset)
               value[:content_disposition] ||= %Q|#{@content_disposition_type}; #{encoded}|
               encoded = BEncoder.encode(name, charset)

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

@@ -0,0 +1,19 @@
+module Mail
+  module Jenc
+    module ContentTypeFieldPatch
+      def parameters
+        if Jenc.enabled?
+          super.tap do |parameters|
+            parameters.delete('charset') if parameters.key?('boundary') || parameters.key?('name')
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+unless Mail::ContentTypeField.included_modules.include?(Mail::Jenc::ContentTypeFieldPatch)
+  Mail::ContentTypeField.prepend Mail::Jenc::ContentTypeFieldPatch
+end

data/lib/mail/jenc/message_patch.rb

@@ -14,8 +14,8 @@ module Mail
 
       def add_file(values)
         if Jenc.enabled?
-          if values.is_a?(Hash) && charset
-            values[:header_charset] = charset
+          if values.is_a?(Hash) && header.charset
+            values[:header_charset] = header.charset
           end
         end
         super

data/lib/mail/jenc/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Jenc
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jenc
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -85,6 +85,7 @@ files:
 - lib/mail/jenc/attachments_list_patch.rb
 - lib/mail/jenc/b_encoder.rb
 - lib/mail/jenc/fields/address_field_patch.rb
+- lib/mail/jenc/fields/content_type_field_patch.rb
 - lib/mail/jenc/fields/unstructured_field_patch.rb
 - lib/mail/jenc/message_patch.rb
 - lib/mail/jenc/percent_encoder.rb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A mail patch for encoding conventional mail