redcarpet 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794753edf10a2310e7bcb5cdef1cf39f69c20a0f
-  data.tar.gz: 9b2baf785cca27311b402c760b8a3d453acee40e
+  metadata.gz: add57c5fb7ad56babf9ce372000b7ce5f86dda6f
+  data.tar.gz: b58fe24ba222fcec7225082dacd7942fc187a405
 SHA512:
-  metadata.gz: ddd0407e934865e45d5c2914f1b396054c16db71b854d77db320905c92b343b41d8ad23fed0db1cd591cfbb10d27fc1ba0a559c6985fe3e5c4ef3ffe072458cb
-  data.tar.gz: 701d3101a85b4e716ae0734dca3cd77ae8d4636540ffc05eaad2cfe7262aebcb18c0fac7b4642341e83c28142a9073408c94535a5c9aae8ed9221a671bad0df5
+  metadata.gz: 6d8ba8386fbaf42f8de15624e3ec892f67d685d3b5a0d5b2f4e1855a8d23107631a2eb99f86757de22477b045fa20d793d4339a270c2b98a30e7f6b4ba3a83e1
+  data.tar.gz: 72ac393c6d785ba58c0c4cf69a167ed042dfd07cc1f86bedeb7854684e357c9d8f5156399ab57f9b19905991b694b499083c2d85169654d673a4a7a451a8fb03

data/Gemfile

@@ -3,11 +3,7 @@ source "https://rubygems.org/"
 gemspec
 
 group :benchmark do
+  gem "benchmark-ips", "~> 1.2.0"
   gem "bluecloth", "~> 2.2.0"
   gem "kramdown", "~> 1.0.2"
 end
-
-platforms :rbx do
-  gem "rubysl"
-  gem "racc"
-end

data/README.markdown

@@ -1,9 +1,9 @@
 Redcarpet is written with sugar, spice and everything nice
 ============================================================
 
-[![Build Status](https://travis-ci.org/vmg/redcarpet.png?branch=master)](https://travis-ci.org/vmg/redcarpet)
+[![Build Status](https://travis-ci.org/vmg/redcarpet.svg?branch=master)](https://travis-ci.org/vmg/redcarpet)
 
-Redcarpet is Ruby library for Markdown processing that smells like
+Redcarpet is a Ruby library for Markdown processing that smells like
 butterflies and popcorn.
 
 This library is written by people
@@ -78,8 +78,8 @@ be added at the end of the opening fence for the code block.
 
 * `:autolink`: parse links even when they are not enclosed in `<>`
 characters. Autolinks for the http, https and ftp protocols will be
-automatically detected. Email addresses are also handled, and http
-links without protocol, but starting with `www`.
+automatically detected. Email addresses and http links without protocol,
+but starting with `www` are also handled.
 
 * `:disable_indented_code_blocks`: do not parse usual markdown
 code blocks. Markdown converts text with four spaces at
@@ -149,6 +149,10 @@ Initializes an HTML renderer. The following flags are available:
 
 * `:no_styles`: do not generate any `<style>` tags.
 
+* `:escape_html`: escape any HTML tags. This option has precedence over
+`:no_styles`, `:no_links`, `:no_images` and `:filter_html` which means
+that any existing tag will be escaped instead of being removed.
+
 * `:safe_links_only`: only generate links for protocols which are considered
 safe.
 
@@ -216,8 +220,9 @@ The following instance methods may be implemented by the renderer:
 ### Block-level calls
 
 If the return value of the method is `nil`, the block will be skipped.
-If the method for a document element is not implemented, the block will
-be skipped.
+Therefore, make sure that your renderer has at least a `paragraph` method
+implemented. If the method for a document element is not implemented, the
+block will be skipped.
 
 Example:
 
@@ -266,9 +271,9 @@ be copied verbatim:
 * footnote_ref(number)
 
 **Note**: When overriding a renderer's method, be sure to return a HTML
-element with a level that match the level of that method (e.g. return a block
-element when overriding a block-level callback). Otherwise, the output may
-be unexpected.
+element with a level that matches the level of that method (e.g. return a
+block element when overriding a block-level callback). Otherwise, the output
+may be unexpected.
 
 ### Low level rendering
 
@@ -327,47 +332,10 @@ SmartyPants works on top of already-rendered HTML, and will ignore replacements
 inside the content of HTML tags and inside specific HTML blocks such as
 `<code>` or `<pre>`.
 
-What? You really want to mix Markdown renderers?
-------------------------------------------------
-
-Redcarpet used to be a drop-in replacement for Redcloth. This is no longer the
-case since version 2 -- it now has its own API, but retains the old name. Yes,
-that does mean that Redcarpet is not backwards-compatible with the 1.X
-versions.
-
-Each renderer has its own API and its own set of extensions: you should choose one
-(it doesn't have to be Redcarpet, though that would be great!), write your
-software accordingly, and force your users to install it. That's the
-only way to have reliable and predictable Markdown output on your program.
-
-Markdown is already ill-specified enough; if you create software that is
-renderer-independent, the results will be completely unreliable!
-
-Still, if major forces (let's say, tornadoes or other natural disasters) force you
-to keep a Markdown-compatibility layer, Redcarpet also supports this:
-
-~~~~~ ruby
-require 'redcarpet/compat'
-~~~~~
-
-Requiring the compatibility library will declare a `Markdown` class with the
-classical RedCloth API, e.g.
-
-~~~~~ ruby
-Markdown.new('this is my text').to_html
-~~~~~
-
-This class renders 100% standards compliant Markdown with 0 extensions. Nada.
-Don't even try to enable extensions with a compatibility layer, because
-that's a maintenance nightmare and won't work.
-
-On a related topic: if your Markdown gem has a `lib/markdown.rb` file that
-monkeypatches the Markdown class, you're a terrible human being. Just saying.
-
 Boring legal stuff
 ------------------
 
-Copyright (c) 2011-2013, Vicent Martí
+Copyright (c) 2011-2014, Vicent Martí
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -27,13 +27,13 @@ end
 
 task 'test:unit' => :compile
 
-desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
+desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0.3)'
 task 'test:conformance' => :compile do |t|
-  script = "#{pwd}/bin/redcarpet"
-  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
+  script  = "#{pwd}/bin/redcarpet"
+  version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
   lib_dir = "#{pwd}/lib"
 
-  chdir("test/MarkdownTest_#{test_version}") do
+  chdir("test/MarkdownTest_#{version}") do
     sh "RUBYLIB=#{lib_dir} ./MarkdownTest.pl --script='#{script}' --tidy"
   end
 end

data/ext/redcarpet/autolink.c

@@ -29,9 +29,9 @@
 int
 sd_autolink_issafe(const uint8_t *link, size_t link_len)
 {
-	static const size_t valid_uris_count = 5;
+	static const size_t valid_uris_count = 6;
 	static const char *valid_uris[] = {
-		"/", "http://", "https://", "ftp://", "mailto:"
+		"#", "/", "http://", "https://", "ftp://", "mailto:"
 	};
 
 	size_t i;

data/ext/redcarpet/html_blocks.h

@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.3 */
+/* C code produced by gperf version 3.0.4 */
 /* Command-line: gperf -N find_block_tag -H hash_block_tag -C -c -E --ignore-case html_block_names.txt  */
 /* Computed positions: -k'1-2' */
 
@@ -29,7 +29,7 @@
 error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-/* maximum key range = 37, duplicates = 0 */
+/* maximum key range = 67, duplicates = 0 */
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
@@ -93,32 +93,32 @@ hash_block_tag (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-       8, 30, 25, 20, 15, 10, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38,  0, 38,  0, 38,
-       5,  5,  5, 15,  0, 38, 38,  0, 15, 10,
-       0, 38, 38, 15,  0,  5, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38,  0, 38,
-       0, 38,  5,  5,  5, 15,  0, 38, 38,  0,
-      15, 10,  0, 38, 38, 15,  0,  5, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      55, 50, 45, 40, 35, 30, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 15, 10,  5, 15, 15,
+       0, 20, 10, 10,  5, 68, 68,  0, 20, 25,
+       0, 68, 68,  0, 25,  0, 15, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 15, 10,  5,
+      15, 15,  0, 20, 10, 10,  5, 68, 68,  0,
+      20, 25,  0, 68, 68,  0, 25,  0, 15, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68
     };
   register int hval = len;
 
@@ -136,7 +136,7 @@ hash_block_tag (str, len)
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
@@ -147,47 +147,68 @@ find_block_tag (str, len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 24,
+      TOTAL_KEYWORDS = 40,
       MIN_WORD_LENGTH = 1,
       MAX_WORD_LENGTH = 10,
       MIN_HASH_VALUE = 1,
-      MAX_HASH_VALUE = 37
+      MAX_HASH_VALUE = 67
     };
 
   static const char * const wordlist[] =
     {
       "",
       "p",
-      "dl",
-      "div",
-      "math",
-      "table",
-      "",
       "ul",
-      "del",
+      "pre",
       "form",
-      "blockquote",
+      "style",
+      "footer",
+      "section",
+      "", "", "",
       "figure",
-      "ol",
+      "hr",
       "fieldset",
+      "math",
+      "figcaption",
+      "header",
+      "dl",
+      "del",
       "",
-      "h1",
+      "blockquote",
+      "canvas",
+      "article",
+      "div",
+      "abbr",
+      "video",
+      "hgroup",
+      "ol",
+      "noscript",
+      "", "", "",
+      "dd",
+      "nav",
+      "",
+      "audio",
+      "iframe",
+      "address",
+      "ins",
+      "",
+      "table",
       "",
       "h6",
-      "pre",
       "", "",
-      "script",
+      "aside",
+      "output",
       "h5",
-      "noscript",
+      "", "",
+      "tfoot",
       "",
-      "style",
-      "iframe",
       "h4",
-      "ins",
-      "", "", "",
+      "", "", "", "",
       "h3",
       "", "", "", "",
-      "h2"
+      "h2",
+      "", "", "", "",
+      "h1"
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

data/ext/redcarpet/html_smartypants.c

@@ -23,7 +23,7 @@
 #include <ctype.h>
 
 #if defined(_WIN32)
-#define snprintf	_snprintf		
+#define snprintf	_snprintf
 #endif
 
 struct smartypants_data {
@@ -139,6 +139,12 @@ smartypants_squote(struct buf *ob, struct smartypants_data *smrt, uint8_t previo
 				return next_squote_len;
 		}
 
+		// trailing single quotes: students', tryin'
+		if (word_boundary(t1)) {
+			BUFPUTSL(ob, "&rsquo;");
+			return 0;
+		}
+
 		// Tom's, isn't, I'm, I'd
 		if ((t1 == 's' || t1 == 't' || t1 == 'm' || t1 == 'd') &&
 			(size == 3 || word_boundary(text[2]))) {

data/ext/redcarpet/markdown.c

@@ -509,14 +509,14 @@ find_emph_char(uint8_t *data, size_t size, uint8_t c)
 		if (i == size)
 			return 0;
 
-		if (data[i] == c)
-			return i;
-
 		/* not counting escaped chars */
 		if (i && data[i - 1] == '\\') {
 			i++; continue;
 		}
 
+		if (data[i] == c)
+			return i;
+
 		if (data[i] == '`') {
 			size_t span_nb = 0, bt;
 			size_t tmp_i = 0;
@@ -845,7 +845,7 @@ char_quote(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offse
 static size_t
 char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size)
 {
-	static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>^~";
+	static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>^~=";
 	struct buf work = { 0, 0, 0, 0 };
 
 	if (size > 1) {
@@ -1624,7 +1624,7 @@ static size_t
 parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size)
 {
 	size_t i = 0, end = 0;
-	int level = 0;
+	int level = 0, last_is_empty = 1;
 	struct buf work = { data, 0, 0, 0 };
 
 	while (i < size) {
@@ -1633,9 +1633,11 @@ parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 		if (is_empty(data + i, size - i))
 			break;
 
-		if ((level = is_headerline(data + i, size - i)) != 0)
+		if (!last_is_empty && (level = is_headerline(data + i, size - i)) != 0)
 			break;
 
+		last_is_empty = 0;
+
 		if (is_atxheader(rndr, data + i, size - i) ||
 			is_hrule(data + i, size - i) ||
 			prefix_quote(data + i, size - i)) {

data/lib/redcarpet.rb

@@ -1,7 +1,7 @@
 require 'redcarpet.so'
 
 module Redcarpet
-  VERSION = '3.1.2'
+  VERSION = '3.2.0'
 
   class Markdown
     attr_reader :renderer
@@ -11,8 +11,8 @@ module Redcarpet
 
     # XHTML Renderer
     class XHTML < HTML
-      def initialize(extensions={})
-        super(extensions.merge(:xhtml => true))
+      def initialize(extensions = {})
+        super(extensions.merge(xhtml: true))
       end
     end
 
@@ -21,6 +21,43 @@ module Redcarpet
       include SmartyPants
     end
 
+    # A renderer object you can use to deal with users' input. It
+    # enables +escape_html+ and +safe_links_only+ by default.
+    #
+    # The +block_code+ callback is also overriden not to include
+    # the lang's class as the user can basically specify anything
+    # with the vanilla one.
+    class Safe < HTML
+      def initialize(extensions = {})
+        super({
+          escape_html: true,
+          safe_links_only: true
+        }.merge(extensions))
+      end
+
+      def block_code(code, lang)
+        "<pre>" \
+          "<code>#{html_escape(code)}</code>" \
+        "</pre>"
+      end
+
+      private
+
+      # TODO: This is far from ideal to have such method as we
+      # are duplicating existing code from Houdini. This method
+      # should be defined at the C level.
+      def html_escape(string)
+        string.gsub(/['&\"<>\/]/, {
+          '&' => '&amp;',
+          '<' => '&lt;',
+          '>' => '&gt;',
+          '"' => '&quot;',
+          "'" => '&#x27;',
+          "/" => '&#x2F',
+        })
+      end
+    end
+
     # SmartyPants Mixin module
     #
     # Implements SmartyPants.postprocess, which
@@ -52,74 +89,3 @@ module Redcarpet
     end
   end
 end
-
-# Compatibility class;
-# Creates an instance of Redcarpet with the RedCloth API.
-class RedcarpetCompat
-  attr_accessor :text
-
-  def initialize(text, *exts)
-    exts_hash, render_hash = *parse_extensions_and_renderer_options(exts)
-    @text = text
-    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,
-    :prettify => :prettify,
-    :lax_htmlblock => :lax_spacing,
-    :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, :prettify, :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/lib/redcarpet/compat.rb

@@ -1,3 +1,76 @@
 require 'redcarpet'
 
+# Deprecated: Please use the default API to parse Markdown
+# documents ; this layer will be removed in Redcarpet 4.0.
+#
+# Creates an instance of Redcarpet with the RedCloth API.
+class RedcarpetCompat
+  attr_accessor :text
+
+  def initialize(text, *exts)
+    exts_hash, render_hash = *parse_extensions_and_renderer_options(exts)
+    @text = text
+    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,
+    :prettify         => :prettify,
+    :lax_htmlblock    => :lax_spacing,
+    :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, :prettify, :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
+
 Markdown = RedcarpetCompat unless defined? Markdown

data/lib/redcarpet/render_strip.rb

@@ -26,9 +26,9 @@ module Redcarpet
         end
       end
 
-      # Other methods where the text content is in another argument
+      # Other methods where we don't return only a specific argument
       def link(link, title, content)
-        content
+        "#{content} (#{link})"
       end
 
       def image(link, title, content)

data/redcarpet.gemspec

@@ -1,10 +1,10 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '3.1.2'
+  s.version = '3.2.0'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2014-05-10'
+  s.date = '2014-10-11'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/vmg/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
@@ -41,16 +41,19 @@ Gem::Specification.new do |s|
     lib/redcarpet/render_man.rb
     lib/redcarpet/render_strip.rb
     redcarpet.gemspec
-    test/test_helper.rb
+    test/benchmark.rb
     test/custom_render_test.rb
+    test/html5_test.rb
     test/html_render_test.rb
     test/html_toc_render_test.rb
     test/markdown_test.rb
     test/pathological_inputs_test.rb
     test/redcarpet_compat_test.rb
+    test/safe_render_test.rb
     test/smarty_html_test.rb
     test/smarty_pants_test.rb
     test/stripdown_render_test.rb
+    test/test_helper.rb
   ]
   # = MANIFEST =
   s.test_files = s.files.grep(%r{^test/})

data/test/benchmark.rb

@@ -0,0 +1,24 @@
+# coding: UTF-8
+# Thanks Kramdown for the inspiration!
+require 'benchmark/ips'
+
+require 'redcarpet'
+require 'bluecloth'
+require 'kramdown'
+
+markdown = File.read(File.join(File.dirname(__FILE__), "fixtures/benchmark.md"))
+
+# Let's bench!
+Benchmark.ips do |bench|
+  bench.report("Redcarpet") do
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(markdown)
+  end
+
+  bench.report("BlueCloth") do
+    BlueCloth.new(markdown).to_html
+  end
+
+  bench.report("Kramdown") do
+    Kramdown::Document.new(markdown).to_html
+  end
+end

data/test/custom_render_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class CustomRenderTest < Test::Unit::TestCase
+class CustomRenderTest < Redcarpet::TestCase
   class SimpleRender < Redcarpet::Render::HTML
     def emphasis(text)
       "<em class=\"cool\">#{text}</em>"

data/test/html5_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class HTML5Test < Redcarpet::TestCase
+  def test_that_html5_works
+    section = <<EOS
+<section>
+  <p>The quick brown fox jumps over the lazy dog.</p>
+</section>
+EOS
+
+    figure = <<EOS
+<figure>
+  <img src="http://example.org/image.jpg" alt="">
+  <figcaption>
+    <p>Hello world!</p>
+  </figcaption>
+</figure>
+EOS
+
+    assert_renders section, section
+    assert_renders figure, figure
+  end
+
+  def test_that_html5_works_with_code_blocks
+    section = <<EOS
+\t<section>
+\t\t<p>The quick brown fox jumps over the lazy dog.</p>
+\t</section>
+EOS
+
+    section_expected = <<EOE
+<pre><code>&lt;section&gt;
+    &lt;p&gt;The quick brown fox jumps over the lazy dog.&lt;/p&gt;
+&lt;/section&gt;
+</code></pre>
+EOE
+
+    header = <<EOS
+    <header>
+        <hgroup>
+            <h1>Section heading</h1>
+            <h2>Subhead</h2>
+        </hgroup>
+    </header>
+EOS
+
+    header_expected = <<EOE
+<pre><code>&lt;header&gt;
+    &lt;hgroup&gt;
+        &lt;h1&gt;Section heading&lt;/h1&gt;
+        &lt;h2&gt;Subhead&lt;/h2&gt;
+    &lt;/hgroup&gt;
+&lt;/header&gt;
+</code></pre>
+EOE
+
+    assert_renders section_expected, section
+    assert_renders header_expected, header
+  end
+end

data/test/html_render_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class HTMLRenderTest < Test::Unit::TestCase
+class HTMLRenderTest < Redcarpet::TestCase
   def setup
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
     @rndr = {
@@ -220,4 +220,21 @@ Markdown
 
     assert output.include?("<code class=\"prettyprint ruby\">")
   end
+
+  def test_safe_links_only_with_anchors
+    markdown = "An [anchor link](#anchor) on a page."
+
+    renderer = Redcarpet::Markdown.new(@rndr[:safe_links])
+    output = renderer.render(markdown)
+
+    assert_match %r{<a href="#anchor">anchor link</a>}, output
+  end
+
+  def test_autolink_with_link_attributes
+    render = Redcarpet::Render::HTML.new(link_attributes: {rel: "nofollow"})
+    parser = Redcarpet::Markdown.new(render, autolink: true)
+
+    output = parser.render("https://github.com/")
+    assert_match %r{rel="nofollow"}, output
+  end
 end

data/test/html_toc_render_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class HTMLTOCRenderTest < Test::Unit::TestCase
+class HTMLTOCRenderTest < Redcarpet::TestCase
   def setup
     @render = Redcarpet::Render::HTML_TOC
     @markdown = "# A title \n## A __nice__ subtitle\n## Another one \n### A sub-sub-title"
@@ -14,8 +14,8 @@ class HTMLTOCRenderTest < Test::Unit::TestCase
     assert output.start_with?("<ul>")
     assert output.end_with?("</ul>")
 
-    assert_equal 4, output.split("<ul>").length
-    assert_equal 5, output.split("<li>").length
+    assert_equal 3, output.scan("<ul>").length
+    assert_equal 4, output.scan("<li>").length
   end
 
   def test_granular_toc_render
@@ -25,7 +25,7 @@ class HTMLTOCRenderTest < Test::Unit::TestCase
     assert output.start_with?("<ul>")
     assert output.end_with?("</ul>")
 
-    assert_equal 4, output.split("<li>").length
+    assert_equal 3, output.scan("<li>").length
     assert !output.include?("A sub-sub title")
   end
 
@@ -38,4 +38,12 @@ class HTMLTOCRenderTest < Test::Unit::TestCase
     assert_match /another-one/, output
     assert_match /a-sub-sub-title/, output
   end
+
+  def test_toc_heading_with_hyphen_and_equal
+    renderer = Redcarpet::Markdown.new(@render)
+    output = renderer.render("# Hello World\n\n-\n\n=")
+
+    assert_equal 1, output.scan("<li>").length
+    assert !output.include?('<a href=\"#\"></a>')
+  end
 end

data/test/markdown_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class MarkdownTest < Test::Unit::TestCase
+class MarkdownTest < Redcarpet::TestCase
 
   def setup
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
@@ -149,6 +149,11 @@ HTML
     header
   end
 
+  def test_a_hyphen_and_a_equal_should_not_be_converted_to_heading
+    html_equal "<p>-</p>\n", @markdown.render("-")
+    html_equal "<p>=</p>\n", @markdown.render("=")
+  end
+
   def test_that_tables_flag_works
     text = <<EOS
  aaa | bbbb
@@ -280,6 +285,17 @@ text
     assert_equal html, render_with({:no_intra_emphasis => true}, markdown)
   end
 
+  def test_emphasis_escaping
+    markdown = @markdown.render("**foo\\*** _dd\\_dd_")
+    html_equal "<p><strong>foo*</strong> <em>dd_dd</em></p>\n", markdown
+  end
+
+  def test_char_escaping_when_highlighting
+    markdown = "==attribute\\==="
+    output = render_with({highlight: true}, markdown)
+    html_equal "<p><mark>attribute=</mark></p>\n", output
+  end
+
   def test_ordered_lists_with_lax_spacing
     markdown = "Foo:\n1. Foo\n2. Bar"
     output = render_with({lax_spacing: true}, markdown)
@@ -290,6 +306,6 @@ text
 
   def test_references_with_tabs_after_colon
     markdown = @markdown.render("[Link][id]\n[id]:\t\t\thttp://google.es")
-    html_equal '<p><a href="http://google.es">Link</a></p>', markdown
+    html_equal "<p><a href=\"http://google.es\">Link</a></p>\n", markdown
   end
 end

data/test/pathological_inputs_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 # Disabled by default
 # (these are the easy ones -- the evil ones are not disclosed)
-class PathologicalInputsTest # < Test::Unit::TestCase
+class PathologicalInputsTest # < Redcarpet::TestCase
   def setup
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
   end

data/test/redcarpet_compat_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class RedcarpetCompatTest < Test::Unit::TestCase
+class RedcarpetCompatTest < Redcarpet::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>\n", html

data/test/safe_render_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class SafeRenderTest < Redcarpet::TestCase
+  def setup
+    @render = Redcarpet::Render::Safe
+    @parser = Redcarpet::Markdown.new(@render, fenced_code_blocks: true)
+  end
+
+  def test_safe_links_only_is_enabled_by_default
+    markdown = "[foo](javascript:alert('foo'))"
+    output   = @parser.render(markdown)
+
+    assert_not_match %r{a href}, output
+  end
+
+  def test_escape_html_is_enabled_by_default
+    markdown = "<p>Hello world!</p>"
+    output   = @parser.render(markdown)
+
+    assert_match %r{&lt;}, output
+  end
+
+  def test_html_escaping_in_code_blocks
+    markdown = "~~~\n<p>Hello!</p>\n~~~"
+    output   = @parser.render(markdown)
+
+    assert_match %r{&lt;p&gt;}, output
+  end
+
+  def test_lang_class_is_removed
+    markdown = "~~~ruby\nclass Foo; end\n~~~"
+    output   = @parser.render(markdown)
+
+    assert_not_match %r{ruby}, output
+  end
+end

data/test/smarty_html_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class SmartyHTMLTest < Test::Unit::TestCase
+class SmartyHTMLTest < Redcarpet::TestCase
   def setup
     @smarty_markdown = Redcarpet::Markdown.new(Redcarpet::Render::SmartyHTML)
   end

data/test/smarty_pants_test.rb

@@ -1,7 +1,7 @@
 # coding: UTF-8
 require 'test_helper'
 
-class SmartyPantsTest < Test::Unit::TestCase
+class SmartyPantsTest < Redcarpet::TestCase
   def setup
     @pants = Redcarpet::Render::SmartyPants
   end
@@ -40,4 +40,9 @@ class SmartyPantsTest < Test::Unit::TestCase
     rd = @pants.render("<p>single `backticks` in HTML should be preserved</p>")
     assert_equal "<p>single `backticks` in HTML should be preserved</p>", rd
   end
+
+  def test_that_smart_converts_trailing_single_quotes_to_curly_quotes
+    rd = @pants.render("<p>Hopin' that this bug gets some fixin'.</p>")
+    assert_equal "<p>Hopin&rsquo; that this bug gets some fixin&rsquo;.</p>", rd
+  end
 end

data/test/stripdown_render_test.rb

@@ -1,42 +1,40 @@
 # coding: UTF-8
 require 'test_helper'
 
-class StripDownRender < Test::Unit::TestCase
-
+class StripDownRender < Redcarpet::TestCase
   def setup
-    @markdown = Redcarpet::Markdown.new(Redcarpet::Render::StripDown)
+    @parser = Redcarpet::Markdown.new(Redcarpet::Render::StripDown)
   end
 
-  def test_basics
-    markdown = <<-Markdown
-# [Foo bar](https://github.com)
-Markdown
-    html = @markdown.render(markdown)
-    html_equal "Foo bar\n", html
+  def test_titles
+    markdown = "# Foo bar"
+    output   = @parser.render(markdown)
+
+    assert_equal "Foo bar\n", output
   end
 
-  def test_insert_new_lines_char
-    markdown = <<-Markdown
-# Foo bar
+  def test_code_blocks
+    markdown = "\tclass Foo\n\tend"
+    output   = @parser.render(markdown)
+
+    assert_equal "class Foo\nend\n", output
+  end
 
-Hello world! Please visit [this site](https://github.com/).
+  def test_images
+    markdown = "Look at this ![picture](http://example.org/picture.png)\n" \
+               "And this: ![](http://example.org/image.jpg)"
+    expected = "Look at this picture http://example.org/picture.png\n" \
+               "And this: http://example.org/image.jpg\n"
+    output   = @parser.render(markdown)
 
-    class Foo
-    end
+    assert_equal expected, output
+  end
 
-Look at this ![picture](http://example.org/picture.png)
-And this: ![](http://example.org/image.jpg)
-Markdown
-    plaintext = <<-Plaintext
-Foo bar
-Hello world! Please visit this site.
-class Foo
-end
-Look at this picture http://example.org/picture.png
-And this: http://example.org/image.jpg
-Plaintext
+  def test_links
+    markdown = "Here's an [example](https://github.com)"
+    expected = "Here's an example (https://github.com)\n"
+    output   = @parser.render(markdown)
 
-    html = @markdown.render(markdown)
-    html_equal plaintext, html
+    assert_equal expected, output
   end
 end

data/test/test_helper.rb

@@ -9,8 +9,21 @@ require 'nokogiri'
 require 'redcarpet'
 require 'redcarpet/render_strip'
 require 'redcarpet/render_man'
+require 'redcarpet/compat'
 
-def html_equal(html_a, html_b)
-  assert_equal Nokogiri::HTML::DocumentFragment.parse(html_a).to_html,
-    Nokogiri::HTML::DocumentFragment.parse(html_b).to_html
+class Redcarpet::TestCase < Test::Unit::TestCase
+  def html_equal(html_a, html_b)
+    assert_equal Nokogiri::HTML::DocumentFragment.parse(html_a).to_html,
+      Nokogiri::HTML::DocumentFragment.parse(html_b).to_html
+  end
+
+  def assert_renders(html, markdown)
+    html_equal html, parser.render(markdown)
+  end
+
+  private
+
+  def parser
+    @parser ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcarpet
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.4
 description: A fast, safe and extensible Markdown to (X)HTML parser
@@ -91,16 +91,19 @@ files:
 - lib/redcarpet/render_man.rb
 - lib/redcarpet/render_strip.rb
 - redcarpet.gemspec
-- test/test_helper.rb
+- test/benchmark.rb
 - test/custom_render_test.rb
+- test/html5_test.rb
 - test/html_render_test.rb
 - test/html_toc_render_test.rb
 - test/markdown_test.rb
 - test/pathological_inputs_test.rb
 - test/redcarpet_compat_test.rb
+- test/safe_render_test.rb
 - test/smarty_html_test.rb
 - test/smarty_pants_test.rb
 - test/stripdown_render_test.rb
+- test/test_helper.rb
 homepage: http://github.com/vmg/redcarpet
 licenses:
 - MIT
@@ -111,28 +114,31 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Markdown that smells nice
 test_files:
-- test/test_helper.rb
+- test/benchmark.rb
 - test/custom_render_test.rb
+- test/html5_test.rb
 - test/html_render_test.rb
 - test/html_toc_render_test.rb
 - test/markdown_test.rb
 - test/pathological_inputs_test.rb
 - test/redcarpet_compat_test.rb
+- test/safe_render_test.rb
 - test/smarty_html_test.rb
 - test/smarty_pants_test.rb
 - test/stripdown_render_test.rb
+- test/test_helper.rb