mail-jenc 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce87dd8df9f740e8fa733161962382dd20924534f720769c4efe0b0bc91a22db
-  data.tar.gz: 1755e999ed838155ed411e3703250ad61634176f0a8299796040ff19f2fe859b
+  metadata.gz: 659a351886afb57bc995d5059ba5a7771f342bb42543963abc18fcf7cfc2f232
+  data.tar.gz: a7403f922e8aeff212f8da861c6cb12da21bd54823c10b800e2f471d0e5a2701
 SHA512:
-  metadata.gz: 55b29a387293f1af1b37066621967d1a6fc3143649866b438560f386e909500fa1f2a602f37f536477fc84189fbe8dbf5dc06a6d86f332cc0c6e15d1ae3f20d4
-  data.tar.gz: 172ee348a7e0611d9fb0416f5a87b0cce1c3e461ded1cf628b72c8127e8ea7234b3af2404f901ebe5ca5dc16da78a8e73029689239ff415b5a0cf51232a0b811
+  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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mail
   module Jenc
     module AttachmentsListPatch

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) && 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

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.10'
+    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.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 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
@@ -85,12 +79,11 @@ files:
 - lib/mail/jenc/attachments_list_patch.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/utilities_patch.rb
 - lib/mail/jenc/version.rb
 homepage: https://github.com/kanety/mail-jenc
 licenses:
@@ -111,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A mail patch for encoding conventional mail

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