Merge lp:~parinporecha/gtg/love_patches into lp:~gtg/gtg/old-trunk

[Parin Porecha]

This is a patch for the Bug #1095390 ( Quick Add bar incorrectly parses tags ).
It was caused due to different regexes used in quick add bar and editor.
I have replaced the quick add bar regex with the editor one.
Now, the tags containing '-' and ':' will be detected whole :)

[Izidor Matušov (izidor)]

Please, use the extract_tags_from_text method instead of having the same RE twice. It will improve maintainablity for future.

review: Needs Fixing (code)

[lp:~parinporecha/gtg/love_patches]

1272. By Izidor Matušov on 2013-01-12

Correct handling of liblarch API 1.0

[Parin Porecha (parinporecha)]

Hey izidor,

I have made the changes you requested :)

> Please, use the extract_tags_from_text method instead of having the same RE
> twice. It will improve maintainablity for future.

[Izidor Matušov (izidor)]

Please, add couple unit test cases. (This is one of few parts of GTG that can be easily tested) :)

review: Needs Fixing (code)

[lp:~parinporecha/gtg/love_patches]

1273. By Izidor Matušov on 2013-01-13

Fix for bug #1095390: Quick Add bar incorrectly parses tags, by Parin Porecha

[Izidor Matušov (izidor)]

Thanks for your patch!

review: Approve

=== modified file 'CHANGELOG'
--- CHANGELOG	2013-01-10 15:51:33 +0000
+++ CHANGELOG	2013-01-13 18:34:21 +0000
@@ -8,6 +8,8 @@
     * Fix for bug #1039651: Urgency coloring of parent tasks in collapsed view, by Parin Porecha
     * Fix for bug #1032745: Calendar widget is padded to always be visible on the screen
     * Russian localization of help by DmDr
+    * Fix for bug #1096622: Damaged image in the help, by Parin Porecha
+    * Fix for bug #1095390: Quick Add bar incorrectly parses tags, by Parin Porecha
 
 2012-11-06 Getting Things GNOME! 0.3
     * Hide tasks with due date someday, #931376

=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2012-11-27 16:53:42 +0000
+++ GTG/core/task.py	2013-01-13 18:34:21 +0000
@@ -31,6 +31,7 @@
 from GTG.tools.dates         import Date
 from GTG.tools.logger        import Log
 from liblarch                import TreeNode
+from GTG.tools.tags          import extract_tags_from_text
 
 
 class Task(TreeNode):
@@ -148,7 +149,7 @@
         defer_date = Date.no_date()
         if text:
             # Get tags in the title
-            for match in re.findall(r'(?:^|[\s])(@\w+)', text, re.UNICODE):
+            for match in extract_tags_from_text(text):
                 tags.append(match)
             # Get attributes
             regexp = r'([\s]*)([\w-]+):\s*([^\s]+)'

=== modified file 'GTG/tests/test_tools_tags.py'
--- GTG/tests/test_tools_tags.py	2012-11-25 19:19:44 +0000
+++ GTG/tests/test_tools_tags.py	2013-01-13 18:34:21 +0000
@@ -35,8 +35,8 @@
         self.assertEqual(tags("some text ended with @endtag"), ["@endtag"])
 
     def test_hypen_in_tag(self):
-        self.assertEqual(tags("@tag, @my-tag, bla bla @do-this-today"),
-            ["@tag", "@my-tag", "@do-this-today"])
+        self.assertEqual(tags("@tag, @my-tag, bla bla @do-this-today, it has @con--tinuous---hypen-s-"),
+            ["@tag", "@my-tag", "@do-this-today", "@con--tinuous---hypen-s"])
 
         self.assertEqual(tags("@hypen-at-end- some other text"),
             ["@hypen-at-end"])
@@ -44,13 +44,16 @@
 
     def test_dot(self):
         self.assertEqual(tags("text @gtg-0.3"), ["@gtg-0.3"])
-        self.assertEqual(tags("@tag., @my.tag, bla bla @do.this.today"),
-            ["@tag", "@my.tag", "@do.this.today"])
+        self.assertEqual(tags("@tag., @my.tag, bla bla @do.this.today, also contains @hy-pen-.s"),
+            ["@tag", "@my.tag", "@do.this.today", "@hy-pen-.s"])
 
     def test_slash(self):
-        self.assertEqual(tags("@tag/, @my/tag, bla bla @do/this/today/"),
-            ["@tag", "@my/tag", "@do/this/today"])
-
+        self.assertEqual(tags("@tag/, @my/tag, bla bla @do/this/today/, @hy-p-/ens with @slash/es/"),
+            ["@tag", "@my/tag", "@do/this/today", "@hy-p-/ens", "@slash/es"])
+    
+    def test_colon(self):
+        self.assertEqual(tags("@tag:, @my:tag, bla bla @do:this:today:, @co:l-on/s-, @:dot/s:, with @com,mas"),
+            ["@tag", "@my:tag", "@do:this:today", "@co:l-on/s", "@:dot/s", "@com"])
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'GTG/tools/tags.py'
--- GTG/tools/tags.py	2012-11-25 19:19:44 +0000
+++ GTG/tools/tags.py	2013-01-13 18:34:21 +0000
@@ -22,7 +22,7 @@
 
 def extract_tags_from_text(text):
     """ Given a string, returns a list of the @tags contained in that """
-    return re.findall(r'(?:^|[\s])(@[\w\/\.\-]*\w)', text)
+    return re.findall(r'(?:^|[\s])(@[\w\/\.\-\:]*\w)', text)
 
 
 def parse_tag_list(text):