Merge pull request #3487 from Raven24/text-formatting

markdown linked image fix, special text formatting

app/assets/javascripts/app/helpers/text_formatter.js

@@ -20,12 +20,13 @@
       // regex copied from: http://daringfireball.net/2010/07/improved_regex_for_matching_urls (slightly modified)
       var urlRegex = /(^|\s)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
       text = text.replace(urlRegex, function(wholematch, space, url) {
+        if( url.match(/^[^\w]/) ) return wholematch; // evil witchcraft, noop
         return space+"<"+url+">";
       });
 
       // process links
       // regex copied from: https://code.google.com/p/pagedown/source/browse/Markdown.Converter.js#1198 (and slightly expanded)
-      var linkRegex = /(\[.*\]:\s)?(<|\()((https?|ftp):\/\/[^\/'">\s][^'">\s]+)(>|\))/gi;
+      var linkRegex = /(\[.*\]:\s)?(<|\()((https?|ftp):\/\/[^\/'">\s][^'">\s]+?)(>|\))/gi;
       text = text.replace(linkRegex, function() {
         var unicodeUrl = arguments[3];
         var addr = parse_url(unicodeUrl);
@@ -52,6 +53,30 @@
       return text;
     });
 
+    // make nice little utf-8 symbols
+    converter.hooks.chain("preConversion", function(text) {
+      var input_strings = [
+        "<->", "->", "<-",
+        "(c)", "(r)", "(tm)",
+        "<3"
+      ];
+      var output_symbols = [
+        "↔", "→", "←",
+        "©", "®", "™",
+        "♥"
+      ];
+      // quote function from: http://stackoverflow.com/a/494122
+      var quote = function(str) {
+        return str.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      };
+
+      _.each(input_strings, function(str, idx) {
+        var r = new RegExp(quote(str), "gi");
+        text = text.replace(r, output_symbols[idx]);
+      });
+      return text;
+    });
+
     converter.hooks.chain("postConversion", function (text) {
       return text.replace(/(\"(?:(?:http|https):\/\/)?[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(?:\/\S*)?\")(\>)/g, '$1 target="_blank">')
     });

spec/javascripts/app/helpers/text_formatter_spec.js

@@ -46,7 +46,36 @@ describe("app.helpers.textFormatter", function(){
       })
     });
 
-    context("non-ascii urls", function() {
+    context("symbol conversion", function() {
+      beforeEach(function() {
+        this.input_strings = [
+          "->", "<-", "<->",
+          "(c)", "(r)", "(tm)",
+          "<3"
+        ];
+        this.output_symbols = [
+          "→", "←", "↔",
+          "©", "®", "™",
+          "♥"
+        ];
+      });
+
+      it("correctly converts the input strings to their corresponding output symbol", function() {
+        _.each(this.input_strings, function(str, idx) {
+          var text = this.formatter.markdownify(str);
+          expect(text).toContain(this.output_symbols[idx]);
+        }, this);
+      });
+
+      it("converts all symbols at once", function() {
+        var text = this.formatter.markdownify(this.input_strings.join(" "));
+        _.each(this.output_symbols, function(sym) {
+          expect(text).toContain(sym);
+        });
+      });
+    });
+
+    context("non-ascii url", function() {
       beforeEach(function() {
         this.evilUrls = [
           "http://www.bürgerentscheid-krankenhäuser.de", // example from issue #2665
@@ -64,14 +93,14 @@ describe("app.helpers.textFormatter", function(){
         ];
       });
 
-      it("correctly encode to punycode", function() {
+      it("correctly encodes to punycode", function() {
         _.each(this.evilUrls, function(url, num) {
           var text = this.formatter.markdownify( "<" + url + ">" );
           expect(text).toContain(this.asciiUrls[num]);
         }, this);
       });
 
-      it("don't break link texts", function() {
+      it("doesn't break link texts", function() {
         var linkText = "check out this awesome link!";
         var text = this.formatter.markdownify( "["+linkText+"]("+this.evilUrls[0]+")" );
 
@@ -79,7 +108,7 @@ describe("app.helpers.textFormatter", function(){
         expect(text).toContain(linkText);
       });
 
-      it("don't break reference style links", function() {
+      it("doesn't break reference style links", function() {
         var postContent = "blabla blab [my special link][1] bla blabla\n\n[1]: "+this.evilUrls[0]+" and an optional title)";
         var text = this.formatter.markdownify(postContent);
 
@@ -89,12 +118,22 @@ describe("app.helpers.textFormatter", function(){
 
       it("can be used as img src", function() {
         var postContent = "![logo]("+ this.evilUrls[1] +")";
-        var niceImg = '"'+ this.asciiUrls[1] +'"'; // the "" are from src=""
+        var niceImg = 'src="'+ this.asciiUrls[1] +'"'; // the "" are from src=""
         var text = this.formatter.markdownify(postContent);
 
         expect(text).toContain(niceImg);
       });
 
+      it("doesn't break linked images", function() {
+        var postContent = "I am linking an image here [![some-alt-text]("+this.evilUrls[1]+")]("+this.evilUrls[3]+")";
+        var text = this.formatter.markdownify(postContent);
+        var linked_image = 'src="'+this.asciiUrls[1]+'"';
+        var image_link = 'href="'+this.asciiUrls[3]+'"';
+
+        expect(text).toContain(linked_image);
+        expect(text).toContain(image_link);
+      });
+
     });
 
   })

spec/javascripts/bookmarklet-spec.js

@@ -33,7 +33,7 @@ describe("bookmarklet", function() {
       _.defer(function() {
         expect($("#publisher #status_message_fake_text").val() == "").toBeFalsy();
         expect($("#publisher #status_message_text").val() == "").toBeFalsy();
-      };
+      });
     });
   });