Moved MailStore interface to extra file.

- Issue #420

3 files changed, 55 insertions, 35 deletions

diff --git a/service/pixelated/adapter/mailstore/__init__.py b/service/pixelated/adapter/mailstore/__init__.py
index ab7bfb94..978df45d 100644
--- a/service/pixelated/adapter/mailstore/__init__.py
+++ b/service/pixelated/adapter/mailstore/__init__.py
@@ -14,38 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
+from pixelated.adapter.mailstore.mailstore import MailStore, underscore_uuid
+from pixelated.adapter.mailstore.leap_mailstore import LeapMailStore
 
-class MailStore(object):
-    def get_mail(self, mail_id):
-        pass
-
-    def get_mails(self, mail_ids):
-        pass
-
-    def all_mails(self):
-        pass
-
-    def delete_mail(self, mail_id):
-        pass
-
-    def update_mail(self, mail):
-        pass
-
-    def add_mail(self, mailbox_name, mail):
-        pass
-
-    def get_mailbox_names(self):
-        pass
-
-    def add_mailbox(self, mailbox_name):
-        pass
-
-    def delete_mailbox(self, mailbox_name):
-        pass
-
-    def get_mailbox_mail_ids(self, mailbox_name):
-        pass
-
-
-def underscore_uuid(uuid):
-    return uuid.replace('-', '_')
+__all__ = ['MailStore', 'LeapMailStore', 'underscore_uuid']
diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py
index 70c19bca..cbb9a28a 100644
--- a/service/pixelated/adapter/mailstore/leap_mailstore.py
+++ b/service/pixelated/adapter/mailstore/leap_mailstore.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from leap.mail.adaptors.soledad import SoledadMailAdaptor
 from twisted.internet import defer
-from pixelated.adapter.mailstore import MailStore, underscore_uuid
+from pixelated.adapter.mailstore.mailstore import MailStore, underscore_uuid
 
 from leap.mail.mail import Message
 from pixelated.adapter.model.mail import Mail
diff --git a/service/pixelated/adapter/mailstore/mailstore.py b/service/pixelated/adapter/mailstore/mailstore.py
new file mode 100644
index 00000000..ab7bfb94
--- /dev/null
+++ b/service/pixelated/adapter/mailstore/mailstore.py
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2015 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+
+
+class MailStore(object):
+    def get_mail(self, mail_id):
+        pass
+
+    def get_mails(self, mail_ids):
+        pass
+
+    def all_mails(self):
+        pass
+
+    def delete_mail(self, mail_id):
+        pass
+
+    def update_mail(self, mail):
+        pass
+
+    def add_mail(self, mailbox_name, mail):
+        pass
+
+    def get_mailbox_names(self):
+        pass
+
+    def add_mailbox(self, mailbox_name):
+        pass
+
+    def delete_mailbox(self, mailbox_name):
+        pass
+
+    def get_mailbox_mail_ids(self, mailbox_name):
+        pass
+
+
+def underscore_uuid(uuid):
+    return uuid.replace('-', '_')