mail-jdec 1.0.10 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe56489a85031c3cbc6d898b9c35a132bc3a01683d7f2682b582727bf2318706
-  data.tar.gz: a7825201050257f08d640ad8a267bb66b31a87cef3068d6ea4936a741de27b17
+  metadata.gz: f4cba29f251d5a8fe9a696f6e965b9fd2b52c622f64aedb23f63567e3ebc15d0
+  data.tar.gz: ae6a610eee21b581f474fedf651a90e54bc9e5dde5d613daeebd621c0520da86
 SHA512:
-  metadata.gz: 3029fcabe732faa31f6eabf0dce16fd3fbeda58ad8d9dba875bddf3263163ae91ac147c38d8c76fdbdc56850a86634e8446b8385463d3de80a298acc230724f6
-  data.tar.gz: f8d774c612e83d0adc375f4ff81bcc57a50b9c399c4b849a6e0383704110a99d9905023de07092861441c2115ea63b48dc7576c4883feedcaa7983f3ea4e392b
+  metadata.gz: c5a8e19b16e943c41890c0652433f1607b15c08108440dbbe0fbe4ca6e3360f3aed4d43328e46aa4230b390bac46b9566db890b123f675444972054231af7514
+  data.tar.gz: 9cd358e45c80af8aab96e8d995d16720028ec657c224a0faeb07ba2eec12b39be15b76f2c778524f4a420b499c7649eea13e751eeefdf55deb53dbf083f1549b

data/.github/workflows/ci.yml

@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
-        gemfile: ['mail27']
+        ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2]
+        gemfile: ['mail28']
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 
@@ -17,7 +17,7 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -1,6 +1,6 @@
 .bundle/
-.project
 Gemfile.lock
+gemfiles/*.lock
 coverage/
 pkg/
 tmp/

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.1.1
+
+* Support charset detection including message parts.
+
+## 1.1.0
+
+* Change supported mail version to 2.8.
+* Drop support for ruby 2.3 and 2.4.
+
 ## 1.0.10
 
 * Fix mail version to < 2.8.0.

data/README.md

@@ -4,8 +4,8 @@ A mail patch for decoding some improper mails.
 
 ## Dependencies
 
-* ruby 2.3+
-* mail 2.7
+* ruby 2.5+
+* mail 2.8
 * charlock_holmes (using libicu)
 
 ## Installation

data/gemfiles/{mail27.gemfile → mail28.gemfile}

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem "mail", "~> 2.7.1"
-gem "net-smtp"
+gem "mail", "~> 2.8.1"
 
 gemspec path: "../"

data/lib/mail/jdec/body_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module BodyPatch

data/lib/mail/jdec/decoder.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     class Decoder
       class << self
         def decode_if_needed(text)
-          return text if text.nil? || text.encoding == Encoding::UTF_8
+          return text if text.nil? || !text.respond_to?(:encoding) || text.encoding == Encoding::UTF_8
 
           detected = Detector.detect(text)
 
@@ -57,7 +59,7 @@ module Mail
             if content =~ ENCODED_VALUE
               bytes = content.scan(/\=\?([^?]+)\?([QB])\?([^?]*?)\?\=/mi).map do |_, encoding, encoded|
                 case encoding
-                when *B_VALUES then Mail::RubyVer.decode_base64(encoded)
+                when *B_VALUES then Mail::Utilities.decode_base64(encoded)
                 when *Q_VALUES then Mail::Encodings::QuotedPrintable.decode(encoded.gsub(/_/, '=20').sub(/\=$/, ''))
                 end
               end.join('')

data/lib/mail/jdec/detector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     class Detector

data/lib/mail/jdec/elements/content_disposition_element_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module ContentDispositionElementPatch

data/lib/mail/jdec/elements/content_type_element_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module ContentTypeElementPatch

data/lib/mail/jdec/encodings_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module EncodingsPatch

data/lib/mail/jdec/fields/common_address_field_patch.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Mail
+  module Jdec
+    module CommonAddressFieldPatch
+      def element
+        super
+      rescue Mail::Field::ParseError => e
+        if Jdec.enabled?
+          @errors = [name, value, e]
+          @element = AddressList.new('')
+        else
+          raise e
+        end
+      end
+
+      def errors
+        @errors
+      end
+
+      def address_list
+        element
+      end
+    end
+  end
+end
+
+klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonAddressField }
+klasses.each do |klass|
+  unless klass.included_modules.include?(Mail::Jdec::CommonAddressFieldPatch)
+    klass.prepend Mail::Jdec::CommonAddressFieldPatch
+  end
+end

data/lib/mail/jdec/fields/common_date_field_patch.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Mail
+  module Jdec
+    module CommonDateFieldPatch
+      def element
+        super
+      rescue Mail::Field::ParseError => e
+        if Jdec.enabled?
+          @errors = [name, value, e]
+          @element = nil
+        else
+          raise e
+        end
+      end
+
+      def date_time
+        if Jdec.enabled?
+          if element
+            begin
+              ::DateTime.parse("#{element.date_string} #{element.time_string}")
+            rescue ArgumentError => e
+              require 'time'
+              begin
+                Time.parse(value).to_datetime
+              rescue ArgumentError => e
+                nil
+              end
+            end
+          else
+            nil
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonDateField }
+klasses.each do |klass|
+  unless klass.included_modules.include?(Mail::Jdec::CommonDateFieldPatch)
+    klass.prepend Mail::Jdec::CommonDateFieldPatch
+  end
+end

data/lib/mail/jdec/fields/parameter_hash_patch.rb

@@ -1,31 +1,33 @@
 # encoding: utf-8
 # frozen_string_literal: true
-module Mail
+require 'mail/constants'
+require 'mail/indifferent_hash'
+require 'mail/encodings'
 
+module Mail
   # ParameterHash is an intelligent Hash that allows you to add
   # parameter values including the MIME extension paramaters that
   # have the name*0="blah", name*1="bleh" keys, and will just return
   # a single key called name="blahbleh" and do any required un-encoding
   # to make that happen
-  # Parameters are defined in RFC2045, split keys are in RFC2231
-
-  class ParameterHash < IndifferentHash
-
-    include Mail::Utilities
-
+  #
+  # Parameters are defined in RFC2045. Split keys are in RFC2231.
+  class ParameterHash < IndifferentHash #:nodoc:
     def [](key_name)
       key_pattern = Regexp.escape(key_name.to_s)
       pairs = []
       exact = nil
+
       each do |k,v|
         if k =~ /^#{key_pattern}(\*|$)/i
-          if $1 == ASTERISK
+          if $1 == Constants::ASTERISK
             pairs << [k, v]
           else
             exact = k
           end
         end
       end
+
       if pairs.empty? # Just dealing with a single value pair
         super(exact || key_name)
       else # Dealing with a multiple value pair or a single encoded value pair
@@ -46,13 +48,13 @@ module Mail
           value = Mail::Encodings.param_encode(value)
           key_name = "#{key_name}*"
         end
-        %Q{#{key_name}=#{quote_token(value)}}
+        %Q{#{key_name}=#{Utilities.quote_token(value)}}
       end.join(";\r\n\s")
     end
 
     def decoded
       map.sort_by { |a| a.first.to_s =~ /^([^*]+)\*(\d+)/ ? [$1, $2.to_i] : [a.first.to_s, 0] }.map! do |key_name, value|
-        %Q{#{key_name}=#{quote_token(value)}}
+        %Q{#{key_name}=#{Utilities.quote_token(value)}}
       end.join("; ")
     end
   end

data/lib/mail/jdec/fields/structured_field_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module StructuredFieldPatch

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module UnstructuredFieldPatch

data/lib/mail/jdec/message_patch.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
     module MessagePatch
       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
@@ -18,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/{ruby_1_9_patch.rb → utilities_patch.rb}

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
-    module Ruby19Patch
+    module UtilitiesPatch
       def pick_encoding(charset)
         if Jdec.enabled?
           Jdec.preferred_charsets.each do |from, to|
@@ -33,6 +35,6 @@ module Mail
   end
 end
 
-unless Mail::Ruby19.singleton_class.included_modules.include?(Mail::Jdec::Ruby19Patch)
-  Mail::Ruby19.singleton_class.prepend Mail::Jdec::Ruby19Patch
+unless Mail::Utilities.singleton_class.included_modules.include?(Mail::Jdec::UtilitiesPatch)
+  Mail::Utilities.singleton_class.prepend Mail::Jdec::UtilitiesPatch
 end

data/lib/mail/jdec/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Mail
   module Jdec
-    VERSION = '1.0.10'
+    VERSION = '1.1.1'
   end
 end

data/lib/mail/jdec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 require 'charlock_holmes'
 
@@ -11,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?
@@ -29,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',

data/mail-jdec.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mail", ">= 2.7.1", "< 2.8.0"
+  spec.add_dependency "mail", ">= 2.8.1"
   spec.add_dependency "charlock_holmes", ">= 0.7.0"
 
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jdec
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +97,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/mail27.gemfile
+- gemfiles/mail28.gemfile
 - lib/mail/jdec.rb
 - lib/mail/jdec/body_patch.rb
 - lib/mail/jdec/decoder.rb
@@ -111,14 +105,13 @@ files:
 - lib/mail/jdec/elements/content_disposition_element_patch.rb
 - lib/mail/jdec/elements/content_type_element_patch.rb
 - lib/mail/jdec/encodings_patch.rb
-- lib/mail/jdec/fields/address_field_patch.rb
-- lib/mail/jdec/fields/date_field_patch.rb
+- lib/mail/jdec/fields/common_address_field_patch.rb
+- lib/mail/jdec/fields/common_date_field_patch.rb
 - lib/mail/jdec/fields/parameter_hash_patch.rb
-- lib/mail/jdec/fields/references_field_patch.rb
 - lib/mail/jdec/fields/structured_field_patch.rb
 - lib/mail/jdec/fields/unstructured_field_patch.rb
 - lib/mail/jdec/message_patch.rb
-- lib/mail/jdec/ruby_1_9_patch.rb
+- lib/mail/jdec/utilities_patch.rb
 - lib/mail/jdec/version.rb
 - mail-jdec.gemspec
 homepage: https://github.com/kanety/mail-jdec
@@ -139,7 +132,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 decoding some improper mails

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

@@ -1,27 +0,0 @@
-module Mail
-  module Jdec
-    module AddressFieldPatch
-      def parse(val = value)
-        super
-      rescue Mail::Field::ParseError => e
-        if Jdec.enabled?
-          @errors = [name, val, e]
-          @address_list = AddressList.new('')
-        else
-          raise e
-        end
-      end
-
-      def errors
-        @errors
-      end
-    end
-  end
-end
-
-klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonAddress }
-klasses.each do |klass|
-  unless klass.included_modules.include?(Mail::Jdec::AddressFieldPatch)
-    klass.prepend Mail::Jdec::AddressFieldPatch
-  end
-end

data/lib/mail/jdec/fields/date_field_patch.rb

@@ -1,54 +0,0 @@
-module Mail
-  module Jdec
-    module DateFieldPatch
-      def date_time
-        super
-      rescue ArgumentError, Mail::Field::ParseError => e
-        if Jdec.enabled?
-          begin
-            require 'time'
-            Time.parse(value).to_datetime
-          rescue ArgumentError => e
-            nil
-          end
-        else
-          raise e
-        end
-      end
-    end
-  end
-end
-
-module Mail
-  class DateField < StructuredField
-    def initialize(value = nil, charset = nil)
-      super(CAPITALIZED_FIELD, self.class.normalize_datetime(value), charset)
-    end
-
-    def self.normalize_datetime(string)
-      if Utilities.blank?(string)
-        datetime = ::DateTime.now
-      else
-        stripped = string.to_s.gsub(/\(.*?\)/, '').squeeze(' ')
-        begin
-          datetime = ::DateTime.parse(stripped)
-        rescue ArgumentError => e
-          raise unless 'invalid date' == e.message
-        end
-      end
-
-      if datetime
-        datetime.strftime('%a, %d %b %Y %H:%M:%S %z')
-      else
-        string
-      end
-    end
-  end
-end
-
-klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonDate }
-klasses.each do |klass|
-  unless klass.included_modules.include?(Mail::Jdec::DateFieldPatch)
-    klass.prepend Mail::Jdec::DateFieldPatch
-  end
-end

data/lib/mail/jdec/fields/references_field_patch.rb

@@ -1,18 +0,0 @@
-module Mail
-  module Jdec
-    module ReferencesFieldPatch
-      def initialize(value = nil, charset = 'utf-8')
-        if Jdec.enabled?
-          if value.is_a?(String)
-            value = value.gsub(/>\s*,\s*</, ">\r\n <")
-          end
-        end
-        super
-      end
-    end
-  end
-end
-
-unless Mail::ReferencesField.included_modules.include?(Mail::Jdec::ReferencesFieldPatch)
-  Mail::ReferencesField.prepend Mail::Jdec::ReferencesFieldPatch
-end