github-markdown 0.5.0 → 0.5.1

data/ext/markdown/gh-markdown.c

@@ -130,7 +130,7 @@ static VALUE rb_ghmd_to_html(VALUE self, VALUE rb_text, VALUE rb_mode)
 
 
 /* Max recursion nesting when parsing Markdown documents */
-static const int GITHUB_MD_NESTING = 16;
+static const int GITHUB_MD_NESTING = 32;
 
 /* Default flags for all Markdown pipelines:
  *

data/ext/markdown/markdown.c

@@ -1624,7 +1624,7 @@ static size_t
 parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, int *flags)
 {
 	struct buf *work = 0, *inter = 0;
-	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
+	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, nestpre = 0, i;
 	int in_empty = 0, has_inside_empty = 0, in_fence = 0;
 
 	/* keeping track of the first indentation prefix */
@@ -1672,6 +1672,14 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 		while (i < 4 && beg + i < end && data[beg + i] == ' ')
 			i++;
 
+		/* handle nested list items */
+		if (i > 0) {
+			if (nestpre == 0 || nestpre > i)
+				nestpre = i;
+			else
+				i = nestpre;
+		}
+
 		pre = i;
 
 		if (rndr->ext_flags & MKDEXT_FENCED_CODE) {

data/github-markdown.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'github-markdown'
-  s.version = '0.5.0'
+  s.version = '0.5.1'
   s.summary = 'The Markdown parser for GitHub.com'
   s.description = 'Self-contained Markdown parser for GitHub, with all our custom extensions'
   s.date = '2012-07-08'

data/test/gfm_test.rb

@@ -23,4 +23,37 @@ class GFMBasicTest < Test::Unit::TestCase
   def test_that_code_blocks_work
     GitHub::Markdown.to_html("~~~~~~~~~~\nhello world!\n~~~~~~~~~\n", :gfm)
   end
+
+  # With GITHUB_MD_NESTING set to 32, we can handle up to 10 levels of list
+  # nesting.  We do not go to 11.
+  def test_nested_list
+    items = [
+      'Item 1',
+      'Item 1a',
+      'Item 1a1',
+      'Item 1a1a',
+      'Item 1a1a1',
+      'Item 1a1a1a',
+      'Item 1a1a1a1',
+      'Item 1a1a1a1a',
+      'Item 1a1a1a1a1',
+      'Item 1a1a1a1a1a'
+    ]
+
+    pre = -3
+    markdown = items.inject('') do |md, item|
+      pre += 3
+      md.concat(' '*pre + '+ ' + item + "\n")
+    end
+
+    html = GitHub::Markdown.render(markdown)
+    parsed = Nokogiri::HTML::DocumentFragment.parse(html)
+
+    items.inject(parsed) do |node, expected_item|
+      child = node.at('.//ul/li')
+      child_item = child.children.detect{|e| e.text?}.text.strip
+      assert_equal expected_item, child_item
+      node = child
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: github-markdown
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - GitHub, Inc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-08 00:00:00 +02:00
+date: 2012-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency