Gmail SMTP support in Postal

src/postal/core.clj

@@ -3,15 +3,13 @@
         [postal.smtp :only [smtp-send]]
         [postal.stress :only [spam]]))
 
-(defn send-message [msg]
-  (when-not (and (:from msg)
-                 (:to msg)
-                 (:subject msg)
-                 (:body msg))
+(defn send-message
+  [{:keys [from to subject body] :as msg}]
+  (when-not (and from to subject body)
     (throw (Exception.
             "message needs at least :from, :to, :subject, and :body")))
   (if (:host (meta msg))
-    (smtp-send msg)
+    (smtp-send (meta msg) msg)
     (sendmail-send msg)))
 
 (defn stress [profile]
@@ -20,8 +18,8 @@
                     :num 1
                     :delay 100
                     :threads 1}
-                 {:from "[email protected]"
-                  :to "[email protected]"}
+                  {:from "[email protected]"
+                   :to "[email protected]"}
         {:keys [host port from to num delay threads]}
         (merge (meta defaults) defaults (meta profile) profile)]
     (println (format "sent %s msgs to %s:%s"

src/postal/message.clj

@@ -1,7 +1,8 @@
 (ns postal.message
   (:use [clojure.set :only [difference]]
-        [postal.date :only [make-date]])
-  (:import [java.util Properties UUID]
+        [postal.date :only [make-date]]
+        [postal.support :only [do-when make-props]])
+  (:import [java.util UUID]
            [javax.mail Session Message$RecipientType]
            [javax.mail.internet MimeMessage InternetAddress
             AddressException]
@@ -16,10 +17,13 @@
 (defn sender [msg]
   (or (:sender msg) (:from msg)))
 
-(defn make-address [addr]
-  (try
-    (InternetAddress. addr)
-    (catch Exception _)))
+(defn make-address
+  ([addr]
+     (try (InternetAddress. addr)
+          (catch Exception _)))
+  ([addr name-str]
+     (try (InternetAddress. addr name-str)
+          (catch Exception _))))
 
 (defn message->str [msg]
   (with-open [out (java.io.ByteArrayOutputStream.)]
@@ -78,12 +82,8 @@
 (defn make-jmessage
   ([msg]
      (let [{:keys [sender from]} msg
-           {:keys [host port user pass]} (meta msg)
-           props (doto (java.util.Properties.)
-                   (.put "mail.smtp.host" (or host "not.provided"))
-                   (.put "mail.smtp.port" (or port "25"))
-                   (.put "mail.smtp.from" (or sender from))
-                   (.put "mail.smtp.auth" (if user "true" "false")))
+           {:keys [user pass]} (meta msg)
+           props (make-props (or sender from) (meta msg))
            session (or (:session (meta msg))
                        (if user
                          (Session/getInstance props (make-auth user pass))
@@ -96,7 +96,9 @@
          (add-recipients! Message$RecipientType/TO (:to msg))
          (add-recipients! Message$RecipientType/CC (:cc msg))
          (add-recipients! Message$RecipientType/BCC (:bcc msg))
-         (.setFrom (make-address (:from msg)))
+         (.setFrom (if-let [sender (:sender msg)]
+                     (make-address (:from msg) sender)
+                     (make-address (:from msg))))
          (.setSubject (:subject msg))
          (.setSentDate (or (:date msg) (make-date)))
          (add-extra! (drop-keys msg standard))

src/postal/smtp.clj

@@ -1,5 +1,6 @@
 (ns postal.smtp
-  (:use [postal.message :only [make-jmessage]])
+  (:use [postal.message :only [make-jmessage]]
+        [postal.support :only [make-props]])
   (:import [javax.mail Transport Session]))
 
 (defn smtp-send
@@ -10,16 +11,17 @@
          {:code 0 :error :SUCCESS :message "message sent"}
          (catch Exception e
            {:code 99 :error (class e) :message (.getMessage e)}))))
-  ([host port & msgs]
-     (let [session (doto (Session/getInstance
-                          (doto (java.util.Properties.)
-                            (.put "mail.smtp.host" (or host "localhost"))
-                            (.put "mail.smtp.port" (or port "25"))))
+  ([auth-map & msgs]
+     (let [{:keys [host port user pass sender] :or {host "localhost"
+                                                    port 25}}
+           auth-map
+           session (doto (Session/getInstance (make-props sender auth-map))
                      (.setDebug false))]
-       (with-open [transport (doto (-> session (.getTransport "smtp"))
-                               (.connect "" ""))]
-         (let [jmsgs (map #(make-jmessage % session) msgs)]
+       (with-open [transport (.getTransport session (if (and user pass)
+                                                      "smtps"
+                                                      "smtp"))]
+         (.connect transport host port (str user) (str pass))
+         (let [jmsgs (map #(make-jmessage % session) msgs)]  
            (doseq [jmsg jmsgs]
-             (.sendMessage transport jmsg (.getAllRecipients jmsg))))))))
-
-
+             (.sendMessage transport jmsg (.getAllRecipients jmsg)))
+           {:code 0 :error :SUCCESS :message "messages sent"})))))

src/postal/support.clj

@@ -0,0 +1,18 @@
+(ns postal.support
+  (:import [java.util Properties]))
+
+(defmacro do-when
+  [arg condition & body]
+  `(when ~condition
+     (doto ~arg ~@body)))
+
+(defn make-props [sender {:keys [host port user tls]}]
+  (doto (Properties.)
+    (.put "mail.smtp.host" (or host "not.provided"))
+    (.put "mail.smtp.port" (or port "25"))
+    (.put "mail.smtp.auth" (if user "true" "false"))
+    (do-when sender (.put "mail.smtp.from" sender))
+    (do-when user (.put "mail.smtp.user" user))
+    (do-when tls  (.put "mail.smtp.starttls.enable" "true"))))
+
+