github-markdown-preview 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fddee4db6c56bdf780f90d4660204917dcf583e2
-  data.tar.gz: be0534e36ac9d885bec975a5245cbb3273763dba
+  metadata.gz: 6811fc2d2bbf7b805709ea7c7f483a03db65482f
+  data.tar.gz: 0cfd60ce46df545e790f5b3e67a11f6990ce5225
 SHA512:
-  metadata.gz: 2ec8668c6455da1113937d57adc3d877310419cde82a881242f28b64a2e1a123b01ceff0de3cef98d703f7fa649d356b06f6cb2794f3c946049ec6cae178f356
-  data.tar.gz: 287ecf069ad8e5ab61a61f6664a6665ba494113e54bccb53bcab238af0c28645bc244adb23fa42699916058630ca7b126f464791211058ead036e7eacc12a1b6
+  metadata.gz: 249bcd30e981b81b4dda35f9aaf56e81a1aa33a4b6b3316f6a451f76c8458400e5ab238e7dd6587afdced9350c45bc9cce9ba28ff7d5d6d94849607839010b54
+  data.tar.gz: 0fa92d6fcda6d4b8bc2bd82843a81ef2881d1a2816ebbdbf8a116c785d0cb1bb96860ff4774bbfc861fe1509a5b2f853d48af1199a364fbd32f30687a4482930

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## v3.1.1
+* Fix double-spaced task lists [#31](https://github.com/dmarcotte/github-markdown-preview/pull/31)
+
 ## v3.1.0
-* Add anchor links in default mode [#30](https://github.com/dmarcotte/github-markdown-preview/pull/30), [#30](https://github.com/dmarcotte/github-markdown-preview/pull/30)
+* Add anchor links in default mode [#28](https://github.com/dmarcotte/github-markdown-preview/pull/28), [#30](https://github.com/dmarcotte/github-markdown-preview/pull/30)
 
 ## v3.0.0
 * Render task lists for readmes [#25](https://github.com/dmarcotte/github-markdown-preview/pull/25) ([Github announcement](https://github.com/blog/1825-task-lists-in-all-markdown-documents))

data/lib/github-markdown-preview/filter/task_list_filter.rb

@@ -25,16 +25,18 @@ module GithubMarkdownPreview
       end
 
       def call
-        doc.search('ul/li').each do |node|
+        process_task = Proc.new do |node|
           first_child = node.children.first
-          next if !first_child.text?
+          next unless first_child.text?
           content = first_child.to_html
           html = task_list_item_filter(content)
           next if html == content
-          node['class'] = 'task-list-item'
-          node.parent()['class'] = 'task-list'
+          (first_child.ancestors('li').first || { })['class'] = 'task-list-item'
+          (first_child.ancestors('ul').first || { })['class'] = 'task-list'
           first_child.replace(html)
         end
+        doc.search('ul/li').each &process_task
+        doc.search('ul/li/p').each &process_task
         doc
       end
 

data/lib/github-markdown-preview/version.rb

@@ -1,3 +1,3 @@
 module GithubMarkdownPreview
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/test/filter/task_list_filter_test.rb

@@ -42,7 +42,7 @@ class HTML::Pipeline::MentionFilterTest < Minitest::Test
     html = "<ul><li>[ ] <em>task</em></li></ul>"
     result  = filter(html)
 
-    assert_equal "<ul class=\"task-list\"><li class=\"task-list-item\">\n<input class=\"task-list-item-checkbox\" type=\"checkbox\"><em>task</em>\n</li></ul>",
+    assert_equal "<ul class=\"task-list\"><li class=\"task-list-item\">\n<input class=\"task-list-item-checkbox\" type=\"checkbox\"> <em>task</em>\n</li></ul>",
                  result
   end
 
@@ -94,4 +94,12 @@ class HTML::Pipeline::MentionFilterTest < Minitest::Test
                  result
   end
 
+  def test_lists_with_p_tags
+    html = "<ul><li><p>[ ] One</p></li><li><p>[ ] Two</p></li></ul>"
+    result  = filter(html)
+
+    assert_equal "<ul class=\"task-list\">\n<li class=\"task-list-item\"><p><input class=\"task-list-item-checkbox\" type=\"checkbox\"> One</p></li>\n<li class=\"task-list-item\"><p><input class=\"task-list-item-checkbox\" type=\"checkbox\"> Two</p></li>\n</ul>",
+                 result
+  end
+
 end

data/test/html_preview_test.rb

@@ -101,6 +101,14 @@ class TestHtmlPreview < Minitest::Test
                  'Should contain a task list item in comment mode'
   end
 
+  def test_double_spaced_task_lists
+    write(@source_file_path, "- [ ] one\n\n- [ ] two")
+    markdown_preview = @ghp.new( @source_file_path, { :comment_mode => true } )
+    assert_equal markdown_preview.wrap_preview("<ul class=\"task-list\">\n<li class=\"task-list-item\"><p><input class=\"task-list-item-checkbox\" type=\"checkbox\"> one</p></li>\n<li class=\"task-list-item\"><p><input class=\"task-list-item-checkbox\" type=\"checkbox\"> two</p></li>\n</ul>"),
+                 read(markdown_preview.preview_file),
+                 'Should render tasks even if list has extra spaces (which render as <p> elements)'
+  end
+
   def test_newlines_ignored
     write(@source_file_path, "foo\nbar")
     markdown_preview = @ghp.new( @source_file_path )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-markdown-preview
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Daniel Marcotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen