mail-jdec 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ab2c096a186f73beaaa84de6c3e857359d65f50e5bc7ed333450624e6d77f7
-  data.tar.gz: c8b624b4155eb04d18864d8fe9bd586dd6e58492e1126aaed056d24615dc04c9
+  metadata.gz: f4cba29f251d5a8fe9a696f6e965b9fd2b52c622f64aedb23f63567e3ebc15d0
+  data.tar.gz: ae6a610eee21b581f474fedf651a90e54bc9e5dde5d613daeebd621c0520da86
 SHA512:
-  metadata.gz: 7daf270c25730a7e2bc0876889f2900e2ad86b06cc21310dba5434e2d525ef82128d27c5abbf5b83fd3a2609f94d27ee8c06d6d236b2172fd19361f4221bbed6
-  data.tar.gz: befc1dfd40761b72c6a7a06993f667fa2396b65cf5a28b0043f2b92b270d8269770628ae37576fa97b93ab6166228a84bbc7f842b30966c7c082c58085ed3861
+  metadata.gz: c5a8e19b16e943c41890c0652433f1607b15c08108440dbbe0fbe4ca6e3360f3aed4d43328e46aa4230b390bac46b9566db890b123f675444972054231af7514
+  data.tar.gz: 9cd358e45c80af8aab96e8d995d16720028ec657c224a0faeb07ba2eec12b39be15b76f2c778524f4a420b499c7649eea13e751eeefdf55deb53dbf083f1549b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.1
+
+* Support charset detection including message parts.
+
 ## 1.1.0
 
 * Change supported mail version to 2.8.

data/lib/mail/jdec/message_patch.rb

@@ -6,13 +6,13 @@ module Mail
       def decoded
         decoded = super
 
-        if Jdec.enabled? && (!has_content_type? || (text? && !has_charset? && !attachment? && !multipart?))
+        if Jdec.enabled? && MessagePatch.autodetect?(self)
           detected = Detector.detect(decoded)
           if detected && detected[:type] == :text
             charset = detected[:encoding].downcase
             decoded = Mail::Encodings.transcode_charset(decoded.dup.force_encoding(charset), charset, 'utf-8')
-            header[:content_type] = 'text/plain'
-            header[:content_type].parameters[:charset] = charset
+            header[:content_type] = 'text/plain' unless has_content_type?
+            header[:content_type].parameters[:charset] = charset unless has_charset?
           else
             decoded = Mail::Encodings.transcode_charset(decoded, decoded.encoding, 'utf-8')
           end
@@ -20,6 +20,23 @@ module Mail
 
         decoded
       end
+
+      class << self
+        def autodetect?(message)
+          !message.has_content_type? ||
+            (mime_types_for_autodetect?(message.mime_type) && !message.has_charset? && !message.attachment? && !message.multipart?)
+        end
+
+        def mime_types_for_autodetect?(mime_type)
+          Jdec.mime_types_for_autodetect.any? do |type|
+            if type.is_a?(Regexp)
+              type.match?(mime_type)
+            else
+              type == mime_type
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/mail/jdec/version.rb

@@ -2,6 +2,6 @@
 
 module Mail
   module Jdec
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/lib/mail/jdec.rb

@@ -13,6 +13,7 @@ module Mail
       attr_reader :enabled
       attr_accessor :autodetect_confidence
       attr_accessor :autodetect_skip_charsets
+      attr_accessor :mime_types_for_autodetect
       attr_accessor :preferred_charsets
 
       def enabled?
@@ -31,6 +32,7 @@ module Mail
     self.enable
     self.autodetect_confidence = 50
     self.autodetect_skip_charsets = %w()
+    self.mime_types_for_autodetect = [%r{^text/}, 'message/delivery-status', 'message/disposition-notification']
     self.preferred_charsets = {
       'iso-2022-jp' => 'cp50221',
       'iso-2022-jp-1' => 'cp50221',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jdec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A mail patch for decoding some improper mails