jekyll-toc 0.12.0.rc2 → 0.12.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6912be740161a70021da9fdcfffcc86c1102b47ca0331fb83dd82ac6c3d9ff3a
-  data.tar.gz: b643b75ca33642f66054b52de2d3bc94ef6280277ac1afe91afbc5d0b9096f09
+  metadata.gz: cbc830ae67f7d9cf7420ededcdd81373c0384544c3622690ba731669cdfd115b
+  data.tar.gz: ce7987e81662a5b84b5fba251755c66abef34d78d02ccd1dd5d1f2e7d0e65ceb
 SHA512:
-  metadata.gz: 26e96485ad84ea72849fde58ff33ced713b3ea962f56dc9ed09caf4ee85c2abff1566994126e0c9cb3f4d56f1d2e7b4638b26ae6e90c0cf9c56405f1b765ef2f
-  data.tar.gz: 714d5b7e4973f32d08e2a8689240ee3f372ca6bb7e983122ffca009db47bf175d8df8e3e21cd6c4a74b225ede5e480c2fe48fbec1cb030a2a3dcee10d04c423a
+  metadata.gz: dc532b059cde9864f956b2f17cea00dcb3c82d51d16377e75ca8a7dff9102b369f77e5b86632d598002893e3ad016f65a52fbf9c165305a64a75baeec5803bb3
+  data.tar.gz: 80c83f7eb2bd69be980483560f367f4ae500c37b7321fe7ffaef7e0e947eac6cb40d23bf2346a5f1f5850222e69628f4a946e542ade81c5d8efa46cec3ede0ff

data/README.md

@@ -67,7 +67,7 @@ If you'd like separated TOC and content, you can use `toc_only` and `inject_anch
 
 #### ~~`toc_only` filter~~
 
-⚠️ Please use `{% toc %}` instead of `{{ contents | toc_only }}`.
+⚠️ Please use `{% toc %}` instead of `{{ content | toc_only }}`.
 
 Generates the TOC itself as described [below](#generated-html).
 Mostly useful in cases where the TOC should _not_ be placed immediately

data/lib/jekyll-toc.rb

@@ -10,31 +10,33 @@ module Jekyll
     def render(context)
       return '' unless context.registers[:page]['toc']
 
-      content_html = context.registers[:page].content
-      ::Jekyll::TableOfContents::Parser.new(content_html).build_toc
+      content_html = context.registers[:page]['content']
+      toc_config = context.registers[:site].config['toc'] || {}
+      TableOfContents::Parser.new(content_html, toc_config).build_toc
     end
   end
 
   # Jekyll Table of Contents filter plugin
   module TableOfContentsFilter
+    # Deprecated method. Removed in v1.0.
     def toc_only(html)
       Jekyll.logger.warn 'Deprecation: toc_only filter is deprecated and will be remove in jekyll-toc v1.0.',
                          'Use `{% toc %}` instead of `{{ contents | toc_only }}`.'
       return '' unless toc_enabled?
 
-      ::Jekyll::TableOfContents::Parser.new(html, toc_config).build_toc
+      TableOfContents::Parser.new(html, toc_config).build_toc
     end
 
     def inject_anchors(html)
       return html unless toc_enabled?
 
-      ::Jekyll::TableOfContents::Parser.new(html, toc_config).inject_anchors_into_html
+      TableOfContents::Parser.new(html, toc_config).inject_anchors_into_html
     end
 
     def toc(html)
       return html unless toc_enabled?
 
-      ::Jekyll::TableOfContents::Parser.new(html, toc_config).toc
+      TableOfContents::Parser.new(html, toc_config).toc
     end
 
     private

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllToc
-  VERSION = '0.12.0.rc2'
+  VERSION = '0.12.0.rc3'
 end

data/test/test_jekyll-toc.rb

@@ -7,19 +7,46 @@ class TestTableOfContentsFilter < Minitest::Test
 
   DUMMY_HTML = '<div>Dummy HTML Content</div>'
 
-  def setup
-    @context = Struct.new(:registers).new(page: { "toc" => false })
-  end
-
   def test_toc_only
+    @context = disable_toc_context
     assert_empty toc_only(DUMMY_HTML)
   end
 
   def test_inject_anchors
-    assert_equal inject_anchors(DUMMY_HTML), DUMMY_HTML
+    @context = disable_toc_context
+    assert_equal DUMMY_HTML, inject_anchors(DUMMY_HTML)
   end
 
   def test_toc
-    assert_equal toc(DUMMY_HTML), DUMMY_HTML
+    @context = disable_toc_context
+    assert_equal DUMMY_HTML, toc(DUMMY_HTML)
+  end
+
+  def test_toc_only2
+    @context = enable_toc_context
+    assert_equal "<ul class=\"section-nav\">\n</ul>", toc_only(DUMMY_HTML)
+  end
+
+  def test_inject_anchors2
+    @context = enable_toc_context
+    assert_equal DUMMY_HTML, inject_anchors(DUMMY_HTML)
+  end
+
+  def test_toc2
+    @context = enable_toc_context
+    assert_equal "<ul class=\"section-nav\">\n</ul>#{DUMMY_HTML}", toc(DUMMY_HTML)
+  end
+
+  private
+
+  def disable_toc_context
+    Struct.new(:registers).new(page: { 'toc' => false })
+  end
+
+  def enable_toc_context
+    Struct.new(:registers).new(
+      page: { 'toc' => true },
+      site: Struct.new(:config).new({ 'toc' => false })
+    )
   end
 end

data/test/test_toc_tag.rb

@@ -7,11 +7,15 @@ class TestTableOfContentsTag < Minitest::Test
 
   def setup
     @stubbed_context  = Struct.new(:registers)
+    @stubbed_context1 = Struct.new(:config)
     @stubbed_context2 = Struct.new(:toc, :content)
   end
 
   def test_toc_tag
-    context = @stubbed_context.new(page: @stubbed_context2.new({ 'toc' => false }, '<h1>test</h1>'))
+    context = @stubbed_context.new(
+      page: @stubbed_context2.new({ 'toc' => false }, '<h1>test</h1>'), 
+      site: @stubbed_context1.new({ 'toc' => nil })
+    )
     tag = Jekyll::TocTag.parse('toc_tag', '', Tokenizer.new(''), ParseContext.new)
     assert_equal tag.render(context), "<ul class=\"section-nav\">\n<li class=\"toc-entry toc-h1\"><a href=\"#test\">test</a></li>\n</ul>"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-toc
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc2
+  version: 0.12.0.rc3
 platform: ruby
 authors:
 - toshimaru
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri