jekyll-toc 0.4.0.rc → 0.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14addb9f45e2c59684378d0a893225af44329358
-  data.tar.gz: 61974f038bb809635bb874991aa9d962a1759a48
+  metadata.gz: 81dc11ec036241d6eed38ef5cddd5014ed2d12d7
+  data.tar.gz: 98c037df71e8684555a75f36fb29bdddf4826189
 SHA512:
-  metadata.gz: ea6df1586db53071164ffa49bd6ef5e9cec024d690aa890838c222853e83de86e817fdd4c916618d4c50604ca3f61f3c253917cb015acb51f45787254d31e8fc
-  data.tar.gz: 4c5b95c5d20a28f7bacdc1effaa717d6e9466fa555c449e7e53b80882c9bd7daf17ae715fb51b79b6abb3983e9ad4cee9075e6c2bf48bb37af12950f1ba98955
+  metadata.gz: 532db0dafa5253716f397e257b5256091e826a98be80644d5b089809e124bc5c9ab76f339786840f54259443ab821fee9ce6d4863c2f331aabda75dcad9e9a1c
+  data.tar.gz: bfd2b4fc0a808179e2e5d1caf2e535610e4ae6702733706b9e5e83e327c11d89a7aca5cb8d4d313d6e4e7388a10bc73b8423392cb931f89b1be03122657dc6ab

data/jekyll-toc.gemspec

@@ -15,10 +15,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.post_install_message = %q(As of jekyll-toc 0.3, nested toc is supported! Please make sure your toc is not broken after update jekyll-toc.
-
-For more info: https://github.com/toshimaru/jekyll-toc/wiki/0.3-Upgrade-Guide)
-
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'

data/lib/table_of_contents/parser.rb

@@ -4,15 +4,13 @@ module Jekyll
     class Parser
       PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u
 
-      attr_reader :doc
-
       def initialize(html)
         @doc = Nokogiri::HTML::DocumentFragment.parse(html)
         @entries = parse_content
       end
 
       def build_toc
-        %(<ul class="section-nav">\n#{build_toc_list(@entries)}</ul>)
+        %(<ul class="section-nav">\n#{build_toc_list(@entries, last_ul_used: true)}</ul>)
       end
 
       def inject_anchors_into_html
@@ -60,7 +58,7 @@ module Jekyll
       end
 
       # Returns the list items for entries
-      def build_toc_list(entries)
+      def build_toc_list(entries, last_ul_used: false)
         i = 0
         toc_list = ''
         min_h_num = entries.map { |e| e[:h_num] }.min
@@ -75,7 +73,7 @@ module Jekyll
               next_entry = entries[i + 1]
               if next_entry[:h_num] > min_h_num
                 nest_entries = get_nest_entries(entries[i + 1, entries.count], min_h_num)
-                toc_list << %(\n<ul>\n#{build_toc_list(nest_entries)}</ul>\n)
+                toc_list << %(\n<ul>\n#{build_toc_list(nest_entries, last_ul_used: true)}</ul>\n)
                 i += nest_entries.count
               end
             end
@@ -84,7 +82,11 @@ module Jekyll
           elsif entry[:h_num] > min_h_num
             # If the current entry should be indented in the list, generate a sublist
             nest_entries = get_nest_entries(entries[i, entries.count], min_h_num)
-            toc_list << %(<ul>\n#{build_toc_list(nest_entries)}</ul>\n)
+            if last_ul_used
+              toc_list << build_toc_list(nest_entries, last_ul_used: true)
+            else
+              toc_list << %(<ul>\n#{build_toc_list(nest_entries, last_ul_used: true)}</ul>\n)
+            end
             i += nest_entries.count - 1
           end
           i += 1

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JekyllToc
-  VERSION = '0.4.0.rc'.freeze
+  VERSION = '0.4.0.rc2'.freeze
 end

data/test/test_kramdown_list.rb

@@ -0,0 +1,125 @@
+require 'test_helper'
+
+class TestKramdownList < Minitest::Test
+  def test_kramdown_list_1
+    text = <<-MARKDOWN
+* level-1
+  * level-2
+    * level-3
+      * level-4
+        * level-5
+    MARKDOWN
+    expected = <<-HTML
+<ul>
+  <li>level-1
+    <ul>
+      <li>level-2
+        <ul>
+          <li>level-3
+            <ul>
+              <li>level-4
+                <ul>
+                  <li>level-5</li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
+    HTML
+
+    assert_equal(expected, Kramdown::Document.new(text).to_html)
+  end
+
+  def test_kramdown_list_2
+    text = <<-MARKDOWN
+* level-1
+    * level-3
+  * level-2
+      * level-4
+        * level-5
+    MARKDOWN
+    expected = <<-HTML
+<ul>
+  <li>level-1
+    <ul>
+      <li>level-3</li>
+      <li>level-2
+        <ul>
+          <li>level-4
+            <ul>
+              <li>level-5</li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
+    HTML
+
+    assert_equal(expected, Kramdown::Document.new(text).to_html)
+  end
+
+  def test_kramdown_list_3
+    text = <<-MARKDOWN
+      * level-4
+    * level-3
+  * level-2
+* level-1
+    MARKDOWN
+    expected = <<-HTML
+    HTML
+
+    assert_equal(expected, Kramdown::Document.new(text).to_html)
+  end
+
+  def test_kramdown_list_3
+    text = <<-MARKDOWN
+* level-1
+      * level-4
+    * level-3
+  * level-2
+* level-1
+    MARKDOWN
+    expected = <<-HTML
+<ul>
+  <li>level-1
+    * level-4
+    <ul>
+      <li>level-3</li>
+      <li>level-2</li>
+    </ul>
+  </li>
+  <li>level-1</li>
+</ul>
+    HTML
+
+    assert_equal(expected, Kramdown::Document.new(text).to_html)
+  end
+
+    def test_kramdown_list_3
+      text = <<-MARKDOWN
+* level-1
+    * level-3
+  * level-2
+* level-1
+      MARKDOWN
+      expected = <<-HTML
+<ul>
+  <li>level-1
+    <ul>
+      <li>level-3</li>
+      <li>level-2</li>
+    </ul>
+  </li>
+  <li>level-1</li>
+</ul>
+      HTML
+
+      assert_equal(expected, Kramdown::Document.new(text).to_html)
+    end
+end

data/test/test_various_toc_html.rb

@@ -23,10 +23,18 @@ class TestVariousTocHtml < Minitest::Test
 <h1>h1</h1>
   HTML
 
+  TEST_HTML_4 = <<-HTML
+<h1>h1</h1>
+<h3>h3</h3>
+<h2>h2</h2>
+<h4>h4</h4>
+<h5>h5</h5>
+  HTML
+
   def test_nested_toc
-    @parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_1)
-    doc = Nokogiri::HTML(@parser.toc)
-    assert_equal(doc.css('ul.section-nav').to_s, <<-HTML
+    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_1)
+    doc = Nokogiri::HTML(parser.toc)
+    expected = <<-HTML
 <ul class="section-nav">
 <li class="toc-entry toc-h1">
 <a href="#h1">h1</a>
@@ -41,20 +49,19 @@ class TestVariousTocHtml < Minitest::Test
 </li>
 </ul>
     HTML
-    )
+
+    assert_equal(expected, doc.css('ul.section-nav').to_s)
   end
 
   def test_complex_nested_toc
-    @parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_2)
-    doc = Nokogiri::HTML(@parser.toc)
-    assert_equal(doc.css('ul.section-nav').to_s, <<-HTML
+    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_2)
+    doc = Nokogiri::HTML(parser.toc)
+    expected = <<-HTML
 <ul class="section-nav">
 <li class="toc-entry toc-h1">
 <a href="#h1">h1</a>
 <ul>
-<ul>
 <li class="toc-entry toc-h3"><a href="#h3">h3</a></li>
-</ul>
 <li class="toc-entry toc-h2">
 <a href="#h2">h2</a>
 <ul>
@@ -65,32 +72,53 @@ class TestVariousTocHtml < Minitest::Test
 </li>
 </ul>
     HTML
-    )
+
+    assert_equal(expected, doc.css('ul.section-nav').to_s)
   end
 
   def test_decremental_headings
-    @parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_3)
-    doc = Nokogiri::HTML(@parser.toc)
-    assert_equal(doc.css('ul.section-nav').to_s, <<-HTML
+    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_3)
+    doc = Nokogiri::HTML(parser.toc)
+    expected = <<-HTML
 <ul class="section-nav">
-<ul>
-<ul>
-<ul>
-<ul>
-<ul>
 <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
-</ul>
 <li class="toc-entry toc-h5"><a href="#h5">h5</a></li>
-</ul>
 <li class="toc-entry toc-h4"><a href="#h4">h4</a></li>
+<li class="toc-entry toc-h3"><a href="#h3">h3</a></li>
+<li class="toc-entry toc-h2"><a href="#h2">h2</a></li>
+<li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
 </ul>
+    HTML
+
+    assert_equal(expected, doc.css('ul.section-nav').to_s)
+  end
+
+
+  def test_decremental_headings
+    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_4)
+    doc = Nokogiri::HTML(parser.toc)
+    expected = <<-HTML
+<ul class="section-nav">
+<li class="toc-entry toc-h1">
+<a href="#h1">h1</a>
+<ul>
 <li class="toc-entry toc-h3"><a href="#h3">h3</a></li>
+<li class="toc-entry toc-h2">
+<a href="#h2">h2</a>
+<ul>
+<li class="toc-entry toc-h4">
+<a href="#h4">h4</a>
+<ul>
+<li class="toc-entry toc-h5"><a href="#h5">h5</a></li>
 </ul>
-<li class="toc-entry toc-h2"><a href="#h2">h2</a></li>
+</li>
 </ul>
-<li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
+</li>
+</ul>
+</li>
 </ul>
     HTML
-    )
+
+    assert_equal(expected, doc.css('ul.section-nav').to_s)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-toc
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc
+  version: 0.4.0.rc2
 platform: ruby
 authors:
 - toshimaru
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -136,6 +136,7 @@ files:
 - lib/version.rb
 - test/test_helper.rb
 - test/test_inject_anchors_filter.rb
+- test/test_kramdown_list.rb
 - test/test_toc_filter.rb
 - test/test_toc_only_filter.rb
 - test/test_various_toc_html.rb
@@ -143,10 +144,7 @@ homepage: https://github.com/toshimaru/jekyll-toc
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
-  As of jekyll-toc 0.3, nested toc is supported! Please make sure your toc is not broken after update jekyll-toc.
-
-  For more info: https://github.com/toshimaru/jekyll-toc/wiki/0.3-Upgrade-Guide
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -169,6 +167,7 @@ summary: Jekyll Table of Contents plugin
 test_files:
 - test/test_helper.rb
 - test/test_inject_anchors_filter.rb
+- test/test_kramdown_list.rb
 - test/test_toc_filter.rb
 - test/test_toc_only_filter.rb
 - test/test_various_toc_html.rb