mail-jenc 1.0.7 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27837d259b2d789de6b636238d36725d356b26baaf16aed91bb25ac4de0984e3
-  data.tar.gz: 270c15b093bfc39bfcf8f518290d26c916ab1ca1bf40361a616fc0be6b73e7d7
+  metadata.gz: ce87dd8df9f740e8fa733161962382dd20924534f720769c4efe0b0bc91a22db
+  data.tar.gz: 1755e999ed838155ed411e3703250ad61634176f0a8299796040ff19f2fe859b
 SHA512:
-  metadata.gz: '0852f0358a7c2c35156a4097892ac5c340c09aaf08e47feebd3a11bdf8020e8d7df4b05c54a66bab8fb159701e417db38e1adee4e435b06a60afbd9d98266b63'
-  data.tar.gz: 1f2380ab17bccf3d84363c4d4d3a940a5aa4970ff7c6485271e2855ff5e6c2a413778e34169dd6ab2c3f398bcf1a15859c4b4fd8d88aef8d253e66d4c401ddb4
+  metadata.gz: 55b29a387293f1af1b37066621967d1a6fc3143649866b438560f386e909500fa1f2a602f37f536477fc84189fbe8dbf5dc06a6d86f332cc0c6e15d1ae3f20d4
+  data.tar.gz: 172ee348a7e0611d9fb0416f5a87b0cce1c3e461ded1cf628b72c8127e8ea7234b3af2404f901ebe5ca5dc16da78a8e73029689239ff415b5a0cf51232a0b811

data/lib/mail/jenc/attachments_list_patch.rb

@@ -2,17 +2,19 @@ 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)
-            transcoded = Mail::Encodings.transcode_charset(name, name.encoding, charset)
-            if (value.key?(:rfc2231) ? value.delete(:rfc2231) : Jenc.rfc2231)
-              encoded = RFC2231Encoder.encode(transcoded, charset: charset)
+            if rfc2231
+              encoded = RFC2231Encoder.encode(name, charset)
               value[:content_disposition] ||= %Q|#{@content_disposition_type}; #{encoded}|
-              encoded = Mail::Encodings.b_value_encode(transcoded)
+              encoded = BEncoder.encode(name, charset)
               value[:content_type] ||= %Q|#{mime_type}; name="#{encoded}"|
             else
-              encoded = Mail::Encodings.b_value_encode(transcoded)
+              encoded = BEncoder.encode(name, charset)
               value[:content_disposition] ||= %Q|#{@content_disposition_type}; filename="#{encoded}"|
               value[:content_type] ||= %Q|#{mime_type}; name="#{encoded}"|
             end

data/lib/mail/jenc/b_encoder.rb

@@ -0,0 +1,35 @@
+module Mail
+  module Jenc
+    class BEncoder
+      class << self
+        def encode(str, charset)
+          if Jenc.escape_sequence_charsets.include?(charset.to_s.downcase)
+            split(str).map { |s| transcode_and_encode(s, charset) }.join(' ')
+          else
+            transcode_and_encode(str, charset)
+          end
+        end
+
+        private
+
+        def transcode_and_encode(str, charset)
+          Mail::Encodings.b_value_encode(Mail::Encodings.transcode_charset(str, str.encoding, charset))
+        end
+
+        def split(str, max: 40)
+          results = []
+          work = ''
+          str.chars.each do |char|
+            if work.bytesize + char.bytesize >= max
+              results << work
+              work = ''
+            end
+            work += char
+          end
+          results << work unless work.empty?
+          results
+        end
+      end
+    end
+  end
+end

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

@@ -7,9 +7,7 @@ module Mail
             list = Mail::AddressList.new(value)
             list.addresses.each do |addr|
               if addr.display_name && !addr.display_name.ascii_only?
-                addr.display_name = Mail::Encodings.b_value_encode(
-                  Mail::Encodings.transcode_charset(addr.display_name, addr.display_name.encoding, charset)
-                )
+                addr.display_name = BEncoder.encode(addr.display_name, charset)
               end
             end
             value = list.addresses.map(&:encoded).join(', ')

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/fields/unstructured_field_patch.rb

@@ -5,9 +5,7 @@ module Mail
         if Jenc.enabled?
           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)
-              )
+              value = BEncoder.encode(value, charset)
             elsif value !~ Mail::Encodings::ENCODED_VALUE
               charset = 'us-ascii'
             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/percent_encoder.rb

@@ -0,0 +1,15 @@
+module Mail
+  module Jenc
+    class PercentEncoder
+      class << self
+        def encode(str)
+          encode_to_array(str).join
+        end
+
+        def encode_to_array(str)
+          str.unpack('H*').first.scan(/.{2}/).map { |hex| "%#{hex.upcase}" }
+        end
+      end
+    end
+  end
+end

data/lib/mail/jenc/{encoder.rb → rfc2231_encoder.rb}

@@ -1,25 +1,15 @@
 module Mail
   module Jenc
-    module PercentEncoder
+    class RFC2231Encoder
       class << self
-        def encode(str)
-          encode_to_array(str).join
+        def encode(name, charset, **options)
+          encode_to_hash(name, charset, **options).map { |k, v| "#{k}=#{v}" }.join(";\r\n\s")
         end
 
-        def encode_to_array(str)
-          str.unpack('H*').first.scan(/.{2}/).map { |hex| "%#{hex.upcase}" }
-        end
-      end
-    end
-
-    module RFC2231Encoder
-      class << self
-        def encode(name, options = {})
-          encode_to_hash(name, **options).map { |k, v| "#{k}=#{v}" }.join(";\r\n\s")
-        end
-
-        def encode_to_hash(name, key: 'filename', charset: 'utf-8')
-          hexes = name.unpack('H*')[0].scan(/.{2}/).map { |hex| "%#{hex.upcase}" }
+        def encode_to_hash(name, charset, key: 'filename')
+          hexes = PercentEncoder.encode_to_array(
+            Mail::Encodings.transcode_charset(name, name.encoding, charset)
+          )
 
           first_hex_num = hex_num(charset.size + key.size + 3)
           if hexes.size <= first_hex_num

data/lib/mail/jenc/version.rb

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

data/lib/mail/jenc.rb

@@ -9,6 +9,7 @@ module Mail
     class << self
       attr_reader :enabled
       attr_accessor :rfc2231
+      attr_accessor :escape_sequence_charsets
       attr_accessor :preferred_charsets
 
       def enabled?
@@ -26,6 +27,7 @@ module Mail
 
     self.enable
     self.rfc2231 = false
+    self.escape_sequence_charsets = ['iso-2022-jp']
     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.7
+  version: 1.0.10
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,10 +83,13 @@ files:
 - Rakefile
 - lib/mail/jenc.rb
 - lib/mail/jenc/attachments_list_patch.rb
-- lib/mail/jenc/encoder.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
+- lib/mail/jenc/rfc2231_encoder.rb
 - lib/mail/jenc/ruby_1_9_patch.rb
 - lib/mail/jenc/version.rb
 homepage: https://github.com/kanety/mail-jenc
@@ -102,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