tight-redcarpet 3.1.1 → 3.2.0

data/ext/redcarpet/markdown.c

@@ -1547,7 +1547,7 @@ prefix_oli(uint8_t *data, size_t size)
 	return i + 2;
 }
 
-/* prefix_uli • returns ordered list item prefix */
+/* prefix_uli • returns unordered list item prefix */
 static size_t
 prefix_uli(uint8_t *data, size_t size)
 {
@@ -1619,7 +1619,7 @@ parse_blockquote(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 static size_t
 parse_htmlblock(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, int do_render);
 
-/* parse_blockquote • handles parsing of a regular paragraph */
+/* parse_paragraph • handles parsing of a regular paragraph */
 static size_t
 parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size)
 {
@@ -1630,15 +1630,11 @@ parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 	while (i < size) {
 		for (end = i + 1; end < size && data[end - 1] != '\n'; end++) /* empty */;
 
-		if (is_empty(data + i, size - i)) {
-			last_is_empty = 1;
+		if (is_empty(data + i, size - i))
 			break;
-		}
 
-		if (!last_is_empty && (level = is_headerline(data + i, size - i)) != 0) {
-			last_is_empty = 0;
+		if (!last_is_empty && (level = is_headerline(data + i, size - i)) != 0)
 			break;
-		}
 
 		last_is_empty = 0;
 
@@ -2804,6 +2800,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 
 	struct buf *text;
 	size_t beg, end;
+	int in_fence = 0;
 
 	text = bufnew(64);
 	if (!text)
@@ -2815,7 +2812,8 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	/* reset the references table */
 	memset(&md->refs, 0x0, REF_TABLE_SIZE * sizeof(void *));
 
-	int footnotes_enabled = md->ext_flags & MKDEXT_FOOTNOTES;
+	int footnotes_enabled  = md->ext_flags & MKDEXT_FOOTNOTES;
+	int codefences_enabled = md->ext_flags & MKDEXT_FENCED_CODE;
 
 	/* reset the footnotes lists */
 	if (footnotes_enabled) {
@@ -2831,10 +2829,13 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	if (doc_size >= 3 && memcmp(document, UTF8_BOM, 3) == 0)
 		beg += 3;
 
-	while (beg < doc_size) /* iterating over lines */
-		if (footnotes_enabled && is_footnote(document, beg, doc_size, &end, &md->footnotes_found))
+	while (beg < doc_size) { /* iterating over lines */
+		if (codefences_enabled && (is_codefence(document + beg, doc_size - beg, NULL) != 0))
+			in_fence = !in_fence;
+
+		if (!in_fence && footnotes_enabled && is_footnote(document, beg, doc_size, &end, &md->footnotes_found))
 			beg = end;
-		else if (is_ref(document, beg, doc_size, &end, md->refs))
+		else if (!in_fence && is_ref(document, beg, doc_size, &end, md->refs))
 			beg = end;
 		else { /* skipping to the next line */
 			end = beg;
@@ -2854,6 +2855,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 
 			beg = end;
 		}
+	}
 
 	/* pre-grow the output buffer to minimize allocations */
 	bufgrow(ob, MARKDOWN_GROW(text->size));

data/ext/redcarpet/markdown.h

@@ -104,9 +104,6 @@ struct sd_callbacks {
 	void (*doc_footer)(struct buf *ob, void *opaque);
 };
 
-/* header methods used internally in Redcarpet */
-char* header_anchor(struct buf *text);
-
 struct sd_markdown;
 
 /*********

data/ext/redcarpet/rc_markdown.c

@@ -122,13 +122,9 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE 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
+	struct rb_redcarpet_rndr *renderer;
+	Data_Get_Struct(rb_rndr, struct rb_redcarpet_rndr, renderer);
+	renderer->options.active_enc = rb_enc_get(text);
 
 	/* initialize buffers */
 	output_buf = bufnew(128);

data/ext/redcarpet/rc_render.c

@@ -472,25 +472,30 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 static VALUE rb_redcarpet_htmltoc_init(int argc, VALUE *argv, VALUE self)
 {
 	struct rb_redcarpet_rndr *rndr;
-	int nesting_level = 6;
-	VALUE hash, key = Qnil;
+	unsigned int render_flags = HTML_TOC;
+	VALUE hash, nesting_level = Qnil;
 
 	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
 
 	if (rb_scan_args(argc, argv, "01", &hash) == 1) {
 		Check_Type(hash, T_HASH);
 
-		key = CSTR2SYM("nesting_level");
+		/* escape_html */
+		if (rb_hash_aref(hash, CSTR2SYM("escape_html")) == Qtrue)
+			render_flags |= HTML_ESCAPE;
 
-		if (RTEST(rb_hash_aref(hash, key))) {
-			Check_Type(rb_hash_aref(hash, key), T_FIXNUM);
-			nesting_level = NUM2INT(rb_hash_aref(hash, key));
-		}
+		/* Nesting level */
+		nesting_level = rb_hash_aref(hash, CSTR2SYM("nesting_level"));
 	}
 
-	sdhtml_toc_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html, nesting_level);
+	sdhtml_toc_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html, render_flags);
 	rb_redcarpet__overload(self, rb_cRenderHTML_TOC);
 
+	if (!(NIL_P(nesting_level)))
+		rndr->options.html.toc_data.nesting_level = NUM2INT(nesting_level);
+	else
+		rndr->options.html.toc_data.nesting_level = 6;
+
 	return Qnil;
 }
 

data/lib/redcarpet.rb

@@ -1,7 +1,8 @@
 require 'redcarpet.so'
+require 'redcarpet/compat'
 
 module Redcarpet
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 
   class Markdown
     attr_reader :renderer
@@ -11,8 +12,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 +22,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 +90,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,73 @@
 require 'redcarpet'
 
+# 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 = 'tight-redcarpet'
-  s.version = '3.1.1'
+  s.version = '3.2.0'
   s.summary = "Markdown that smells nice (patch level 'tight')"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser patched to have smaller headings and no quote-escaping'
-  s.date = '2014-07-04'
+  s.date = '2015-01-08'
   s.email = 'ujifgc@github.com'
   s.homepage = 'http://github.com/ujifgc/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí", "Igor Bochkariov"]
@@ -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/})
@@ -59,7 +62,7 @@ Gem::Specification.new do |s|
   s.executables = ["redcarpet"]
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "nokogiri", "~> 1.6.0"
+  s.add_development_dependency "nokogiri", "~> 1.6.3.1"
   s.add_development_dependency "rake-compiler", "~> 0.8.3"
   s.add_development_dependency "test-unit", "~> 2.5.4"
 end

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/html5_test.rb

@@ -0,0 +1,69 @@
+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
+
+  def test_script_tag_recognition
+    markdown = <<-Md
+<script type="text/javascript">
+  alert('Foo!');
+</script>
+Md
+    assert_renders markdown, markdown
+  end
+end