markdownr 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6f6186e83f09bb4239d8ca1fd5cca349fbbe17ccea6565a5579c11920e7ce2e
-  data.tar.gz: 1eb3bc2813a2748ad37b63271e3e6844b4f927dc638f0c0bd1d0a7d65f940e28
+  metadata.gz: bc15590907558465b90d7d219e6bede5a9479141b0993843188a22a2723ab72a
+  data.tar.gz: 34f073a1b9cf5c3a2550e61da3f1ffe9250bc4843fac344e140c1e0629a5f4a8
 SHA512:
-  metadata.gz: c249628b120b2af78fe64e9690362aa2978896cf098fc9aec04f7225f685661203f3d5dd59bde5b8ddf3bb6c959ac92a4c09f5b46483f121a9355bdf7675e68c
-  data.tar.gz: 80774310a8da3df52c41ef1e7ea811040a85392d5b6d02e149e1b3be0d12bc63d1f4bab5b7972f0a173da2a118f44aaf932df4c6e11487a62ffc7fe5fd47b548
+  metadata.gz: 19aad92e46d89d0cbec62ba172167a029a74794f6b1914cdc458d896eea4e25186852cf5f37c493e5459f680b922b19c3c7c44c0de71f6c528d8c18d37479b3f
+  data.tar.gz: cb08bd3772391f5a0c742930953ac4982366c8657e89b802bc4b090ea476e3ec89e456fe255543622c0ab8e58b7191823d590cda143f7e37ba9b151bfec4e084

data/bin/markdownr

@@ -2,7 +2,7 @@
 require "optparse"
 require_relative "../lib/markdown_server"
 
-options = { port: 4567, bind: "0.0.0.0" }
+options = { port: 4567, bind: "127.0.0.1" }
 
 OptionParser.new do |opts|
   opts.banner = "Usage: markdownr [options] [directory]"
@@ -11,7 +11,7 @@ OptionParser.new do |opts|
     options[:port] = p
   end
 
-  opts.on("-b", "--bind ADDRESS", "Address to bind to (default: 0.0.0.0)") do |b|
+  opts.on("-b", "--bind ADDRESS", "Address to bind to (default: 127.0.0.1)") do |b|
     options[:bind] = b
   end
 

data/lib/markdown_server/app.rb

@@ -19,6 +19,7 @@ module MarkdownServer
       set :root_dir, Dir.pwd
       set :custom_title, nil
       set :show_exceptions, false
+      set :protection, false
     end
 
     helpers do
@@ -189,26 +190,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 +230,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.7"
 end

metadata

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