mail-ses 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5076a7ce9398b8272a112f6ef1c3617459147ce22a1c9086f7c5e27dfa0b537d
-  data.tar.gz: 97cb25004d481a9d9c8129db9248513b4ff08c6b68a298c307a137210554fff6
+  metadata.gz: f36fa8ab1100cbb6f4fe9702bb821a133a476a3819fd638f9ef92c1abeb99b8b
+  data.tar.gz: 3e2c95acbc148a29c1a7cb21342d0e4de459ef3ac83e1bfdf8aceb73ad1e1c30
 SHA512:
-  metadata.gz: 3fe5da3cc1004f2dd7c05a7ce444c8c0453b1c599b4066085b1673f30fd75b475184168a2cc585e59eaebed9a032195c1d67253bbf29b6a9fbb396eb3b849cdc
-  data.tar.gz: 5847f439fa23d06aea8c1af63b4514ff0c90b1d4012c2919a6ebef05d2f31ec5563b0cd02945e0df03018f72a054883b328a21283c380af5ab2226a6a082fba6
+  metadata.gz: d8da07c2fd176ec7d44b5944ae1defd6f5406cb83ced2877ab4a7bf8caefe6b91b12a09f4fff084e5efb4c4866f17e2728d0d0a17c21ede5909fedbc1367e963
+  data.tar.gz: 2d488a916475fc9bfc4d1d206c3f7316e8873d213d3f249267a41abc4549d1d61bbb4fb2bf7bdbef89fde299d8f79022982a33c72fcf25525eb7cbc98289efda

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+### 1.0.3
+
+- Support UTF-8 chars in from, to, etc addresses.
+
+### 1.0.2
+
+- Fix labels in being stripped from email addresses.
+- Support Reply-To address.
+
+### 1.0.1
+
+- Add compatibility with Mail gem 2.8.0.
+
 ### 1.0.0
 
 - BREAKING CHANGE: Upgrade to AWS Ruby SDK v3 - SESv2 API ([@khrvi](https://github.com/khrvi))

data/lib/mail/ses/message_validator.rb

@@ -25,7 +25,11 @@ module Mail
       end
 
       def validate_delivery_params
-        Mail::CheckDeliveryParams.check(@message)
+        if defined?(Mail::CheckDeliveryParams) # mail gem < 2.7.0
+          Mail::CheckDeliveryParams.check(@message)
+        elsif defined?(Mail::SmtpEnvelope) # mail gem >= 2.8.0
+          Mail::SmtpEnvelope.new(@message)
+        end
       end
 
       def validate_attachments

data/lib/mail/ses/options_builder.rb

@@ -4,6 +4,14 @@ module Mail
   class SES
     # Builds options for Aws::SESV2::Client#send_email
     class OptionsBuilder
+      SES_FIELDS = %i[ from_email_address
+                       from_email_address_identity_arn
+                       reply_to_addresses
+                       feedback_forwarding_email_address
+                       feedback_forwarding_email_address_identity_arn
+                       email_tags
+                       configuration_set_name ].freeze
+
       # message - The Mail::Message object to be sent.
       # options - The Hash options which override any defaults
       #           from the message.
@@ -20,16 +28,18 @@ module Mail
       private
 
       def ses_options
-        slice_hash(@options, *RAW_EMAIL_ATTRS)
+        # TODO: address fields should be encoded to UTF-8
+        slice_hash(@options, *SES_FIELDS)
       end
 
       def message_options
         {
-          from_email_address: @message.from&.first,
+          from_email_address: extract_value(:from)&.first,
+          reply_to_addresses: extract_value(:reply_to),
           destination: {
-            to_addresses: Array(@message.to).compact,
-            cc_addresses: Array(@message.cc).compact,
-            bcc_addresses: Array(@message.bcc).compact
+            to_addresses: extract_value(:to) || [],
+            cc_addresses: extract_value(:cc) || [],
+            bcc_addresses: extract_value(:bcc) || []
           },
           content: { raw: { data: @message.to_s } }
         }.compact
@@ -38,6 +48,14 @@ module Mail
       def slice_hash(hash, *keys)
         keys.each_with_object({}) { |k, h| h[k] = hash[k] if hash.key?(k) }
       end
+
+      def extract_value(key)
+        @message.header[key]&.formatted&.map { |v| encode(v) }
+      end
+
+      def encode(value)
+        Mail::Encodings.address_encode(value)
+      end
     end
   end
 end

data/lib/mail/ses/version.rb

@@ -2,6 +2,6 @@
 
 module Mail
   class SES
-    VERSION = '1.0.0'
+    VERSION = '1.0.3'
   end
 end

data/lib/mail/ses.rb

@@ -7,13 +7,6 @@ require 'mail/ses/options_builder'
 module Mail
   # Mail delivery method handler for AWS SES
   class SES
-    RAW_EMAIL_ATTRS = %i[ from_email_address
-                          from_email_address_identity_arn
-                          feedback_forwarding_email_address
-                          feedback_forwarding_email_address_identity_arn
-                          email_tags
-                          configuration_set_name ].freeze
-
     attr_accessor :settings
     attr_reader :client
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-ses
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Johnny Shields
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sesv2
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: Ruby Mail delivery method handler for Amazon SES