lib/sendgrid_actionmailer.rb in sendgrid-actionmailer-2.1.0 vs lib/sendgrid_actionmailer.rb in sendgrid-actionmailer-2.2.0

@@ -21,11 +21,11 @@
 
     def deliver!(mail)
       sendgrid_mail = Mail.new.tap do |m|
         m.from = to_email(mail.from)
         m.reply_to = to_email(mail.reply_to)
-        m.subject = mail.subject
+        m.subject = mail.subject || ""
         # https://sendgrid.com/docs/Classroom/Send/v3_Mail_Send/personalizations.html
         m.add_personalization(to_personalizations(mail))
       end
 
       add_api_key(sendgrid_mail, mail)
@@ -81,13 +81,14 @@
         to_emails(mail.cc).each { |cc| p.add_cc(cc) }
         to_emails(mail.bcc).each { |bcc| p.add_bcc(bcc) }
 
         if mail['dynamic_template_data']
           p.add_dynamic_template_data(json_parse(mail['dynamic_template_data'].value))
+        else
+          p.add_substitution(Substitution.new(key: "%asm_group_unsubscribe_raw_url%", value: "<%asm_group_unsubscribe_raw_url%>"))
+          p.add_substitution(Substitution.new(key: "%asm_global_unsubscribe_raw_url%", value: "<%asm_global_unsubscribe_raw_url%>"))
+          p.add_substitution(Substitution.new(key: "%asm_preferences_raw_url%", value: "<%asm_preferences_raw_url%>"))
         end
-        p.add_substitution(Substitution.new(key: "%asm_group_unsubscribe_raw_url%", value: "<%asm_group_unsubscribe_raw_url%>"))
-        p.add_substitution(Substitution.new(key: "%asm_global_unsubscribe_raw_url%", value: "<%asm_global_unsubscribe_raw_url%>"))
-        p.add_substitution(Substitution.new(key: "%asm_preferences_raw_url%", value: "<%asm_preferences_raw_url%>"))
       end
     end
 
     def to_attachment(part)
       Attachment.new.tap do |a|