vimwiki_markdown 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9350bfdab384da03bd60949b18575b0d29b69df197e73370e5e20d5124a2105e
-  data.tar.gz: acf9164c1ff195e280364de0e3a341c618a7d892989a6d7702e6a7eab57bdd20
+  metadata.gz: bdd35443aa295839dff9ecc54fcaaf48616e7fa53b5733be67edb2fee17b9320
+  data.tar.gz: 711548c56d682b546f93e8e22d80f8dc948947bf3f9eee2bff4caeafdd475943
 SHA512:
-  metadata.gz: 25a3d1674dd3b8511ccc76e0be69b77e08a7aa87a311895019e0cb5649d65e37e4ef12423521318a4e35d6415e9bd205c9836f0b26233eab8a360b112cd85d2a
-  data.tar.gz: bdb112d177af8f0d5f039b847e9e94bd5d274aaf075b8a037ac7326f392c8393a4aac3fd6da18819c760066c447670d826b091b9c33d791b9f14e286a1994f3a
+  metadata.gz: 77964b75a2cedd98f97af51d7f738730c6740f3d3b634b4efea9a26ff438c7cd94f5fca1034ea4a0eca7a76355453d0992984693a08ce3f1da3b3f5d546496ad
+  data.tar.gz: 7cd72fdeaee7b2ee7718955b2b628ab8358a9b4eb3de2cadac63b952e93a13d605a8a0de3eb9064a2e821b92ea2c89bd8d319127356dad6e3548ba1c2243383e

data/changelog.md

@@ -1,3 +1,6 @@
+## 0.4.4 [June 16 2019]
+Allow fragments if they are for local vimwiki links only
+
 ## 0.4.3 [June 16 2019]
 temporarily revoke fragments until we're not altering old links
 

data/lib/vimwiki_markdown/version.rb

@@ -1,3 +1,3 @@
 module VimwikiMarkdown
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 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
@@ -24,7 +25,7 @@ module VimwikiMarkdown
 
 
     def to_s
-      "[#{title}](#{uri})"
+      "[#{title}](#{uri}#{fragment})"
     end
 
     private
@@ -33,6 +34,7 @@ module VimwikiMarkdown
       if vimwiki_markdown_file_exists?
         path = Pathname.new(uri)
         @uri = "#{path.dirname + path.basename(markdown_extension).to_s.parameterize}.html"
+        @fragment = fragment.parameterize.prepend("#") unless fragment.empty?
       end
     end
 

data/spec/lib/vimwiki_markdown/vimwiki_link_spec.rb

@@ -9,8 +9,21 @@ module VimwikiMarkdown
 
     it "should leave external links alone" do
       link = VimwikiLink.new(markdown_link, source_filepath, markdown_extension, root_path)
-      expect(link.title).to eq("title")
-      expect(link.uri).to eq("http://www.google.com")
+      expect(link.to_s).to eq(markdown_link)
+    end
+    
+    it "should not alter fragments which are part of a url" do
+      markdown_link = "[test](http://foo#Bar)"
+
+      link = VimwikiLink.new(markdown_link, source_filepath, markdown_extension, root_path)
+      expect(link.to_s).to eq("[test](http://foo#Bar)")
+    end
+
+    it "should not alter fragment-only links" do
+      markdown_link = "[test](#GTD)"
+
+      link = VimwikiLink.new(markdown_link, source_filepath, markdown_extension, root_path)
+      expect(link.to_s).to eq("[test](#GTD)")
     end
 
     context "with an existing markdown file matching name" do
@@ -32,16 +45,21 @@ module VimwikiMarkdown
 
       it "must convert same-directory markdown links correctly" do
         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")
+        expect(link.to_s).to eq("[test](#{existing_file_no_extension}.html)")
       end
 
       it "must convert same-directory markdown links with no extension correctly" do
         markdown_link =  "[test](#{existing_file_no_extension})"
 
         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")
+        expect(link.to_s).to eq("[test](#{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.to_s).to eq("[test](#{existing_file_no_extension}.html#wiki-heading)")
       end
 
       context "subdirectory linked files" do
@@ -49,15 +67,13 @@ module VimwikiMarkdown
 
         it "must convert markdown links correctly" do
           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")
+          expect(link.to_s).to eq("[test](#{existing_file_no_extension}.html)")
         end
 
         it "must convert directory links correctly" do
           markdown_link =  "[subdirectory](subdirectory/)"
           link = VimwikiLink.new(markdown_link, source_filepath, markdown_extension, root_path)
-          expect(link.title).to eq("subdirectory")
-          expect(link.uri).to eq("subdirectory/")
+          expect(link.to_s).to eq("[subdirectory](subdirectory/)")
         end
 
       end
@@ -68,8 +84,7 @@ module VimwikiMarkdown
 
         it "must convert sub-directory markdown links correctly" do
           link = VimwikiLink.new("[test](../test)", source_filepath, markdown_extension, root_path)
-          expect(link.title).to eq("test")
-          expect(link.uri).to eq("../test.html")
+          expect(link.to_s).to eq("[test](../test.html)")
         end
       end
 
@@ -80,12 +95,12 @@ module VimwikiMarkdown
 
         it "must convert absolute paths correctly" do
           link = VimwikiLink.new("[test](/test.md)", source_filepath, markdown_extension, root_path)
-          expect(link.uri).to eq("/test.html")
+          expect(link.to_s).to eq("[test](/test.html)")
         end
 
         it "must convert absolute paths without extension correctly" do
           link = VimwikiLink.new("[test](/test)", source_filepath, markdown_extension, root_path)
-          expect(link.uri).to eq("/test.html")
+          expect(link.to_s).to eq("[test](/test.html)")
         end
 
         context "from the root directory" do
@@ -93,7 +108,7 @@ module VimwikiMarkdown
 
           it "must convert absolute paths correctly" do
             link = VimwikiLink.new("[test](/test)", source_filepath, markdown_extension, ".")
-            expect(link.uri).to eq("/test.html")
+            expect(link.to_s).to eq("[test](/test.html)")
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimwiki_markdown
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Patrick Davey