sendgrid-actionmailer 0.2.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279c424c1fb91a3d43959b079eb62ff18cc49f4b
-  data.tar.gz: 612acbbe466f59ef1cfe8fb43d3e50b905b480c7
+  metadata.gz: 92aceed9d68cf14a3c461fef95478935b2d6abad
+  data.tar.gz: cda4360a31bddc4dbc8dd02b1ad6bf96519b1f84
 SHA512:
-  metadata.gz: efa913396a27fca27aaa83f3aa4ee00f9c59a8e5706d881d097e43e7a2d246fb06283f6c58a41ebe468fd997a6b2b7e56fe43b444597c31fe465bfaca2ff007e
-  data.tar.gz: 22c1f0dc2f693e4788cd508ccb2a4a7997e4437423ceea8c6eeaf5372dd2905c52447660dd0590f548f1f17dc2faa07410f3efebe1732af47a587502b88702fc
+  metadata.gz: 7687cc4ede183737d615e2892844f1ac538e8b629f74952fd584761a81207c32fdcc44cd031898bc00996edc8a2eb13dbe5c01cbaf4bf951c2f31532d99c553e
+  data.tar.gz: e63c5d2236e329ab7b7898875c0d87fa2ffa34565e9b0ddbd58aa70753be615a4ea22a428b20f4e879e9b97cb0ac50209f3b5dfff80a825863a51c084fc1fdfc

data/.travis.yml

@@ -1,11 +1,14 @@
 sudo: false
 language: ruby
 rvm:
-- 2.2.1
-- 2.0.0
-- 1.9.3
-before_script:
-- bundle install
+  - 2.5.1
+  - 2.4.4
+  - 2.3.4
+  - 2.3.7
+  - 2.2.10
+before_install:
+  - gem install bundler
 gemfile:
   - gemfiles/mail_2.5.gemfile
   - gemfiles/mail_2.6.gemfile
+  - gemfiles/mail_2.7.gemfile

data/Appraisals

@@ -5,3 +5,7 @@ end
 appraise "mail-2.6" do
   gem "mail", "2.6.4"
 end
+
+appraise "mail-2.7" do
+  gem "mail", "2.7.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.0.0 - 2018-08-15
+
+### Changed
+
+- Compatibility with `sendgrid-ruby` v5.0.
+
 ## 0.2.1 - 2016-04-26
 
 ### Fixed

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sendgrid-actionmailer.gemspec
 gemspec
+
+if RUBY_VERSION < '2'
+  gem 'public_suffix', '~> 1.4.6'
+  gem 'mime-types', '~> 2.99'
+end

data/README.md

@@ -1,23 +1,12 @@
 # SendGrid ActionMailer
 
-An ActionMailer adapter to send email using SendGrid's HTTPS Web API (instead of SMTP).
-
-[![BuildStatus](https://travis-ci.org/eddiezane/sendgrid-actionmailer.svg?branch=master)](https://travis-ci.org/eddiezane/sendgrid-actionmailer)
+An ActionMailer adapter to send email using SendGrid's HTTPS Web API (instead of SMTP). Compatible with Rails 5 and Sendgrid API v3.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'sendgrid-actionmailer'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sendgrid-actionmailer
-    
+    gem 'sendgrid-actionmailer', github: 'eddiezane/sendgrid-actionmailer'
 
 ## Usage
 
@@ -26,74 +15,210 @@ Create a [SendGrid API Key](https://app.sendgrid.com/settings/api_keys) for your
 ```ruby
 config.action_mailer.delivery_method = :sendgrid_actionmailer
 config.action_mailer.sendgrid_actionmailer_settings = {
-  api_key: ENV['SENDGRID_API_KEY']
+  api_key: ENV['SENDGRID_API_KEY'],
+  raise_delivery_errors: true
 }
 ```
 
 Normal ActionMailer usage will now transparently be sent using SendGrid's Web API.
 
-### X-SMTPAPI
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body')```
+
+### Dynamic API Key
+
+If you need to send mail for a number of Sendgrid accounts, you can set the API key for these as follows:
 
-You may optionally set SendGrid's [X-SMTPAPI](https://sendgrid.com/docs/API_Reference/SMTP_API/index.html) header on messages to control SendGrid specific functionality. This header must be set to a JSON string.
 
 ```ruby
-class UserMailer < ApplicationMailer
-  def welcome_email(user)
-    headers['X-SMTPAPI'] = {
-      category: ['newuser']
-    }.to_json
-
-    mail(to: user.email, subject: 'Welcome to My Awesome Site')
-  end
-end
+mail(to: 'example@email.com',
+     subject: 'email subject',
+     body: 'email body',
+     delivery_method_options: {
+       api_key: 'SENDGRID_API_KEY'
+     })
 ```
 
-The following `X-SMTPAPI` options are supported:
+## SendGrid Mail Extensions
 
-- `filters`
-- `category`
-- `send_at`
-- `send_each_at`
-- `section`
-- `sub`
-- `asm_group_id`
-- `unique_args`
-- `ip_pool`
+The Mail functionality is extended to include additional attributes provided by the Sendgrid API.
 
-#### X-SMTPAPI Defaults
+[Sendgrid v3 API Documentation](https://sendgrid.com/docs/API_Reference/api_v3.html)
 
-Default values for the `X-SMTPAPI` header may be set at different levels using ActionMailer's normal options for setting default headers. However, since `X-SMTPAPI` is treated as a single string value, it's important to note that default values at different levels will not get merged together. So if you override the `X-SMTPAPI` header at any level, you may need to repeat any default values at more specific levels.
+### template_id (string)
+The id of a template that you would like to use. If you use a template that contains a subject and content (either text or html), you do not need to specify those at the personalizations nor message level.
 
-Global defaults can be set inside `config/application.rb`:
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', template_id: 'template_1')```
 
-```ruby
-config.action_mailer.default_options = {
-  'X-SMTPAPI' => {
-    ip_pool: 'marketing_ip_pool'
-  }.to_json
-}
-```
+### sections (object)
+An object of key/value pairs that define block sections of code to be used as substitutions.
 
-Per-mailer defaults can be set inside an ActionMailer class:
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', sections: {'%header%' => "<h1>Header</h1>"})```
 
-```ruby
-class NewsletterMailer < ApplicationMailer
-  default('X-SMTPAPI' => {
-    category: ['newsletter'],
-
-    # Assuming the above "config.action_mailer.default_options" global default
-    # example, the default "ip_pool" value must be repeated here if you want
-    # that default value to also apply to this specific mailer that's
-    # specifying it's own default X-SMTPAPI value.
-    ip_pool: 'marketing_ip_pool'
-  }.to_json)
-end
-```
+### headers (object)
+An object containing key/value pairs of header names and the value to substitute for them. You must ensure these are properly encoded if they contain unicode characters. Must not be one of the reserved headers.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', headers: {'X-CUSTOM-HEADER' => "foo"})```
+
+### categories (array)
+An array of category names for this message. Each category name may not exceed 255 characters.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', categories: ['marketing', 'sales'])```
+
+### custom_args (object)
+Values that are specific to the entire send that will be carried along with the email and its activity data. Substitutions will not be made on custom arguments, so any string that is entered into this parameter will be assumed to be the custom argument that you would like to be used. This parameter is overridden by personalizations[x].custom_args if that parameter has been defined. Total custom args size may not exceed 10,000 bytes.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', custom_args: {campaign: 'welcome'})```
+
+### send_at (integer)
+A unix timestamp allowing you to specify when you want your email to be delivered. This may be overridden by the personalizations[x].send_at parameter. You can't schedule more than 72 hours in advance. If you have the flexibility, it's better to schedule mail for off-peak times. Most emails are scheduled and sent at the top of the hour or half hour. Scheduling email to avoid those times (for example, scheduling at 10:53) can result in lower deferral rates because it won't be going through our servers at the same times as everyone else's mail.
+
+### batch_id (string)
+This ID represents a batch of emails to be sent at the same time. Including a batch_id in your request allows you include this email in that batch, and also enables you to cancel or pause the delivery of that batch. For more information, see [cancel_schedule_send](https://sendgrid.com/docs/API_Reference/Web_API_v3/cancel_schedule_send.html)
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', send_at: 1443636842, batch_id: 'batch1')```
+
+### asm (object)
+An object allowing you to specify how to handle unsubscribes.
+
+#### group_id (integer) *required
+The unsubscribe group to associate with this email.
+
+#### groups_to_display (array[integer])
+An array containing the unsubscribe groups that you would like to be displayed on the unsubscribe preferences page.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', asm: group_id: 99, groups_to_display: [4,5,6,7,8])```
+
+### ip_pool_name (string)
+The IP Pool that you would like to send this email from.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', ip_pool_name: 'marketing_ips')```
+
+### mail_settings (object)
+A collection of different mail settings that you can use to specify how you would like this email to be handled.
+
+#### bcc (object)
+This allows you to have a blind carbon copy automatically sent to the specified email address for every email that is sent.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+##### email (string)
+The email address that you would like to receive the BCC.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', mail_settings: {bcc: {enable: true, email: 'bcc@example.com}})```
+
+#### bypass_list_management (object)
+Allows you to bypass all unsubscribe groups and suppressions to ensure that the email is delivered to every single recipient. This should only be used in emergencies when it is absolutely necessary that every recipient receives your email.
+
+###### enable (boolean)
+Indicates if this setting is enabled.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  mail_settings:{ bypass_list_management: { enable: true }})```
+
+#### footer (object)
+The default footer that you would like included on every email.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+##### text (string)
+The plain text content of your footer.
+
+##### html (string)
+The HTML content of your footer.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  mail_settings:{ footer: { enable: true, text: 'FOOTER', html: '<h1>FOOTER</h1>' }})```
+
+#### sandbox_mode (object)
+This allows you to send a test email to ensure that your request body is valid and formatted correctly.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  mail_settings:{ sandbox_mode: { enable: true }})```
+
+#### spam_check (object)
+This allows you to test the content of your email for spam.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+##### threshold (integer)
+The threshold used to determine if your content qualifies as spam on a scale from 1 to 10, with 10 being most strict, or most likely to be considered as spam.
+
+##### post_to_url (string)
+An Inbound Parse URL that you would like a copy of your email along with the spam report to be sent to.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  mail_settings:{ spam_check: {enable: true, threshold: 1, post_to_url: 'https://spamcatcher.sendgrid.com'}})```
+### tracking_settings(json)
+Settings to determine how you would like to track the metrics of how your recipients interact with your email.
+
+#### click_tracking(object)
+Allows you to track whether a recipient clicked a link in your email.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+#####  enable_text (boolean)
+Indicates if this setting should be included in the text/plain portion of your email.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  tracking_settings:{ enable: false, enable_text: false }})```
+
+#### open_tracking (object)
+Allows you to track whether the email was opened or not, but including a single pixel image in the body of the content. When the pixel is loaded, we can log that the email was opened.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+##### substitution_tag (string)
+Allows you to specify a substitution tag that you can insert in the body of your email at a location that you desire. This tag will be replaced by the open tracking pixel.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  tracking_settings:{ enable: true, substitution_tag: 'Optional tag to replace with the open image in the body of the message' }})```
+
+#### subscription_tracking (object)
+Allows you to insert a subscription management link at the bottom of the text and html bodies of your email. If you would like to specify the location of the link within your email, you may use the substitution_tag.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+##### text (string)
+Text to be appended to the email, with the subscription tracking link. You may control where the link is by using the tag <% %>
+
+##### html (string)
+HTML to be appended to the email, with the subscription tracking link. You may control where the link is by using the tag <% %>
+
+##### substitution_tag (string)
+A tag that will be replaced with the unsubscribe URL. for example: [unsubscribe_url]. If this parameter is used, it will override both the text and html parameters. The URL of the link will be placed at the substitution tag’s location, with no additional formatting.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  tracking_settings:{ enable: true, text: 'text to insert into the text/plain portion of the message', html: 'html to insert into the text/html portion of the message', substitution_tag: 'Optional tag to replace with the open image in the body of the message' }})```
+
+#### ganalytics (object)
+Allows you to enable tracking provided by Google Analytics.
+
+##### enable (boolean)
+Indicates if this setting is enabled.
+
+##### utm_source (string)
+Name of the referrer source. (e.g. Google, SomeDomain.com, or Marketing Email)
+
+##### utm_medium (string)
+Name of the marketing medium. (e.g. Email)
+
+##### utm_term (string)
+Used to identify any paid keywords.
+
+##### utm_content (string)
+Used to differentiate your campaign from advertisements.
+
+##### utm_campaign (string)
+The name of the campaign.
+
+```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  tracking_settings:{ enable: true, utm_source: 'some source', utm_medium: 'some medium', utm_term: 'some term', utm_content: 'some content', utm_campaign: 'some campaign' }})```
+
+### Unsubscribe Links
 
-## Contributing
+Sendgrid unfortunately uses <% %> for their default substitution syntax, which makes it incompatible with Rails templates. Their proposed solution is to use Personalization Substitutions with the v3 Mail Send Endpoint.  This gem makes that modification to make the following Rails friendly unsubscribe urls.
 
-1. Fork it ( https://github.com/[my-github-username]/sendgrid-actionmailer/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+ * `<a href="%asm_group_unsubscribe_raw_url%">Unsubscribe</a>`
+ * `<a href="%asm_global_unsubscribe_raw_url%">Unsubscribe from List</a>`
+ * `<a href="%asm_preferences_raw_url%">Manage Email Preferences</a>`

data/gemfiles/mail_2.7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mail", "2.7.0"
+
+gemspec :path => "../"

data/lib/sendgrid_actionmailer.rb

@@ -1,136 +1,232 @@
 require 'sendgrid_actionmailer/version'
 require 'sendgrid_actionmailer/railtie' if defined? Rails
-
-require 'fileutils'
-require 'tmpdir'
-
 require 'sendgrid-ruby'
 
 module SendGridActionMailer
   class DeliveryMethod
-    attr_reader :client
+    # TODO: use custom class to customer excpetion payload
+    SendgridDeliveryError = Class.new(StandardError)
 
-    def initialize(params)
-      @client = SendGrid::Client.new do |c|
-        c.api_user = params[:api_user]
-        c.api_key  = params[:api_key]
-      end
+    include SendGrid
+
+    DEFAULTS = {
+      raise_delivery_errors: false
+    }.freeze
+
+    attr_accessor :settings, :api_key
+
+    def initialize(**params)
+      self.settings = DEFAULTS.merge(params)
     end
 
     def deliver!(mail)
-      attachment_temp_dirs = []
-      from = mail[:from].addrs.first
-
-      email = SendGrid::Mail.new do |m|
-        m.to        = mail[:to].addresses
-        m.cc        = mail[:cc].addresses  if mail[:cc]
-        m.bcc       = mail[:bcc].addresses if mail[:bcc]
-        m.from      = from.address
-        m.from_name = from.display_name
-        m.reply_to  = mail[:reply_to].addresses.first if mail[:reply_to]
-        m.date      = mail[:date].to_s if mail[:date]
-        m.subject   = mail.subject
-      end
-
-      smtpapi = mail['X-SMTPAPI']
-
-      # If multiple X-SMTPAPI headers are present on the message, then pick the
-      # first one. This may happen when X-SMTPAPI is set with defaults at the
-      # class-level (using defaults()), as well as inside an individual method
-      # (using headers[]=). In this case, we'll defer to the more specific
-      # header set in the individual method, which is the first header
-      # (somewhat counter-intuitively:
-      # https://github.com/rails/rails/issues/15912).
-      if(smtpapi.kind_of?(Array))
-        smtpapi = smtpapi.first
-      end
-
-      if smtpapi && smtpapi.value
-        begin
-          data = JSON.parse(smtpapi.value)
-
-          if data['filters']
-            email.smtpapi.set_filters(data['filters'])
-          end
+      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
+        # https://sendgrid.com/docs/Classroom/Send/v3_Mail_Send/personalizations.html
+        m.add_personalization(to_personalizations(mail))
+      end
 
-          if data['category']
-            email.smtpapi.set_categories(data['category'])
-          end
+      add_api_key(sendgrid_mail, mail)
+      add_content(sendgrid_mail, mail)
+      add_send_options(sendgrid_mail, mail)
+      add_mail_settings(sendgrid_mail, mail)
+      add_tracking_settings(sendgrid_mail, mail)
 
-          if data['send_at']
-            email.smtpapi.set_send_at(data['send_at'])
-          end
+      response = perform_send_request(sendgrid_mail)
 
-          if data['send_each_at']
-            email.smtpapi.set_send_each_at(data['send_each_at'])
-          end
+      settings[:return_response] ? response : self
+    end
 
-          if data['section']
-            email.smtpapi.set_sections(data['section'])
-          end
+    private
 
-          if data['sub']
-            email.smtpapi.set_substitutions(data['sub'])
-          end
+    def client
+      @client = SendGrid::API.new(api_key: api_key).client
+    end
 
-          if data['asm_group_id']
-            email.smtpapi.set_asm_group(data['asm_group_id'])
-          end
+    # type should be either :plain or :html
+    def to_content(type, value)
+      Content.new(type: "text/#{type}", value: value)
+    end
 
-          if data['unique_args']
-            email.smtpapi.set_unique_args(data['unique_args'])
-          end
+    def to_email(input)
+      to_emails(input).first
+    end
 
-          if data['ip_pool']
-            email.smtpapi.set_ip_pool(data['ip_pool'])
-          end
-        rescue JSON::ParserError
-          raise ArgumentError, "X-SMTPAPI is not JSON: #{smtpapi.value}"
+    def to_emails(input)
+      if input.is_a?(String)
+        [Email.new(email: input)]
+      elsif input.is_a?(::Mail::AddressContainer) && !input.instance_variable_get('@field').nil?
+        input.instance_variable_get('@field').addrs.map do |addr| # Mail::Address
+          Email.new(email: addr.address, name: addr.name)
+        end
+      elsif input.is_a?(::Mail::AddressContainer)
+        input.map do |addr|
+          Email.new(email: addr)
         end
+      elsif input.is_a?(::Mail::StructuredField)
+        [Email.new(email: input.value)]
+      elsif input.nil?
+        []
+      else
+        puts "unknown type #{input.class.name}"
+      end
+    end
+
+    def to_personalizations(mail)
+      Personalization.new.tap do |p|
+        to_emails(mail.to).each { |to| p.add_to(to) }
+        to_emails(mail.cc).each { |cc| p.add_cc(cc) }
+        to_emails(mail.bcc).each { |bcc| p.add_bcc(bcc) }
+        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|
+        a.content = Base64.strict_encode64(part.body.decoded)
+        a.type = part.mime_type
+        a.filename = part.filename
+
+        disposition = get_disposition(part)
+        a.disposition = disposition unless disposition.nil?
+
+        has_content_id = part.header && part.has_content_id?
+        a.content_id = part.header['content_id'].value if has_content_id
       end
+    end
+
+    def get_disposition(message)
+      return if message.header.nil?
+      content_disp = message.header[:content_disposition]
+      return unless content_disp.respond_to?(:disposition_type)
+      content_disp.disposition_type
+    end
 
-      # TODO: This is pretty ugly
+    def add_api_key(sendgrid_mail, mail)
+      self.api_key = settings.fetch(:api_key)
+      if mail['delivery-method-options'] && mail['delivery-method-options'].value.include?('api_key')
+        self.api_key = JSON.parse(mail['delivery-method-options'].value.gsub('=>', ':'))['api_key']
+      end
+    end
+
+    def add_content(sendgrid_mail, mail)
       case mail.mime_type
       when 'text/plain'
-        # Text
-        email.text = mail.body.decoded
+        sendgrid_mail.add_content(to_content(:plain, mail.body.decoded))
       when 'text/html'
-        # HTML
-        email.html = mail.body.decoded
+        sendgrid_mail.add_content(to_content(:html, mail.body.decoded))
       when 'multipart/alternative', 'multipart/mixed', 'multipart/related'
-        email.html = mail.html_part.decoded if mail.html_part
-        email.text = mail.text_part.decoded if mail.text_part
-
-        mail.attachments.each do |a|
-          # Write the attachment into a temporary location, since sendgrid-ruby
-          # expects to deal with files.
-          #
-          # We write to a temporary directory (instead of a tempfile) and then
-          # use the original filename inside there, since sendgrid-ruby's
-          # add_content method pulls the filename from the path (so tempfiles
-          # would lead to random filenames).
-          temp_dir = Dir.mktmpdir('sendgrid-actionmailer')
-          attachment_temp_dirs << temp_dir
-          temp_path = File.join(temp_dir, a.filename)
-          File.open(temp_path, 'wb') do |file|
-            file.write(a.read)
+        sendgrid_mail.add_content(to_content(:plain, mail.text_part.decoded)) if mail.text_part
+        sendgrid_mail.add_content(to_content(:html, mail.html_part.decoded)) if mail.html_part
+
+        mail.attachments.each do |part|
+          sendgrid_mail.add_attachment(to_attachment(part))
+        end
+      end
+    end
+
+    def json_parse(text, symbolize=true)
+      JSON.parse(text.gsub(/:*\"*([\%a-zA-Z0-9_-]*)\"*(( *)=>\ *)/) { "\"#{$1}\":" }, symbolize_names: symbolize)
+    end
+
+    def add_send_options(sendgrid_mail, mail)
+      if mail['template_id']
+         sendgrid_mail.template_id = mail['template_id'].to_s
+      end
+      if mail['sections']
+        json_parse(mail['sections'].value, false).each do |key, value|
+          sendgrid_mail.add_section(Section.new(key: key, value: value))
+        end
+      end
+      if mail['headers']
+        json_parse(mail['headers'].value, false).each do |key, value|
+          sendgrid_mail.add_header(Header.new(key: key, value: value))
+        end
+      end
+      if mail['categories']
+        mail['categories'].value.split(",").each do |value|
+          sendgrid_mail.add_category(Category.new(name: value.strip))
+        end
+      end
+      if mail['custom_args']
+        json_parse(mail['custom_args'].value, false).each do |key, value|
+          sendgrid_mail.add_custom_arg(CustomArg.new(key: key, value: value))
+        end
+      end
+      if mail['send_at'] && mail['batch_id']
+        sendgrid_mail.send_at = mail['send_at'].value.to_i
+        sendgrid_mail.batch_id= mail['batch_id'].to_s
+      end
+      if mail['asm']
+        asm = json_parse(mail['asm'].value)
+        asm =  asm.delete_if { |key, value| !key.to_s.match(/(group_id)|(groups_to_display)/) }
+        if asm[:group_id]
+          sendgrid_mail.asm = ASM.new(asm)
+        end
+      end
+      if mail['ip_pool_name']
+        sendgrid_mail.ip_pool_name = mail['ip_pool_name'].to_s
+      end
+    end
+
+    def add_mail_settings(sendgrid_mail, mail)
+      if mail['mail_settings']
+        settings = json_parse(mail['mail_settings'].value)
+        sendgrid_mail.mail_settings = MailSettings.new.tap do |m|
+          if settings[:bcc]
+            m.bcc = BccSettings.new(settings[:bcc])
+          end
+          if settings[:bypass_list_management]
+            m.bypass_list_management = BypassListManagement.new(settings[:bypass_list_management])
+          end
+          if settings[:footer]
+            m.footer = Footer.new(settings[:footer])
           end
+          if settings[:sandbox_mode]
+            m.sandbox_mode = SandBoxMode.new(settings[:sandbox_mode])
+          end
+          if settings[:spam_check]
+            m.spam_check = SpamCheck.new(settings[:spam_check])
+          end
+        end
+      end
+    end
 
-          if(mail.mime_type == 'multipart/related' && a.header[:content_id])
-            email.add_content(temp_path, a.header[:content_id].field.content_id)
-          else
-            email.add_attachment(temp_path, a.filename)
+    def add_tracking_settings(sendgrid_mail, mail)
+      if mail['tracking_settings']
+        settings = json_parse(mail['tracking_settings'].value)
+        sendgrid_mail.tracking_settings = TrackingSettings.new.tap do |t|
+          if settings[:click_tracking]
+            t.click_tracking = ClickTracking.new(settings[:click_tracking])
+          end
+          if settings[:open_tracking]
+            t.open_tracking = OpenTracking.new(settings[:open_tracking])
+          end
+          if settings[:subscription_tracking]
+            t.subscription_tracking = SubscriptionTracking.new(settings[:subscription_tracking])
+          end
+          if settings[:ganalytics]
+            t.ganalytics = Ganalytics.new(settings[:ganalytics])
           end
         end
       end
+    end
+
+    def perform_send_request(email)
+      result = client.mail._('send').post(request_body: email.to_json) # ლ(ಠ益ಠლ) that API
 
-      client.send(email)
-    ensure
-      # Close and delete the attachment tempfiles after the e-mail has been
-      # sent.
-      attachment_temp_dirs.each do |dir|
-        FileUtils.remove_entry_secure(dir)
+      if result.status_code && result.status_code.start_with?('4')
+        message = JSON.parse(result.body).fetch('errors').pop.fetch('message')
+        full_message = "Sendgrid delivery failed with #{result.status_code} #{message}"
+
+        settings[:raise_delivery_errors] ? raise(SendgridDeliveryError, full_message) : warn(full_message)
       end
+
+      result
     end
   end
 end