resend 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67fb549176718ac10025dad2b41cba2519de04a0890631950c4f2d022e6106f8
-  data.tar.gz: de3d5e59326e9ae9fdd1e5d4d0b507a147ecc95aa3ed6db918e4a5f40894d782
+  metadata.gz: e3bd3c129bc391019cd0d3f1c30b40da0354cdc38ab1f2eb8b09830f2276afad
+  data.tar.gz: e7d83291e24db93d771f1a7588b5fc57353f62c86b97b5f9df1d09151f403284
 SHA512:
-  metadata.gz: 77ae6d4b92169173fef0d18661de7e873fdb6c2e33291a0676a5a2ef622845bec3bfff815e63fda76ec6c5f8fb5f267df60b64fa62812544e100ceaa79bd916b
-  data.tar.gz: a2dbe3619bf9958234a96299909937de98a752fe61678fb8d0082d83ba845828ca12fdc593b92c52fffbf98dd9139db9283957a45659aa8b4aba2d4ae5582c9b
+  metadata.gz: c27434e2d97b55af4a0b8bde50e5cf3c398498c460451e3ee5c367d6a78a47c8f65d3ecf7c5b7455de2a40040c4e6533b587fa7a0ee2af57d7ec262f2c2e7bf0
+  data.tar.gz: 671f1d0e1fb99bcfbd254ac0fa70b15c52da9406d0800188e77585be420ed7ec6ef61d8a9a4778ec03414c5275f30fb28633a17825ce7a8e110fcbb180f80c15

data/lib/resend/mailer.rb

@@ -7,6 +7,17 @@ module Resend
   class Mailer
     attr_accessor :config, :settings
 
+    # These are set as `headers` by the Rails API, but these will be filtered out
+    # when constructing the Resend API payload, since they're are sent as post params.
+    # https://resend.com/docs/api-reference/emails/send-email
+    IGNORED_HEADERS = %w[
+      cc bcc
+      from reply-to to subject mime-version
+      html text
+      content-type tags scheduled_at
+      headers
+    ].freeze
+
     def initialize(config)
       @config = config
       raise Resend::Error.new("Make sure your API Key is set", @config) unless Resend.api_key
@@ -51,7 +62,19 @@ module Resend
     end
 
     #
-    # Add custom headers fields
+    # Add custom headers fields.
+    #
+    # Both ways are supported:
+    #
+    #   1. Through the `#mail()` method ie:
+    #     mail(headers: { "X-Custom-Header" => "value" })
+    #
+    #   2. Through the Rails `#headers` method ie:
+    #     headers["X-Custom-Header"] = "value"
+    #
+    #
+    # setting the header values through the `#mail` method will overwrite values set
+    # through the `#headers` method using the same key.
     #
     # @param Mail mail Rails Mail object
     #
@@ -59,7 +82,37 @@ module Resend
     #
     def get_headers(mail)
       params = {}
-      params[:headers] = mail[:headers].unparsed_value if mail[:headers].present?
+
+      if mail[:headers].present? || unignored_headers(mail).present?
+        params[:headers] = {}
+        params[:headers].merge!(headers_values(mail)) if unignored_headers(mail).present?
+        params[:headers].merge!(mail_headers_values(mail)) if mail[:headers].present?
+      end
+
+      params
+    end
+
+    # Gets the values of the headers that are set through the `#mail` method
+    #
+    # @param Mail mail Rails Mail object
+    # @return Hash hash with mail headers values
+    def mail_headers_values(mail)
+      params = {}
+      mail[:headers].unparsed_value.each do |k, v|
+        params[k.to_s] = v
+      end
+      params
+    end
+
+    # Gets the values of the headers that are set through the `#headers` method
+    #
+    # @param Mail mail Rails Mail object
+    # @return Hash hash with headers values
+    def headers_values(mail)
+      params = {}
+      unignored_headers(mail).each do |h|
+        params[h.name.to_s] = h.unparsed_value
+      end
       params
     end
 
@@ -144,5 +197,16 @@ module Resend
       end
       attachments
     end
+
+    #
+    # Get all headers that are not ignored
+    #
+    # @param Mail mail
+    #
+    # @return Array headers
+    #
+    def unignored_headers(mail)
+      @unignored_headers ||= mail.header_fields.reject { |h| IGNORED_HEADERS.include?(h.name.downcase) }
+    end
   end
 end

data/lib/resend/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resend
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resend
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Derich Pacheco
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty