mail-jenc 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32da2bde725e3d20eab75a686cc14d111d9be8c01f5ab2b54fbd2fa57e8b9ad0
-  data.tar.gz: 65503198ba6b1e3ddcfd27c495614e003c1e368ae6ec2b2935da219e9e3d6d2b
+  metadata.gz: dfee35d6df629f80ba43bf19452f290442843ca98012c672d60077efd6e21834
+  data.tar.gz: 39712976e5b7dcf560fe7c969176243a540f8080cb3b17e0cd82878bba312aa5
 SHA512:
-  metadata.gz: dd7a383c86ccfbccd98f10f7ad2b0c517afa1b2588bdbe5cf3401d3dd24c633847f11d2c5cbd2e9461d163a565aa28911e21d9de58018a4e685b03bc2042e3e8
-  data.tar.gz: 142b1c5a9ed24ed17f0f1ee3b0ab6a141d61156f1b824130d93a3ed8e19d6643e17c75929a235389d957993a7127e959ace8a97b7b1013f7f5400a8b87b4953f
+  metadata.gz: 00c777f94d40b33f15f1effe417674639002db244af18f1e19f08577d1b4e1b80dc036241acc96bc1c396fc7984c40e9cb0ad936a7afe767c4030724875e6aa4
+  data.tar.gz: fc6e89e2d1fe3293d3f82631eaa15e1f4093feceb0a677b413e7af447d71ee0c31cacf3f999d6860c8a813c1c1e4ea1c8f5fbf30894defb6c1b1f1740ae5efaf

data/lib/mail/jenc/attachments_list_patch.rb

@@ -5,14 +5,13 @@ module Mail
         if Jenc.enabled?
           if name && !name.ascii_only? && name.encoding == Encoding::UTF_8 && value.is_a?(Hash) && (charset = value.delete(:header_charset))
             mime_type = set_mime_type(name)
-            transcoded = Mail::Encodings.transcode_charset(name, name.encoding, charset)
-            if value.key?(:rfc2231) ? value[:rfc2231] : Jenc.rfc2231
-              encoded = RFC2231Encoder.encode(transcoded, charset: charset)
+            if (value.key?(:rfc2231) ? value.delete(:rfc2231) : Jenc.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/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

@@ -5,7 +5,7 @@ module Mail
         if Jenc.enabled?
           if value.is_a?(String) && !value.ascii_only? && value.encoding == Encoding::UTF_8 && charset && charset.downcase != 'utf-8' && @transport_encoding.to_s != '8bit'
             value = Mail::Encodings.transcode_charset(value, value.encoding, charset)
-            value.force_encoding('us-ascii') if @transport_encoding.to_s == '7bit'
+            value.force_encoding('us-ascii') if @transport_encoding.to_s == '7bit' && charset.downcase == 'iso-2022-jp'
             value = @transport_encoding.encode(value)
           end
         end

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.4'
+    VERSION = '1.0.8'
   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.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -77,10 +77,12 @@ 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/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 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A mail patch for encoding conventional mail