From 8c60236e432f8bb07f84f6dc216c5715275c63f3 Mon Sep 17 00:00:00 2001
From: owainlewis <owain@owainlewis.com>
Date: Wed, 31 Oct 2012 13:08:48 +0000
Subject: [PATCH] better public api and tostring on from and to address

---
 src/clojure_mail/core.clj    | 19 ++++++++++++++++---
 src/clojure_mail/message.clj |  6 ++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/clojure_mail/core.clj b/src/clojure_mail/core.clj
index 370db7b..f3fea21 100644
--- a/src/clojure_mail/core.clj
+++ b/src/clojure_mail/core.clj
@@ -1,4 +1,5 @@
 (ns clojure-mail.core
+  (refer-clojure :exclude [read])
   (:require [clojure-mail.store :as store]
             [clojure-mail.message :as msg]
             [clojure-mail.folder :as folder])
@@ -68,19 +69,31 @@
 (defn message-count
   "Returns the number of messages in a folder"
   [store folder]
-  (let [fd (doto (.getFolder store folder) (.open Folder/READ_ONLY))]
+  (let [fd (doto (.getFolder store folder)
+                 (.open Folder/READ_ONLY))]
     (.getMessageCount fd)))
 
+;; Public api
+
 (defn read-all
   [folder]
   (all-messages (gen-store) folder))
 
 (defn get-inbox []
   "Returns all messages from the inbox"
-  (read-all (get folder-names :inbox)))
+  (read-all
+    (get folder-names :inbox)))
 
 (defn get-spam []
-  (read-all (get folder-names :spam)))
+  (read-all
+    (get folder-names :spam)))
+
+(defn read-message
+  "Reads a java mail message instance"
+  [message]
+  (msg/read message))
+
+(defn search [query])
 
 (defn unread-messages
   "Find unread messages"
diff --git a/src/clojure_mail/message.clj b/src/clojure_mail/message.clj
index 5b63711..f516597 100644
--- a/src/clojure_mail/message.clj
+++ b/src/clojure_mail/message.clj
@@ -14,13 +14,15 @@
     (str "unexpected type, \"" type \")))
 
 (defn from [m]
-  (.getFrom m))
+  (.toString
+    (.getFrom m)))
 
 (defn subject [m]
   (.getSubject m))
 
 (defn sender [m]
-  (.getSender m))
+  (.toString
+    (.getSender m)))
 
 (defn content-type [m]
   (let [type (.getContentType m)]