ext/toc.c
@@ -16,18 +16,9 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
VALUE buf = rb_str_buf_new(4096);
FILE *stream = rb_str_io_new(buf);
- /* compile flags */
- int flags = MKD_TABSTOP | MKD_NOHEADER;
+ int flags = rb_rdiscount__get_flags(self);
- /* smart */
- if ( rb_funcall(self, rb_intern("smart"), 0) != Qtrue )
- flags = flags | MKD_NOPANTS;
-
- /* filter_html */
- if ( rb_funcall(self, rb_intern("filter_html"), 0) == Qtrue )
- flags = flags | MKD_NOHTML;
-
- MMIOT *doc = mkd_string(RSTRING(text)->ptr, RSTRING(text)->len, flags);
+ MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
markdown(doc, stream, flags);
fclose(stream);
@@ -35,10 +26,55 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
return buf;
}
+static VALUE
+rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
+{
+ int flags = rb_rdiscount__get_flags(self);
+
+ /* grab char pointer to markdown input text */
+ VALUE text = rb_funcall(self, rb_intern("text"), 0);
+ Check_Type(text, T_STRING);
+
+ /* allocate a ruby string buffer and wrap it in a stream */
+ VALUE buf = rb_str_buf_new(4096);
+ FILE *stream = rb_str_io_new(buf);
+
+ MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
+ mkd_compile(doc, flags);
+ mkd_generatetoc(doc, stream);
+
+ fclose(stream);
+
+ return buf;
+}
+
+int rb_rdiscount__get_flags(VALUE ruby_obj)
+{
+ /* compile flags */
+ int flags = MKD_TABSTOP | MKD_NOHEADER;
+
+ /* smart */
+ if ( rb_funcall(ruby_obj, rb_intern("smart"), 0) != Qtrue )
+ flags = flags | MKD_NOPANTS;
+
+ /* filter_html */
+ if ( rb_funcall(ruby_obj, rb_intern("filter_html"), 0) == Qtrue )
+ flags = flags | MKD_NOHTML;
+
+ /* generate_toc */
+ if ( rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
+ flags = flags | MKD_TOC;
+
+ return flags;
+
+}
+
+
void Init_rdiscount()
{
rb_cRDiscount = rb_define_class("RDiscount", rb_cObject);
rb_define_method(rb_cRDiscount, "to_html", rb_rdiscount_to_html, -1);
+ rb_define_method(rb_cRDiscount, "toc_content", rb_rdiscount_toc_content, -1);
}
/* vim: set ts=4 sw=4: */
ext/rdiscount.c
@@ -41,6 +41,9 @@ class RDiscount
# RedCloth compatible line folding -- not used for Markdown but
# included for compatibility.
attr_accessor :fold_lines
+
+ # Enable Table Of Contents generation
+ attr_accessor :generate_toc
# Create a RDiscount Markdown processor. The +text+ argument
# should be a string containing Markdown text. Additional arguments may be
lib/rdiscount.rb
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
ext/rbstrio.h
ext/rdiscount.c
ext/resource.c
+ ext/toc.c
lib/markdown.rb
lib/rdiscount.rb
rdiscount.gemspec
rdiscount.gemspec
@@ -7,9 +7,9 @@ MARKDOWN_TEST_DIR = "#{File.dirname(__FILE__)}/MarkdownTest_1.0.3"
class MarkdownTest < Test::Unit::TestCase
- def test_that_extension_methods_are_present_on_markdown_class
- assert Markdown.instance_methods.include?('to_html'),
- "Markdown class should respond to #to_html"
+ def test_that_extension_methods_are_present_on_markdown_class
+ assert Markdown.instance_methods.map{|m| m.to_s }.include?('to_html'),
+ "Markdown class should respond to #to_html"
end
def test_that_simple_one_liner_goes_to_html
test/markdown_test.rb
@@ -27,4 +27,16 @@ class RDiscountTest < Test::Unit::TestCase
rd = RDiscount.new(%(# Heading\n\n"Quoted text"), :smart)
assert_equal %(<h1>Heading</h1>\n\n<p>“Quoted text”</p>\n), rd.to_html
end
+
+ def test_that_generate_toc_sets_toc_ids
+ rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
+ assert rd.generate_toc
+ assert_equal %(<h1 id="Level+1\">Level 1</h1>\n\n<h2 id="Level+2\">Level 2</h2>\n), rd.to_html
+ end
+
+ def test_should_get_the_generated_toc
+ rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
+ exp = %(<ul>\n <li><a href="#Level+1">Level 1</a>\n <ul>\n <li><a href="#Level+2">Level 2</a> </li>\n </ul>\n </li>\n </ul>)
+ assert_equal exp, rd.toc_content.strip
+ end
end
test/rdiscount_test.rb
6090614bb5936647d5b6c213b58ea0fc44f8d131
82efdbb6f4b913c8be86659809d72c98549d0d9d
Ryan Tomayko
rtomayko@gmail.com
http://github.com/rtomayko/rdiscount/commit/8ad8780b22561aae67634a74a04d15afb9144eae
8ad8780b22561aae67634a74a04d15afb9144eae
2009-01-31T13:41:21-08:00
2009-01-31T13:41:21-08:00
Merge js/master: TOC and Ruby 1.9 support
08a2676b58cfdf6121ced44b2958b86e0697a017
Ryan Tomayko
rtomayko@gmail.com