redcarpet 2.1.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
 -------------------------------------------------------
@@ -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,8 +1,9 @@
 #!/usr/bin/env ruby
-# Usage: redcarpet [--parse-<extension>...] [--render-<extension>] [<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]
@@ -17,6 +18,7 @@ require 'redcarpet'
 
 render_extensions = {}
 parse_extensions = {}
+renderer = Redcarpet::Render::HTML
 
 ARGV.delete_if do |arg|
   if arg =~ /^--render-([\w-]+)$/
@@ -25,10 +27,12 @@ ARGV.delete_if do |arg|
   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 = Redcarpet::Render::HTML.new(render_extensions)
+render = renderer.new(render_extensions)
 STDOUT.write(Redcarpet::Markdown.new(render, parse_extensions).render(ARGF.read))

data/ext/redcarpet/html.c

@@ -509,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)
 {
@@ -546,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,

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++;
 		}
 
@@ -1967,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;
@@ -2244,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)
@@ -2255,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);

data/ext/redcarpet/rc_markdown.c

@@ -104,6 +104,8 @@ 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
 	{

data/lib/redcarpet.rb

@@ -1,7 +1,7 @@
 require 'redcarpet.so'
 
 module Redcarpet
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 
   class Markdown
     attr_reader :renderer
@@ -86,7 +86,7 @@ class RedcarpetCompat
     :space_header => :space_after_headers,
     :strikethrough => :strikethrough,
     :tables => :tables,
-    :with_toc_data => :generate_toc,
+    :generate_toc => :with_toc_data,
     :xhtml => :xhtml,
     # old names with no new mapping
     :gh_blockcode => nil,

data/redcarpet.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '2.1.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'

data/test/redcarpet_test.rb

@@ -61,6 +61,7 @@ class HTMLRenderTest < Test::Unit::TestCase
       :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
 
@@ -114,6 +115,18 @@ EOE
     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
@@ -328,6 +341,18 @@ 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"