markdownr 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6f6186e83f09bb4239d8ca1fd5cca349fbbe17ccea6565a5579c11920e7ce2e
-  data.tar.gz: 1eb3bc2813a2748ad37b63271e3e6844b4f927dc638f0c0bd1d0a7d65f940e28
+  metadata.gz: 01f55ab4612df6c57dc37c6632765cdced4f4a18d19965eca28db4c653c262d6
+  data.tar.gz: 3b3cd87a76bd220fc998557978c240aab570705df3b890beba2459b8634feac5
 SHA512:
-  metadata.gz: c249628b120b2af78fe64e9690362aa2978896cf098fc9aec04f7225f685661203f3d5dd59bde5b8ddf3bb6c959ac92a4c09f5b46483f121a9355bdf7675e68c
-  data.tar.gz: 80774310a8da3df52c41ef1e7ea811040a85392d5b6d02e149e1b3be0d12bc63d1f4bab5b7972f0a173da2a118f44aaf932df4c6e11487a62ffc7fe5fd47b548
+  metadata.gz: 914d2a3a8bb19aff817d29c2f2bb651ad6175a084faca1c261554eee64daad795e7a7e65a5e3ac1631ea0d1eaad5bca43b5a9751b56f3412734d268c58ee4763
+  data.tar.gz: e1afd582d417c7170accd7fbb95b00c896f920a910a4d6ab0c04727834819e5f5fcdb8a58946cae7ef156a8fe552c215ba87b0b17fe8042e798e81c8215f8a23

data/lib/markdown_server/app.rb

@@ -189,26 +189,39 @@ module MarkdownServer
         nil
       end
 
+      def render_inline_wiki_links(str)
+        result = ""
+        last_end = 0
+        str.scan(/\[\[([^\]]+)\]\]/) do |match|
+          raw = match[0]
+          m_start = $~.begin(0)
+          result += h(str[last_end...m_start])
+          target, display = raw.include?("|") ? raw.split("|", 2) : [raw, nil]
+          label = display || target
+          if target.start_with?("#")
+            anchor = target[1..].downcase.gsub(/\s+/, "-").gsub(/[^\w-]/, "")
+            result += %(<a class="wiki-link" href="##{h(anchor)}">#{h(label)}</a>)
+          else
+            resolved = resolve_wiki_link(target)
+            if resolved
+              result += %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}">#{h(label)}</a>)
+            else
+              result += %(<span class="wiki-link broken">#{h(label)}</span>)
+            end
+          end
+          last_end = $~.end(0)
+        end
+        result += h(str[last_end..])
+        result
+      end
+
       def render_frontmatter_value(value)
         case value
         when Array
           value.map { |v|
             str = v.to_s
             if str =~ /\A\[\[([^\]]+)\]\]\z/
-              raw = $1
-              target, display = raw.include?("|") ? raw.split("|", 2) : [raw, nil]
-              label = display || target
-              if target.start_with?("#")
-                anchor = target[1..].downcase.gsub(/\s+/, "-").gsub(/[^\w-]/, "")
-                %(<a class="wiki-link" href="##{h(anchor)}">#{h(label)}</a>)
-              else
-                resolved = resolve_wiki_link(target)
-                if resolved
-                  %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}">#{h(label)}</a>)
-                else
-                  %(<span class="wiki-link broken">#{h(label)}</span>)
-                end
-              end
+              render_inline_wiki_links(str)
             else
               %(<span class="tag">#{h(str)}</span>)
             end
@@ -216,6 +229,8 @@ module MarkdownServer
         when String
           if value =~ /\Ahttps?:\/\//
             %(<a href="#{h(value)}" target="_blank" rel="noopener">#{h(value)}</a>)
+          elsif value.include?("[[")
+            render_inline_wiki_links(value)
           elsif value.length > 120
             render_markdown(value)
           else

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdownr
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Brian Dunn