jekyll-toc 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c1e79e71caeb6e93026f4111464e4dc7ac4d8040b7af5c9fe0d5b426c0cfd5
-  data.tar.gz: c93040f18d95262ce323cbf660a21cd41b1d9afe756bf617f9a434c791d43dcb
+  metadata.gz: afa3ea6b7c656558ab8ac87171d113867f0c720a5917d4a057b7754c0f2b1516
+  data.tar.gz: 5309a5224a0e925d3993024736821e29d2605fc74c003e9e412ab0af9a26c869
 SHA512:
-  metadata.gz: c7b9e1971a2c442d34104a698efe9625b6defa110c6833751b6767ef959d4257ad18ea6b6f9c1f93e756a44daf936eea79a62dd24f638b20621aa91bd7ab2ed2
-  data.tar.gz: ed6afcf94eeb1813607311b6c5caef82f905314fe5e76bee044a0bdc008692d1218989ae97c9f5c8517154d034d325525c4471b521ca730a89444a0599a5a8e1
+  metadata.gz: 0a51b5ea083c92d3cf6842f4d4ab5ec41c8da3425ec8f64c1938933f2e43514eaebd9731a59742bac191990e47318bd72104b92cf8611a97d3858d21c390db74
+  data.tar.gz: 34b863397e58393a41d567a412a84676ac125fa5ad3465a509114ad0b965f3d440ef3a730f81d96313b6f76beb3c8529a610702ca667489fa012fd4dfd76125d

data/.travis.yml

@@ -7,12 +7,12 @@ rvm:
   - 2.3.7
   - 2.4.4
   - 2.5.1
+  - 2.6.2
 # gemfile is generated by appraisal
 gemfile:
   - gemfiles/jekyll_3.8.gemfile
   - gemfiles/jekyll_3.7.gemfile
   - gemfiles/jekyll_3.6.gemfile
-  - gemfiles/jekyll_3.5.gemfile
 before_script:
   # Download cc-test-reporter
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/Appraisals

@@ -11,7 +11,3 @@ end
 appraise 'jekyll-3.6' do
   gem 'jekyll', '3.6'
 end
-
-appraise 'jekyll-3.5' do
-  gem 'jekyll', '3.5'
-end

data/jekyll-toc.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'jekyll', '>= 3.5'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest', '~> 5.11'
+  spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'

data/lib/table_of_contents/parser.rb

@@ -39,8 +39,8 @@ module Jekyll
 
       def inject_anchors_into_html
         @entries.each do |entry|
-          entry[:content_node].add_previous_sibling(
-            %(<a id="#{entry[:id]}#{entry[:uniq]}" class="anchor" href="##{entry[:id]}#{entry[:uniq]}" aria-hidden="true"><span class="octicon octicon-link"></span></a>)
+          entry[:header_content].add_previous_sibling(
+            %(<a class="anchor" href="##{entry[:id]}" aria-hidden="true"><span class="octicon octicon-link"></span></a>)
           )
         end
 
@@ -63,17 +63,14 @@ module Jekyll
                .gsub(PUNCTUATION_REGEXP, '') # remove punctuation
                .tr(' ', '-') # replace spaces with dash
 
-          uniq = headers[id].positive? ? "-#{headers[id]}" : ''
+          suffix_num = headers[id]
           headers[id] += 1
-          header_content = node.children.first
-          next entries unless header_content
 
           entries << {
-            id: id,
-            uniq: uniq,
+            id: suffix_num.zero? ? id : "#{id}-#{suffix_num}",
             text: CGI.escapeHTML(text),
             node_name: node.name,
-            content_node: header_content,
+            header_content: node.children.first,
             h_num: node.name.delete('h').to_i
           }
         end
@@ -89,7 +86,7 @@ module Jekyll
           entry = entries[i]
           if entry[:h_num] == min_h_num
             # If the current entry should not be indented in the list, add the entry to the list
-            toc_list << %(<li class="#{@item_class} #{@item_prefix}#{entry[:node_name]}"><a href="##{entry[:id]}#{entry[:uniq]}">#{entry[:text]}</a>)
+            toc_list << %(<li class="#{@item_class} #{@item_prefix}#{entry[:node_name]}"><a href="##{entry[:id]}">#{entry[:text]}</a>)
             # If the next entry should be indented in the list, generate a sublist
             next_i = i + 1
             if next_i < entries.count && entries[next_i][:h_num] > min_h_num

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllToc
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/test/{test_inject_anchors_filter.rb → parser/test_inject_anchors_filter.rb}

@@ -12,7 +12,7 @@ class TestInjectAnchorsFilter < Minitest::Test
   def test_injects_anchors_into_content
     html = @parser.inject_anchors_into_html
 
-    assert_match(%r{<a id="simple-h1" class="anchor" href="#simple-h1" aria-hidden="true"><span.*span></a>Simple H1}, html)
+    assert_match(%r{<a class="anchor" href="#simple-h1" aria-hidden="true"><span.*span></a>Simple H1}, html)
   end
 
   def test_does_not_inject_toc

data/test/{test_toc_filter.rb → parser/test_toc_filter.rb}

@@ -12,7 +12,7 @@ class TestTOCFilter < Minitest::Test
   def test_injects_anchors
     html = @parser.toc
 
-    assert_match(%r{<a id="simple-h1" class="anchor" href="#simple-h1" aria-hidden="true"><span.*span></a>Simple H1}, html)
+    assert_match(%r{<a class="anchor" href="#simple-h1" aria-hidden="true"><span.*span></a>Simple H1}, html)
   end
 
   def test_nested_toc

data/test/{test_various_toc_html.rb → parser/test_various_toc_html.rb}

@@ -391,9 +391,30 @@ class TestVariousTocHtml < Minitest::Test
     assert_equal(expected, actual)
 
     html = parser.inject_anchors_into_html
-    assert_includes(html, %(<a id="h1" class="anchor" href="#h1" aria-hidden="true">))
-    assert_includes(html, %(<a id="second" class="anchor" href="#second" aria-hidden="true">))
-    assert_includes(html, %(<a id="third" class="anchor" href="#third" aria-hidden="true">))
+    assert_includes(html, %(<a class="anchor" href="#h1" aria-hidden="true">))
+    assert_includes(html, %(<a class="anchor" href="#second" aria-hidden="true">))
+    assert_includes(html, %(<a class="anchor" href="#third" aria-hidden="true">))
+  end
+
+
+  TEST_UNIQ_ID = <<~HTML
+    <h1>h1</h1>
+    <h1>h1</h1>
+    <h1>h1</h1>
+  HTML
+
+  def test_anchor_is_uniq
+    parser = Jekyll::TableOfContents::Parser.new(TEST_UNIQ_ID)
+    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="#h1-1">h1</a></li>
+      <li class="toc-entry toc-h1"><a href="#h1-2">h1</a></li>
+      </ul>
+    HTML
+    actual = doc.css('ul.section-nav').to_s
+    assert_equal(expected, actual)
   end
 
   def test_custom_css_classes

data/test/test_helper.rb

@@ -4,6 +4,9 @@ require 'simplecov'
 SimpleCov.start
 
 require 'minitest/autorun'
+require "minitest/reporters"
+Minitest::Reporters.use!
+
 require 'jekyll'
 require 'jekyll-toc'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-toc
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - toshimaru
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -59,14 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +152,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- gemfiles/jekyll_3.5.gemfile
 - gemfiles/jekyll_3.6.gemfile
 - gemfiles/jekyll_3.7.gemfile
 - gemfiles/jekyll_3.8.gemfile
@@ -146,14 +159,14 @@ files:
 - lib/jekyll-toc.rb
 - lib/table_of_contents/parser.rb
 - lib/version.rb
+- test/parser/test_inject_anchors_filter.rb
+- test/parser/test_option_error.rb
+- test/parser/test_toc_filter.rb
+- test/parser/test_toc_only_filter.rb
+- test/parser/test_various_toc_html.rb
 - test/test_helper.rb
-- test/test_inject_anchors_filter.rb
 - test/test_jekyll-toc.rb
 - test/test_kramdown_list.rb
-- test/test_option_error.rb
-- test/test_toc_filter.rb
-- test/test_toc_only_filter.rb
-- test/test_various_toc_html.rb
 homepage: https://github.com/toshimaru/jekyll-toc
 licenses:
 - MIT
@@ -178,11 +191,11 @@ signing_key:
 specification_version: 4
 summary: Jekyll Table of Contents plugin
 test_files:
+- test/parser/test_inject_anchors_filter.rb
+- test/parser/test_option_error.rb
+- test/parser/test_toc_filter.rb
+- test/parser/test_toc_only_filter.rb
+- test/parser/test_various_toc_html.rb
 - test/test_helper.rb
-- test/test_inject_anchors_filter.rb
 - test/test_jekyll-toc.rb
 - test/test_kramdown_list.rb
-- test/test_option_error.rb
-- test/test_toc_filter.rb
-- test/test_toc_only_filter.rb
-- test/test_various_toc_html.rb

data/gemfiles/jekyll_3.5.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "jekyll", "3.5"
-
-gemspec path: "../"