mail-jenc 1.0.10 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce87dd8df9f740e8fa733161962382dd20924534f720769c4efe0b0bc91a22db
-  data.tar.gz: 1755e999ed838155ed411e3703250ad61634176f0a8299796040ff19f2fe859b
+  metadata.gz: 3f4d09dee3b6fcb41a2c89d36fa5d03612996fe805e2c641c2aef579056a37e6
+  data.tar.gz: c6ccc4f85aa7c1ac09cbaee529e1da56fd7404eca00a03a3191e66b53b93a591
 SHA512:
-  metadata.gz: 55b29a387293f1af1b37066621967d1a6fc3143649866b438560f386e909500fa1f2a602f37f536477fc84189fbe8dbf5dc06a6d86f332cc0c6e15d1ae3f20d4
-  data.tar.gz: 172ee348a7e0611d9fb0416f5a87b0cce1c3e461ded1cf628b72c8127e8ea7234b3af2404f901ebe5ca5dc16da78a8e73029689239ff415b5a0cf51232a0b811
+  metadata.gz: 7ab7f00be8087ab1300bb239112885cdb5b3135fe18fdeab33bf2c86e82baa3130e2756268c0296feb9fff609f64d7c3a721ce96259dbb9fd42dae57f5882cc7
+  data.tar.gz: e3cf8443136b5fe92bfdfaf5ffd5891c03151b65d96edc1a641414609d5e5edfb7b12008e93902e1b87e4830d432df0e372ae5ca54bc9de0233891f87c6f9b15

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
 
@@ -25,10 +25,10 @@ Use mail as usual. You can enable/disable patched features as follows:
 
 ```ruby
 # disable patch
-Mail::Jenc.disable
+Mail::Jenc.disable!
 
 # enable patch
-Mail::Jenc.enable
+Mail::Jenc.enable!
 ```
 
 ## Contributing

data/lib/mail/jenc/attachments_list_patch.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     module AttachmentsListPatch
       def []=(name, value)
         if Jenc.enabled? && value.is_a?(Hash)
           charset = value.delete(:header_charset)
-          rfc2231 = value.key?(:rfc2231) ? value.delete(:rfc2231) : Jenc.rfc2231
+          rfc2231 = value.key?(:rfc2231) ? value.delete(:rfc2231) : Jenc.config.rfc2231
 
           if name && name.encoding == Encoding::UTF_8 && charset
             mime_type = set_mime_type(name)
@@ -27,6 +29,4 @@ module Mail
   end
 end
 
-unless Mail::AttachmentsList.included_modules.include?(Mail::Jenc::AttachmentsListPatch)
-  Mail::AttachmentsList.prepend Mail::Jenc::AttachmentsListPatch
-end
+Mail::AttachmentsList.prepend Mail::Jenc::AttachmentsListPatch

data/lib/mail/jenc/b_encoder.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     class BEncoder
       class << self
         def encode(str, charset)
-          if Jenc.escape_sequence_charsets.include?(charset.to_s.downcase)
+          if Jenc.config.escape_sequence_charsets.include?(charset.to_s.downcase)
             split(str).map { |s| transcode_and_encode(s, charset) }.join(' ')
           else
             transcode_and_encode(str, charset)

data/lib/mail/jenc/config.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Mail
+  module Jenc
+    class Config
+      NAMES = [:enabled, :rfc2231, :escape_sequence_charsets, :preferred_charsets]
+      NAMES.each do |name|
+        attr_accessor name
+      end
+
+      def initialize(attrs = {})
+        attrs.each do |key, val|
+          send("#{key}=", val)
+        end
+      end
+
+      def attributes
+        NAMES.each_with_object({}) do |name, hash|
+          hash[name] = send(name)
+        end
+      end
+    end
+  end
+end

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,7 @@ 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
-  end
+  klass.prepend Mail::Jenc::CommonAddressFieldPatch
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     module UnstructuredFieldPatch
@@ -17,6 +19,4 @@ module Mail
   end
 end
 
-unless Mail::UnstructuredField.included_modules.include?(Mail::Jenc::UnstructuredFieldPatch)
-  Mail::UnstructuredField.prepend Mail::Jenc::UnstructuredFieldPatch
-end
+Mail::UnstructuredField.prepend Mail::Jenc::UnstructuredFieldPatch

data/lib/mail/jenc/message_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     module MessagePatch
@@ -14,16 +16,24 @@ module Mail
 
       def add_file(values)
         if Jenc.enabled?
-          if values.is_a?(Hash) && header.charset
-            values[:header_charset] = header.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
 
-unless Mail::Message.included_modules.include?(Mail::Jenc::MessagePatch)
-  Mail::Message.prepend Mail::Jenc::MessagePatch
-end
+Mail::Message.prepend Mail::Jenc::MessagePatch

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/utilities_patch.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Mail
+  module Jenc
+    module UtilitiesPatch
+      def transcode_charset(str, from_encoding, to_encoding = Encoding::UTF_8)
+        if Jenc.enabled?
+          coded = super(str, from_encoding, UtilitiesPatch.preferred_charset(to_encoding))
+          coded.force_encoding(to_encoding)
+        else
+          super
+        end
+      end
+
+      class << self
+        def preferred_charset(charset)
+          Jenc.config.preferred_charsets[charset.to_s.downcase] || charset
+        end
+      end
+    end
+  end
+end
+
+Mail::Utilities.singleton_class.prepend Mail::Jenc::UtilitiesPatch

data/lib/mail/jenc/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
-    VERSION = '1.0.10'
+    VERSION = '1.2.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|
@@ -7,30 +9,45 @@ end
 module Mail
   module Jenc
     class << self
-      attr_reader :enabled
-      attr_accessor :rfc2231
-      attr_accessor :escape_sequence_charsets
-      attr_accessor :preferred_charsets
+      @@config = Config.new(
+        enabled: true,
+        rfc2231: false,
+        escape_sequence_charsets: ['iso-2022-jp'],
+        preferred_charsets: {
+          'iso-2022-jp' => 'cp50221',
+          'shift_jis' => 'cp932'
+        }
+      )
+
+      def configure
+        yield @@config
+      end
+
+      THREAD_KEY = :_mail_jenc
+
+      def config
+        Thread.current[THREAD_KEY] || @@config
+      end
+
+      def with_config(hash = {})
+        old = Thread.current[THREAD_KEY]
+        Thread.current[THREAD_KEY] = Config.new(config.attributes.merge(hash))
+        yield
+      ensure
+        Thread.current[THREAD_KEY] = old
+      end
 
       def enabled?
-        @@enabled
+        config.enabled
       end
 
-      def enable
-        @@enabled = true
+      def enable!
+        config.enabled = true
       end
 
-      def disable
-        @@enabled = false
+      def disable!
+        config.enabled = false
       end
     end
-
-    self.enable
-    self.rfc2231 = false
-    self.escape_sequence_charsets = ['iso-2022-jp']
-    self.preferred_charsets = {
-      'iso-2022-jp' => 'cp50221',
-      'shift_jis' => 'cp932'
-    }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jenc
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2023-10-18 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
@@ -84,19 +78,19 @@ files:
 - lib/mail/jenc.rb
 - lib/mail/jenc/attachments_list_patch.rb
 - lib/mail/jenc/b_encoder.rb
+- lib/mail/jenc/config.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/utilities_patch.rb
 - lib/mail/jenc/version.rb
 homepage: https://github.com/kanety/mail-jenc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A mail patch for encoding conventional mail
 test_files: []

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

@@ -1,19 +0,0 @@
-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/ruby_1_9_patch.rb

@@ -1,24 +0,0 @@
-module Mail
-  module Jenc
-    module Ruby19Patch
-      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.force_encoding(to_encoding)
-        else
-          super
-        end
-      end
-
-      class << self
-        def preferred_charset(charset)
-          Jenc.preferred_charsets[charset.to_s.downcase] || charset
-        end
-      end
-    end
-  end
-end
-
-unless Mail::Ruby19.singleton_class.included_modules.include?(Mail::Jenc::Ruby19Patch)
-  Mail::Ruby19.singleton_class.prepend Mail::Jenc::Ruby19Patch
-end