mail-jenc 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659a351886afb57bc995d5059ba5a7771f342bb42543963abc18fcf7cfc2f232
-  data.tar.gz: a7403f922e8aeff212f8da861c6cb12da21bd54823c10b800e2f471d0e5a2701
+  metadata.gz: 6be26126a52c7fa6f1b764db469345786c068acd66b5ab06220164446d66e06e
+  data.tar.gz: 00e48f04acba4a936c0304c5b83b44680a1ae858433592b2182693dab4b7a904
 SHA512:
-  metadata.gz: bec8d00b898b8b67bfe177aae5d40403f7b52f7a8477732091d51a1bbe8b82732a86f80b707371e3b4a0a155ae5eb60fe95310c4f28e6c4d13d5d10318da340b
-  data.tar.gz: ef8a1742265b7b27302ee91f7081da69183073152a750f94c4db0d7f86e8aa7d582b3ddb46f4a0fcbab625989da79d6de307d85edc6d0517f68e14cd9f7803bb
+  metadata.gz: 64eb29b35a617a0ce374c8e845bc96e0df1e6031dba548d767f10f522e2c4fa85e46ca08d19dbd8339333c365fc3396e92c7155c424ef419b99e712d89da489f
+  data.tar.gz: 5524579d13014fb391b9d96fa494b1383946778b907c3e31aef100c2410a1e5e01edad7b6507748a34957bd21f5ce90060c6a9244614a1ecd8689e520f3dc9ba

data/README.md

@@ -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

@@ -6,7 +6,7 @@ module Mail
       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)
@@ -29,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

@@ -5,7 +5,7 @@ module Mail
     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

@@ -23,7 +23,5 @@ end
 
 klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonAddressField }
 klasses.each do |klass|
-  unless klass.included_modules.include?(Mail::Jenc::CommonAddressFieldPatch)
-    klass.prepend Mail::Jenc::CommonAddressFieldPatch
-  end
+  klass.prepend Mail::Jenc::CommonAddressFieldPatch
 end

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

@@ -19,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

@@ -36,6 +36,4 @@ module Mail
   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/smtp_envelope_patch.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'mail/smtp_envelope'
+
+module Mail
+  module Jenc
+    module SmtpEnvelopePatch
+      def validate_addr(addr_name, addr)
+        if Jenc.enabled?
+          super(addr_name, addr.to_s)
+          addr
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+Mail::SmtpEnvelope.prepend Mail::Jenc::SmtpEnvelopePatch

data/lib/mail/jenc/utilities_patch.rb

@@ -14,13 +14,11 @@ module Mail
 
       class << self
         def preferred_charset(charset)
-          Jenc.preferred_charsets[charset.to_s.downcase] || charset
+          Jenc.config.preferred_charsets[charset.to_s.downcase] || charset
         end
       end
     end
   end
 end
 
-unless Mail::Utilities.singleton_class.included_modules.include?(Mail::Jenc::UtilitiesPatch)
-  Mail::Utilities.singleton_class.prepend Mail::Jenc::UtilitiesPatch
-end
+Mail::Utilities.singleton_class.prepend Mail::Jenc::UtilitiesPatch

data/lib/mail/jenc/version.rb

@@ -2,6 +2,6 @@
 
 module Mail
   module Jenc
-    VERSION = '1.1.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/mail/jenc.rb

@@ -9,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.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -78,18 +78,20 @@ 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/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/smtp_envelope_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
@@ -104,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A mail patch for encoding conventional mail
 test_files: []