markdownr 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf955ffcbe5dfc1e1f5070b3fa36a6d2d15a092e7be6ca7f8ac5dcd4b863162a
-  data.tar.gz: 3ea514cfed258bc71a8a3e82f6ef883e1ed619fc63b46e9217eb4745c455fdd5
+  metadata.gz: e91138e164e026f52b6957f44693eb86d75b79eda7e4404d094f1ea0d4e35d26
+  data.tar.gz: b549ff9d07b45f43cc1639c2b4a47171f3a38bb76e2e98c1bb0ffe03ddc53fbe
 SHA512:
-  metadata.gz: 19f44c77aab4f8a5a2978c85f8fd900f6a0cc45d9399897a26acae80d5809ce57669716a1a5e488c276a4b53e0b2e5d5e3bc13d8b6463a5c8d9c76342eb39e4f
-  data.tar.gz: b8adb9e49b1def08d6d3f4061de5048d3cf14232d4ce0c3b9fde51f605f52fb9338a9b39ad49f569d9663fdf9e718e1396f37674e55c7c3f025ffa7a271d3548
+  metadata.gz: cfc1004e65a89e09263f3a35f2da2b3b354afe8351efa87e49194b0aec3bef5aaeedd7d4aba70f00c01ebca6468150a296be2bdad0d8ca238f87b5bc73ebca0d
+  data.tar.gz: c0cc3d73580b42c40c3f9244ed5acc69a74363237c54af0d21877bf4f1a64d2b642150fc4c384d13a6efb74a1bf86f12819d10b913f935ff60298e1e055e8460

data/lib/markdown_server/app.rb

@@ -180,15 +180,33 @@ module MarkdownServer
       def resolve_wiki_link(name)
         filename = "#{name}.md"
         base = File.realpath(root_dir)
+
+        # Check the current file's directory first (exact case, then case-insensitive)
+        if @current_wiki_dir
+          local_exact = nil
+          local_ci = nil
+          Dir.glob(File.join(@current_wiki_dir, filename), File::FNM_CASEFOLD).each do |path|
+            real = File.realpath(path) rescue next
+            next unless real.start_with?(base)
+            relative = real.sub("#{base}/", "")
+            first_segment = relative.split("/").first
+            next if EXCLUDED.include?(first_segment) || first_segment&.start_with?(".")
+            if File.basename(real) == filename
+              local_exact = relative
+              break
+            else
+              local_ci ||= relative
+            end
+          end
+          return local_exact if local_exact
+          return local_ci if local_ci
+        end
+
+        # Fall back to global recursive search
         exact_match = nil
         ci_match = nil
-
         Dir.glob(File.join(base, "**", filename), File::FNM_CASEFOLD).each do |path|
-          begin
-            real = File.realpath(path)
-          rescue Errno::ENOENT
-            next
-          end
+          real = File.realpath(path) rescue next
           next unless real.start_with?(base)
           relative = real.sub("#{base}/", "")
           first_segment = relative.split("/").first
@@ -517,7 +535,7 @@ module MarkdownServer
             if slash.empty?
               m = attrs.match(/href\s*=\s*["']([^"']*)["']/i)
               if m && !m[1].match?(/\Ajavascript:/i)
-                href = m[1]
+                href = m[1].gsub(/&/i, "&")
                 if base_url && href !~ /\Ahttps?:\/\//i && !href.start_with?("#")
                   href = (URI.join(base_url, href).to_s rescue href)
                 end
@@ -635,9 +653,18 @@ module MarkdownServer
 
       meta, body = parse_frontmatter(content)
       title = (meta.is_a?(Hash) && meta["title"]) || File.basename(real, ".md")
+      @current_wiki_dir = File.dirname(real)
       html = render_markdown(body)
 
-      JSON.dump({ title: title.to_s, html: html })
+      frontmatter_html = ""
+      if meta && !meta.empty?
+        rows = meta.map { |key, value|
+          "<tr><th>#{h(key)}</th><td>#{render_frontmatter_value(value)}</td></tr>"
+        }.join
+        frontmatter_html = %(<div class="frontmatter"><div class="frontmatter-heading">Frontmatter</div><table class="meta-table">#{rows}</table></div>)
+      end
+
+      JSON.dump({ title: title.to_s, html: html, frontmatter_html: frontmatter_html })
     end
 
     get "/fetch" do
@@ -748,6 +775,7 @@ module MarkdownServer
       when ".md"
         content = File.read(real_path, encoding: "utf-8")
         @meta, body = parse_frontmatter(content)
+        @current_wiki_dir = File.dirname(real_path)
         @content = render_markdown(body)
         @toc = extract_toc(@content)
         @has_toc = @toc.length > 1

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/views/layout.erb

@@ -1578,8 +1578,9 @@
                 .then(function(r) { return r.ok ? r.json() : null; })
                 .then(function(data) {
                   if (!data) { cache[path] = false; updatePopup('<p style="margin:0;color:#c44;font-family:sans-serif;font-size:0.85rem">Preview unavailable.</p>'); return; }
-                  cache[path] = { title: data.title, html: data.html };
-                  updatePopup(data.html, data.title || label);
+                  var bodyHtml = data.html + (data.frontmatter_html || '');
+                  cache[path] = { title: data.title, html: bodyHtml };
+                  updatePopup(bodyHtml, data.title || label);
                 })
                 .catch(function() {
                   cache[path] = false;

metadata

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