redcarpet 1.5.0 → 1.5.1

data/ext/redcarpet.c

@@ -50,23 +50,21 @@ static void rb_redcarpet__get_flags(VALUE ruby_obj,
 	if (rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
 		render_flags |= XHTML_TOC;
 
-	if (rb_funcall(ruby_obj, rb_intern("no_strikethrough"), 0) == Qtrue)
-		render_flags |= XHTML_SKIP_STRIKETHROUGH;
-
-	/* parser - strict
-	 * This is fucking stupid; what the 'strict' flag actually
-	 * enforces is laxer emphasis parsing. So we use a properly
-	 * named flag internally, even if outside we have retarded
-	 * naming because of compat. issues .*/
+	/**
+	 * Markdown extensions -- all disabled by default 
+	 */
 	if (rb_funcall(ruby_obj, rb_intern("strict"), 0) == Qtrue)
 		extensions |= MKDEXT_LAX_EMPHASIS;
 
-	if (rb_funcall(ruby_obj, rb_intern("no_tables"), 0) != Qtrue)
+	if (rb_funcall(ruby_obj, rb_intern("tables"), 0) == Qtrue)
 		extensions |= MKDEXT_TABLES;
 
-	if (rb_funcall(ruby_obj, rb_intern("no_fencedcode"), 0) != Qtrue)
+	if (rb_funcall(ruby_obj, rb_intern("fenced_code"), 0) == Qtrue)
 		extensions |= MKDEXT_FENCED_CODE;
 
+	if (rb_funcall(ruby_obj, rb_intern("strikethrough"), 0) == Qtrue)
+		render_flags |= XHTML_STRIKETHROUGH;
+
 	*enabled_extensions_p = extensions;
 	*render_flags_p = render_flags;
 }

data/ext/xhtml.c

@@ -167,7 +167,7 @@ rndr_double_emphasis(struct buf *ob, struct buf *text, char c, void *opaque)
 		return 0;
 
 	if (c == '~') {
-		if (options->flags & XHTML_SKIP_STRIKETHROUGH)
+		if ((options->flags & XHTML_STRIKETHROUGH) == 0)
 			return 0;
 		
 		BUFPUTSL(ob, "<span style=\"text-decoration:line-through;\">");

data/ext/xhtml.h

@@ -27,7 +27,7 @@ typedef enum {
 	XHTML_AUTOLINK = (1 << 6),
 	XHTML_SAFELINK = (1 << 7),
 	XHTML_TOC = (1 << 8),
-	XHTML_SKIP_STRIKETHROUGH = (1 << 10),
+	XHTML_STRIKETHROUGH = (1 << 10),
 } render_mode;
 
 void

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -37,8 +37,6 @@ class Redcarpet
   # Do not output <tt><style></tt> tags included in the source text.
   attr_accessor :filter_styles
 
-  attr_accessor :fold_lines # Ignore, just for compatibility
-
   # Do not output any raw HTML included in the source text.
   attr_accessor :filter_html
 
@@ -60,14 +58,17 @@ class Redcarpet
   # Add TOC anchors to every header
   attr_accessor :generate_toc
 
-  # Do not process tables
-  attr_accessor :no_tables
+  # Enable PHP-Markdown tables extension
+  attr_accessor :tables
+
+  # Enable PHP-Markdown ~~strikethrough~~ extension
+  attr_accessor :strikethrough
 
-  # Do not process ~~strikethrough~~
-  attr_accessor :no_strikethrough
+  # Enable PHP-Markdown fenced code extension
+  attr_accessor :fenced_code
 
-  # Do not process fenced code blocks
-  attr_accessor :no_fencedcode
+  # Backwards compatibility
+  attr_accessor :fold_lines
 
   def initialize(text, *extensions)
     @text  = text

data/redcarpet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.5.0'
+  s.version = '1.5.1'
   s.summary = "Ruby bindings for libupskirt"
   s.date = '2011-04-11'
   s.email = 'vicent@github.com'

data/test/redcarpet_test.rb

@@ -155,22 +155,25 @@ class RedcarpetTest < Test::Unit::TestCase
     header
   end
 
-  def test_that_no_tables_flag_works
-    rd = Redcarpet.new(<<EOS, :no_tables)
+  def test_that_tables_flag_works
+    text = <<EOS
  aaa | bbbb
 -----|------
 hello|sailor
 EOS
-    assert rd.to_html !~ /<table/
+
+    assert Redcarpet.new(text).to_html !~ /<table/
+    assert Redcarpet.new(text, :tables).to_html ~ /<table/
   end
 
-  def test_strikethrough
-    rd = Redcarpet.new("this is ~some~ striked ~~text~~", :no_strikethrough)
-    assert rd.to_html !~ /text-decoration:line-through;/
+  def test_strikethrough_flag_works
+    text = "this is ~some~ striked ~~text~~"
+    assert Redcarpet.new(text).to_html !~ /text-decoration:line-through;/
+    assert Redcarpet.new(text, :strikethrough).to_html ~ /text-decoration:line-through;/
   end
 
-  def test_that_no_fenced_flag_works
-    rd = Redcarpet.new(<<fenced, :no_fencedcode)
+  def test_that_fenced_flag_works
+    text = <<fenced
 This is a simple test
 
 ~~~~~
@@ -178,7 +181,9 @@ This is some awesome code
     with tabs and shit
 ~~~
 fenced
-    assert rd.to_html !~ /<code/
+
+    assert Redcarpet.new(text).to_html !~ /<code/
+    assert Redcarpet.new(text, :fenced_code).to_html ~ /<code/
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"