redcarpet 2.3.0 → 3.0.0

data/README.markdown

@@ -11,7 +11,7 @@ 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](https://www.github.com/vmg/sundown)
+Redcarpet is based on the [Sundown](https://www.github.com/vmg/sundown)
 library. You might want to find out more about Sundown to see what makes this
 Ruby library so awesome.
 
@@ -29,10 +29,11 @@ You can totally install it as a Gem
 
 Redcarpet is readily available as a Ruby gem. It will build some native
 extensions, but the parser is standalone and requires no installed libraries.
+Redcarpet requires at least Ruby 1.9.2 on your system.
 
     $ [sudo] gem install redcarpet
 
-The Redcarpet source (including Sundown as a submodule) is available at GitHub:
+The Redcarpet source is available at GitHub:
 
     $ git clone git://github.com/vmg/redcarpet.git
 
@@ -63,12 +64,12 @@ parser will identify. The following extensions are accepted:
 * `:no_intra_emphasis`: do not parse emphasis inside of words.
 Strings such as `foo_bar_baz` will not generate `<em>` tags.
 
-* `:tables`: parse tables, PHP-Markdown style
+* `:tables`: parse tables, PHP-Markdown style.
 
 * `:fenced_code_blocks`: parse fenced code blocks, PHP-Markdown
 style. Blocks delimited with 3 or more `~` or backtickswill 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
+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
@@ -83,9 +84,9 @@ with `fenced_code_blocks: true`.
 
 * `:strikethrough`: parse strikethrough, PHP-Markdown style
 Two `~` characters mark the start of a strikethrough,
-e.g. `this is ~~good~~ bad`
+e.g. `this is ~~good~~ bad`.
 
-* `:lax_spacing` - HTML blocks do not require to be surrounded by an
+* `:lax_spacing`: HTML blocks do not require to be surrounded by an
 empty line as in the Markdown standard.
 
 * `:space_after_headers`: A space is always required between the hash
@@ -97,6 +98,9 @@ would not be a valid header.
 * `:underline`: parse underscored emphasis as underlines.
 `This is _underlined_ but this is still *italic*`.
 
+* `:highlight`: parse highlights.
+`This is ==highlighted==`. It looks like this: `<mark>highlighted</mark>`
+
 Example:
 
 ~~~~~ ruby
@@ -124,25 +128,25 @@ performance — several degrees of magnitude faster than other Ruby Markdown
 solutions.
 
 All the rendering flags that previously applied only to HTML output have
-now been moved to the `Render::HTML` class, and may be enabled when
+now been moved to the `Redcarpet::Render::HTML` class, and may be enabled when
 instantiating the renderer:
 
 ~~~~~ ruby
-Render::HTML.new(render_options = {})
+Redcarpet::Render::HTML.new(render_options = {})
 ~~~~~
 
 Initializes an HTML renderer. The following flags are available:
 
-* `:filter_html`: do not allow any user-inputted HTML in the output
+* `:filter_html`: do not allow any user-inputted HTML in the output.
 
-* `:no_images`: do not generate any `<img>` tags
+* `:no_images`: do not generate any `<img>` tags.
 
-* `:no_links`: do not generate any `<a>` tags
+* `:no_links`: do not generate any `<a>` tags.
 
-* `:no_styles`: do not generate any `<style>` tags
+* `:no_styles`: do not generate any `<style>` tags.
 
 * `:safe_links_only`: only generate links for protocols which are considered
-safe
+safe.
 
 * `:with_toc_data`: add HTML anchors to each header in the output HTML,
 to allow linking to each section.
@@ -153,9 +157,9 @@ Markdown document had newlines (by default, Markdown ignores these newlines).
 * `:xhtml`: output XHTML-conformant tags. This option is always enabled in the
 `Render::XHTML` renderer.
 
-* `:prettify`: add prettyprint classes to `<code>` tags for google-code-prettify
+* `:prettify`: add prettyprint classes to `<code>` tags for google-code-prettify.
 
-* `:link_attributes`: hash of extra attributes to add to links
+* `:link_attributes`: hash of extra attributes to add to links.
 
 Example:
 
@@ -190,18 +194,19 @@ end
 markdown = Redcarpet::Markdown.new(HTMLwithPygments, :fenced_code_blocks => true)
 ~~~~~
 
-But new renderers can also be created from scratch (see `lib/render_man.rb` for
+But new renderers can also be created from scratch (see `lib/redcarpet/render_man.rb` for
 an example implementation of a Manpage renderer)
 
 ~~~~~~ ruby
 class ManPage < Redcarpet::Render::Base
-    # you get the drill -- keep going from here
+  # you get the drill -- keep going from here
 end
 ~~~~~
 
 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.
@@ -246,6 +251,7 @@ be copied verbatim:
 * strikethrough(text)
 * superscript(text)
 * underline(text)
+* highlight(text)
 
 ### Low level rendering
 
@@ -288,7 +294,7 @@ The SmartyPants parser can be found in `Redcarpet::Render::SmartyPants`. It has
 been implemented as a module, so it can be used standalone or as a mixin.
 
 When mixed with a Renderer class, it will override the `postprocess` method
-to perform SmartyPants replacements once the rendering is complete
+to perform SmartyPants replacements once the rendering is complete.
 
 ~~~~ ruby
 # Mixin

data/Rakefile

@@ -12,7 +12,46 @@ Rake::ExtensionTask.new('redcarpet')
 require 'bundler/gem_tasks'
 
 # Testing
-load 'tasks/testing.rake'
+require 'rake/testtask'
 
-# Sundown
-load 'tasks/sundown.rake'
+Rake::TestTask.new('test:unit') do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+  t.warning = false
+end
+
+task 'test:unit' => :compile
+
+desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
+task 'test:conformance' => :compile do |t|
+  script = "#{pwd}/bin/redcarpet"
+  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
+  lib_dir = "#{pwd}/lib"
+
+  chdir("test/MarkdownTest_#{test_version}") do
+    sh "RUBYLIB=#{lib_dir} ./MarkdownTest.pl --script='#{script}' --tidy"
+  end
+end
+
+desc 'Run version 1.0 conformance suite'
+task 'test:conformance:1.0' => :compile do |t|
+  ENV['MARKDOWN_TEST_VER'] = '1.0'
+  Rake::Task['test:conformance'].invoke
+end
+
+desc 'Run 1.0.3 conformance suite'
+task 'test:conformance:1.0.3' => :compile do |t|
+  ENV['MARKDOWN_TEST_VER'] = '1.0.3'
+  Rake::Task['test:conformance'].invoke
+end
+
+desc 'Run unit and conformance tests'
+task :test => %w[test:unit test:conformance]
+
+desc 'Run benchmarks'
+task :benchmark => :compile do |t|
+  $:.unshift 'lib'
+  load 'test/benchmark.rb'
+end

data/ext/redcarpet/autolink.c

@@ -141,7 +141,7 @@ check_domain(uint8_t *data, size_t size, int allow_short)
 		return 0;
 
 	for (i = 1; i < size - 1; ++i) {
-		if (data[i] == '.') np++;
+		if (strchr(".:", data[i]) != NULL) np++;
 		else if (!isalnum(data[i]) && data[i] != '-') break;
 	}
 

data/ext/redcarpet/autolink.h

@@ -47,5 +47,3 @@ sd_autolink__url(size_t *rewind_p, struct buf *link,
 #endif
 
 #endif
-
-/* vim: set filetype=c: */

data/ext/redcarpet/houdini_html_e.c

@@ -69,7 +69,11 @@ houdini_escape_html0(struct buf *ob, const uint8_t *src, size_t size, int secure
 		if (src[i] == '/' && !secure) {
 			bufputc(ob, '/');
 		} else {
-			bufputs(ob, HTML_ESCAPES[esc]);
+			/* The left and right tags (< and >) aren't escaped in comments */
+			if ((src[i] == '<' && src[i + 1] == '!') || (src[i] == '>' && src[i - 1] == '-'))
+				bufputc(ob, src[i]);
+			else
+				bufputs(ob, HTML_ESCAPES[esc]);
 		}
 
 		i++;

data/ext/redcarpet/html.c

@@ -231,6 +231,19 @@ rndr_underline(struct buf *ob, const struct buf *text, void *opaque)
 	return 1;
 }
 
+static int
+rndr_highlight(struct buf *ob, const struct buf *text, void *opaque)
+{
+	if (!text || !text->size)
+		return 0;
+
+	BUFPUTSL(ob, "<mark>");
+	bufput(ob, text->data, text->size);
+	BUFPUTSL(ob, "</mark>");
+
+	return 1;
+}
+
 static int
 rndr_linebreak(struct buf *ob, void *opaque)
 {
@@ -587,6 +600,7 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 		rndr_double_emphasis,
 		rndr_emphasis,
 		rndr_underline,
+		rndr_highlight,
 		NULL,
 		NULL,
 		toc_link,
@@ -629,6 +643,7 @@ sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options,
 		rndr_double_emphasis,
 		rndr_emphasis,
 		rndr_underline,
+		rndr_highlight,
 		rndr_image,
 		rndr_linebreak,
 		rndr_link,

data/ext/redcarpet/markdown.c

@@ -65,6 +65,7 @@ typedef size_t
 
 static size_t char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_underline(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
+static size_t char_highlight(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_linebreak(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_codespan(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
@@ -395,7 +396,7 @@ find_emph_char(uint8_t *data, size_t size, uint8_t c)
 	size_t i = 1;
 
 	while (i < size) {
-		while (i < size && data[i] != c && data[i] != '`' && data[i] != '[')
+		while (i < size && data[i] != c && data[i] != '[')
 			i++;
 
 		if (i == size)
@@ -539,6 +540,8 @@ parse_emph2(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 
 			if (c == '~')
 				r = rndr->cb.strikethrough(ob, work, rndr->opaque);
+			else if (c == '=')
+				r = rndr->cb.highlight(ob, work, rndr->opaque);
 			else
 				r = rndr->cb.double_emphasis(ob, work, rndr->opaque);
 
@@ -600,14 +603,14 @@ char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of
 	size_t ret;
 
 	if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS) {
-		if (offset > 0 && !_isspace(data[-1]) && data[-1] != '>')
+		if (offset > 0 && !_isspace(data[-1]) && data[-1] != '>' && data[-1] != '(')
 			return 0;
 	}
 
 	if (size > 2 && data[1] != c) {
 		/* whitespace cannot follow an opening emphasis;
 		 * strikethrough only takes two characters '~~' */
-		if (c == '~' || _isspace(data[1]) || (ret = parse_emph1(ob, rndr, data + 1, size - 1, c)) == 0)
+		if (c == '~' || c == '=' || _isspace(data[1]) || (ret = parse_emph1(ob, rndr, data + 1, size - 1, c)) == 0)
 			return 0;
 
 		return ret + 1;
@@ -621,7 +624,7 @@ char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of
 	}
 
 	if (size > 4 && data[1] == c && data[2] == c && data[3] != c) {
-		if (c == '~' || _isspace(data[3]) || (ret = parse_emph3(ob, rndr, data + 3, size - 3, c)) == 0)
+		if (c == '~' || c == '=' || _isspace(data[3]) || (ret = parse_emph3(ob, rndr, data + 3, size - 3, c)) == 0)
 			return 0;
 
 		return ret + 3;
@@ -898,10 +901,18 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 		link_b = i;
 
 		/* looking for link end: ' " ) */
+		/* Count the number of open parenthesis */
+		size_t nb_p = 0;
+
 		while (i < size) {
 			if (data[i] == '\\') i += 2;
-			else if (data[i] == ')') break;
-			else if (i >= 1 && _isspace(data[i-1]) && (data[i] == '\'' || data[i] == '"')) break;
+			else if (data[i] == '(' && i != 0) {
+				nb_p++; i++;
+			}
+			else if (data[i] == ')') {
+				if (nb_p == 0) break;
+				else nb_p--; i++;
+			} else if (i >= 1 && _isspace(data[i-1]) && (data[i] == '\'' || data[i] == '"')) break;
 			else i++;
 		}
 
@@ -2423,6 +2434,8 @@ sd_markdown_new(
 		md->active_char['_'] = MD_CHAR_EMPHASIS;
 		if (extensions & MKDEXT_STRIKETHROUGH)
 			md->active_char['~'] = MD_CHAR_EMPHASIS;
+		if (extensions & MKDEXT_HIGHLIGHT)
+			md->active_char['='] = MD_CHAR_EMPHASIS;
 	}
 
 	if (md->cb.codespan)
@@ -2555,5 +2568,3 @@ sd_version(int *ver_major, int *ver_minor, int *ver_revision)
 	*ver_minor = SUNDOWN_VER_MINOR;
 	*ver_revision = SUNDOWN_VER_REVISION;
 }
-
-/* vim: set filetype=c: */

data/ext/redcarpet/markdown.h

@@ -61,6 +61,7 @@ enum mkd_extensions {
 	MKDEXT_SUPERSCRIPT = (1 << 7),
 	MKDEXT_LAX_SPACING = (1 << 8),
 	MKDEXT_DISABLE_INDENTED_CODE = (1 << 9),
+	MKDEXT_HIGHLIGHT = (1 << 10)
 };
 
 /* sd_callbacks - functions for rendering parsed data */
@@ -85,6 +86,7 @@ struct sd_callbacks {
 	int (*double_emphasis)(struct buf *ob, const struct buf *text, void *opaque);
 	int (*emphasis)(struct buf *ob, const struct buf *text, void *opaque);
 	int (*underline)(struct buf *ob, const struct buf *text, void *opaque);
+	int (*highlight)(struct buf *ob, const struct buf *text, void *opaque);
 	int (*image)(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque);
 	int (*linebreak)(struct buf *ob, void *opaque);
 	int (*link)(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque);
@@ -137,5 +139,3 @@ sd_version(int *major, int *minor, int *revision);
 #endif
 
 #endif
-
-/* vim: set filetype=c: */

data/ext/redcarpet/rc_markdown.c

@@ -50,6 +50,9 @@ static void rb_redcarpet_md_flags(VALUE hash, unsigned int *enabled_extensions_p
 	if (rb_hash_lookup(hash, CSTR2SYM("underline")) == Qtrue)
 		extensions |= MKDEXT_UNDERLINE;
 
+	if (rb_hash_lookup(hash, CSTR2SYM("highlight")) == Qtrue)
+		extensions |= MKDEXT_HIGHLIGHT;
+
 	if (rb_hash_lookup(hash, CSTR2SYM("lax_spacing")) == Qtrue)
 		extensions |= MKDEXT_LAX_SPACING;
 
@@ -110,8 +113,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;
+	if (NIL_P(text))
+		return Qnil;
 
 #ifdef HAVE_RUBY_ENCODING_H
 	{
@@ -132,7 +135,7 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 		markdown);
 
 	/* build the Ruby string */
-	text = redcarpet_str_new((const char*)output_buf->data, output_buf->size, rb_enc_get(text));
+	text = rb_enc_str_new((const char*)output_buf->data, output_buf->size, rb_enc_get(text));
 
 	bufrelease(output_buf);
 
@@ -145,11 +148,11 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 __attribute__((visibility("default")))
 void Init_redcarpet()
 {
-    rb_mRedcarpet = rb_define_module("Redcarpet");
+	rb_mRedcarpet = rb_define_module("Redcarpet");
 
 	rb_cMarkdown = rb_define_class_under(rb_mRedcarpet, "Markdown", rb_cObject);
-    rb_define_singleton_method(rb_cMarkdown, "new", rb_redcarpet_md__new, -1);
-    rb_define_method(rb_cMarkdown, "render", rb_redcarpet_md_render, 1);
+	rb_define_singleton_method(rb_cMarkdown, "new", rb_redcarpet_md__new, -1);
+	rb_define_method(rb_cMarkdown, "render", rb_redcarpet_md_render, 1);
 
 	Init_redcarpet_rndr();
 }

data/ext/redcarpet/rc_render.c

@@ -40,11 +40,7 @@ VALUE rb_cRenderHTML;
 VALUE rb_cRenderHTML_TOC;
 VALUE rb_mSmartyPants;
 
-#ifdef HAVE_RUBY_ENCODING_H
-#define buf2str(t) ((t) ? redcarpet_str_new((const char*)(t)->data, (t)->size, opt->active_enc) : Qnil)
-#else
-#define buf2str(t) ((t) ? redcarpet_str_new((const char*)(t)->data, (t)->size, NULL) : Qnil)
-#endif
+#define buf2str(t) ((t) ? rb_enc_str_new((const char*)(t)->data, (t)->size, opt->active_enc) : Qnil)
 
 static void
 rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, void *opaque)
@@ -171,6 +167,12 @@ rndr_underline(struct buf *ob, const struct buf *text, void *opaque)
 	SPAN_CALLBACK("underline", 1, buf2str(text));
 }
 
+static int
+rndr_highlight(struct buf *ob, const struct buf *text, void *opaque)
+{
+	SPAN_CALLBACK("highlight", 1, buf2str(text));
+}
+
 static int
 rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque)
 {
@@ -279,6 +281,7 @@ static struct sd_callbacks rb_redcarpet_callbacks = {
 	rndr_double_emphasis,
 	rndr_emphasis,
 	rndr_underline,
+	rndr_highlight,
 	rndr_image,
 	rndr_linebreak,
 	rndr_link,
@@ -312,6 +315,7 @@ static const char *rb_redcarpet_method_names[] = {
 	"double_emphasis",
 	"emphasis",
 	"underline",
+	"highlight",
 	"image",
 	"linebreak",
 	"link",
@@ -456,7 +460,7 @@ static VALUE rb_redcarpet_smartypants_render(VALUE self, VALUE text)
 	output_buf = bufnew(128);
 
 	sdhtml_smartypants(output_buf, (const uint8_t*)RSTRING_PTR(text), RSTRING_LEN(text));
-	result = redcarpet_str_new((const char*)output_buf->data, output_buf->size, rb_enc_get(text));
+	result = rb_enc_str_new((const char*)output_buf->data, output_buf->size, rb_enc_get(text));
 
 	bufrelease(output_buf);
 	return result;

data/ext/redcarpet/redcarpet.h

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

data/lib/redcarpet.rb

@@ -1,7 +1,7 @@
 require 'redcarpet.so'
 
 module Redcarpet
-  VERSION = '2.3.0'
+  VERSION = '3.0.0'
 
   class Markdown
     attr_reader :renderer

data/redcarpet.gemspec

@@ -1,13 +1,14 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '2.3.0'
+  s.version = '3.0.0'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2013-05-22'
+  s.date = '2013-07-09'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/vmg/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
+  s.license = 'MIT'
   # = MANIFEST =
   s.files = %w[
     COPYING
@@ -39,7 +40,6 @@ Gem::Specification.new do |s|
     lib/redcarpet/render_man.rb
     lib/redcarpet/render_strip.rb
     redcarpet.gemspec
-    sundown
     test/test_helper.rb
     test/custom_render_test.rb
     test/html_render_test.rb
@@ -57,9 +57,9 @@ Gem::Specification.new do |s|
   s.executables = ["redcarpet"]
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "nokogiri"
-  s.add_development_dependency "rake-compiler"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "bluecloth"
-  s.add_development_dependency "kramdown"
+  s.add_development_dependency "nokogiri", "~> 1.6.0"
+  s.add_development_dependency "rake-compiler", "~> 0.8.3"
+  s.add_development_dependency "test-unit", "~> 2.5.4"
+  s.add_development_dependency "bluecloth", "~> 2.2.0"
+  s.add_development_dependency "kramdown", "~> 1.0.2"
 end

data/test/html_render_test.rb

@@ -89,4 +89,51 @@ EOE
     rd = render_with(@rndr[:escape_html], %([This'link"is](http://example.net/)))
     assert_equal "<p><a href=\"http://example.net/\">This&#39;link&quot;is</a></p>\n", rd
   end
+
+  def test_that_code_emphasis_work
+    markdown = <<-MD
+This should be **`a bold codespan`**
+However, this should be *`an emphasised codespan`*
+
+* **`ABC`** or **`DEF`**
+* Foo bar
+MD
+
+    html = <<HTML
+<p>This should be <strong><code>a bold codespan</code></strong>
+However, this should be <em><code>an emphasised codespan</code></em></p>
+
+<ul>
+<li><strong><code>ABC</code></strong> or <strong><code>DEF</code></strong></li>
+<li>Foo bar</li>
+</ul>
+HTML
+
+    output = render_with(Redcarpet::Render::HTML.new, markdown)
+    assert_equal html, output
+  end
+
+  def test_that_parenthesis_are_handled_into_links
+    markdown = "Hey have a look at the [bash man page](man:bash(1))!"
+    html = "<p>Hey have a look at the <a href=\"man:bash(1)\">bash man page</a>!</p>\n"
+    output = render_with(Redcarpet::Render::HTML.new, markdown)
+
+    assert_equal html, output
+  end
+
+  def test_autolinking_works_as_expected
+    markdown = "Example of uri ftp://user:pass@example.com/. Email foo@bar.com and link http://bar.com"
+    renderer = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true)
+    output = renderer.render(markdown)
+
+    assert output.include? '<a href="ftp://user:pass@example.com/">ftp://user:pass@example.com/</a>'
+    assert output.include? 'mailto:foo@bar.com'
+    assert output.include? '<a href="http://bar.com">'
+  end
+
+  def test_that_comments_arent_escaped
+    input = "<!-- This is a nice comment! -->"
+    output = render_with(@rndr[:escape_html], input)
+    assert output.include? input
+  end
 end

data/test/markdown_test.rb

@@ -88,26 +88,6 @@ class MarkdownTest < Test::Unit::TestCase
     html_equal "<p><a href=\"http://github.com/rtomayko/rdiscount\">http://github.com/rtomayko/rdiscount</a></p>\n", rd
   end
 
-  if "".respond_to?(:encoding)
-    def test_should_return_string_in_same_encoding_as_input
-      input = "Yogācāra"
-      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
     rd = @markdown.render("foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b>")
     html_equal "<p>foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b></p>\n", rd
@@ -190,6 +170,15 @@ EOS
     assert output.include? '<em>some</em>'
   end
 
+  def test_highlight_flag_works
+    text = "this is ==highlighted=="
+
+    refute render_with({}, text).include? '<mark>highlighted</mark>'
+
+    output = render_with({:highlight => true}, text)
+    assert output.include? '<mark>highlighted</mark>'
+  end
+
   def test_that_fenced_flag_works
     text = <<fenced
 This is a simple test
@@ -256,5 +245,9 @@ text
     assert render_with({:no_intra_emphasis => true}, "this fails: hello_world_") !~ /<em>/
     assert render_with({:no_intra_emphasis => true}, "this also fails: hello_world_#bye") !~ /<em>/
     assert render_with({:no_intra_emphasis => true}, "this works: hello_my_world") !~ /<em>/
+
+    markdown = "This is (**bold**) and this_is_not_italic!"
+    html = "<p>This is (<strong>bold</strong>) and this_is_not_italic!</p>\n"
+    assert_equal html, render_with({:no_intra_emphasis => true}, markdown)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcarpet
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,88 +10,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 description: A fast, safe and extensible Markdown to (X)HTML parser
 email: vicent@github.com
 executables:
@@ -140,7 +140,8 @@ files:
 - test/smarty_pants_test.rb
 - test/stripdown_render_test.rb
 homepage: http://github.com/vmg/redcarpet
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: