redcarpet 1.2.0 → 1.2.1

data/ext/render.c

@@ -22,7 +22,8 @@
 #include <stdio.h>
 
 
-static int is_safe_link(const char *link, size_t link_len)
+static int
+is_safe_link(const char *link, size_t link_len)
 {
 	static const size_t valid_uris_count = 4;
 	static const char *valid_uris[] = {
@@ -41,6 +42,12 @@ static int is_safe_link(const char *link, size_t link_len)
 	return 0;
 }
 
+static inline int
+is_uri_char(char c)
+{
+	return isalnum(c) || strchr("/:$-_.+!*'(),", c) != NULL;
+}
+
 static int
 put_scaped_char(struct buf *ob, char c)
 {
@@ -435,17 +442,16 @@ rndr_normal_text(struct buf *ob, struct buf *text, struct mkd_renderopt *options
 		 */
 		if (autolink) {
 			/* Autolinking is not standarized in the Markdown spec.
-			 * We only check for links after special characters, i.e.
-			 * immediately after a space or a parenthesis */
-			if ((i == 0 || isspace(text->data[i - 1]) || text->data[i - 1] == '(') &&
+			 * We only check for links immediately after a space  */
+			if ((i == 0 || isspace(text->data[i - 1])) &&
 				is_safe_link(text->data + i, text->size - i)) {
 				size_t j = i + i;
 
-				while (j < text->size && !isspace(text->data[j]))
+				while (j < text->size && is_uri_char(text->data[j]))
 					j++;
 
 				rndr_autolink2(ob, &text->data[i], j - i, MKDA_NORMAL);
-				i = j;
+				i = j - 1;
 				continue;
 			}
 		}

data/lib/redcarpet.rb

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

data/redcarpet.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.2.0'
+  s.version = '1.2.1'
   s.summary = "Ruby bindings for libupskirt"
-  s.date = '2011-04-02'
+  s.date = '2011-04-04'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true

data/test/redcarpet_test.rb

@@ -122,4 +122,10 @@ class RedcarpetTest < Test::Unit::TestCase
     assert_equal exp, rd.toc_content.strip
   end
 
+  def test_whitespace_after_urls
+    rd = Redcarpet.new("Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)", :autolink)
+    exp = %{<p>Japan: <a href="http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm">http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm</a> (yes, japan)</p>}
+    assert_equal exp, rd.to_html.strip
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-02 00:00:00 +03:00
+date: 2011-04-04 00:00:00 +03:00
 default_executable: 
 dependencies: []