redcarpet 1.13.2 → 1.14.0

data/ext/redcarpet/markdown.c

@@ -261,15 +261,28 @@ 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] == '@'
-	|| (data[i] >= 'a' && data[i] <= 'z')
-	|| (data[i] >= 'A' && data[i] <= 'Z')
-	|| (data[i] >= '0' && data[i] <= '9'))) {
-		if (data[i] == '@') nb += 1;
-		i += 1; }
-	if (i >= size || data[i] != '>' || nb != 1) return 0;
-	return i + 1;
+	for (i = 0; i < size; ++i) {
+		if (isalnum(data[i]))
+			continue;
+
+		switch (data[i]) {
+			case '@':
+				nb++;
+
+			case '-':
+			case '.':
+			case '_':
+				break;
+
+			case '>':
+				return (nb == 1) ? i + 1 : 0;
+
+			default:
+				return 0;
+		}
+	}
+
+	return 0;
 }
 
 /* tag_length • returns the length of the given tag, or 0 is it's not valid */
@@ -281,17 +294,18 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink)
 	/* a valid tag can't be shorter than 3 chars */
 	if (size < 3) return 0;
 
-	/* begins with a '<' optionally followed by '/', followed by letter */
+	/* begins with a '<' optionally followed by '/', followed by letter or number */
 	if (data[0] != '<') return 0;
 	i = (data[1] == '/') ? 2 : 1;
-	if ((data[i] < 'a' || data[i] > 'z')
-	&&  (data[i] < 'A' || data[i] > 'Z')) return 0;
+
+	if (!isalnum(data[i]))
+		return 0;
 
 	/* scheme test */
 	*autolink = MKDA_NOT_AUTOLINK;
 
 	/* try to find the beggining of an URI */
-	while (i < size && (isalpha(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-'))
+	while (i < size && (isalnum(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-'))
 		i++;
 
 	if (i > 1 && data[i] == '@') {

data/ext/redcarpet/markdown.h

@@ -21,9 +21,9 @@
 
 #include "buffer.h"
 
-#define UPSKIRT_VERSION "1.2.0"
+#define UPSKIRT_VERSION "1.14.0"
 #define UPSKIRT_VER_MAJOR 1
-#define UPSKIRT_VER_MINOR 2
+#define UPSKIRT_VER_MINOR 14
 #define UPSKIRT_VER_REVISION 0
 
 /********************

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.13.2'
+  VERSION = '1.14.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.13.2'
+  s.version = '1.14.0'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-05-16'
+  s.date = '2011-05-17'
   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: 39
+  hash: 47
   prerelease: false
   segments: 
   - 1
-  - 13
-  - 2
-  version: 1.13.2
+  - 14
+  - 0
+  version: 1.14.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 +03:00
+date: 2011-05-17 00:00:00 +03:00
 default_executable: 
 dependencies: []