1 files changed, 46 insertions, 5 deletions

diff --git a/kronos/parser.py b/kronos/parser.py
index 5f79144..0c39b95 100644
--- a/kronos/parser.py
+++ b/kronos/parser.py
@@ -9,12 +9,53 @@ Activity Parser
 
 class Activity(object):
 
-    activity = "my activity"
-    description = "Some cool stuff!"
-    category = "Home"
+    def __init__(self, activity, description=None, category=None):
+        self.activity = activity
+        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)
 
 
 class ActivityParser(object):
 
-    def parse(self, text):
-        return Activity()
+    def __init__(self, text):
+        self.text = text
+        self.tokens = text.split(' ')
+
+    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