redcarpet 2.0.0 → 2.1.1

data/README.markdown

@@ -9,12 +9,9 @@ case since version 2 -- it now has its own API, but retains the old name. Yes,
 that does mean that Redcarpet 2 is not backwards-compatible with the 1.X
 versions.
 
-Redcarpet is powered by the Sundown library, which can be found at
-
-    https://www.github.com/tanoku/sundown
-
-You might want to find out more about Sundown to see what makes this Ruby
-library so awesome.
+Redcarpet is powered by the [Sundown](https://www.github.com/tanoku/sundown)
+library. You might want to find out more about Sundown to see what makes this
+Ruby library so awesome.
 
 This library is written by people
 -------------------------------------------------------
@@ -66,7 +63,7 @@ settings, and reused between parses.
                 :tables - parse tables, PHP-Markdown style
 
                 :fenced_code_blocks - parse fenced code blocks, PHP-Markdown
-                    style .Blocks delimited with 3 or more `~` or backticks
+                    style. Blocks delimited with 3 or more `~` or backticks
                     will be considered as code, without the need to be
                     indented. An optional language name may be added at the
                     end of the opening fence for the code block
@@ -102,7 +99,7 @@ Rendering with the `Markdown` object is done through `Markdown#render`.
 Unlike in the RedCloth API, the text to render is passed as an argument
 and not stored inside the `Markdown` instance, to encourage reusability.
 
-    Markdown.render(text)
+    Markdown#render(text)
 
     Render a Markdown document with the attached renderer
 
@@ -253,7 +250,10 @@ The following instance methods may be implemented by the renderer:
     # document before or after the rendering process begins
     preprocess(full_document)
     postprocess(full_document)
-    
+
+You can look at
+["How to extend the Redcarpet 2 Markdown library?"](http://dev.af83.com/2012/02/27/howto-extend-the-redcarpet2-markdown-lib.html)
+for some more explanations.
 
 Also, now our Pants are much smarter
 ------------------------------------

data/bin/redcarpet

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
-# Usage: redcarpet [<file>...]
+# Usage: redcarpet [--parse-<extension>...] [--render-<extension>...] [--smarty] [<file>...]
 # Convert one or more Markdown files to HTML and write to standard output. With
 # no <file> or when <file> is '-', read Markdown source text from standard input.
+# With <extension>s, perform additional Markdown processing before writing output.
+# With --smarty, use the SmartyHTML renderer
 if ARGV.include?('--help')
   File.read(__FILE__).split("\n").grep(/^# /).each do |line|
     puts line[2..-1]
@@ -9,5 +11,28 @@ if ARGV.include?('--help')
   exit 0
 end
 
+root = File.expand_path('../../', __FILE__)
+$:.unshift File.expand_path('lib', root)
+
 require 'redcarpet'
-STDOUT.write(Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(ARGF.read))
+
+render_extensions = {}
+parse_extensions = {}
+renderer = Redcarpet::Render::HTML
+
+ARGV.delete_if do |arg|
+  if arg =~ /^--render-([\w-]+)$/
+    arg = $1.gsub('-', '_')
+    render_extensions[arg.to_sym] = true
+  elsif arg =~ /^--parse-([\w-]+)$/
+    arg = $1.gsub('-', '_')
+    parse_extensions[arg.to_sym] = true
+  elsif arg == '--smarty'
+    renderer = Redcarpet::Render::SmartyHTML
+  else
+    false
+  end
+end
+
+render = renderer.new(render_extensions)
+STDOUT.write(Redcarpet::Markdown.new(render, parse_extensions).render(ARGF.read))

data/ext/redcarpet/buffer.c

@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 /* MSVC compat */
 #if defined(_MSC_VER)
@@ -34,6 +35,7 @@ int
 bufprefix(const struct buf *buf, const char *prefix)
 {
 	size_t i;
+	assert(buf && buf->unit);
 
 	for (i = 0; i < buf->size; ++i) {
 		if (prefix[i] == 0)
@@ -52,7 +54,10 @@ bufgrow(struct buf *buf, size_t neosz)
 {
 	size_t neoasz;
 	void *neodata;
-	if (!buf || !buf->unit || neosz > BUFFER_MAX_ALLOC_SIZE)
+
+	assert(buf && buf->unit);
+
+	if (neosz > BUFFER_MAX_ALLOC_SIZE)
 		return BUF_ENOMEM;
 
 	if (buf->asize >= neosz)
@@ -91,8 +96,7 @@ bufnew(size_t unit)
 const char *
 bufcstr(struct buf *buf)
 {
-	if (!buf || !buf->unit)
-		return NULL;
+	assert(buf && buf->unit);
 
 	if (buf->size < buf->asize && buf->data[buf->size] == 0)
 		return (char *)buf->data;
@@ -110,12 +114,11 @@ void
 bufprintf(struct buf *buf, const char *fmt, ...)
 {
 	va_list ap;
-	if (!buf || !buf->unit)
-		return;
-
 	int n;
 
-	if (buf == 0 || (buf->size >= buf->asize && bufgrow(buf, buf->size + 1)) < 0)
+	assert(buf && buf->unit);
+
+	if (buf->size >= buf->asize && bufgrow(buf, buf->size + 1) < 0)
 		return;
 	
 	va_start(ap, fmt);
@@ -133,6 +136,7 @@ bufprintf(struct buf *buf, const char *fmt, ...)
 	if ((size_t)n >= buf->asize - buf->size) {
 		if (bufgrow(buf, buf->size + n + 1) < 0)
 			return;
+
 		va_start(ap, fmt);
 		n = _buf_vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
 		va_end(ap);
@@ -148,8 +152,7 @@ bufprintf(struct buf *buf, const char *fmt, ...)
 void
 bufput(struct buf *buf, const void *data, size_t len)
 {
-	if (!buf)
-		return;
+	assert(buf && buf->unit);
 
 	if (buf->size + len > buf->asize && bufgrow(buf, buf->size + len) < 0)
 		return;
@@ -170,8 +173,7 @@ bufputs(struct buf *buf, const char *str)
 void
 bufputc(struct buf *buf, int c)
 {
-	if (!buf)
-		return;
+	assert(buf && buf->unit);
 
 	if (buf->size + 1 > buf->asize && bufgrow(buf, buf->size + 1) < 0)
 		return;
@@ -208,8 +210,7 @@ bufreset(struct buf *buf)
 void
 bufslurp(struct buf *buf, size_t len)
 {
-	if (!buf || !buf->unit || len <= 0)
-		return;
+	assert(buf && buf->unit);
 
 	if (len >= buf->size) {
 		buf->size = 0;
@@ -220,10 +221,3 @@ bufslurp(struct buf *buf, size_t len)
 	memmove(buf->data, buf->data + len, buf->size);
 }
 
-/* vbufprintf: stdarg variant of formatted printing into a buffer */
-void
-vbufprintf(struct buf *buf, const char *fmt, va_list ap)
-{
-
-}
-

data/ext/redcarpet/html.c

@@ -60,6 +60,16 @@ sdhtml_is_tag(const uint8_t *tag_data, size_t tag_size, const char *tagname)
 	return HTML_TAG_NONE;
 }
 
+static inline void escape_html(struct buf *ob, const uint8_t *source, size_t length)
+{
+	houdini_escape_html0(ob, source, length, 0);
+}
+
+static inline void escape_href(struct buf *ob, const uint8_t *source, size_t length)
+{
+	houdini_escape_href(ob, source, length);
+}
+
 /********************
  * GENERIC RENDERER *
  ********************/
@@ -79,7 +89,7 @@ rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, vo
 	BUFPUTSL(ob, "<a href=\"");
 	if (type == MKDA_EMAIL)
 		BUFPUTSL(ob, "mailto:");
-	houdini_escape_href(ob, link->data, link->size);
+	escape_href(ob, link->data, link->size);
 
 	if (options->link_attributes) {
 		bufputc(ob, '\"');
@@ -95,9 +105,9 @@ rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, vo
 	 * want to print the `mailto:` prefix
 	 */
 	if (bufprefix(link, "mailto:") == 0) {
-		houdini_escape_html(ob, link->data + 7, link->size - 7);
+		escape_html(ob, link->data + 7, link->size - 7);
 	} else {
-		houdini_escape_html(ob, link->data, link->size);
+		escape_html(ob, link->data, link->size);
 	}
 
 	BUFPUTSL(ob, "</a>");
@@ -127,7 +137,7 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 					org++;
 
 				if (cls) bufputc(ob, ' ');
-				houdini_escape_html(ob, lang->data + org, i - org);
+				escape_html(ob, lang->data + org, i - org);
 			}
 		}
 
@@ -136,7 +146,7 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		houdini_escape_html(ob, text->data, text->size);
+		escape_html(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -154,7 +164,7 @@ static int
 rndr_codespan(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BUFPUTSL(ob, "<code>");
-	if (text) houdini_escape_html(ob, text->data, text->size);
+	if (text) escape_html(ob, text->data, text->size);
 	BUFPUTSL(ob, "</code>");
 	return 1;
 }
@@ -230,11 +240,11 @@ rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, const
 	BUFPUTSL(ob, "<a href=\"");
 
 	if (link && link->size)
-		houdini_escape_href(ob, link->data, link->size);
+		escape_href(ob, link->data, link->size);
 
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		houdini_escape_html(ob, title->data, title->size);
+		escape_html(ob, title->data, title->size);
 	}
 
 	if (options->link_attributes) {
@@ -322,9 +332,9 @@ rndr_raw_block(struct buf *ob, const struct buf *text, void *opaque)
 	size_t org, sz;
 	if (!text) return;
 	sz = text->size;
-	while (sz > 0 && text->data[sz - 1] == '\n') sz -= 1;
+	while (sz > 0 && text->data[sz - 1] == '\n') sz--;
 	org = 0;
-	while (org < sz && text->data[org] == '\n') org += 1;
+	while (org < sz && text->data[org] == '\n') org++;
 	if (org >= sz) return;
 	if (ob->size) bufputc(ob, '\n');
 	bufput(ob, text->data + org, sz - org);
@@ -356,15 +366,15 @@ rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, cons
 	if (!link || !link->size) return 0;
 
 	BUFPUTSL(ob, "<img src=\"");
-	houdini_escape_href(ob, link->data, link->size);
+	escape_href(ob, link->data, link->size);
 	BUFPUTSL(ob, "\" alt=\"");
 
 	if (alt && alt->size)
-		houdini_escape_html(ob, alt->data, alt->size);
+		escape_html(ob, alt->data, alt->size);
 
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		houdini_escape_html(ob, title->data, title->size); }
+		escape_html(ob, title->data, title->size); }
 
 	bufputs(ob, USE_XHTML(options) ? "\"/>" : "\">");
 	return 1;
@@ -375,6 +385,13 @@ rndr_raw_html(struct buf *ob, const struct buf *text, void *opaque)
 {
 	struct html_renderopt *options = opaque;
 
+	/* HTML_ESCAPE overrides SKIP_HTML, SKIP_STYLE, SKIP_LINKS and SKIP_IMAGES
+	* It doens't see if there are any valid tags, just escape all of them. */
+	if((options->flags & HTML_ESCAPE) != 0) {
+		escape_html(ob, text->data, text->size);
+		return 1;
+	}
+
 	if ((options->flags & HTML_SKIP_HTML) != 0)
 		return 1;
 
@@ -466,7 +483,7 @@ static void
 rndr_normal_text(struct buf *ob, const struct buf *text, void *opaque)
 {
 	if (text)
-		houdini_escape_html(ob, text->data, text->size);
+		escape_html(ob, text->data, text->size);
 }
 
 static void
@@ -492,10 +509,18 @@ toc_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 
 	bufprintf(ob, "<a href=\"#toc_%d\">", options->toc_data.header_count++);
 	if (text)
-		bufput(ob, text->data, text->size);
+		escape_html(ob, text->data, text->size);
 	BUFPUTSL(ob, "</a>\n");
 }
 
+static int
+toc_link(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque)
+{
+	if (content && content->size) 
+		bufput(ob, content->data, content->size);
+	return 1;
+}
+
 static void
 toc_finalize(struct buf *ob, void *opaque)
 {
@@ -529,7 +554,7 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 		rndr_emphasis,
 		NULL,
 		NULL,
-		NULL,
+		toc_link,
 		NULL,
 		rndr_triple_emphasis,
 		rndr_strikethrough,
@@ -598,6 +623,6 @@ sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options,
 		callbacks->autolink = NULL;
 	}
 
-	if (render_flags & HTML_SKIP_HTML)
+	if (render_flags & HTML_SKIP_HTML || render_flags & HTML_ESCAPE)
 		callbacks->blockhtml = NULL;
 }

data/ext/redcarpet/html.h

@@ -43,6 +43,7 @@ typedef enum {
 	HTML_TOC = (1 << 6),
 	HTML_HARD_WRAP = (1 << 7),
 	HTML_USE_XHTML = (1 << 8),
+	HTML_ESCAPE = (1 << 9),
 } html_render_mode;
 
 typedef enum {

data/ext/redcarpet/markdown.c

@@ -694,6 +694,8 @@ char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offs
 			rndr->cb.normal_text(ob, &work, rndr->opaque);
 		}
 		else bufputc(ob, data[1]);
+	} else if (size == 1) {
+		bufputc(ob, data[0]);
 	}
 
 	return 2;
@@ -886,7 +888,8 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 		/* looking for link end: ' " ) */
 		while (i < size) {
 			if (data[i] == '\\') i += 2;
-			else if (data[i] == ')' || data[i] == '\'' || data[i] == '"') break;
+			else if (data[i] == ')') break;
+			else if (i >= 1 && _isspace(data[i-1]) && (data[i] == '\'' || data[i] == '"')) break;
 			else i++;
 		}
 
@@ -1575,7 +1578,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 	struct buf *work = 0, *inter = 0;
 	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
 	int in_empty = 0, has_inside_empty = 0;
-	int has_next_uli, has_next_oli;
+	size_t has_next_uli, has_next_oli;
 
 	/* keeping track of the first indentation prefix */
 	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
@@ -1627,9 +1630,8 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 
 		/* checking for ul/ol switch */
 		if (in_empty && (
-					((*flags & MKD_LIST_ORDERED) && has_next_uli) ||
-					(!(*flags & MKD_LIST_ORDERED) && has_next_oli)
-			)){
+			((*flags & MKD_LIST_ORDERED) && has_next_uli) ||
+			(!(*flags & MKD_LIST_ORDERED) && has_next_oli))){
 			*flags |= MKD_LI_END;
 			break; /* the following item must have same list type */
 		}
@@ -1804,7 +1806,7 @@ parse_htmlblock(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 		i++;
 
 	if (i < size)
-		curtag = find_block_tag((char *)data + 1, i - 1);
+		curtag = find_block_tag((char *)data + 1, (int)i - 1);
 
 	/* handling of special cases */
 	if (!curtag) {
@@ -1968,10 +1970,13 @@ parse_table_header(
 
 	header_end = i;
 
+	while (header_end > 0 && _isspace(data[header_end - 1]))
+		header_end--;
+
 	if (data[0] == '|')
 		pipes--;
 
-	if (i > 2 && data[i - 1] == '|')
+	if (header_end && data[header_end - 1] == '|')
 		pipes--;
 
 	*columns = pipes + 1;
@@ -2245,8 +2250,8 @@ is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_re
 			line_end = title_end;
 			title_end = i; } }
 
-	if (!line_end)
-		return 0; /* garbage after the link */
+	if (!line_end || link_end == link_offset)
+		return 0; /* garbage after the link empty link */
 
 	/* a valid ref has been found, filling-in return structures */
 	if (last)
@@ -2256,6 +2261,8 @@ is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_re
 		struct link_ref *ref;
 
 		ref = add_link_ref(refs, data + id_offset, id_end - id_offset);
+		if (!ref)
+			return 0;
 
 		ref->link = bufnew(link_end - link_offset);
 		bufput(ref->link, data + link_offset, link_end - link_offset);
@@ -2361,7 +2368,8 @@ sd_markdown_new(
 void
 sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, struct sd_markdown *md)
 {
-	static const float MARKDOWN_GROW_FACTOR = 1.4f;
+#define MARKDOWN_GROW(x) ((x) + ((x) >> 1))
+	static const char UTF8_BOM[] = {0xEF, 0xBB, 0xBF};
 
 	struct buf *text;
 	size_t beg, end;
@@ -2378,6 +2386,12 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 
 	/* first pass: looking for references, copying everything else */
 	beg = 0;
+
+	/* Skip a possible UTF-8 BOM, even though the Unicode standard
+	 * discourages having these in UTF-8 documents */
+	if (doc_size >= 3 && memcmp(document, UTF8_BOM, 3) == 0)
+		beg += 3;
+
 	while (beg < doc_size) /* iterating over lines */
 		if (is_ref(document, beg, doc_size, &end, md->refs))
 			beg = end;
@@ -2401,7 +2415,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 		}
 
 	/* pre-grow the output buffer to minimize allocations */
-	bufgrow(ob, text->size * MARKDOWN_GROW_FACTOR);
+	bufgrow(ob, MARKDOWN_GROW(text->size));
 
 	/* second pass: actual rendering */
 	if (md->cb.doc_header)

data/ext/redcarpet/rc_markdown.c

@@ -24,6 +24,8 @@ static void rb_redcarpet_md_flags(VALUE hash, unsigned int *enabled_extensions_p
 {
 	unsigned int extensions = 0;
 
+	Check_Type(hash, T_HASH);
+
 	/**
 	 * Markdown extensions -- all disabled by default
 	 */
@@ -102,6 +104,16 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 
 	if (rb_respond_to(rb_rndr, rb_intern("preprocess")))
 		text = rb_funcall(rb_rndr, rb_intern("preprocess"), 1, text);
+  if (NIL_P(text))
+    return Qnil;
+
+#ifdef HAVE_RUBY_ENCODING_H
+	{
+		struct rb_redcarpet_rndr *renderer;
+		Data_Get_Struct(rb_rndr, struct rb_redcarpet_rndr, renderer);
+		renderer->options.active_enc = rb_enc_get(text);
+	}
+#endif
 
 	/* initialize buffers */
 	output_buf = bufnew(128);
@@ -114,7 +126,7 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 		markdown);
 
 	/* build the Ruby string */
-	text = redcarpet_str_new(output_buf->data, output_buf->size);
+	text = redcarpet_str_new(output_buf->data, output_buf->size, rb_enc_get(text));
 
 	bufrelease(output_buf);
 

data/ext/redcarpet/rc_render.c

@@ -40,13 +40,11 @@ VALUE rb_cRenderHTML;
 VALUE rb_cRenderHTML_TOC;
 VALUE rb_mSmartyPants;
 
-static inline VALUE
-buf2str(const struct buf *text)
-{
-	if (!text || !text->size) return Qnil;
-	return redcarpet_str_new(text->data, text->size);
-}
-
+#ifdef HAVE_RUBY_ENCODING_H
+#define buf2str(t) ((t) ? redcarpet_str_new((t)->data, (t)->size, opt->active_enc) : Qnil)
+#else
+#define buf2str(t) ((t) ? redcarpet_str_new((t)->data, (t)->size, NULL) : Qnil)
+#endif
 
 static void
 rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, void *opaque)
@@ -352,6 +350,10 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 	{
 		Check_Type(hash, T_HASH);
 
+		/* escape_html */
+		if (rb_hash_aref(hash, CSTR2SYM("escape_html")) == Qtrue)
+			render_flags |= HTML_ESCAPE;
+
 		/* filter_html */
 		if (rb_hash_aref(hash, CSTR2SYM("filter_html")) == Qtrue)
 			render_flags |= HTML_SKIP_HTML;
@@ -409,7 +411,7 @@ static VALUE rb_redcarpet_smartypants_render(VALUE self, VALUE text)
 	output_buf = bufnew(128);
 
 	sdhtml_smartypants(output_buf, RSTRING_PTR(text), RSTRING_LEN(text));
-	result = redcarpet_str_new(output_buf->data, output_buf->size);
+	result = redcarpet_str_new(output_buf->data, output_buf->size, rb_enc_get(text));
 
 	bufrelease(output_buf);
 	return result;

data/ext/redcarpet/redcarpet.h

@@ -7,9 +7,9 @@
 
 #ifdef HAVE_RUBY_ENCODING_H
 #	include <ruby/encoding.h>
-#	define redcarpet_str_new(data, size) rb_enc_str_new(data, size, rb_utf8_encoding())
+#	define redcarpet_str_new(data, size, enc) rb_enc_str_new(data, size, enc)
 #else
-#	define redcarpet_str_new(data, size) rb_str_new(data, size)
+#	define redcarpet_str_new(data, size, enc) rb_str_new(data, size)
 #endif
 
 #include "markdown.h"
@@ -23,6 +23,9 @@ struct redcarpet_renderopt {
 	struct html_renderopt html;
 	VALUE self;
 	VALUE base_class;
+#ifdef HAVE_RUBY_ENCODING_H
+	rb_encoding *active_enc;
+#endif
 };
 
 struct rb_redcarpet_rndr {

data/lib/redcarpet/compat.rb

@@ -0,0 +1,3 @@
+require 'redcarpet'
+
+Markdown = RedcarpetCompat unless defined? Markdown

data/lib/redcarpet/render_strip.rb

@@ -0,0 +1,33 @@
+
+module Redcarpet
+  module Render
+    # Markdown-stripping renderer. Turns Markdown into plaintext
+    # Thanks to @toupeira (Markus Koller)
+    class StripDown < Base
+      # Methods where the first argument is the text content
+      [
+        # block-level calls
+        :block_code, :block_quote,
+        :block_html, :header, :list,
+        :list_item, :paragraph,
+
+        # span-level calls
+        :autolink, :codespan, :double_emphasis,
+        :emphasis, :raw_html, :triple_emphasis,
+        :strikethrough, :superscript,
+
+        # low level rendering
+        :entity, :normal_text
+      ].each do |method|
+        define_method method do |*args|
+          args.first
+        end
+      end
+
+      # Other methods where the text content is in another argument
+      def link(link, title, content)
+        content
+      end
+    end
+  end
+end

data/lib/redcarpet.rb

@@ -1,7 +1,7 @@
 require 'redcarpet.so'
 
 module Redcarpet
-  VERSION = '2.0.0b5'
+  VERSION = '2.1.1'
 
   class Markdown
     attr_reader :renderer
@@ -54,20 +54,71 @@ module Redcarpet
 end
 
 # Compatibility class;
-# Creates a instance of Redcarpet with the RedCloth
-# API. This instance has no extensions enabled whatsoever,
-# and no accessors to change this. 100% pure, standard
-# Markdown.
+# Creates an instance of Redcarpet with the RedCloth API.
 class RedcarpetCompat
   attr_accessor :text
 
-  def initialize(text, *_dummy)
+  def initialize(text, *exts)
+    exts_hash, render_hash = *parse_extensions_and_renderer_options(exts)
     @text = text
-    @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+    renderer = Redcarpet::Render::HTML.new(render_hash)
+    @markdown = Redcarpet::Markdown.new(renderer, exts_hash)
   end
 
   def to_html(*_dummy)
     @markdown.render(@text)
   end
+  
+  private
+  
+  EXTENSION_MAP = {
+    # old name => new name
+    :autolink => :autolink,
+    :fenced_code => :fenced_code_blocks,
+    :filter_html => :filter_html,
+    :hard_wrap => :hard_wrap,
+    :lax_htmlblock => :lax_html_blocks,
+    :no_image => :no_images,
+    :no_intraemphasis => :no_intra_emphasis,
+    :no_links => :no_links,
+    :filter_styles => :no_styles,
+    :safelink => :safe_links_only,
+    :space_header => :space_after_headers,
+    :strikethrough => :strikethrough,
+    :tables => :tables,
+    :generate_toc => :with_toc_data,
+    :xhtml => :xhtml,
+    # old names with no new mapping
+    :gh_blockcode => nil,
+    :no_tables => nil,
+    :smart => nil,
+    :strict => nil
+  }
+  
+  RENDERER_OPTIONS = [:filter_html, :no_images, :no_links, :no_styles, 
+    :safe_links_only, :with_toc_data, :hard_wrap, :xhtml]
+  
+  def rename_extensions(exts)
+    exts.map do |old_name|
+      if new_name = EXTENSION_MAP[old_name]
+        new_name
+      else
+        old_name
+      end
+    end.compact
+  end
+  
+  # Returns two hashes, the extensions and renderer options
+  # given the extension list
+  def parse_extensions_and_renderer_options(exts)
+    exts = rename_extensions(exts)
+    exts.partition {|ext| !RENDERER_OPTIONS.include?(ext) }.
+      map {|list| list_to_truthy_hash(list) }
+  end
+  
+  # Turns a list of symbols into a hash of <tt>symbol => true</tt>.
+  def list_to_truthy_hash(list)
+    list.inject({}) {|h, k| h[k] = true; h }
+  end
 end
 

data/redcarpet.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '2.0.0'
+  s.version = '2.1.1'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
   s.date = '2011-09-14'
@@ -34,7 +34,9 @@ Gem::Specification.new do |s|
     ext/redcarpet/stack.c
     ext/redcarpet/stack.h
     lib/redcarpet.rb
+    lib/redcarpet/compat.rb
     lib/redcarpet/render_man.rb
+    lib/redcarpet/render_strip.rb
     redcarpet.gemspec
     sundown
     test/redcarpet_test.rb

data/test/redcarpet_test.rb

@@ -60,6 +60,8 @@ class HTMLRenderTest < Test::Unit::TestCase
       :no_images => Redcarpet::Render::HTML.new(:no_images => true),
       :no_links => Redcarpet::Render::HTML.new(:no_links => true),
       :safe_links => Redcarpet::Render::HTML.new(:safe_links_only => true),
+      :escape_html => Redcarpet::Render::HTML.new(:escape_html => true),
+      :hard_wrap => Redcarpet::Render::HTML.new(:hard_wrap => true),
     }
   end
 
@@ -67,6 +69,28 @@ class HTMLRenderTest < Test::Unit::TestCase
     Redcarpet::Markdown.new(rndr).render(text)
   end
 
+  # Hint: overrides filter_html, no_images and no_links
+  def test_that_escape_html_works
+    source = <<EOS
+Through <em>NO</em> <script>DOUBLE NO</script>
+
+<script>BAD</script>
+
+<img src="/favicon.ico" />
+EOS
+    expected = <<EOE
+<p>Through &lt;em&gt;NO&lt;/em&gt; &lt;script&gt;DOUBLE NO&lt;/script&gt;</p>
+
+<p>&lt;script&gt;BAD&lt;/script&gt;</p>
+
+<p>&lt;img src=&quot;/favicon.ico&quot; /&gt;
+
+EOE
+
+    markdown = render_with(@rndr[:escape_html], source)
+    html_equal expected, markdown
+  end
+
   def test_that_filter_html_works
     markdown = render_with(@rndr[:no_html], 'Through <em>NO</em> <script>DOUBLE NO</script>')
     html_equal "<p>Through NO DOUBLE NO</p>", markdown
@@ -91,6 +115,18 @@ class HTMLRenderTest < Test::Unit::TestCase
     rd = render_with(@rndr[:safe_links], "[IRC](irc://chat.freenode.org/#freenode)")
     html_equal "<p>[IRC](irc://chat.freenode.org/#freenode)</p>\n", rd
   end
+
+  def test_that_hard_wrap_works
+    rd = render_with(@rndr[:hard_wrap], <<EOE)
+Hello world,
+this is just a simple test
+
+With hard wraps
+and other *things*.
+EOE
+    
+    assert rd =~ /<br>/
+  end
 end
 
 class MarkdownTest < Test::Unit::TestCase
@@ -186,6 +222,18 @@ class MarkdownTest < Test::Unit::TestCase
       output = @markdown.render(input)
       assert_equal input.encoding.name, output.encoding.name
     end
+
+    def test_should_return_string_in_same_encoding_not_in_utf8
+      input = "testing".encode('US-ASCII')
+      output = @markdown.render(input)
+      assert_equal input.encoding.name, output.encoding.name
+    end
+    
+    def test_should_accept_non_utf8_or_ascii
+      input = "testing \xAB\xCD".force_encoding('ASCII-8BIT')
+      output = @markdown.render(input)
+      assert_equal 'ASCII-8BIT', output.encoding.name
+    end
   end
 
   def test_that_tags_can_have_dashes_and_underscores
@@ -293,6 +341,54 @@ class CustomRenderTest < Test::Unit::TestCase
     html_equal "<p>This is <em class=\"cool\">just</em> a test</p>",
       md.render("This is *just* a test")
   end
+
+  class NilPreprocessRenderer < Redcarpet::Render::HTML
+    def preprocess(fulldoc)
+      nil
+    end
+  end
+
+  def test_preprocess_returning_nil
+    md = Redcarpet::Markdown.new(NilPreprocessRenderer)
+    assert_equal(nil,md.render("Anything"))
+  end
+
+end
+
+class RedcarpetCompatTest < Test::Unit::TestCase
+  def test_simple_compat_api
+    html = RedcarpetCompat.new("This is_just_a test").to_html
+    html_equal "<p>This is<em>just</em>a test</p>", html
+  end
+  
+  def test_compat_api_enables_extensions
+    html = RedcarpetCompat.new("This is_just_a test", :no_intra_emphasis).to_html
+    html_equal "<p>This is_just_a test</p>", html
+  end
+
+  def test_compat_api_knows_fenced_code_extension
+    text = "```ruby\nx = 'foo'\n```"
+    html = RedcarpetCompat.new(text, :fenced_code).to_html
+    html_equal "<pre><code class=\"ruby\">x = 'foo'\n</code></pre>", html
+  end
+  
+  def test_compat_api_ignores_gh_blockcode_extension
+    text = "```ruby\nx = 'foo'\n```"
+    html = RedcarpetCompat.new(text, :fenced_code, :gh_blockcode).to_html
+    html_equal "<pre><code class=\"ruby\">x = 'foo'\n</code></pre>", html
+  end
+
+  def test_compat_api_knows_no_intraemphasis_extension
+    html = RedcarpetCompat.new("This is_just_a test", :no_intraemphasis).to_html
+    html_equal "<p>This is_just_a test</p>", html
+  end
+  
+  def test_translate_outdated_extensions
+    # these extensions are no longer used
+    exts = [:gh_blockcode, :no_tables, :smart, :strict]
+    html = RedcarpetCompat.new('"TEST"', *exts).to_html
+    html_equal "<p>&quot;TEST&quot;</p>", html
+  end
 end
 
 # Disabled by default

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 9
   prerelease: 
   segments: 
   - 2
-  - 0
-  - 0
-  version: 2.0.0
+  - 1
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -65,7 +65,9 @@ files:
 - ext/redcarpet/stack.c
 - ext/redcarpet/stack.h
 - lib/redcarpet.rb
+- lib/redcarpet/compat.rb
 - lib/redcarpet/render_man.rb
+- lib/redcarpet/render_strip.rb
 - redcarpet.gemspec
 - test/redcarpet_test.rb
 homepage: http://github.com/tanoku/redcarpet
@@ -97,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Markdown that smells nice