diff options
| author | Manuel Ebert <manuel@1450.me> | 2014-08-07 13:31:25 +0200 |
|---|---|---|
| committer | Manuel Ebert <manuel@1450.me> | 2014-08-07 13:31:25 +0200 |
| commit | 7617f9e7f84fb2724632d4ce6838f8d5cba47c71 (patch) | |
| tree | 6994d25c84e4cf1ba6f0dcc229f42f234ab5d661 | |
| parent | 6dafc3d9398aa9469b4f365e68696b57f6f9130a (diff) | |
| parent | 9c4b97ef5cd9c0fd38c65ee33af851b572dc269b (diff) | |
Merge pull request #267 from maebert/issue-2651.9.3
Tags at the beginning of entries
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | features/tagging.feature | 28 | ||||
| -rwxr-xr-x | jrnl/Entry.py | 2 | ||||
| -rw-r--r-- | jrnl/__init__.py | 2 |
4 files changed, 22 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 699d7c08..0c320414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog ### 1.9 (July 21, 2014) +* __1.9.3__ Fixed: Tags at the beginning of lines * __1.9.2__ Fixed: Tag search ignores email-addresses (thanks to @mjhoffman65) * __1.9.1__ Fixed: Dates in the future can be parsed as well. * __1.9.0__ Improved: Greatly improved date parsing. Also added an `-on` option for filtering diff --git a/features/tagging.feature b/features/tagging.feature index 649ff9bf..4eba8470 100644 --- a/features/tagging.feature +++ b/features/tagging.feature @@ -31,12 +31,22 @@ Feature: Tagging @c++ : 1 @c# : 1 """ - Scenario: An email should not be a tag - Given we use the config "tags-237.json" - When we run "jrnl --tags" - Then we should get no error - and the output should be - """ - @newline : 1 - @email : 1 - """
\ No newline at end of file + Scenario: An email should not be a tag + Given we use the config "tags-237.json" + When we run "jrnl --tags" + Then we should get no error + and the output should be + """ + @newline : 1 + @email : 1 + """ + + Scenario: Entry cans start and end with tags + Given we use the config "basic.json" + When we run "jrnl today: @foo came over, we went to a @bar" + When we run "jrnl --tags" + Then the output should be + """ + @foo : 1 + @bar : 1 + """ diff --git a/jrnl/Entry.py b/jrnl/Entry.py index fb92c3b6..f04d9e0f 100755 --- a/jrnl/Entry.py +++ b/jrnl/Entry.py @@ -17,7 +17,7 @@ class Entry: self.modified = False def parse_tags(self): - fulltext = " ".join([self.title, self.body]).lower() + fulltext = " " + " ".join([self.title, self.body]).lower() tags = re.findall(r'(?u)\s([{tags}][-+*#/\w]+)'.format(tags=self.journal.config['tagsymbols']), fulltext, re.UNICODE) self.tags = tags return set(tags) diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 8d23f05e..c041bbbc 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -8,7 +8,7 @@ jrnl is a simple journal application for your command line. from __future__ import absolute_import __title__ = 'jrnl' -__version__ = '1.9.2' +__version__ = '1.9.3' __author__ = 'Manuel Ebert' __license__ = 'MIT License' __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert' |