vimwiki_markdown 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4893e1d18542936cff19882c791e51c9d8234cefaaec3751cff7fc9724eb70e
-  data.tar.gz: 1e51ef4d9df34eb09ad1cf0528efad3b3471e11790a3628594b27224e1560176
+  metadata.gz: df82303f4e7c42a37b10f251dc47ff99f7f8bdb47213320647ec9e287b18e349
+  data.tar.gz: 87779ad8e73e817a491a4b02d5dfdee31c0486c6c53a71a3f7777f8eea039326
 SHA512:
-  metadata.gz: d4301871b6d662d7f02c8c549dcdcd239633183f4bfb9a05f3c04c6d40405778da03ef88948a1d954a0d6b6b41c2c4df3a43602f2d3673108cbf1402b484442e
-  data.tar.gz: 908c6005ba6107459aa00297331a62eac008ccc88e4feb526943225d01dd6bdbd21307db1466303424a9fb0378c03cd29f7ca6a586b1274e82b39264739728d1
+  metadata.gz: ae0332624f846dd12436ea09f2c01b57a1f3828161304cd422dbbb5525fadacdf3c3681675901478ee92a06566cff7fdbb946e7dee68e64fbe053cf67a055cdf
+  data.tar.gz: 39d46583937bcea223d642b8432ea555de284d8e4e0f623ab38681f39cd66fce12982cdcb526591aaccf547bdf88c9f2fefc11e0d19910fe986fb59f9e5ba456

data/changelog.md

@@ -1,3 +1,17 @@
+## 0.8.1 [March 7 2022]
+Update commonmarker version, fixes security issue!
+
+## 0.8.0 [March 7 2022]
+Fixes an issue where VimwikiTOC generated table of contents where there are duplicate heading names did not match the output HTML from the Github pipeline.
+
+This means any generated (dupliate) bookmarks are going to be broken though, so, this is backwardly incompatible
+
+see https://github.com/patrickdavey/vimwiki_markdown/pull/39
+
+## 0.7.0 [July 8 2021]
+Fixes an issue whereby non english filenames were being replaced with empty strings
+see https://github.com/patrickdavey/vimwiki_markdown/pull/35
+
 ## 0.6.0 [April 26 2020]
 Support for todo lists with enhanced state options. Thanks to @primercuervo
 

data/lib/vimwiki_markdown/version.rb

@@ -1,3 +1,3 @@
 module VimwikiMarkdown
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end

data/lib/vimwiki_markdown/vimwiki_toc_filter.rb

@@ -0,0 +1,32 @@
+class VimwikiTOCFilter < HTML::Pipeline::TableOfContentsFilter
+  def call
+    result[:toc] = String.new('')
+
+    headers = Hash.new(1)
+    doc.css('h1, h2, h3, h4, h5, h6').each do |node|
+      text = node.text
+      id = ascii_downcase(text)
+      id.gsub!(PUNCTUATION_REGEXP, '') # remove punctuation
+      id.tr!(' ', '-') # replace spaces with dash
+
+      uniq = headers[id] > 1 ? "-#{headers[id]}" : ''
+      headers[id] += 1
+      if header_content = node.children.first
+        result[:toc] << %(<li><a href="##{id}#{uniq}">#{EscapeUtils.escape_html(text)}</a></li>\n)
+        header_content.add_previous_sibling(%(<a id="#{id}#{uniq}" class="anchor" href="##{id}#{uniq}" aria-hidden="true">#{anchor_icon}</a>))
+      end
+    end
+    result[:toc] = %(<ul class="section-nav">\n#{result[:toc]}</ul>) unless result[:toc].empty?
+    doc
+  end
+
+  if RUBY_VERSION >= '2.4'
+    def ascii_downcase(str)
+      str.downcase(:ascii)
+    end
+  else
+    def ascii_downcase(str)
+      str.downcase
+    end
+  end
+end

data/lib/vimwiki_markdown/wiki_body.rb

@@ -3,6 +3,7 @@ require 'github/markup'
 require 'html/pipeline'
 require 'pathname'
 require "vimwiki_markdown/vimwiki_link"
+require "vimwiki_markdown/vimwiki_toc_filter"
 
 class VimwikiMarkdown::WikiBody
 
@@ -23,7 +24,7 @@ class VimwikiMarkdown::WikiBody
 
     pipeline = HTML::Pipeline.new([
       HTML::Pipeline::SyntaxHighlightFilter,
-      HTML::Pipeline::TableOfContentsFilter
+      VimwikiTOCFilter
     ], { scope: "highlight"})
     @result = pipeline.call(html)
     @result = @result[:output].to_s

data/vimwiki_markdown.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency     "activesupport", "~> 4.1"
   spec.add_runtime_dependency     "github-markup", "~> 3.0"
-  spec.add_runtime_dependency     "commonmarker", "~> 0.20"
+  spec.add_runtime_dependency     "commonmarker", "~> 0.23.4"
   spec.add_runtime_dependency     "html-pipeline", "~> 2.0"
   spec.add_runtime_dependency     "rouge", "~> 3.3"
   spec.add_runtime_dependency     "escape_utils", "~> 1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimwiki_markdown
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Patrick Davey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.23.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +236,7 @@ files:
 - lib/vimwiki_markdown/template.rb
 - lib/vimwiki_markdown/version.rb
 - lib/vimwiki_markdown/vimwiki_link.rb
+- lib/vimwiki_markdown/vimwiki_toc_filter.rb
 - lib/vimwiki_markdown/wiki_body.rb
 - spec/lib/vimwiki_markdown/options_spec.rb
 - spec/lib/vimwiki_markdown/template_spec.rb