From 81140d851bed8c1c90f739510ff059db698b4f79 Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Wed, 3 Dec 2014 13:53:52 +0100
Subject: Moved mail.as_dict to PixelatedMail.

- currently it only works for this class.
---
 service/pixelated/adapter/mail.py                  | 27 +++++++++++-----------
 .../test/unit/controllers/mails_controller_test.py |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'service')

diff --git a/service/pixelated/adapter/mail.py b/service/pixelated/adapter/mail.py
index eedc8242..472bdad4 100644
--- a/service/pixelated/adapter/mail.py
+++ b/service/pixelated/adapter/mail.py
@@ -25,8 +25,7 @@ from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
 from pycryptopp.hash import sha256
 
-
-class Mail:
+class Mail(object):
     @property
     def to(self):
         return self.headers['To']
@@ -73,18 +72,6 @@ class Mail:
     def _get_chash(self):
         return sha256.SHA256(self.raw).hexdigest()
 
-    def as_dict(self):
-        return {
-            'header': {k.lower(): v for k, v in self.headers.items()},
-            'ident': self.ident,
-            'tags': list(self.tags),
-            'status': list(self.status),
-            'security_casing': self.security_casing,
-            'body': self.body,
-            'mailbox': self.mailbox_name.lower(),
-            'attachments': self.parts['attachments'] if self.parts else []
-        }
-
 
 class InputMail(Mail):
     FROM_EMAIL_ADDRESS = None
@@ -319,3 +306,15 @@ class PixelatedMail(Mail):
     @property
     def encrypted(self):
         return self.hdoc.content["headers"].get("OpenPGP", None) is not None
+
+    def as_dict(self):
+        return {
+            'header': {k.lower(): v for k, v in self.headers.items()},
+            'ident': self.ident,
+            'tags': list(self.tags),
+            'status': list(self.status),
+            'security_casing': self.security_casing,
+            'body': self.body,
+            'mailbox': self.mailbox_name.lower(),
+            'attachments': self.parts['attachments'] if self.parts else []
+        }
diff --git a/service/test/unit/controllers/mails_controller_test.py b/service/test/unit/controllers/mails_controller_test.py
index 93748de9..6d566c83 100644
--- a/service/test/unit/controllers/mails_controller_test.py
+++ b/service/test/unit/controllers/mails_controller_test.py
@@ -115,7 +115,7 @@ class TestMailsController(unittest.TestCase):
 
     def _successfuly_send_mail(self, ident, mail):
         sent_mail = mock()
-        mail.mailbox_name = 'TRASH'
+        sent_mail.mailbox_name = 'TRASH'
         sent_mail.as_dict = lambda: self.input_mail.json
 
         return sent_mail
-- 
cgit v1.2.3