redcarpet 1.16.0 → 1.17.0

data/Rakefile

@@ -115,9 +115,9 @@ desc 'Gather required Upskirt sources into extension directory'
 task :gather => 'upskirt/src/markdown.h' do |t|
   files =
     FileList[
-      'upskirt/src/{markdown,buffer,array}.h',
+      'upskirt/src/{markdown,buffer,array,autolink}.h',
       'upskirt/src/{markdown,buffer,array,autolink}.c',
-      'upskirt/html/{html,html_smartypants,html_autolink}.c',
+      'upskirt/html/{html,html_smartypants}.c',
       'upskirt/html/html.h',
     ]
   cp files, 'ext/redcarpet/',

data/ext/redcarpet/autolink.c

@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "markdown.h"
 #include "buffer.h"
 
 #include <string.h>

data/ext/redcarpet/html.h

@@ -34,12 +34,6 @@ 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);
 
@@ -55,9 +49,5 @@ 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/markdown.h

@@ -20,6 +20,7 @@
 #define UPSKIRT_MARKDOWN_H
 
 #include "buffer.h"
+#include "autolink.h"
 
 #define UPSKIRT_VERSION "1.15.2"
 #define UPSKIRT_VER_MAJOR 1
@@ -105,15 +106,6 @@ 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

@@ -1,6 +1,14 @@
+#define RSTRING_NOT_MODIFIED
+
 #include <stdio.h>
 #include "ruby.h"
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#else
+#define rb_enc_copy(dst, src)
+#endif
+
 #include "markdown.h"
 #include "html.h"
 
@@ -79,31 +87,6 @@ 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,11 +135,8 @@ static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 	upshtml_free_renderer(&renderer);
 
 	/* 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);
-	}
-
+	rb_enc_copy(result, text);
+	
 	return result;
 }
 
@@ -177,7 +157,5 @@ 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.16.0'
+  VERSION = '1.17.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.16.0'
+  s.version = '1.17.0'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-06-08'
+  s.date = '2011-06-09'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
     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
@@ -29,7 +28,6 @@ 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 83
   prerelease: false
   segments: 
   - 1
-  - 16
+  - 17
   - 0
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 +02:00
+date: 2011-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -41,7 +41,6 @@ files:
 - 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
@@ -49,7 +48,6 @@ files:
 - lib/markdown.rb
 - lib/redcarpet.rb
 - redcarpet.gemspec
-- test/autolink_test.rb
 - test/benchmark.rb
 - test/benchmark.txt
 - test/markdown_test.rb

data/ext/redcarpet/html_autolink.c

@@ -1,174 +0,0 @@
-/*
- * 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/test/autolink_test.rb

@@ -1,121 +0,0 @@
-# encoding: utf-8
-rootdir = File.dirname(File.dirname(__FILE__))
-$LOAD_PATH.unshift "#{rootdir}/lib"
-
-require 'test/unit'
-require 'cgi'
-require 'redcarpet'
-
-class RedcarpetAutolinkTest < Test::Unit::TestCase
-  def assert_linked(expected, url)
-    assert_equal expected, Redcarpet.auto_link(url)
-  end
-
-  def test_autolink_works
-    url = "http://example.com/"
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_not_autolink_www
-    assert_linked "Awww... man", "Awww... man"
-  end
-
-  def test_does_not_terminate_on_dash
-    url = "http://example.com/Notification_Center-GitHub-20101108-140050.jpg"
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_does_not_include_trailing_gt
-    url = "http://example.com"
-    assert_linked "&lt;<a href=\"#{url}\">#{url}</a>&gt;", "&lt;#{url}&gt;"
-  end
-
-  def test_links_with_anchors
-    url = "https://github.com/github/hubot/blob/master/scripts/cream.js#L20-20"
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_links_like_rails
-    urls = %w(http://www.rubyonrails.com
-              http://www.rubyonrails.com:80
-              http://www.rubyonrails.com/~minam
-              https://www.rubyonrails.com/~minam
-              http://www.rubyonrails.com/~minam/url%20with%20spaces
-              http://www.rubyonrails.com/foo.cgi?something=here
-              http://www.rubyonrails.com/foo.cgi?something=here&and=here
-              http://www.rubyonrails.com/contact;new
-              http://www.rubyonrails.com/contact;new%20with%20spaces
-              http://www.rubyonrails.com/contact;new?with=query&string=params
-              http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
-              http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
-              http://www.mail-archive.com/rails@lists.rubyonrails.org/
-              http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
-              http://en.wikipedia.org/wiki/Sprite_(computer_graphics)
-              http://en.wikipedia.org/wiki/Texas_hold'em
-              https://www.google.com/doku.php?id=gps:resource:scs:start
-            )
-
-    urls.each do |url|
-      assert_linked %(<a href="#{url}">#{CGI.escapeHTML(url)}</a>), url
-    end
-  end
-
-  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">#{link_raw}</a>}
-    link2_raw    = 'www.rubyonrails.com'
-    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}">#{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}">#{link5_raw}</a>}
-    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
-    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}">#{link8_raw}</a>}
-    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
-    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}">#{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 %(<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 %(<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 %(<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 %(<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 %(<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 %(<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>'
-  end
-end