Much better pass at the parser. Huzzah for TDD.

2 files changed, 35 insertions, 71 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)
diff --git a/kronos/tests/test_parser.py b/kronos/tests/test_parser.py
index e7d64a3..1f9ec40 100644
--- a/kronos/tests/test_parser.py
+++ b/kronos/tests/test_parser.py
@@ -9,50 +9,50 @@ Activity Parser Test Suite
 
 
 from nose.tools import assert_equals
-from kronos.parser import ActivityParser
+from kronos.parser import parse_activity
 
 
-def parse_text(text):
-    return ActivityParser(text).parse()
-
 class TestWhenParsingBasicFormat(object):
 
     def test_should_get_activity(self):
-        results = parse_text("my activity, Some cool stuff!@Home")
+        results = parse_activity("my activity@Home, Some cool stuff!")
+        assert_equals(results.activity, "my activity")
+
+        results = parse_activity("my activity")
         assert_equals(results.activity, "my activity")
 
-        results = parse_text("my activity")
+        results = parse_activity("my activity@Home")
         assert_equals(results.activity, "my activity")
 
-        results = parse_text("my activity@Home")
+        results = parse_activity("my activity, Some cool stuff!")
         assert_equals(results.activity, "my activity")
 
     def test_should_get_description(self):
-        results = parse_text("my activity, Some cool stuff!@Home")
+        results = parse_activity("my activity@Home, Some cool stuff!")
         assert_equals(results.description, "Some cool stuff!")
 
-        results = parse_text("my activity, Some cool stuff!")
+        results = parse_activity("my activity, Some cool stuff!")
         assert_equals(results.description, "Some cool stuff!")
 
-        results = parse_text("my activity")
+        results = parse_activity("my activity")
         assert_equals(results.description, None)
 
     def test_should_get_category(self):
-        results = parse_text("my activity, Some cool stuff!@Home")
+        results = parse_activity("my activity@Home, Some cool stuff!")
         assert_equals(results.category, "Home")
 
-        results = parse_text("my activity, Some cool stuff!")
+        results = parse_activity("my activity, Some cool stuff!")
         assert_equals(results.category, None)
 
-        results = parse_text("my activity@Home")
+        results = parse_activity("my activity@Home")
         assert_equals(results.category, "Home")
 
 
 class TestWhenParsingWithTags(object):
 
     def setup(self):
-        test_input = "my activity, Some cool stuff!@Home #tag1 #tag2"
-        self.results = ActivityParser(test_input).parse()
+        test_input = "my activity@Home, Some cool stuff! #tag1 #tag2"
+        self.results = parse_activity(test_input)
 
     def test_should_get_tags(self):
         pass
@@ -60,30 +60,24 @@ class TestWhenParsingWithTags(object):
 
 class TestWhenParsingWithTimeOffset(object):
 
-    def _parse_text(self, text):
-        return ActivityParser(text).parse()
-
     def test_should_understand_minutes(self):
-        test_input = "my activity, Some cool stuff!@Home 10m"
-        test_input = "my activity, Some cool stuff!@Home 10M"
+        test_input = "my activity@Home, Some cool stuff! 10m"
+        test_input = "my activity@Home, Some cool stuff! 10M"
 
     def test_should_understand_hours(self):
-        test_input = "my activity, Some cool stuff!@Home 10h"
-        test_input = "my activity, Some cool stuff!@Home 10H"
+        test_input = "my activity@Home, Some cool stuff! 10h"
+        test_input = "my activity@Home, Some cool stuff! 10H"
 
     def test_should_understand_seconds(self):
-        test_input = "my activity, Some cool stuff!@Home 10s"
-        test_input = "my activity, Some cool stuff!@Home 10S"
+        test_input = "my activity@Home, Some cool stuff! 10s"
+        test_input = "my activity@Home, Some cool stuff! 10S"
 
 
 class TestWhenParsingWithAbsoluteTime(object):
 
-    def _parse_text(self, text):
-        return ActivityParser(text).parse()
-
     def test_should_understand_military_time(self):
-        test_input = "my activity, Some cool stuff!@Home 11:30-14:40"
+        test_input = "my activity@Home, Some cool stuff! 11:30-14:40"
 
     def test_should_understand_simple_time(self):
-        test_input = "my activity, Some cool stuff!@Home 11:30AM-2:40PM"
-        test_input = "my activity, Some cool stuff!@Home 11:30A-2:40P"
+        test_input = "my activity@Home, Some cool stuff! 11:30AM-2:40PM"
+        test_input = "my activity@Home, Some cool stuff! 11:30A-2:40P"