github-markdown 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6433aeeb45a4d139e4245c135b7b43065095c37b
-  data.tar.gz: 62050a7a94c8dd6e6e0516bb3bd61ab31c272f49
+  metadata.gz: b2259a61a92711bdcd173441f680a8562efcb5cf
+  data.tar.gz: 8864e4e619a0c537b562c09ae6380c2d76fcf2d4
 SHA512:
-  metadata.gz: 2894fe2ff8e055f248a2c16bbacbc54e73d1c0db547176631c81d284713f23d40fb16c406a1b5bf3a7352624e1304ce06a4c00bf31d2e665b7fe6e2a4b820078
-  data.tar.gz: 4f01241c3918cc5d68c091ef5c52bc7da93f306677e7ff4b00c5db1d295d6a70bb7e82f1d1dd1db9a815fb42f8b7719a04d12cf0a5edd65af96a92a17b4f0965
+  metadata.gz: f246c6463214dda999648c480d5612a70e425e1d11ef10c3f066eb07a100fa4f5d8fe668ba268b2c43b1df10803c6cb2ef55ca40ad0e1772226de968cebd7365
+  data.tar.gz: c9765a24214c9b6b05f24829582c0730e5765ef82526f2975d3d79ba1c37e960b4b500b5a4ce97bd1b15c40e54f2710f0b3bdab59eb272c1626d718ce536d876

data/ext/markdown/markdown.c

@@ -1365,7 +1365,7 @@ prefix_uli(uint8_t *data, size_t size)
 
 	if (i < size && data[i] == ' ') i++;
 	if (i < size && data[i] == ' ') i++;
-	if (i < size && data[i] == ' ') i++;
+  if (i < size && data[i] == ' ') i++;
 
 	if (i + 1 >= size ||
 		(data[i] != '*' && data[i] != '+' && data[i] != '-') ||
@@ -1630,8 +1630,8 @@ 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;
-	int in_empty = 0, has_inside_empty = 0, in_fence = 0;
+	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, previous_indent = 0, i;
+	int in_empty = 0, has_inside_empty = 0, in_fence = 0, previous_indent_diff = 0;
 
 	/* keeping track of the first indentation prefix */
 	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
@@ -1678,7 +1678,13 @@ 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++;
 
+		previous_indent_diff = i - previous_indent;
+		/* allow indentations between 2 and 4 spaces to count as a new list */
+		if (previous_indent_diff > 1 && previous_indent_diff < 4)
+			i = 2;
+
 		pre = i;
+		previous_indent = pre;
 
 		if (rndr->ext_flags & MKDEXT_FENCED_CODE) {
 			if (is_codefence(data + beg + i, end - beg - i, NULL) != 0)

data/github-markdown.gemspec

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

data/test/gfm_test.rb

@@ -16,13 +16,13 @@ def html_equal(html_a, html_b)
 end
 
 class GFMBasicTest < Test::Unit::TestCase
-  Dir['test/fixtures/*.md'].each do |md_file|
-    markup = md_file.split('/').last.gsub(/\.md/, '')
-
-    define_method "test_#{markup}" do
+  Dir['test/fixtures/*.text', 'test/fixtures/Markdown_Redcarpet/**/*.text'].each do |md_file|
+    dirname = File.dirname(md_file)
+    markup = md_file.split('/').last.gsub(/\.text/, '').gsub(/(\s+)/, "_")
+    define_method "test_#{dirname}_#{markup}" do
       source = File.read(md_file)
 
-      expected_file = "test/fixtures/#{markup}.html"
+      expected_file = "#{dirname}/#{markup}.html"
       expected = File.read(expected_file).rstrip
       actual = GitHub::Markdown.render(source).rstrip
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-markdown
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - GitHub, Inc