vimwiki_markdown 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2fd707b900cb57f83d9b363ca7ecdfb1ef7bc3c0784b6d837d025506bfb23c9
-  data.tar.gz: 0ab730e8add13342a0d1188d281185c80ec23dbd2b4f7a88fd37953c665b2eab
+  metadata.gz: c5a191248476c71d6d9f33309db8800da0a0d7405e89f13b58b10a58187f5fde
+  data.tar.gz: 1220ed04bf3a24eab1598e31b974b1a101351b9e7e12a7314bc98a4b63434c79
 SHA512:
-  metadata.gz: 0e4bd0e9039a5dd14a1183eba6d1fab3bdf6d184bed9838be0da24be1ccd369c48f00d40fa35085f6355baf259907a1842ed8bfb242ff79152be91f955360615
-  data.tar.gz: 1efbc7939774eaca7b8d6b731a252cf2248da1f9bad622b3c74c567f35eea2572070e006b75d449fe005fefb6b48b1b52593ec8742ad3e60ae57e3b4aa7b1e08
+  metadata.gz: f9cfce9007b1a2627f621a7d5e2c164ef022576460d430849983a672e04bf6d5a711291793f5b89da9c483e8993c295abd57a939e01c29a10a45234d96ad9c0e
+  data.tar.gz: e00bb2831a4a8c7af9599e51d76a4d41d3aacf6cb00a7ad768e18e7771ab581b778881048dc0d2faeec54e26bad6ecc0a881da2c82600751745f87652b6956f5

data/changelog.md

@@ -1,3 +1,7 @@
+## 0.4.2 [June 16 2019]
+Allow "fragments" in markdown style links such as those generated by :VimwikiTOC or or when using a diary_caption_level.
+Thanks to @djeremiah - see https://github.com/patrickdavey/vimwiki_markdown/pull/23
+
 ## 0.4.1 [June 16 2019]
 Allow "unsafe" HTML tags in markdown content (iframe etc.)
 

data/lib/vimwiki_markdown/version.rb

@@ -1,3 +1,3 @@
 module VimwikiMarkdown
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/vimwiki_markdown/vimwiki_link.rb

@@ -9,13 +9,14 @@
 
 module VimwikiMarkdown
   class VimwikiLink
-    MARKDOWN_LINK_REGEX = /\[(?<title>.*)\]\((?<uri>.*)\)/
+    MARKDOWN_LINK_REGEX = /\[(?<title>.*)\]\((?<uri>(?:(?!#).)*)(?<fragment>(?:#)?.*)\)/
 
-    attr_reader :title, :uri, :source_markdown_directory, :markdown_extension, :root_path
+    attr_reader :title, :uri, :fragment, :source_markdown_directory, :markdown_extension, :root_path
 
     def initialize(markdown_link, source_markdown_filepath, markdown_extension, root_path)
       @title = markdown_link.match(MARKDOWN_LINK_REGEX)[:title]
       @uri = markdown_link.match(MARKDOWN_LINK_REGEX)[:uri]
+      @fragment = markdown_link.match(MARKDOWN_LINK_REGEX)[:fragment]
       @markdown_extension = markdown_extension
       @root_path = root_path
       @source_markdown_directory = Pathname.new(source_markdown_filepath).dirname
@@ -34,6 +35,8 @@ module VimwikiMarkdown
         path = Pathname.new(uri)
         @uri = "#{path.dirname + path.basename(markdown_extension).to_s.parameterize}.html"
       end
+
+      @uri = "#{uri}#{fragment.empty? ? '' : '#' + fragment.parameterize}"
     end
 
     def vimwiki_markdown_file_exists?

data/spec/lib/vimwiki_markdown/vimwiki_link_spec.rb

@@ -13,6 +13,14 @@ module VimwikiMarkdown
       expect(link.uri).to eq("http://www.google.com")
     end
 
+    it "should render fragment-only links correctly" do
+      markdown_link = "[test](#Wiki Heading)"
+
+      link = VimwikiLink.new(markdown_link, source_filepath, markdown_extension, root_path)
+      expect(link.title).to eq("test")
+      expect(link.uri).to eq("#wiki-heading")
+    end
+
     context "with an existing markdown file matching name" do
       let(:existing_file) { "test#{markdown_extension}" }
       let(:existing_file_no_extension) { existing_file.gsub(/#{markdown_extension}$/,"") }
@@ -44,6 +52,14 @@ module VimwikiMarkdown
         expect(link.uri).to eq("#{existing_file_no_extension}.html")
       end
 
+      it "must convert same-directory markdown links with url fragments correctly" do
+        markdown_link = "[test](#{existing_file_no_extension}#Wiki Heading)"
+
+        link = VimwikiLink.new(markdown_link, source_filepath, markdown_extension, root_path)
+        expect(link.title).to eq("test")
+        expect(link.uri).to eq("#{existing_file_no_extension}.html#wiki-heading")
+      end
+
       context "subdirectory linked files" do
         let(:existing_file) { "subdirectory/test.md" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimwiki_markdown
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Patrick Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler