Merge pull request #37 from parrish/fix-tag-parsing

Parses tags correctly
zooniverse · May 3, 2016 · 9032080 · 9032080
2 parents d4619fb + 09812e4
commit 9032080
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "markdownz",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Markdown viewer and editor for the Zooniverse",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/lib/default-transformer.js b/src/lib/default-transformer.js
@@ -11,12 +11,12 @@ export default function(input, {project, baseURI}) {
 
     return input
     // hashtags #tagname
-        .replace(/(?!\B.*\/+\b)\B#(\b[\w+-\/]+\b)/g, function(fullTag, tagName) {
+        .replace(/(?:^|\s)\#([-\w\d]{3,40})/g, function(fullTag, tagName) {
             if (owner && name) {
-                return `[${fullTag}](${baseURI}/projects/${owner}/${name}/talk/tags/${tagName})`
+                return `[#${tagName}](${baseURI}/projects/${owner}/${name}/talk/tags/${tagName})`
             }
             else {
-                return `[${fullTag}](${baseURI}/talk/search?query=${tagName})`
+                return `[#${tagName}](${baseURI}/talk/search?query=${tagName})`
             }
         })
 

diff --git a/test/lib/default-transformer-test.js b/test/lib/default-transformer-test.js
@@ -19,10 +19,10 @@ describe('default-transformer', () => {
     });
 
     it('works in a sentence with multiple tags & a URL', () => {
-        const sentence = `#test sentenc #tag and url: http://docs.panoptes.apiary.io/#reference/user/users-collection/list-all-users`
+        const sentence = `#test sentence #tag and url: http://docs.panoptes.apiary.io/#reference/user/users-collection/list-all-users`
 
         const htmlSentence = replaceSymbols(sentence, {project, baseURI})
-        expect(htmlSentence).to.equal(`#test sentenc #tag and url: http://docs.panoptes.apiary.io/#reference/user/users-collection/list-all-users`)
+        expect(htmlSentence).to.equal(`[#test](/talk/search?query=test) sentence[#tag](/talk/search?query=tag) and url: http://docs.panoptes.apiary.io/#reference/user/users-collection/list-all-users`)
     })
 
     it('ignores links with hashes', () => {
@@ -33,7 +33,7 @@ describe('default-transformer', () => {
     })
 
     it('allows delimiters in hashtags', () => {
-        ['#test-tag', '#test_tag', '#test.tag'].forEach((tag) => {
+        ['#test-tag', '#test_tag'].forEach((tag) => {
             const parsedTag = replaceSymbols(tag, {project, baseURI})
             expect(parsedTag).to.equal(`[${tag}](/talk/search?query=${tag.slice(1, tag.length)})`)
         })