vimwiki_markdown 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906fabd0c29669e95009a6d932f85972836e245b
-  data.tar.gz: 2dcb95b6af6aee3c52998f5fa336129f87edfecf
+  metadata.gz: b1eedf430b8b2d456f161be94b5e8442fc067c65
+  data.tar.gz: c93a44f60628a554df3f3b988b8b8fdae2814c96
 SHA512:
-  metadata.gz: 6970110fe34db2557327ead5bc447075f18904977047bb08686be834a3ded04622927e7665d5ab28f69241e1ec12bf7b4efe9488045d1eb58a1d93563a964475
-  data.tar.gz: dc78376885a59561e34b1d9d3dd2e0aa692efe4c7ef053032231b29b4ced5c59c53345e86a961756113f6a8aca7c6246799ac45e50915bee9dd72c44c9471227
+  metadata.gz: 78fa1cd9bb2c713edcc40858970b6c9c72a309233b371bfed8b0f0ec4fb1230871a4192aa16782eb07dd084369e13f27a10f95e39a1d14b1a3275532ebae6a8f
+  data.tar.gz: 8cbbaef17fd634549ef9f24e688480bfd9d50e48156b012a5e614fcf4fbc50d678d3d9cfba68ab981b3a8f275cfc5ccd8719e58dafc0ae33300e546de0cd7ca5

data/README.md

@@ -52,6 +52,12 @@ and ensure that before the closing </head> tag you put
 
 A sample tpl file is available here https://raw.githubusercontent.com/patrickdavey/vimwiki_markdown/master/example_files/default.tpl
 
+#### Optional %root_html% marker.
+
+You can also have a `%root_html%` marker in your template file, thanks
+to [this commit](https://github.com/patrickdavey/vimwiki_markdown/commit/8645883b96df9962aba616d0d12961285cd3f4d7).
+It will get rewritten with the relative path to the root
+of the site (e.g. `./` or `../../` etc)
 
 ## Contributing
 

data/changelog.md

@@ -1,3 +1,6 @@
+## 0.2.3 [December 15th 2016]
+Bugfix - multiple links on the same line were not processed correctly.
+
 ## 0.2.1 [December 15th 2016]
 Allow %root_path% substitution in template file.
 

data/lib/vimwiki_markdown/version.rb

@@ -1,3 +1,3 @@
 module VimwikiMarkdown
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/vimwiki_markdown/wiki_body.rb

@@ -55,10 +55,9 @@ class VimwikiMarkdown::WikiBody
   end
 
   def convert_markdown_local_links!
-    @markdown_body.gsub!(/\[.*\]\(.*\)/) do |match|
+    @markdown_body = @markdown_body.gsub(/\[.*?\]\(.*?\)/) do |match|
       VimwikiMarkdown::VimwikiLink.new(match, options.input_file, options.extension, options.root_path).to_s
     end
-
   end
 
 end

data/spec/lib/vimwiki_markdown/wiki_body_spec.rb

@@ -31,6 +31,13 @@ module VimwikiMarkdown
       allow(wiki_body).to receive(:get_wiki_markdown_contents).and_return("hello")
       expect(wiki_body.to_s).to match(/hello/)
     end
+
+    it "must convert multiple links on the same line correctly" do
+      allow(wiki_body).to receive(:get_wiki_markdown_contents).and_return("[here](here) [there](there)")
+      allow_any_instance_of(VimwikiMarkdown::VimwikiLink).to receive(:vimwiki_markdown_file_exists?).and_return(true)
+      expect(wiki_body.to_s).to match(/<a href="here.html">here<\/a>/)
+      expect(wiki_body.to_s).to match(/<a href="there.html">there<\/a>/)
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimwiki_markdown
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Patrick Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler