markdownr 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf955ffcbe5dfc1e1f5070b3fa36a6d2d15a092e7be6ca7f8ac5dcd4b863162a
-  data.tar.gz: 3ea514cfed258bc71a8a3e82f6ef883e1ed619fc63b46e9217eb4745c455fdd5
+  metadata.gz: 77751617a0f29c77c283ed5a5861539501bc6e5795af91b83d2f7ca15ff7e19c
+  data.tar.gz: fc0003a34b89f185e567954561d5a367a0a671d085f79719d4a292b82d23270f
 SHA512:
-  metadata.gz: 19f44c77aab4f8a5a2978c85f8fd900f6a0cc45d9399897a26acae80d5809ce57669716a1a5e488c276a4b53e0b2e5d5e3bc13d8b6463a5c8d9c76342eb39e4f
-  data.tar.gz: b8adb9e49b1def08d6d3f4061de5048d3cf14232d4ce0c3b9fde51f605f52fb9338a9b39ad49f569d9663fdf9e718e1396f37674e55c7c3f025ffa7a271d3548
+  metadata.gz: 65dc66819263dd1367b965e3ec480b90dea99581c9e6039e7bf4e171cfd6cfba6d590c19ef9bbfd4e01a440f8e41478a0640734a6552999b9e69aa72672361f6
+  data.tar.gz: 825fe2505eb934401acd0881a8826a2de0b2900ba764b0b3f5e4c5da8a54d06efe567becb87f2d38beb5a2f746c46701272d6c30df95ef3902d8d64596d6738c

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.3"
 end

data/views/layout.erb

@@ -1419,6 +1419,7 @@
       var touchMoved = false;
       var historyStack = [];
       var currentPopupPos = { x: 0, y: 0 };
+      var mouseLeaveTimer = null;
 
       function escHtml(s) {
         return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
@@ -1446,11 +1447,11 @@
 
       var extLinkIcon = '<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:middle;flex-shrink:0"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg>';
 
-      function showPopup(x, y, title, bodyHtml, href) {
+      function showPopup(x, y, title, bodyHtml, href, linkRect) {
         // Remove old popup without clearing historyStack
         if (popup && popup.parentNode) popup.parentNode.removeChild(popup);
         popup = null;
-        currentPopupPos = { x: x, y: y };
+        currentPopupPos = { x: x, y: y, linkRect: linkRect || null };
 
         popup = document.createElement('div');
         popup.className = 'link-ctx-popup';
@@ -1469,6 +1470,14 @@
           '<div class="link-ctx-popup-body">' + bodyHtml + '</div>';
         document.body.appendChild(popup);
 
+        clearTimeout(mouseLeaveTimer);
+        popup.addEventListener('mouseleave', function() {
+          mouseLeaveTimer = setTimeout(hidePopup, 150);
+        });
+        popup.addEventListener('mouseenter', function() {
+          clearTimeout(mouseLeaveTimer);
+        });
+
         repositionPopup();
 
         var backBtnEl = popup.querySelector('.link-ctx-popup-back');
@@ -1476,7 +1485,7 @@
           backBtnEl.addEventListener('click', function(e) {
             e.stopPropagation();
             var prev = historyStack.pop();
-            if (prev) showPopup(prev.x, prev.y, prev.title, prev.bodyHtml, prev.href);
+            if (prev) showPopup(prev.x, prev.y, prev.title, prev.bodyHtml, prev.href, prev.linkRect);
           });
         }
         popup.querySelector('.link-ctx-popup-close').addEventListener('click', hidePopup);
@@ -1492,10 +1501,10 @@
           if (!linkHref || isAnchorOnly(linkHref)) return;
           e.stopPropagation();
           e.preventDefault();
-          var savedPos = { x: currentPopupPos.x, y: currentPopupPos.y };
+          var savedPos = { x: currentPopupPos.x, y: currentPopupPos.y, linkRect: currentPopupPos.linkRect };
           var titleEl = popup.querySelector('.link-ctx-popup-title');
           historyStack.push({
-            x: savedPos.x, y: savedPos.y,
+            x: savedPos.x, y: savedPos.y, linkRect: savedPos.linkRect,
             title: titleEl ? titleEl.querySelector('span').textContent : '',
             bodyHtml: body.innerHTML,
             href: titleEl ? (titleEl.getAttribute('href') || '') : ''
@@ -1510,10 +1519,10 @@
           if (!linkHref || isAnchorOnly(linkHref)) return;
           e.stopPropagation();
           e.preventDefault();
-          var savedPos = { x: currentPopupPos.x, y: currentPopupPos.y };
+          var savedPos = { x: currentPopupPos.x, y: currentPopupPos.y, linkRect: currentPopupPos.linkRect };
           var titleEl = popup.querySelector('.link-ctx-popup-title');
           historyStack.push({
-            x: savedPos.x, y: savedPos.y,
+            x: savedPos.x, y: savedPos.y, linkRect: savedPos.linkRect,
             title: titleEl ? titleEl.querySelector('span').textContent : '',
             bodyHtml: body.innerHTML,
             href: titleEl ? (titleEl.getAttribute('href') || '') : ''
@@ -1529,13 +1538,35 @@
       function repositionPopup() {
         if (!popup) return;
         var x = currentPopupPos.x, y = currentPopupPos.y;
+        var rect = currentPopupPos.linkRect;
         var vw = Math.min(window.innerWidth, document.documentElement.clientWidth);
         var vh = window.innerHeight;
-        var left = x + 12;
-        var top = y + 12;
-        if (left + popup.offsetWidth > vw - 8) left = Math.max(8, vw - popup.offsetWidth - 8);
-        if (top + popup.offsetHeight > vh - 8) top = Math.max(8, y - popup.offsetHeight - 12);
-        if (top < 8) top = 8;
+        var pw = popup.offsetWidth;
+        var ph = popup.offsetHeight;
+
+        // Horizontal: position so mouse is ~16px inside left edge, clamped to viewport
+        var left = Math.min(x - 16, vw - pw - 8);
+        if (left < 8) left = 8;
+
+        // Vertical: tight to link bounds when available
+        var top;
+        if (rect) {
+          var gap = 3;
+          var belowTop = rect.bottom + gap;
+          var aboveTop = rect.top - ph - gap;
+          if (belowTop + ph <= vh - 8) {
+            top = belowTop;                          // fits below
+          } else if (aboveTop >= 8) {
+            top = aboveTop;                          // fits above
+          } else {
+            top = Math.max(8, vh - ph - 8);         // clamp: covers link
+          }
+        } else {
+          top = y + 12;
+          if (top + ph > vh - 8) top = Math.max(8, y - ph - 12);
+          if (top < 8) top = 8;
+        }
+
         popup.style.left = left + 'px';
         popup.style.top = top + 'px';
       }
@@ -1550,36 +1581,41 @@
       }
 
       function hidePopup() {
+        clearTimeout(mouseLeaveTimer);
         if (popup && popup.parentNode) popup.parentNode.removeChild(popup);
         popup = null;
         historyStack = [];
       }
 
+
       function handleLink(anchor, x, y, chained) {
         if (!chained) historyStack = [];
         var href = anchor.getAttribute('href');
         if (!href || isAnchorOnly(href)) return;
         var label = anchor.textContent.trim() || href;
+        // For chained popup navigation keep the current link rect; for new popups measure the anchor
+        var linkRect = chained ? currentPopupPos.linkRect : anchor.getBoundingClientRect();
 
         if (isLocalMd(href)) {
           var path = previewPath(href);
           var cached = cache[path];
           if (cached && typeof cached === 'object') {
-            showPopup(x, y, cached.title || label, cached.html, href);
+            showPopup(x, y, cached.title || label, cached.html, href, linkRect);
           } else if (cached === false) {
             showPopup(x, y, label,
               '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>' +
-              '<p style="margin:0;color:#888;font-family:sans-serif;font-size:0.82rem">Preview not available</p>', href);
+              '<p style="margin:0;color:#888;font-family:sans-serif;font-size:0.82rem">Preview not available</p>', href, linkRect);
           } else {
-            showPopup(x, y, label, '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', href);
+            showPopup(x, y, label, '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', href, linkRect);
             if (cached === undefined) {
               cache[path] = null;
               fetch(path)
                 .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;
@@ -1591,13 +1627,13 @@
           var extKey = 'ext:' + href;
           var extCached = cache[extKey];
           if (extCached && typeof extCached === 'object') {
-            showPopup(x, y, extCached.title || label, extCached.html, href);
+            showPopup(x, y, extCached.title || label, extCached.html, href, linkRect);
           } else if (extCached === false) {
             showPopup(x, y, label,
               '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>' +
-              '<p style="margin:0.5rem 0 0;color:#888;font-family:sans-serif;font-size:0.82rem">Could not fetch page content.</p>', href);
+              '<p style="margin:0.5rem 0 0;color:#888;font-family:sans-serif;font-size:0.82rem">Could not fetch page content.</p>', href, linkRect);
           } else {
-            showPopup(x, y, label, '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', href);
+            showPopup(x, y, label, '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', href, linkRect);
             if (extCached === undefined) {
               cache[extKey] = null;
               fetch('/fetch?url=' + encodeURIComponent(href))
@@ -1622,7 +1658,7 @@
             }
           }
         } else {
-          showPopup(x, y, label, '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>', href);
+          showPopup(x, y, label, '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>', href, linkRect);
         }
       }
 
@@ -1685,6 +1721,7 @@
           });
           a.addEventListener('mouseleave', function() {
             clearTimeout(hoverTimer);
+            if (popup) mouseLeaveTimer = setTimeout(hidePopup, 150);
           });
         });
       })();

metadata

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