mail-jenc 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb05b511c576b2f913b39c322c3954f9dc6d9cd76ee7b18690f8a8b3e540bfd2
-  data.tar.gz: e4b8f8576ec61dc116676e219286b834a180e0429a915f4025e54105402a89ca
+  metadata.gz: 659a351886afb57bc995d5059ba5a7771f342bb42543963abc18fcf7cfc2f232
+  data.tar.gz: a7403f922e8aeff212f8da861c6cb12da21bd54823c10b800e2f471d0e5a2701
 SHA512:
-  metadata.gz: 9d59ef6e391d7a2da7b06a4943284e3e85d09937ba73acd47bf85f0e54d7cb42d1cec0fd50918193f547a1253706aec5eb3b2666769ab9f1790f3949c1a0f7f4
-  data.tar.gz: 140f4e85e8d84bc1c5d5a3a12235a1d73b8c8177ea41d41a17f30ca54621fb3cda31ac4f2b99cb08e2dcc290ee5bd04102579a4acbef4448180b7562d9bad660
+  metadata.gz: bec8d00b898b8b67bfe177aae5d40403f7b52f7a8477732091d51a1bbe8b82732a86f80b707371e3b4a0a155ae5eb60fe95310c4f28e6c4d13d5d10318da340b
+  data.tar.gz: ef8a1742265b7b27302ee91f7081da69183073152a750f94c4db0d7f86e8aa7d582b3ddb46f4a0fcbab625989da79d6de307d85edc6d0517f68e14cd9f7803bb

data/README.md

@@ -4,8 +4,8 @@ A mail patch for encoding conventional mail.
 
 ## Dependencies
 
-* ruby 2.3+
-* mail 2.7
+* ruby 2.5+
+* mail 2.8
 
 ## Installation
 

data/lib/mail/jenc/attachments_list_patch.rb

@@ -1,11 +1,16 @@
+# frozen_string_literal: true
+
 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/b_encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     class BEncoder

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
-    module AddressFieldPatch
+    module CommonAddressFieldPatch
       def initialize(value, charset = nil)
         if Jenc.enabled?
           if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset.downcase != 'utf-8'
@@ -19,9 +21,9 @@ module Mail
   end
 end
 
-klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonAddress }
+klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonAddressField }
 klasses.each do |klass|
-  unless klass.included_modules.include?(Mail::Jenc::AddressFieldPatch)
-    klass.prepend Mail::Jenc::AddressFieldPatch
+  unless klass.included_modules.include?(Mail::Jenc::CommonAddressFieldPatch)
+    klass.prepend Mail::Jenc::CommonAddressFieldPatch
   end
 end

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

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

data/lib/mail/jenc/message_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     module MessagePatch
@@ -14,12 +16,22 @@ module Mail
 
       def add_file(values)
         if Jenc.enabled?
-          if values.is_a?(Hash) && charset
-            values[:header_charset] = charset
+          if values.is_a?(Hash)
+            values[:charset] ||= nil
+            values[:header_charset] = header.charset if header.charset
           end
         end
         super
       end
+
+      def convert_to_multipart
+        unless has_content_type?
+          content_type = 'text/plain'
+          content_type += "; charset=#{charset}" if charset
+          self.content_type = content_type
+        end
+        super
+      end
     end
   end
 end

data/lib/mail/jenc/percent_encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     class PercentEncoder

data/lib/mail/jenc/rfc2231_encoder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     class RFC2231Encoder

data/lib/mail/jenc/{ruby_1_9_patch.rb → utilities_patch.rb}

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
-    module Ruby19Patch
+    module UtilitiesPatch
       def transcode_charset(str, from_encoding, to_encoding = Encoding::UTF_8)
         if Jenc.enabled?
-          coded = super(str, from_encoding, Ruby19Patch.preferred_charset(to_encoding))
+          coded = super(str, from_encoding, UtilitiesPatch.preferred_charset(to_encoding))
           coded.force_encoding(to_encoding)
         else
           super
@@ -19,6 +21,6 @@ module Mail
   end
 end
 
-unless Mail::Ruby19.singleton_class.included_modules.include?(Mail::Jenc::Ruby19Patch)
-  Mail::Ruby19.singleton_class.prepend Mail::Jenc::Ruby19Patch
+unless Mail::Utilities.singleton_class.included_modules.include?(Mail::Jenc::UtilitiesPatch)
+  Mail::Utilities.singleton_class.prepend Mail::Jenc::UtilitiesPatch
 end

data/lib/mail/jenc/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
-    VERSION = '1.0.9'
+    VERSION = '1.1.0'
   end
 end

data/lib/mail/jenc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mail'
 
 Dir["#{__dir__}/jenc/**/*.rb"].each do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jenc
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2023-02-12 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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +83,7 @@ files:
 - lib/mail/jenc/message_patch.rb
 - lib/mail/jenc/percent_encoder.rb
 - lib/mail/jenc/rfc2231_encoder.rb
-- lib/mail/jenc/ruby_1_9_patch.rb
+- lib/mail/jenc/utilities_patch.rb
 - lib/mail/jenc/version.rb
 homepage: https://github.com/kanety/mail-jenc
 licenses:
@@ -110,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A mail patch for encoding conventional mail