E-Mail Endpoint Change

Gemfile

@@ -53,6 +53,7 @@ gem 'delayed_job' # we use this to run jobs to index our data
 gem 'mail' # Used for mail
 gem 'mustache' # used for mail
 gem 'premailer' # we use this to inline css in our emails
+gem 'rest-client', :git => "https://github.com/archiloque/rest-client.git" # lets us send e-mail via Mailgun's HTTP API
 
 # ActionView
 gem 'sanitize' # used in app/controllers/posts_controller.rb (which is dead code) ! remove

Gemfile.lock

@@ -23,6 +23,13 @@ GIT
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
 
+GIT
+  remote: https://github.com/archiloque/rest-client.git
+  revision: 4e5bd4893a3df02c82f56c432f746fd1d9c5830c
+  specs:
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -322,8 +329,6 @@ GEM
       redis (>= 2.0.1)
       resque (>= 1.8.0)
       rufus-scheduler
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rmagick (2.13.1)
     rollout (0.3.0)
     rpm_contrib (2.1.4)
@@ -472,6 +477,7 @@ DEPENDENCIES
   resque (~> 1.19.0)
   resque-exceptional
   resque-scheduler
+  rest-client!
   rmagick
   rollout
   rpm_contrib

config/initializers/mail.rb

@@ -10,6 +10,7 @@
     :domain => ENV['domain'],
     :authentication => ENV['mail_authentication'],
     :user_name => ENV['mail_username'],
-    :password => ENV['mail_password'] 
+    :password => ENV['mail_password'],
+    :api_key => ENV['mail_api_key']
     } 
   end

lib/mail_gun.rb

@@ -0,0 +1,49 @@
+class MailGun
+
+  def self.deliver(method, options, to, from, reply_to, subject, body, content_type = "text/html", charset = "UTF-8", headers = {}, fake = false)
+    if (method == :file)
+      # STUB
+      return
+    elsif (method == :action_mailer)
+      # Send the e-mail with actionmailer
+      Mail.defaults do
+        delivery_method(method, options)
+      end
+      Mail.deliver(:to => to,
+                   :from => from,
+                   :reply_to => reply_to,
+                   :subject => subject,
+                   :content_type => content_type,
+                   :body => body,
+                   :charset => charset,
+                   :headers => headers)
+    else
+      # Deliver with Mailgun
+      params = {}
+      params[:to] = to
+      params[:from] = from
+      params[:subject] = subject
+      params[:html] = body
+      if headers['X-Mailgun-Tag']
+        params[:tag] = headers['X-Mailgun-Tag']
+        headers.delete('X-Mailgun-Tag')
+      else
+        params[:tag] = ''
+      end
+      params["h:X-Reply-To"] = reply_to
+      headers.each do |k,v|
+        params["h:#{k}"] = v
+      end
+
+      endpoint = "https://api:#{options[:api_key]}@api.mailgun.net/v2/#{options[:domain]}/messages"
+      if fake
+        puts "Sending e-mail to endpoint #{endpoint} with parameters #{params.inspect}"
+      else
+        response = RestClient.post endpoint, {:params => params}
+        # Do something with the response...
+        Resque.redis.rpush("api_results", response.to_str)
+      end
+    end
+  end
+
+end

mail/mail_base.rb

@@ -2,11 +2,6 @@
 require 'premailer'
 require 'sass'
 
-Mail.defaults do
-  delivery_method($MailDeliveryMethod,
-                  $MailDeliveryOptions)
-end
-
 class MailBase < Mustache
   include MailUrls
 
@@ -110,19 +105,19 @@ def meets_limitation_requirement
 
   def deliver
     if deliver?
-      mail = Mail.deliver(:to => self.to,
-                          :from => self.from,
-                          :reply_to => self.reply_to,
-                          :subject => self.subject,
-                          :content_type => "text/html",
-                          :body => self.render_html,
-                          :charset => 'UTF-8',
-                          :headers => {
-                            "Precedence" => "list",
-                            "Auto-Submitted" => "auto-generated",
-                            "X-Campaign-Id" => community ? community.slug : "administrative",
-                            "X-Mailgun-Tag" => self.tag
-                          })
+      mail = MailGun.deliver($MailDeliveryMethod,
+                             $MailDeliveryOptions,
+                             :to => self.to,
+                             :from => self.from,
+                             :reply_to => self.reply_to,
+                             :subject => self.subject,
+                             :body => self.render_html,
+                             :headers => {
+                               "Auto-Submitted" => "auto-generated",
+                               "Return-Path" => "<>",
+                               "X-Campaign-Id" => community ? community.slug : "administrative",
+                               "X-Mailgun-Tag" => self.tag
+                             })
     end
   end