redcarpet 1.15.2 → 1.16.0

data/Rakefile

@@ -116,10 +116,9 @@ task :gather => 'upskirt/src/markdown.h' do |t|
   files =
     FileList[
       'upskirt/src/{markdown,buffer,array}.h',
-      'upskirt/src/{markdown,buffer,array}.c',
-      'upskirt/render/html.c',
-      'upskirt/render/html_smartypants.c',
-      'upskirt/render/html.h',
+      'upskirt/src/{markdown,buffer,array,autolink}.c',
+      'upskirt/html/{html,html_smartypants,html_autolink}.c',
+      'upskirt/html/html.h',
     ]
   cp files, 'ext/redcarpet/',
     :preserve => true,

data/ext/redcarpet/autolink.c

@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2011, Vicent Marti
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "markdown.h"
+#include "buffer.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+int
+is_safe_link(const char *link, size_t link_len)
+{
+	static const size_t valid_uris_count = 4;
+	static const char *valid_uris[] = {
+		"http://", "https://", "ftp://", "mailto://"
+	};
+
+	size_t i;
+
+	for (i = 0; i < valid_uris_count; ++i) {
+		size_t len = strlen(valid_uris[i]);
+
+		if (link_len > len &&
+			strncasecmp(link, valid_uris[i], len) == 0 &&
+			isalnum(link[len]))
+			return 1;
+	}
+
+	return 0;
+}
+
+static size_t
+autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
+{
+	char cclose, copen = 0;
+
+	while (link_end > 0) {
+		if (strchr("?!.,", data[link_end - 1]) != NULL)
+			link_end--;
+
+		else if (data[link_end - 1] == ';') {
+			size_t new_end = link_end - 2;
+
+			while (new_end > 0 && isalpha(data[new_end]))
+				new_end--;
+
+			if (new_end < link_end - 2 && data[new_end] == '&')
+				link_end = new_end;
+			else
+				link_end--;
+		}
+
+		else if (data[link_end - 1] == '>') {
+			while (link_end > 0 && data[link_end] != '<')
+				link_end--;
+		}
+		else break;
+	}
+
+	if (link_end == 0)
+		return 0;
+
+	cclose = data[link_end - 1];
+
+	switch (cclose) {
+	case '"':	copen = '"'; break;
+	case '\'':	copen = '\''; break;
+	case ')':	copen = '('; break;
+	case ']':	copen = '['; break;
+	case '}':	copen = '{'; break;
+	}
+
+	if (copen != 0) {
+		size_t closing = 0;
+		size_t opening = 0;
+		size_t i = 0;
+
+		/* Try to close the final punctuation sign in this same line;
+		 * if we managed to close it outside of the URL, that means that it's
+		 * not part of the URL. If it closes inside the URL, that means it
+		 * is part of the URL.
+		 *
+		 * Examples:
+		 *
+		 *	foo http://www.pokemon.com/Pikachu_(Electric) bar
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
+		 *
+		 *	foo (http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
+		 *
+		 *	foo http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *		=> http://www.pokemon.com/Pikachu_(Electric))
+		 *
+		 *	(foo http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *		=> foo http://www.pokemon.com/Pikachu_(Electric)
+		 */
+
+		while (i < link_end) {
+			if (data[i] == copen)
+				opening++;
+			else if (data[i] == cclose)
+				closing++;
+
+			i++;
+		}
+
+		if (closing != opening)
+			link_end--;
+	}
+
+	return link_end;
+}
+
+size_t
+ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
+{
+	size_t link_end;
+	int np = 0;
+
+	if (offset > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
+		return 0;
+
+	if (size < 4 || memcmp(data, "www.", STRLEN("www.")) != 0)
+		return 0;
+
+	link_end = 0;
+	while (link_end < size && !isspace(data[link_end])) {
+		if (data[link_end] == '.')
+			np++;
+
+		link_end++;
+	}
+
+	if (np < 2)
+		return 0;
+
+	link_end = autolink_delim(data, link_end, offset, size);
+
+	if (link_end == 0)
+		return 0;
+
+	bufput(link, data, link_end);
+	*rewind_p = 0;
+
+	return (int)link_end;
+}
+
+size_t
+ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
+{
+	size_t link_end, rewind;
+	int nb = 0, np = 0;
+
+	for (rewind = 0; rewind < offset; ++rewind) {
+		char c = data[-rewind - 1];
+
+		if (isalnum(c))
+			continue;
+
+		if (strchr(".+-_", c) != NULL)
+			continue;
+
+		break;
+	}
+
+	if (rewind == 0)
+		return 0;
+
+	for (link_end = 0; link_end < size; ++link_end) {
+		char c = data[link_end];
+
+		if (isalnum(c))
+			continue;
+
+		if (c == '@')
+			nb++;
+		else if (c == '.' && link_end < size - 1)
+			np++;
+		else if (c != '-' && c != '_')
+			break;
+	}
+
+	if (link_end < 2 || nb != 1 || np == 0)
+		return 0;
+
+	link_end = autolink_delim(data, link_end, offset, size);
+
+	if (link_end == 0)
+		return 0;
+
+	bufput(link, data - rewind, link_end + rewind);
+	*rewind_p = rewind;
+
+	return link_end;
+}
+
+size_t
+ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
+{
+	size_t link_end, rewind = 0;
+
+	if (size < 4 || data[1] != '/' || data[2] != '/')
+		return 0;
+
+	while (rewind < offset && isalpha(data[-rewind - 1]))
+		rewind++;
+
+	if (!is_safe_link(data - rewind, size + rewind))
+		return 0;
+
+	link_end = 0;
+	while (link_end < size && !isspace(data[link_end]))
+		link_end++;
+
+	link_end = autolink_delim(data, link_end, offset, size);
+
+	if (link_end == 0)
+		return 0;
+
+	bufput(link, data - rewind, link_end + rewind);
+	*rewind_p = rewind;
+
+	return link_end;
+}
+

data/ext/redcarpet/html.c

@@ -45,9 +45,9 @@ put_scaped_char(struct buf *ob, char c)
 	}
 }
 
-/* attr_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
-static void
-attr_escape(struct buf *ob, const char *src, size_t size)
+/* upshtml_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
+void
+upshtml_escape(struct buf *ob, const char *src, size_t size)
 {
 	size_t  i = 0, org;
 	while (i < size) {
@@ -127,9 +127,9 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	 * want to print the `mailto:` prefix
 	 */
 	if (bufprefix(link, "mailto:") == 0) {
-		attr_escape(ob, link->data + 7, link->size - 7);
+		upshtml_escape(ob, link->data + 7, link->size - 7);
 	} else {
-		attr_escape(ob, link->data, link->size);
+		upshtml_escape(ob, link->data, link->size);
 	}
 
 	BUFPUTSL(ob, "</a>");
@@ -159,7 +159,7 @@ rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
 					org++;
 
 				if (cls) bufputc(ob, ' ');
-				attr_escape(ob, lang->data + org, i - org);
+				upshtml_escape(ob, lang->data + org, i - org);
 			}
 		}
 
@@ -168,7 +168,7 @@ rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		attr_escape(ob, text->data, text->size);
+		upshtml_escape(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -204,16 +204,16 @@ rndr_blockcode_github(struct buf *ob, struct buf *text, struct buf *lang, void *
 			i++;
 
 		if (lang->data[0] == '.')
-			attr_escape(ob, lang->data + 1, i - 1);
+			upshtml_escape(ob, lang->data + 1, i - 1);
 		else
-			attr_escape(ob, lang->data, i);
+			upshtml_escape(ob, lang->data, i);
 
 		BUFPUTSL(ob, "\"><code>");
 	} else
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		attr_escape(ob, text->data, text->size);
+		upshtml_escape(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -230,7 +230,7 @@ static int
 rndr_codespan(struct buf *ob, struct buf *text, void *opaque)
 {
 	BUFPUTSL(ob, "<code>");
-	if (text) attr_escape(ob, text->data, text->size);
+	if (text) upshtml_escape(ob, text->data, text->size);
 	BUFPUTSL(ob, "</code>");
 	return 1;
 }
@@ -299,7 +299,7 @@ rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *conte
 	if (link && link->size) bufput(ob, link->data, link->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		attr_escape(ob, title->data, title->size); }
+		upshtml_escape(ob, title->data, title->size); }
 	BUFPUTSL(ob, "\">");
 	if (content && content->size) bufput(ob, content->data, content->size);
 	BUFPUTSL(ob, "</a>");
@@ -406,13 +406,13 @@ rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt,
 	struct html_renderopt *options = opaque;	
 	if (!link || !link->size) return 0;
 	BUFPUTSL(ob, "<img src=\"");
-	attr_escape(ob, link->data, link->size);
+	upshtml_escape(ob, link->data, link->size);
 	BUFPUTSL(ob, "\" alt=\"");
 	if (alt && alt->size)
-		attr_escape(ob, alt->data, alt->size);
+		upshtml_escape(ob, alt->data, alt->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		attr_escape(ob, title->data, title->size); }
+		upshtml_escape(ob, title->data, title->size); }
 
 	bufputc(ob, '"');
 	bufputs(ob, options->close_tag);
@@ -503,7 +503,7 @@ static void
 rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
 {
 	if (text)
-		attr_escape(ob, text->data, text->size);
+		upshtml_escape(ob, text->data, text->size);
 }
 
 static void

data/ext/redcarpet/html.h

@@ -18,6 +18,8 @@
 #define UPSKIRT_HTML_H
 
 #include "markdown.h"
+#include "buffer.h"
+#include <stdlib.h>
 
 typedef enum {
 	HTML_SKIP_HTML = (1 << 0),
@@ -32,6 +34,15 @@ typedef enum {
 	HTML_USE_XHTML = (1 << 11),
 } render_mode;
 
+typedef enum {
+	AUTOLINK_URLS = (1 << 0),
+	AUTOLINK_EMAILS = (1 << 1),
+	AUTOLINK_ALL = AUTOLINK_URLS|AUTOLINK_EMAILS
+} autolink_mode;
+
+void
+upshtml_escape(struct buf *ob, const char *src, size_t size);
+
 extern void
 upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags);
 
@@ -44,5 +55,9 @@ upshtml_free_renderer(struct mkd_renderer *renderer);
 extern void
 upshtml_smartypants(struct buf *ob, struct buf *text);
 
+extern void
+upshtml_autolink(struct buf *ob, struct buf *text, unsigned int autolink_flags);
+
+
 #endif
 

data/ext/redcarpet/html_autolink.c

@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2011, Vicent Marti
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "markdown.h"
+#include "buffer.h"
+#include "html.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+static inline int
+is_closing_a(const char *tag, size_t size)
+{
+	size_t i;
+
+	if (tag[0] != '<' || size < STRLEN("</a>") || tag[1] != '/')
+		return 0;
+
+	i = 2;
+
+	while (i < size && isspace(tag[i]))
+		i++;
+
+	if (i == size || tag[i] != 'a')
+		return 0;
+
+	i++;
+
+	while (i < size && isspace(tag[i]))
+		i++;
+
+	if (i == size || tag[i] != '>')
+		return 0;
+
+	return i;
+}
+
+static size_t
+skip_tags(struct buf *ob, const char *text, size_t size)
+{
+	size_t i = 0;
+
+	while (i < size && text[i] != '>')
+		i++;
+
+	if (size > 3 && text[1] == 'a' && isspace(text[2])) {
+		while (i < size) {
+			size_t tag_len = is_closing_a(text + i, size - i);
+			if (tag_len) {
+				i += tag_len;
+				break;
+			}
+			i++;
+		}
+	}
+
+	bufput(ob, text, i + 1);
+	return i + 1;
+}
+
+void
+upshtml_autolink(struct buf *ob, struct buf *text, unsigned int flags)
+{
+	size_t i, end;
+	struct buf *link = bufnew(16);
+	const char *active_chars;
+
+	if (!text || text->size == 0)
+		return;
+
+	switch (flags) {
+		case AUTOLINK_EMAILS:
+			active_chars = "<@";
+			break;
+
+		case AUTOLINK_URLS:
+			active_chars = "<w:";
+
+		case AUTOLINK_ALL:
+			active_chars = "<@w:";
+			break;
+
+		default:
+			return;
+	}
+
+	bufgrow(ob, text->size);
+
+	i = end = 0;
+
+	while (i < text->size) {
+		size_t rewind;
+
+		while (end < text->size && strchr(active_chars, text->data[end]) == NULL)
+			end++;
+
+		bufput(ob, text->data + i, end - i);
+
+		if (end >= text->size)
+			break;
+
+		i = end;
+		link->size = 0;
+
+		switch (text->data[i]) {
+		case '@':
+			end = ups_autolink__email(&rewind, link, text->data + i, i, text->size - i);
+			if (end > 0) {
+				ob->size -= rewind;
+				BUFPUTSL(ob, "<a href=\"mailto:");
+				bufput(ob, link->data, link->size);
+				BUFPUTSL(ob, "\">");
+				upshtml_escape(ob, link->data, link->size);
+				BUFPUTSL(ob, "</a>");
+			}
+			break;
+
+		case 'w':
+			end = ups_autolink__www(&rewind, link, text->data + i, i, text->size - i);
+			if (end > 0) {
+				BUFPUTSL(ob, "<a href=\"http://");
+				bufput(ob, link->data, link->size);
+				BUFPUTSL(ob, "\">");
+				upshtml_escape(ob, link->data, link->size);
+				BUFPUTSL(ob, "</a>");
+			}
+			break;
+
+		case ':':
+			end = ups_autolink__url(&rewind, link, text->data + i, i, text->size - i);
+			if (end > 0) {
+				ob->size -= rewind;
+				BUFPUTSL(ob, "<a href=\"");
+				bufput(ob, link->data, link->size);
+				BUFPUTSL(ob, "\">");
+				upshtml_escape(ob, link->data, link->size);
+				BUFPUTSL(ob, "</a>");
+			}
+			break;
+
+		case '<':
+			end = skip_tags(ob, text->data + i, text->size - i);
+			break;
+
+		default:
+			end = 0;
+			break;
+		}
+
+		if (!end)
+			end = i + 1;
+		else { 
+			i += end;
+			end = i;
+		} 
+	}
+}
+
+

data/ext/redcarpet/markdown.c

@@ -165,28 +165,6 @@ static struct html_tag block_tags[] = {
 /***************************
  * HELPER FUNCTIONS *
  ***************************/
-int
-is_safe_link(const char *link, size_t link_len)
-{
-	static const size_t valid_uris_count = 4;
-	static const char *valid_uris[] = {
-		"http://", "https://", "ftp://", "mailto://"
-	};
-
-	size_t i;
-
-	for (i = 0; i < valid_uris_count; ++i) {
-		size_t len = strlen(valid_uris[i]);
-
-		if (link_len > len &&
-			strncasecmp(link, valid_uris[i], len) == 0 &&
-			isalnum(link[len]))
-			return 1;
-	}
-
-	return 0;
-}
-
 static void
 unscape_text(struct buf *ob, struct buf *src)
 {
@@ -730,237 +708,69 @@ char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset,
 	else return end;
 }
 
-static size_t
-autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
-{
-	char cclose, copen = 0;
-
-	/* See if the link finishes with a punctuation sign that can be skipped. */
-	switch (data[link_end - 1]) {
-	case '?':
-	case '!':
-	case '.':
-	case ',':
-		link_end--;
-		break;
-
-	case ';':
-	{
-		size_t new_end = link_end - 2;
-
-		while (new_end > 0 && isalpha(data[new_end]))
-			new_end--;
-
-		if (new_end < link_end - 2 && data[new_end] == '&')
-			link_end = new_end;
-		else
-			link_end--;
-
-		break;
-	}
-
-	case '>':
-		while (link_end > 0 && data[link_end] != '<')
-			link_end--;
-
-		if (link_end == 0)
-			return 0;
-
-		break;
-	}
-
-	cclose = data[link_end - 1];
-
-	switch (cclose) {
-	case '"':	copen = '"'; break;
-	case '\'':	copen = '\''; break;
-	case ')':	copen = '('; break;
-	case ']':	copen = '['; break;
-	case '}':	copen = '{'; break;
-	}
-
-	if (copen != 0) {
-		size_t closing = 0;
-		size_t opening = 0;
-		size_t i = 0;
-
-		/* Try to close the final punctuation sign in this same line;
-		 * if we managed to close it outside of the URL, that means that it's
-		 * not part of the URL. If it closes inside the URL, that means it
-		 * is part of the URL.
-		 *
-		 * Examples:
-		 *
-		 *	foo http://www.pokemon.com/Pikachu_(Electric) bar
-		 *		=> http://www.pokemon.com/Pikachu_(Electric)
-		 *
-		 *	foo (http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *		=> http://www.pokemon.com/Pikachu_(Electric)
-		 *
-		 *	foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *		=> http://www.pokemon.com/Pikachu_(Electric))
-		 *
-		 *	(foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *		=> foo http://www.pokemon.com/Pikachu_(Electric)
-		 */
-
-		while (i < link_end) {
-			if (data[i] == copen)
-				opening++;
-			else if (data[i] == cclose)
-				closing++;
-
-			i++;
-		}
-
-		if (closing != opening)
-			link_end--;
-	}
-
-	return link_end;
-}
-
-
 static size_t
 char_autolink_www(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
-	struct buf work = { 0, 0, 0, 0, 0 };
-	size_t link_end;
-	int np = 0;
-
-	if (offset > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
-		return 0;
-
-	if (size < 4 || memcmp(data, "www.", STRLEN("www.")) != 0)
-		return 0;
-
-	link_end = 0;
-	while (link_end < size && !isspace(data[link_end])) {
-		if (data[link_end] == '.')
-			np++;
-
-		link_end++;
-	}
+	struct buf *link, *link_url;
+	size_t link_len, rewind;
 
-	if (np < 2)
+	if (!rndr->make.link)
 		return 0;
 
-	link_end = autolink_delim(data, link_end, offset, size);
+	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
-	if (link_end == 0)
-		return 0;
-
-	work.size = link_end;
-	work.data = data;
-
-	if (rndr->make.link) {
-		struct buf *u_link = rndr_newbuf(rndr, BUFFER_SPAN);
-		BUFPUTSL(u_link, "http://");
-		unscape_text(u_link, &work);
+	if ((link_len = ups_autolink__www(&rewind, link, data, offset, size)) > 0) {
+		link_url = rndr_newbuf(rndr, BUFFER_SPAN);
+		BUFPUTSL(link_url, "http://");
+		bufput(link_url, link->data, link->size);
 
-		rndr->make.link(ob, u_link, NULL, &work, rndr->make.opaque);
+		ob->size -= rewind;
+		rndr->make.link(ob, link_url, NULL, link, rndr->make.opaque);
 		rndr_popbuf(rndr, BUFFER_SPAN);
 	}
 
-	return link_end;
+	rndr_popbuf(rndr, BUFFER_SPAN);
+	return link_len;
 }
 
 static size_t
 char_autolink_email(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
-	struct buf work = { 0, 0, 0, 0, 0 };
-	size_t link_end, rewind;
-	int nb = 0, np = 0;
-
-	for (rewind = 0; rewind < offset; ++rewind) {
-		char c = data[-rewind - 1];
-
-		if (isalnum(c))
-			continue;
-
-		if (strchr(".+-_", c) != NULL)
-			continue;
-
-		break;
-	}
-
-	if (rewind == 0)
-		return 0;
-
-	for (link_end = 0; link_end < size; ++link_end) {
-		char c = data[link_end];
-
-		if (isalnum(c))
-			continue;
-
-		if (c == '@')
-			nb++;
-		else if (c == '.' && link_end < size - 1)
-			np++;
-		else if (c != '-' && c != '_')
-			break;
-	}
-
-	if (link_end < 2 || nb != 1 || np == 0)
-		return 0;
-
-	link_end = autolink_delim(data, link_end, offset, size);
+	struct buf *link;
+	size_t link_len, rewind;
 
-	if (link_end == 0)
+	if (!rndr->make.autolink)
 		return 0;
 
-	work.size = link_end + rewind;
-	work.data = data - rewind;
-
-	if (rndr->make.autolink) {
-		struct buf *u_link = rndr_newbuf(rndr, BUFFER_SPAN);
-		unscape_text(u_link, &work);
+	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
+	if ((link_len = ups_autolink__email(&rewind, link, data, offset, size)) > 0) {
 		ob->size -= rewind;
-		rndr->make.autolink(ob, u_link, MKDA_EMAIL, rndr->make.opaque);
-		rndr_popbuf(rndr, BUFFER_SPAN);
-	}	
+		rndr->make.autolink(ob, link, MKDA_EMAIL, rndr->make.opaque);
+	}
 
-	return link_end;
+	rndr_popbuf(rndr, BUFFER_SPAN);
+	return link_len;
 }
 
 static size_t
 char_autolink_url(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
-	struct buf work = { 0, 0, 0, 0, 0 };
-	size_t link_end, rewind = 0;
-
-	if (size < 4 || data[1] != '/' || data[2] != '/')
-		return 0;
-
-	while (rewind < offset && isalpha(data[-rewind - 1]))
-		rewind++;
-
-	if (!is_safe_link(data - rewind, size + rewind))
-		return 0;
-
-	link_end = 0;
-	while (link_end < size && !isspace(data[link_end]))
-		link_end++;
-
-	link_end = autolink_delim(data, link_end, offset, size);
+	struct buf *link;
+	size_t link_len, rewind;
 
-	if (link_end == 0)
+	if (!rndr->make.autolink)
 		return 0;
 
-	work.size = link_end + rewind;
-	work.data = data - rewind;
-
-	if (rndr->make.autolink) {
-		struct buf *u_link = rndr_newbuf(rndr, BUFFER_SPAN);
-		unscape_text(u_link, &work);
+	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
+	if ((link_len = ups_autolink__url(&rewind, link, data, offset, size)) > 0) {
 		ob->size -= rewind;
-		rndr->make.autolink(ob, u_link, MKDA_NORMAL, rndr->make.opaque);
-		rndr_popbuf(rndr, BUFFER_SPAN);
+		rndr->make.autolink(ob, link, MKDA_NORMAL, rndr->make.opaque);
 	}
 
-	return link_end;
+	rndr_popbuf(rndr, BUFFER_SPAN);
+	return link_len;
 }
 
 /* char_link • '[': parsing a link or an image */

data/ext/redcarpet/markdown.h

@@ -105,6 +105,15 @@ struct mkd_renderer {
 int
 is_safe_link(const char *link, size_t link_len);
 
+size_t
+ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
+
+size_t
+ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
+
+size_t
+ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
+
 /**********************
  * EXPORTED FUNCTIONS *
  **********************/

data/ext/redcarpet/redcarpet.c

@@ -79,6 +79,31 @@ static void rb_redcarpet__get_flags(VALUE ruby_obj,
 	*render_flags_p = render_flags;
 }
 
+static VALUE rb_redcarpet_autolink(VALUE self, VALUE text)
+{
+	VALUE result;
+	struct buf input_buf, *output_buf;
+
+	memset(&input_buf, 0x0, sizeof(struct buf));
+	input_buf.data = RSTRING_PTR(text);
+	input_buf.size = RSTRING_LEN(text);
+
+	output_buf = bufnew(128);
+
+	upshtml_autolink(output_buf, &input_buf, AUTOLINK_ALL);
+	result = rb_str_new(output_buf->data, output_buf->size);
+
+	bufrelease(output_buf);
+
+	/* force the input encoding */
+	if (rb_respond_to(text, rb_intern("encoding"))) {
+		VALUE encoding = rb_funcall(text, rb_intern("encoding"), 0);
+		rb_funcall(result, rb_intern("force_encoding"), 1, encoding);
+	}
+
+	return result;
+}
+
 static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 {
 	VALUE text = rb_funcall(self, rb_intern("text"), 0);
@@ -152,5 +177,7 @@ void Init_redcarpet()
     rb_cRedcarpet = rb_define_class("Redcarpet", rb_cObject);
     rb_define_method(rb_cRedcarpet, "to_html", rb_redcarpet_to_html, -1);
     rb_define_method(rb_cRedcarpet, "toc_content", rb_redcarpet_toc, -1);
+
+	rb_define_singleton_method(rb_cRedcarpet, "auto_link", rb_redcarpet_autolink, 1);
 }
 

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.15.2'
+  VERSION = '1.16.0'
 
   # Original Markdown formatted text.
   attr_reader :text

data/redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.15.2'
+  s.version = '1.16.0'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-06-02'
+  s.date = '2011-06-08'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
@@ -15,11 +15,13 @@ Gem::Specification.new do |s|
     bin/redcarpet
     ext/redcarpet/array.c
     ext/redcarpet/array.h
+    ext/redcarpet/autolink.c
     ext/redcarpet/buffer.c
     ext/redcarpet/buffer.h
     ext/redcarpet/extconf.rb
     ext/redcarpet/html.c
     ext/redcarpet/html.h
+    ext/redcarpet/html_autolink.c
     ext/redcarpet/html_smartypants.c
     ext/redcarpet/markdown.c
     ext/redcarpet/markdown.h
@@ -27,10 +29,10 @@ Gem::Specification.new do |s|
     lib/markdown.rb
     lib/redcarpet.rb
     redcarpet.gemspec
+    test/autolink_test.rb
     test/benchmark.rb
     test/benchmark.txt
     test/markdown_test.rb
-    test/rails_test.rb
     test/redcarpet_test.rb
     upskirt
   ]

data/test/{rails_test.rb → autolink_test.rb}

@@ -6,17 +6,17 @@ require 'test/unit'
 require 'cgi'
 require 'redcarpet'
 
-class RedcarpetRailsTest < Test::Unit::TestCase
+class RedcarpetAutolinkTest < Test::Unit::TestCase
   def assert_linked(expected, url)
-    assert_equal "<p>#{expected}</p>", Redcarpet.new(url, :autolink).to_html.strip
+    assert_equal expected, Redcarpet.auto_link(url)
   end
 
-  def test_auto_link_works
+  def test_autolink_works
     url = "http://example.com/"
     assert_linked "<a href=\"#{url}\">#{url}</a>", url
   end
 
-  def test_does_not_autolink_www
+  def test_not_autolink_www
     assert_linked "Awww... man", "Awww... man"
   end
 
@@ -25,8 +25,8 @@ class RedcarpetRailsTest < Test::Unit::TestCase
     assert_linked "<a href=\"#{url}\">#{url}</a>", url
   end
 
-  def test_does_not_include_gt
-    url = "http://example.com/"
+  def test_does_not_include_trailing_gt
+    url = "http://example.com"
     assert_linked "&lt;<a href=\"#{url}\">#{url}</a>&gt;", "&lt;#{url}&gt;"
   end
 
@@ -60,60 +60,60 @@ class RedcarpetRailsTest < Test::Unit::TestCase
     end
   end
 
-  def test_like_rails_rules
+  def test_links_like_autolink_rails
     email_raw    = 'david@loudthinking.com'
     email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
     email2_raw    = '+david@loudthinking.com'
     email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
     link_raw     = 'http://www.rubyonrails.com'
     link_result  = %{<a href="#{link_raw}">#{link_raw}</a>}
-    link_result_with_options  = %{<a href="#{link_raw}" target="_blank">#{CGI.escapeHTML(link_raw)}</a>}
+    link_result_with_options  = %{<a href="#{link_raw}" target="_blank">#{link_raw}</a>}
     link2_raw    = 'www.rubyonrails.com'
-    link2_result = %{<a href="http://#{link2_raw}">#{CGI.escapeHTML(link2_raw)}</a>}
+    link2_result = %{<a href="http://#{link2_raw}">#{link2_raw}</a>}
     link3_raw    = 'http://manuals.ruby-on-rails.com/read/chapter.need_a-period/103#page281'
-    link3_result = %{<a href="#{link3_raw}">#{CGI.escapeHTML(link3_raw)}</a>}
+    link3_result = %{<a href="#{link3_raw}">#{link3_raw}</a>}
     link4_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
     link4_result = %{<a href="#{link4_raw}">#{CGI.escapeHTML(link4_raw)}</a>}
     link5_raw    = 'http://foo.example.com:3000/controller/action'
-    link5_result = %{<a href="#{link5_raw}">#{CGI.escapeHTML(link5_raw)}</a>}
+    link5_result = %{<a href="#{link5_raw}">#{link5_raw}</a>}
     link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
-    link6_result = %{<a href="#{link6_raw}">#{CGI.escapeHTML(link6_raw)}</a>}
+    link6_result = %{<a href="#{link6_raw}">#{link6_raw}</a>}
     link7_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
     link7_result = %{<a href="#{link7_raw}">#{CGI.escapeHTML(link7_raw)}</a>}
     link8_raw    = 'http://foo.example.com:3000/controller/action.html'
-    link8_result = %{<a href="#{link8_raw}">#{CGI.escapeHTML(link8_raw)}</a>}
+    link8_result = %{<a href="#{link8_raw}">#{link8_raw}</a>}
     link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
-    link9_result = %{<a href="#{link9_raw}">#{CGI.escapeHTML(link9_raw)}</a>}
+    link9_result = %{<a href="#{link9_raw}">#{link9_raw}</a>}
     link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
-    link10_result = %{<a href="#{link10_raw}">#{CGI.escapeHTML(link10_raw)}</a>}
+    link10_result = %{<a href="#{link10_raw}">#{link10_raw}</a>}
 
     assert_linked %(Go to #{link_result} and say hello to #{email_result}), "Go to #{link_raw} and say hello to #{email_raw}"
-    assert_linked %(Link #{link_result}), "Link #{link_raw}"
-    assert_linked %(#{link_result} Link), "#{link_raw} Link"
+    assert_linked %(<p>Link #{link_result}</p>), "<p>Link #{link_raw}</p>"
+    assert_linked %(<p>#{link_result} Link</p>), "<p>#{link_raw} Link</p>"
     assert_linked %(Go to #{link_result}.), %(Go to #{link_raw}.)
-    assert_linked %(Go to #{link_result}, then say hello to #{email_result}.), %(Go to #{link_raw}, then say hello to #{email_raw}.)
-    assert_linked %(Link #{link2_result}), "Link #{link2_raw}"
-    assert_linked %(#{link2_result} Link), "#{link2_raw} Link"
+    assert_linked %(<p>Go to #{link_result}, then say hello to #{email_result}.</p>), %(<p>Go to #{link_raw}, then say hello to #{email_raw}.</p>)
+    assert_linked %(<p>Link #{link2_result}</p>), "<p>Link #{link2_raw}</p>"
+    assert_linked %(<p>#{link2_result} Link</p>), "<p>#{link2_raw} Link</p>"
     assert_linked %(Go to #{link2_result}.), %(Go to #{link2_raw}.)
-    assert_linked %(Say hello to #{email_result}, then go to #{link2_result}.), %(Say hello to #{email_raw}, then go to #{link2_raw}.)
-    assert_linked %(Link #{link3_result}), "Link #{link3_raw}"
-    assert_linked %(#{link3_result} Link), "#{link3_raw} Link"
+#    assert_linked %(<p>Say hello to #{email_result}, then go to #{link2_result},</p>), %(<p>Say hello to #{email_raw}, then go to #{link2_raw},</p>)
+    assert_linked %(<p>Link #{link3_result}</p>), "<p>Link #{link3_raw}</p>"
+    assert_linked %(<p>#{link3_result} Link</p>), "<p>#{link3_raw} Link</p>"
     assert_linked %(Go to #{link3_result}.), %(Go to #{link3_raw}.)
-    assert_linked %(Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.), %(Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.)
-    assert_linked %(Link #{link4_result}), "Link #{link4_raw}"
-    assert_linked %(#{link4_result} Link), "#{link4_raw} Link"
-    assert_linked %(#{link5_result} Link), "#{link5_raw} Link"
-    assert_linked %(#{link6_result} Link), "#{link6_raw} Link"
-    assert_linked %(#{link7_result} Link), "#{link7_raw} Link"
-    assert_linked %(Link #{link8_result}), "Link #{link8_raw}"
-    assert_linked %(#{link8_result} Link), "#{link8_raw} Link"
+    assert_linked %(<p>Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.</p>), %(<p>Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.</p>)
+    assert_linked %(<p>Link #{link4_result}</p>), "<p>Link #{link4_raw}</p>"
+    assert_linked %(<p>#{link4_result} Link</p>), "<p>#{link4_raw} Link</p>"
+    assert_linked %(<p>#{link5_result} Link</p>), "<p>#{link5_raw} Link</p>"
+    assert_linked %(<p>#{link6_result} Link</p>), "<p>#{link6_raw} Link</p>"
+    assert_linked %(<p>#{link7_result} Link</p>), "<p>#{link7_raw} Link</p>"
+    assert_linked %(<p>Link #{link8_result}</p>), "<p>Link #{link8_raw}</p>"
+    assert_linked %(<p>#{link8_result} Link</p>), "<p>#{link8_raw} Link</p>"
     assert_linked %(Go to #{link8_result}.), %(Go to #{link8_raw}.)
-    assert_linked %(Go to #{link8_result}. seriously, #{link8_result}? i think I'll say hello to #{email_result}. instead.), %(Go to #{link8_raw}. seriously, #{link8_raw}? i think I'll say hello to #{email_raw}. instead.)
-    assert_linked %(Link #{link9_result}), "Link #{link9_raw}"
-    #assert_linked %(#{link9_result} Link), "#{link9_raw} Link"
+    assert_linked %(<p>Go to #{link8_result}. seriously, #{link8_result}? i think I'll say hello to #{email_result}. instead.</p>), %(<p>Go to #{link8_raw}. seriously, #{link8_raw}? i think I'll say hello to #{email_raw}. instead.</p>)
+    assert_linked %(<p>Link #{link9_result}</p>), "<p>Link #{link9_raw}</p>"
+    assert_linked %(<p>#{link9_result} Link</p>), "<p>#{link9_raw} Link</p>"
     assert_linked %(Go to #{link9_result}.), %(Go to #{link9_raw}.)
-    #assert_linked %(Go to #{link9_result}. seriously, #{link9_result}? i think I'll say hello to #{email_result}. instead.), %(Go to #{link9_raw}. seriously, #{link9_raw}? i think I'll say hello to #{email_raw}. instead.)
-    #assert_linked %(#{link10_result} Link), "#{link10_raw} Link"
+    assert_linked %(<p>Go to #{link9_result}. seriously, #{link9_result}? i think I'll say hello to #{email_result}. instead.</p>), %(<p>Go to #{link9_raw}. seriously, #{link9_raw}? i think I'll say hello to #{email_raw}. instead.</p>)
+    assert_linked %(<p>#{link10_result} Link</p>), "<p>#{link10_raw} Link</p>"
     assert_linked email2_result, email2_raw
     assert_linked "#{link_result} #{link_result} #{link_result}", "#{link_raw} #{link_raw} #{link_raw}"
     assert_linked '<a href="http://www.rubyonrails.com">Ruby On Rails</a>', '<a href="http://www.rubyonrails.com">Ruby On Rails</a>'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 87
   prerelease: false
   segments: 
   - 1
-  - 15
-  - 2
-  version: 1.15.2
+  - 16
+  - 0
+  version: 1.16.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +02:00
+date: 2011-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -35,11 +35,13 @@ files:
 - bin/redcarpet
 - ext/redcarpet/array.c
 - ext/redcarpet/array.h
+- ext/redcarpet/autolink.c
 - ext/redcarpet/buffer.c
 - ext/redcarpet/buffer.h
 - ext/redcarpet/extconf.rb
 - ext/redcarpet/html.c
 - ext/redcarpet/html.h
+- ext/redcarpet/html_autolink.c
 - ext/redcarpet/html_smartypants.c
 - ext/redcarpet/markdown.c
 - ext/redcarpet/markdown.h
@@ -47,10 +49,10 @@ files:
 - lib/markdown.rb
 - lib/redcarpet.rb
 - redcarpet.gemspec
+- test/autolink_test.rb
 - test/benchmark.rb
 - test/benchmark.txt
 - test/markdown_test.rb
-- test/rails_test.rb
 - test/redcarpet_test.rb
 has_rdoc: true
 homepage: http://github.com/tanoku/redcarpet