ses_api-rails 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de9daf34f95efa8b7df130f3aa60a03a4ff19a8
-  data.tar.gz: 55dc920bb50c3a435040e9556d3c66a08bd92b23
+  metadata.gz: fbc9437dc0c338b9dbd896f49e490c91434146c9
+  data.tar.gz: c1794cfaf066969298a913830928adf5513abddd
 SHA512:
-  metadata.gz: 1dc9fc30d9186dc9eaea6293447522ef1bd2ffeb7cca7114dbabdce90d4271dc4e20ee39d3d7f36fb78a77c6b0eb82e9443667a1441e092e7e958138e343a14e
-  data.tar.gz: ece94310d777f0ae08604db59014caa008be02fdf4989387c208e3322327a51d7c995b6dd9a35071293c32c84d30a07a927e7aa5a2e24ba79cc0824b9294bb31
+  metadata.gz: 92eb2f7e7708052aa272a85de157892be39d8e519442454fb5af2b209ed48d085fbdccdf8079493f006800f84fa9329e79f9febab6a436d34a6c1847a94a876a
+  data.tar.gz: bb5380c00ec717c258892c31dc0bdcdeb0c926e3b3bc57da8333f833a536964b96edfa5a6ddaf94b3ba8388150b75e1639884159c15b58942803d57c6220cf22

data/lib/ses_api/rails/api.rb

@@ -54,10 +54,9 @@ module SesApi
       end
 
       def create_payload
-        to = mail.to.each_with_index.map { |email, i| "&Destination.ToAddresses.member.#{i+1}=#{CGI::escape(email)}"}.join
-        cc = mail.cc.each_with_index.map { |email, i| "&Destination.CcAddresses.member.#{i+1}=#{CGI::escape(email)}"}.join if mail.cc.present?
-        bcc = mail.bcc.each_with_index.map { |email, i| "&Destination.BccAddresses.member.#{i+1}=#{CGI::escape(email)}"}.join if mail.bcc.present?
-        from = "&Source=#{CGI::escape(mail.from[0])}"
+        display_names = create_display_names
+        destinations = build_destination_addresses(display_names)
+        from = "&Source=#{format_email(mail.from[0], display_names)}"
         subject = "&Message.Subject.Data=#{CGI::escape(mail.subject)}"
 
         if mail.body.raw_source.present?
@@ -68,7 +67,31 @@ module SesApi
           body << "&Message.Body.Text.Data=#{CGI::escape(mail.text_part.body.raw_source)}&Message.Body.Text.Charset=UTF-8"
         end
 
-        payload = "AWSAccessKeyId=#{SesApi::Rails.configuration.access_key_id}&Action=SendEmail#{to}#{cc}#{bcc}#{body}#{subject}#{from}"
+        payload = "AWSAccessKeyId=#{SesApi::Rails.configuration.access_key_id}&Action=SendEmail#{destinations}#{body}#{subject}#{from}"
+      end
+
+      def create_display_names
+        display_names = {}
+        mail.header.fields.each do |f|
+          if %w[To From Cc Bcc].include? f.name
+            f.address_list.addresses.each do |a|
+              email = "#{a.local}@#{a.domain}"
+              display_names.[]=(email, a.display_name) ? a.display_name.present? : a.local
+            end
+          end
+        end
+        display_names
+      end
+
+      def build_destination_addresses(display_names)
+        to = mail.to.each_with_index.map { |email, i| "&Destination.ToAddresses.member.#{i+1}=#{format_email(email, display_names)}"}.join
+        cc = mail.cc.each_with_index.map { |email, i| "&Destination.CcAddresses.member.#{i+1}=#{format_email(email, display_names)}"}.join if mail.cc.present?
+        bcc = mail.bcc.each_with_index.map { |email, i| "&Destination.BccAddresses.member.#{i+1}=#{format_email(email, display_names)}"}.join if mail.bcc.present?
+        return "#{to}#{cc}#{bcc}"
+      end
+
+      def format_email(email, display_names)
+        CGI::escape("#{display_names[email]}<#{email}>")
       end
 
       def create_canonical_request(headers, hashed_payload, signed_headers)

data/lib/ses_api/rails/version.rb

@@ -1,5 +1,5 @@
 module SesApi
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ses_api-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Ickes