redcarpet 1.17.1 → 1.17.2

data/ext/redcarpet/autolink.c

@@ -47,6 +47,13 @@ static size_t
 autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
 {
 	char cclose, copen = 0;
+	size_t i;
+
+	for (i = 0; i < link_end; ++i)
+		if (data[i] == '<') {
+			link_end = i;
+			break;
+		}
 
 	while (link_end > 0) {
 		if (strchr("?!.,", data[link_end - 1]) != NULL)
@@ -63,11 +70,6 @@ autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
 			else
 				link_end--;
 		}
-
-		else if (data[link_end - 1] == '>') {
-			while (link_end > 0 && data[link_end] != '<')
-				link_end--;
-		}
 		else break;
 	}
 
@@ -125,11 +127,29 @@ autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
 	return link_end;
 }
 
+static size_t
+check_domain(char *data, size_t size)
+{
+	size_t i, np = 0;
+
+	if (!isalnum(data[0]))
+		return 0;
+
+	for (i = 1; i < size - 1; ++i) {
+		if (data[i] == '.') np++;
+		else if (!isalnum(data[i]) && data[i] != '-') break;
+	}
+
+	if (!isalnum(data[i - 1]) || np == 0)
+		return 0;
+
+	return i;
+}
+
 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;
@@ -137,17 +157,14 @@ ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset,
 	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++;
-	}
+	link_end = check_domain(data, size);
 
-	if (np < 2)
+	if (link_end == 0)
 		return 0;
 
+	while (link_end < size && !isspace(data[link_end]))
+		link_end++;
+
 	link_end = autolink_delim(data, link_end, offset, size);
 
 	if (link_end == 0)
@@ -211,7 +228,7 @@ ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offse
 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;
+	size_t link_end, rewind = 0, domain_len;
 
 	if (size < 4 || data[1] != '/' || data[2] != '/')
 		return 0;
@@ -221,8 +238,13 @@ ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset,
 
 	if (!is_safe_link(data - rewind, size + rewind))
 		return 0;
+	link_end = STRLEN("://");
+
+	domain_len = check_domain(data + link_end, size - link_end);
+	if (domain_len == 0)
+		return 0;
 
-	link_end = 0;
+	link_end += domain_len;
 	while (link_end < size && !isspace(data[link_end]))
 		link_end++;
 

data/ext/redcarpet/autolink.h

@@ -19,12 +19,6 @@
 
 #include "buffer.h"
 
-typedef enum {
-	AUTOLINK_URLS = (1 << 0),
-	AUTOLINK_EMAILS = (1 << 1),
-	AUTOLINK_ALL = AUTOLINK_URLS|AUTOLINK_EMAILS
-} autolink_mode;
-
 extern size_t
 ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
 

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.17.1'
+  VERSION = '1.17.2'
 
   # 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.17.1'
+  s.version = '1.17.2'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-06-09'
+  s.date = '2011-06-19'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 81
-  prerelease: false
+  hash: 87
+  prerelease: 
   segments: 
   - 1
   - 17
-  - 1
-  version: 1.17.1
+  - 2
+  version: 1.17.2
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 +02:00
+date: 2011-06-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libupskirt