azure_communication_email 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6425a9b60979a7f4d2388fd367a092ee2f63ffa90c087ab71e923bb8944419f
-  data.tar.gz: a455a2ec63a22d96849d102a0af4860633c76720ce85d6b35d20b9fa68461c96
+  metadata.gz: e13809a220b8a5a263414d0b53618afb1ed9006d576d9df3bc784b766e3c6faf
+  data.tar.gz: 1cf7750c4545e6dfe01c756a950212387e771a080345532b9cdf368bed4fe548
 SHA512:
-  metadata.gz: df8bb2c7678d15227d6b50d3ecc950cf8984a05ef71f870e82dd0fc8f6bce24439fd59d291a684d280e3a61e8f987579675a9d939bf6a49deda8971e4774880b
-  data.tar.gz: 7ca782265ac31312825f7fbc78cac03225266e9edfb55cd8e9ca6d62012f780a2462d2c254e91c3748fb4dd10bebe1fc74935a5c88a1d271f97c1e6e1f93ca65
+  metadata.gz: cda943ef50229a34293a1c0b87fc9b99835c6279c863a5f4857dc6adbbb2c88bec93596751e59cdb55c17ca25949c223cb27c551ce1e96d7c02976928f029761
+  data.tar.gz: ee436d8da33038971b9491568a2794420b448662a5086f5a4164fca2ca80fdb2bd10ddff6979e0e96362f64e3ad7f8e9454e1e1147fc3574dac0dc45b562d64f

data/README.md

@@ -1,6 +1,6 @@
 # Azure Communication Email
 
-Azure Communication Email is an Action Mailer delivery method for Ruby on Rails using the Azure Communication Email API.
+Azure Communication Email is an Action Mailer delivery method for Ruby on Rails using the [Azure Email Communications Service](https://learn.microsoft.com/en-us/azure/communication-services/quickstarts/email/create-email-communication-resource?pivots=platform-azp).
 
 ## Installation
 
@@ -26,12 +26,28 @@ To send emails using Azure Communication Services, configure Action Mailer with
 Rails.application.configure do
   config.action_mailer.delivery_method = :azure_communication_email
   config.action_mailer.azure_communication_email_settings = {
-    endpoint:   ENV.fetch("ACS_EMAIL_ENDPOINT"),
+    endpoint:   ENV.fetch("ACS_EMAIL_ENDPOINT"), # e.g., "https://<RESOURCE_NAME>.communication.azure.com"
     access_key: ENV.fetch("ACS_EMAIL_ACCESS_KEY"),
   }
 end
 ```
 
+Then, you can use Action Mailer as usual:
+
+```ruby
+class UserMailer < ApplicationMailer
+  def welcome_email(user)
+    @user = user
+    mail(to: @user.email, from: "donotreply@<yourdomain>.com", subject: "Hello World!")
+  end
+end
+```
+
+## Links
+
+- [Service limits for Azure Communication Services](https://learn.microsoft.com/en-us/azure/communication-services/concepts/service-limits#email)
+- [How to add and remove Multiple Sender Addresses to Email Communication Service](https://learn.microsoft.com/en-us/azure/communication-services/quickstarts/email/add-multiple-senders?pivots=platform-azp)
+
 ## Contributing
 
 Bug reports and pull requests are welcome.

data/lib/azure_communication_email/delivery_method.rb

@@ -10,7 +10,7 @@ require "uri"
 
 module AzureCommunicationEmail
   class DeliveryMethod
-    DEFAULTS = { api_version: "2023-03-31" }
+    DEFAULTS = { api_version: "2025-01-15-preview" }
 
     attr_accessor :endpoint, :api_version, :access_key
 

data/lib/azure_communication_email/payload.rb

@@ -12,32 +12,44 @@ module AzureCommunicationEmail
 
     def as_json
       hash = {
-        "senderAddress" => first_address(@mail.from),
+        "senderAddress" => first_sender_address,
         "content" => {
           "subject"   => @mail.subject.to_s,
           "plainText" => plain_text_body
         },
         "recipients" => {
-          "to" => recipient_objects(@mail.to)
+          "to" => recipient_objects(:to)
         }
       }
 
-      html = html_body
-      hash["content"]["html"] = html if html.present?
+      # Does only work with custom domains
+      if (name = first_sender_display_name).present?
+        hash["senderDisplayName"] = name
+      end
+
+      if (html = html_body).present?
+        hash["content"]["html"] = html
+      end
 
-      cc  = recipient_objects(@mail.cc)
-      bcc = recipient_objects(@mail.bcc)
-      hash["recipients"]["cc"]  = cc  if cc.present?
-      hash["recipients"]["bcc"] = bcc if bcc.present?
+      if (cc = recipient_objects(:cc)).present?
+        hash["recipients"]["cc"] = cc
+      end
 
-      reply_to = recipient_objects(@mail.reply_to)
-      hash["replyTo"] = reply_to if reply_to.present?
+      if (bcc = recipient_objects(:bcc)).present?
+        hash["recipients"]["bcc"] = bcc
+      end
+
+      if (reply_to = recipient_objects(:reply_to)).present?
+        hash["replyTo"] = reply_to
+      end
 
-      headers = custom_headers
-      hash["headers"] = headers if headers.present?
+      if (headers = custom_headers).present?
+        hash["headers"] = headers
+      end
 
-      attachments = attachment_objects
-      hash["attachments"] = attachments if attachments.present?
+      if (attachments = attachment_objects).present?
+        hash["attachments"] = attachments
+      end
 
       hash
     end
@@ -49,23 +61,61 @@ module AzureCommunicationEmail
     private
 
     def plain_text_body
-      if @mail.text_part
-        @mail.text_part.decoded
-      else
-        @mail.body.decoded.to_s
-      end
+      return extract_text_part if @mail.text_part
+      return extract_plain_body if @mail.mime_type.to_s.start_with?("text/plain")
+      return extract_bare_body   if @mail.mime_type.to_s.blank?
+
+      "" # HTML-only message
     end
 
     def html_body
-      @mail.html_part&.decoded
+      return extract_html_part if @mail.html_part
+      return extract_html_body if @mail.mime_type.to_s.start_with?("text/html")
+
+      nil
+    end
+
+    def extract_text_part
+      @mail.text_part.body.decoded.to_s
     end
 
-    def first_address(list)
-      Array(list).compact_blank.first
+    def extract_plain_body
+      @mail.body.decoded.to_s
     end
 
-    def recipient_objects(addresses)
-      Array(addresses).compact_blank.map { |address| { "address" => address } }
+    def extract_bare_body
+      @mail.body&.decoded.to_s
+    end
+
+    def extract_html_part
+      @mail.html_part.body.decoded.to_s
+    end
+
+    def extract_html_body
+      @mail.body.decoded.to_s
+    end
+
+    def address_list(field_sym)
+      field = @mail[field_sym]
+      return [] unless field.respond_to?(:addrs)
+      field.addrs
+    end
+
+    def first_sender_address
+      address_list(:from).first&.address.to_s
+    end
+
+    def first_sender_display_name
+      address_list(:from).first&.display_name.to_s.strip
+    end
+
+    def recipient_objects(field_sym)
+      address_list(field_sym).map do |addr|
+        obj = { "address" => addr.address.to_s }
+        name = addr.display_name.to_s.strip
+        obj["displayName"] = name if name.present?
+        obj
+      end
     end
 
     def attachment_objects
@@ -84,8 +134,8 @@ module AzureCommunicationEmail
       return {} unless @mail.header
 
       @mail.header.fields
-        .select { |field| field.name =~ /\AX-/i }
-        .to_h { |field| [ field.name, field.value.to_s ] }
+           .select { |field| field.name =~ /\AX-/i }
+           .to_h { |field| [ field.name, field.value.to_s ] }
     end
   end
 end

data/lib/azure_communication_email/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AzureCommunicationEmail
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure_communication_email
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Devran Cosmo Uenal
@@ -65,8 +65,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
-description: Action Mailer delivery method using the Azure Communication Services
-  Email API.
+description: Action Mailer delivery method using the Azure Email Communications Service.
 email:
 - maccosmo@gmail.com
 executables: []
@@ -105,5 +104,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.7.1
 specification_version: 4
-summary: Azure Communication Services Email Delivery Method for Action Mailer
+summary: Azure Email Communications Service Delivery Method for Action Mailer
 test_files: []