jekyll-toc 0.8.0.beta1 → 0.8.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d596d99053aad35a05c81278de0edfad519bd76727ff60d9b01b70e71008e987
-  data.tar.gz: 331da3befd626489ff0a39d9d70837abbd902bf8cb17548b219b10e7e24b876a
+SHA1:
+  metadata.gz: b22b1a38ade3692df275b45f909d15c6c08c86a9
+  data.tar.gz: 10c79cce93cbdfe9c1f563b89357aa4b22f5e95c
 SHA512:
-  metadata.gz: ec2c4e4cba02a4205b05249997746a4acab870876e89368b54f601e0082908e42ea3e08098483b3e12b0eb691cbf24a60da81c86db8717525336486d1deb083c
-  data.tar.gz: 577d24958e189a1f69feafb48e8f1a937cfdbb966ba5186773fe693641bd958575145186dc7d5e7d13be26b633437a06146d9c73c179c46ecbc5065568a57e7e
+  metadata.gz: 4cf2f7ece01ba18e9c3df914974f395e1f9133da89380e73bf5cad9d82e20b2dcdd81b6f813854cc0dead5af0f79e72924f200b8cf5fc66bc48023b56859ecb5
+  data.tar.gz: 2bf2aa4519199fd01957562b769f14fe22ff0586d5a44c61a8e33180716508b1274967ffe37766e7d1fb63ec47876b82cd1b36d2d64d7b46a69358315fd0c783

data/lib/table_of_contents/parser.rb

@@ -50,9 +50,14 @@ module Jekyll
         # TODO: Use kramdown auto ids
         @doc.css(toc_headings).reject { |n| n.classes.include?('no_toc') }.each do |node|
           text = node.text
-          id = text.downcase
-          id.gsub!(PUNCTUATION_REGEXP, '') # remove punctuation
-          id.tr!(' ', '-') # replace spaces with dash
+          id = if node.attribute('id')
+            node.attribute('id')
+          else
+            text
+              .downcase
+              .gsub(PUNCTUATION_REGEXP, '') # remove punctuation
+              .tr(' ', '-') # replace spaces with dash
+          end
 
           uniq = headers[id] > 0 ? "-#{headers[id]}" : ''
           headers[id] += 1

data/lib/version.rb

@@ -1,3 +1,3 @@
 module JekyllToc
-  VERSION = '0.8.0.beta1'.freeze
+  VERSION = '0.8.0.beta2'.freeze
 end

data/test/test_various_toc_html.rb

@@ -283,4 +283,24 @@ HTML
 
     assert_equal(expected, actual)
   end
+
+  TEST_EXPLICIT_ID = <<-HTML
+<h1>h1</h1>
+<h1 id="second">h2</h1>
+<h1 id="third">h3</h1>
+  HTML
+
+  def test_toc_with_explicit_id
+    parser = Jekyll::TableOfContents::Parser.new(TEST_EXPLICIT_ID, { "ignore_within" => '.exclude'})
+    doc = Nokogiri::HTML(parser.toc)
+    expected = <<-HTML
+<ul class="section-nav">
+<li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
+<li class="toc-entry toc-h1"><a href="#second">h2</a></li>
+<li class="toc-entry toc-h1"><a href="#third">h3</a></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.8.0.beta1
+  version: 0.8.0.beta2
 platform: ruby
 authors:
 - toshimaru
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Jekyll Table of Contents plugin