send_grid_mailer 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63020124b1515b99d0c9caf1d5df50ea94321a32c721a7200be76ac46514afca
-  data.tar.gz: b29dbcffafae53610da1043f09b9cb855af6f54f556faa818c7395c205199efb
+  metadata.gz: d3ba49658ee4d361ee0447235860596bfbda468304436ef9853ef240fb578aae
+  data.tar.gz: 578c91e30a4aadc8c6399eab270a661f6d319e60a3197033a1018bd6fcfb5fe4
 SHA512:
-  metadata.gz: 7ab1703c02724aaf91be20a94ef241eecee55c0767efabbe87b7a8ad52d5d1f93f541e1208551a566f7bdf9b909537c6f320a83e610ce26842dc6280fafd7b7a
-  data.tar.gz: fc46b2077fe4e08ecdbce69cf47c2dc3c088c6c9e8d8db36d510480e7cbe008160e5ae1f1cae7b5ddacdb4457976f000dda07819fee62272ad22dcb9ae30f93c
+  metadata.gz: 077a40754df2f0004cf2dc8feff8583b927a644d69acbd67fbf200bbce7d1c3a1edd32f49594f79f0a8808b1d1a672ff67952cfae0a30cca2497d86d5e2a15b4
+  data.tar.gz: 56849b81c28093d0fadcc07e24abe1912a5e3291330d29f3c929f54e117776add2af462e6c8d5533f3fb3e459b8ea34f3def59eaeb038c827d2b065cade5355f

data/.circleci/config.yml

@@ -13,10 +13,10 @@ executors:
     parameters:
       ruby-version:
         description: "Ruby version"
-        default: "2.7"
+        default: "3.2"
         type: string
     docker:
-      - image: circleci/ruby:<<parameters.ruby-version>>-node
+      - image: cimg/ruby:<<parameters.ruby-version>>-node
         environment: *env-vars
 
 commands:
@@ -54,7 +54,7 @@ jobs:
     parameters:
       ruby-version:
         description: "Ruby version"
-        default: "2.7"
+        default: "3.2"
         type: string
     executor:
       name: main-executor
@@ -92,7 +92,7 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby-version: ["2.6", "2.7"]
+              ruby-version: ["2.6", "2.7", "3.1", "3.2"]
       - deploy:
           context: org-global
           filters:

data/.ruby-version

@@ -1 +1 @@
-2.7
+3.2

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### v2.4.0
+
+#### Added
+
+*  Add the set_reply_to method to enable setting the Reply-To header. [#28] thanks @m-quezada-loyola
+
+### v2.3.0
+
+##### Added
+
+* Add Ruby 3.2 support
+
 ### v2.2.0
 
 * :sendgrid_dev replace handlerbars library with a pure ruby implementation. [#25]

data/lib/send_grid_mailer/definition.rb

@@ -6,6 +6,7 @@ module SendGridMailer
       :set_template_id,
       :set_sender,
       :set_recipients,
+      :set_reply_to,
       :set_subject,
       :set_content,
       :add_attachment,
@@ -30,16 +31,10 @@ module SendGridMailer
     end
 
     def set_sender(email)
-      return unless email
-
-      matched_format = email.match(/<(.+)>/)
-      if matched_format
-        address = matched_format[1]
-        name = email.match(/\"?([^<^\"]*)\"?\s?/)[1].strip
-        mail.from = SendGrid::Email.new(email: address, name: name)
-      else
-        mail.from = SendGrid::Email.new(email: email)
-      end
+      email_info = extract_email_and_name(email)
+      return unless email_info
+    
+      mail.from = SendGrid::Email.new(email: email_info[:email], name: email_info[:name])
     end
 
     def set_recipients(mode, *emails)
@@ -50,6 +45,13 @@ module SendGridMailer
       end
     end
 
+    def set_reply_to(email)
+      email_info = extract_email_and_name(email)
+      return unless email_info
+    
+      mail.reply_to = SendGrid::Email.new(email: email_info[:email], name: email_info[:name])
+    end
+
     def set_subject(value)
       return unless value
 
@@ -94,6 +96,19 @@ module SendGridMailer
       @mail ||= SendGrid::Mail.new
     end
 
+    def extract_email_and_name(email)
+      return unless email
+    
+      matched_format = email.match(/<(.+)>/)
+      if matched_format
+        address = matched_format[1]
+        name = email.match(/\"?([^<^\"]*)\"?\s?/)[1].strip
+        { email: address, name: name }
+      else
+        { email: email }
+      end
+    end
+
     def clean_recipients(mode)
       personalization.instance_variable_set("@#{mode}s", [])
     end
@@ -108,6 +123,8 @@ module SendGridMailer
 
     def sender?; mail.from.present? end
 
+    def reply_to?; mail.reply_to.present? end
+
     def subject?; personalization.subject.present? end
 
     def template_id?; mail.template_id.present? end

data/lib/send_grid_mailer/dev_deliverer.rb

@@ -65,6 +65,7 @@ module SendGridMailer
       m.to = emails(:tos) if emails(:tos).present?
       m.cc = emails(:ccs) if emails(:ccs).present?
       m.bcc = emails(:bccs) if emails(:bccs).present?
+      m.reply_to = @sg_definition.mail.reply_to["email"] if @sg_definition.mail.reply_to.present?
 
       m
     end

data/lib/send_grid_mailer/mailer_base_ext.rb

@@ -33,6 +33,7 @@ module ActionMailer
       set_recipients(:to, params[:to])
       set_recipients(:cc, params[:cc])
       set_recipients(:bcc, params[:bcc])
+      set_reply_to(params[:reply_to]) unless sg_definition.reply_to?
       set_subject(params[:subject]) unless sg_definition.subject?
       set_body(params)
       add_attachments

data/lib/send_grid_mailer/version.rb

@@ -1,3 +1,3 @@
 module SendGridMailer
-  VERSION = "2.2.0"
+  VERSION = "2.4.0"
 end

data/spec/dummy/app/mailers/test_mailer.rb

@@ -48,6 +48,15 @@ class TestMailer < ApplicationMailer
     mail(template_id: "XXX")
   end
 
+  def reply_to_email
+    set_reply_to("reply-to@platan.us")
+    mail(body: "X")
+  end
+
+  def reply_to_params_email
+    mail(reply_to: "reply-to@platan.us", body: "X")
+  end
+
   def subject_email
     set_subject("My Subject")
     mail(body: "X")