Much better pass at the parser. Huzzah for TDD.

1 files changed, 11 insertions, 41 deletions

diff --git a/kronos/parser.py b/kronos/parser.py
index 0c39b95..b18b4f9 100644
--- a/kronos/parser.py
+++ b/kronos/parser.py
@@ -14,48 +14,18 @@ class Activity(object):
         self.description = description
         self.category = category
 
-    def __repr__(self):
-        return "Activity({0!r}, description={1!r}, category={2!r})".format(
-                self.activity, self.description, self.category)
 
+def parse_activity(text):
+    description = None
+    if ',' in text:
+        text, description = text.split(',', 1)
+        description = description.strip()
 
-class ActivityParser(object):
+    category = None
+    if '@' in text:
+        text, category = text.split('@', 1)
+        category = category.strip()
 
-    def __init__(self, text):
-        self.text = text
-        self.tokens = text.split(' ')
+    activity = text.strip()
 
-    def parse(self):
-        activity = Activity(self._parse_activity())
-        activity.description = self._parse_description()
-        activity.category = self._parse_category()
-
-        return activity
-
-    def _parse_activity(self):
-        return self.text.split(',')[0].split('@')[0]
-
-    def _parse_description(self):
-        text = self.text
-
-        if ',' in self.text:
-            text = text.split(',', 1)[1]
-
-        if '@' in text:
-            text = text.split('@', 1)[0]
-
-        if text == self.text:
-            return None
-
-        return text.strip()
-
-    def _parse_category(self):
-        text = self.text
-
-        if '@' in text:
-            text = text.split('@', 1)[1]
-
-        if text == self.text:
-            return None
-
-        return text
+    return Activity(activity, description, category)