rdiscount 1.3.1 → 1.3.1.1

data/ext/rdiscount.c

@@ -16,29 +16,64 @@ 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;
+    MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
+    markdown(doc, stream, flags);
 
-    /* filter_html */
-    if ( rb_funcall(self, rb_intern("filter_html"), 0) == Qtrue )
-        flags = flags | MKD_NOHTML;
+    fclose(stream);
 
-    MMIOT *doc = mkd_string(RSTRING(text)->ptr, RSTRING(text)->len, flags);
-    markdown(doc, stream, flags);
+    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: */

data/ext/toc.c

@@ -0,0 +1,62 @@
+/*
+ * toc -- spit out a table of contents based on header blocks
+ *
+ * Copyright (C) 2008 Jjgod Jiang, David L Parsons.
+ * The redistribution terms are provided in the COPYRIGHT file that must
+ * be distributed with this source code.
+ */
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+/* write an header index
+ */
+int
+mkd_generatetoc(Document *p, FILE *output)
+{
+    Paragraph *pp;
+
+    int last_hnumber = 0,
+	first_hnumber = 0;
+
+    if ( !(p && p->ctx) ) return -1;
+    if ( ! (p->ctx->flags & TOC) ) return 0;
+
+    for ( pp = p->code; pp ; pp = pp->next ) {
+        if ( pp->typ == HDR && pp->text ) {
+	    
+	    if ( last_hnumber == pp->hnumber )
+		fprintf(output, "%*s</li>\n", pp->hnumber, "");
+	    else while ( last_hnumber > pp->hnumber ) {
+		fprintf(output, "%*s</li>\n%*s</ul>\n",
+				 last_hnumber, "",
+				 last_hnumber-1,"");
+		--last_hnumber;
+	    }
+	    
+	    while ( pp->hnumber > last_hnumber ) {
+		fprintf(output, "\n%*s<ul>\n", pp->hnumber, "");
+		++last_hnumber;
+	    }
+	    fprintf(output, "%*s<li><a href=\"#", pp->hnumber, "");
+	    mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), putc, output);
+	    fprintf(output, "\">");
+	    mkd_text(T(pp->text->text), S(pp->text->text), output, 0);
+	    fprintf(output, "</a>");
+        }
+    }
+
+    while ( last_hnumber > 0 ) {
+        fprintf(output, "%*s</li>\n%*s</ul>\n",
+			last_hnumber, "", last_hnumber, "");
+	--last_hnumber;
+    }
+
+    return 0;
+}
+

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.3.1'
+  VERSION = '1.3.1.1'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -42,6 +42,9 @@ class RDiscount
   # 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
   # supplied to set various processing options:

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.3.1'
+  s.version = '1.3.1.1'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-01-10'
+  s.date = '2009-01-31'
   s.email = 'r@tomayko.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true
@@ -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

data/test/markdown_test.rb

@@ -1,15 +1,16 @@
-$: << File.join(File.dirname(__FILE__), "../lib")
+rootdir = File.dirname(File.dirname(__FILE__))
+$LOAD_PATH.unshift "#{rootdir}/lib"
 
 require 'test/unit'
 require 'markdown'
 
-MARKDOWN_TEST_DIR = "#{File.dirname(__FILE__)}/MarkdownTest_1.0.3"
+MARKDOWN_TEST_DIR = "#{rootdir}/test/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"
+      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
@@ -20,7 +21,6 @@ class MarkdownTest < Test::Unit::TestCase
 
   def test_that_inline_markdown_goes_to_html
     markdown = Markdown.new('_Hello World_!')
-    assert_respond_to markdown, :to_html
     assert_equal "<p><em>Hello World</em>!</p>", markdown.to_html.strip
   end
 
@@ -28,6 +28,9 @@ class MarkdownTest < Test::Unit::TestCase
     markdown = Markdown.new('_start _ foo_bar bar_baz _ end_ *italic* **bold** <a>_blah_</a>')
     assert_respond_to markdown, :to_html
     assert_equal "<p><em>start _ foo_bar bar_baz _ end</em> <em>italic</em> <strong>bold</strong> <a><em>blah</em></a></p>", markdown.to_html.strip
+
+    markdown = Markdown.new("Run 'rake radiant:extensions:rbac_base:migrate'")
+    assert_equal "<p>Run 'rake radiant:extensions:rbac_base:migrate'</p>", markdown.to_html.strip
   end
 
   def test_that_filter_html_works

data/test/rdiscount_test.rb

@@ -1,4 +1,5 @@
-$: << File.join(File.dirname(__FILE__), "../lib")
+rootdir = File.dirname(File.dirname(__FILE__))
+$LOAD_PATH.unshift "#{rootdir}/lib"
 
 require 'test/unit'
 require 'rdiscount'
@@ -27,4 +28,16 @@ class RDiscountTest < Test::Unit::TestCase
     rd = RDiscount.new(%(# Heading\n\n"Quoted text"), :smart)
     assert_equal %(<h1>Heading</h1>\n\n<p>&ldquo;Quoted text&rdquo;</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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.1.1
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-10 00:00:00 -08:00
+date: 2009-01-31 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - ext/rbstrio.h
 - ext/rdiscount.c
 - ext/resource.c
+- ext/toc.c
 - lib/markdown.rb
 - lib/rdiscount.rb
 - rdiscount.gemspec