redcarpet 1.11.0 → 1.11.1

data/ext/markdown.c

@@ -205,6 +205,7 @@ static size_t
 is_mail_autolink(char *data, size_t size)
 {
 	size_t i = 0, nb = 0;
+
 	/* address is assumed to be: [-@._a-zA-Z0-9]+ with exactly one '@' */
 	while (i < size && (data[i] == '-' || data[i] == '.'
 	|| data[i] == '_' || data[i] == '@'
@@ -239,17 +240,18 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink)
 	while (i < size && (isalpha(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-'))
 		i++;
 
+	if (i > 1 && data[i] == '@') {
+		if ((j = is_mail_autolink(data + i, size - i)) != 0) {
+			*autolink = MKDA_EMAIL;
+			return i + j;
+		}
+	}
+
 	if (i > 2 && data[i] == ':') {
 		*autolink = MKDA_NORMAL;
 		i++;
 	}
 
-	/* 
-	 * FIXME: check for double slashes after the URI id?
-	 * There are some protocols that don't have them, e.g.
-	 *	news:resource
-	 */
-
 	/* completing autolink test: no whitespace or ' or " */
 	if (i >= size || i == '>')
 		*autolink = MKDA_NOT_AUTOLINK;
@@ -262,11 +264,8 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink)
 		if (i >= size) return 0;
 		if (i > j && data[i] == '>') return i + 1;
 		/* one of the forbidden chars has been found */
-		*autolink = MKDA_NOT_AUTOLINK; }
-	else if ((j = is_mail_autolink(data + i, size - i)) != 0) {
-		*autolink = (i == 8)
-				? MKDA_EXPLICIT_EMAIL : MKDA_IMPLICIT_EMAIL;
-		return i + j; }
+		*autolink = MKDA_NOT_AUTOLINK;
+	}
 
 	/* looking for sometinhg looking like a tag end */
 	while (i < size && data[i] != '>') i += 1;

data/ext/markdown.h

@@ -28,9 +28,8 @@
 /* mkd_autolink • type of autolink */
 enum mkd_autolink {
 	MKDA_NOT_AUTOLINK,	/* used internally when it is not an autolink*/
-	MKDA_NORMAL,		/* normal http/http/ftp/etc link */
-	MKDA_EXPLICIT_EMAIL,	/* e-mail link with explit mailto: */
-	MKDA_IMPLICIT_EMAIL	/* e-mail link without mailto: */
+	MKDA_NORMAL,		/* normal http/http/ftp/mailto/etc link */
+	MKDA_EMAIL,			/* e-mail link without explit mailto: */
 };
 
 enum mkd_extensions {

data/ext/xhtml.c

@@ -114,19 +114,27 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	if (!link || !link->size)
 		return 0;
 
-	if ((options->flags & XHTML_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
+	if ((options->flags & XHTML_SAFELINK) != 0 &&
+		!is_safe_link(link->data, link->size) &&
+		type != MKDA_EMAIL)
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
-	if (type == MKDA_IMPLICIT_EMAIL)
+	if (type == MKDA_EMAIL)
 		BUFPUTSL(ob, "mailto:");
 	bufput(ob, link->data, link->size);
 	BUFPUTSL(ob, "\">");
 
-	if (type == MKDA_EXPLICIT_EMAIL && link->size > 7)
+	/*
+	 * Pretty printing: if we get an email address as
+	 * an actual URI, e.g. `mailto:foo@bar.com`, we don't
+	 * want to print the `mailto:` prefix
+	 */
+	if (bufprefix(link, "mailto:") == 0) {
 		lus_attr_escape(ob, link->data + 7, link->size - 7);
-	else
+	} else {
 		lus_attr_escape(ob, link->data, link->size);
+	}
 
 	BUFPUTSL(ob, "</a>");
 

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.11.0'
+  VERSION = '1.11.1'
 
   # 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.11.0'
+  s.version = '1.11.1'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-04-23'
+  s.date = '2011-04-25'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 1
   - 11
-  - 0
-  version: 1.11.0
+  - 1
+  version: 1.11.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 +03:00
+date: 2011-04-25 00:00:00 +03:00
 default_executable: 
 dependencies: []