markdownr 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 719c684f6ed25cb57662a6a78234695ef2fea07b1c4f301159a79e0383bd7426
-  data.tar.gz: 1c1b1fc19db8308c8e47479a45b3fea84bb797bfe22fb16e4b5e19c8387e8c0e
+  metadata.gz: 7fa7bf05bfbfb6241e8e616541dbe810e9eadcae27466e18a0861b12f008221b
+  data.tar.gz: e0124174f4645e6a611f3be1e1be778d9a342ff14f2dc9823fa07e2b33171789
 SHA512:
-  metadata.gz: fccc91e9f80f3848af6bb2bede88e65ebea736275189e2f7beb9db326c948d9c85c2000da77386acc71a424626a0f6b6e7115c9df1d2ff157956c56126706f58
-  data.tar.gz: 8d6c8c6cf5dbf13040ccc83e891548e20f2fc7f30f385b3e2ee19d8adfa56273dc385cad897d3e17e88cd2ab5fa02d08299e4b446d5c3e0b8134700841e34f99
+  metadata.gz: 625f0a9bc04adb7bf2d2eeb954b8d0a377b96ea28ad9341eeccd4603f7142b152eb690cf66028836101312ef2f2ce56ae9f8c9135ff0f626932831e5b0041e95
+  data.tar.gz: 92b68d478a360d2b005ca7c8d10de909e73a263e4056f37c010f1a5d79bf97aec0e48cbccdab86eb8a08f698e73b63a36ae45585439a71256967b556d4eade0e

data/bin/markdownr

@@ -23,6 +23,10 @@ OptionParser.new do |opts|
     options[:allow_robots] = true
   end
 
+  opts.on("--no-link-tooltips", "Disable preview tooltips for local markdown links") do
+    options[:link_tooltips] = false
+  end
+
   opts.on("-v", "--version", "Show version") do
     puts "markdownr #{MarkdownServer::VERSION}"
     exit
@@ -40,6 +44,7 @@ end
 MarkdownServer::App.set :root_dir, dir
 MarkdownServer::App.set :custom_title, options[:title]
 MarkdownServer::App.set :allow_robots, options[:allow_robots] || false
+MarkdownServer::App.set :link_tooltips, options.fetch(:link_tooltips, true)
 MarkdownServer::App.set :port, options[:port]
 MarkdownServer::App.set :bind, options[:bind]
 

data/lib/markdown_server/app.rb

@@ -19,6 +19,7 @@ module MarkdownServer
       set :root_dir, Dir.pwd
       set :custom_title, nil
       set :allow_robots, false
+      set :link_tooltips, true
       set :show_exceptions, false
       set :protection, false
       set :host_authorization, { permitted_hosts: [] }
@@ -176,22 +177,28 @@ module MarkdownServer
 
       def resolve_wiki_link(name)
         filename = "#{name}.md"
+        base = File.realpath(root_dir)
+        exact_match = nil
+        ci_match = nil
 
-        # Search all subdirectories
-        Dir.glob(File.join(root_dir, "**", filename)).each do |path|
-          real = File.realpath(path)
-          base = File.realpath(root_dir)
+        Dir.glob(File.join(base, "**", filename), File::FNM_CASEFOLD).each do |path|
+          begin
+            real = File.realpath(path)
+          rescue Errno::ENOENT
+            next
+          end
+          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?(".")
-          return relative
+          if File.basename(real) == filename
+            exact_match ||= relative
+          else
+            ci_match ||= relative
+          end
         end
 
-        # Try root level
-        path = File.join(root_dir, filename)
-        return filename if File.exist?(path)
-
-        nil
+        exact_match || ci_match
       end
 
       def render_inline_wiki_links(str)
@@ -430,6 +437,7 @@ module MarkdownServer
       rescue RegexpError => e
         raise RegexpError, e.message
       end
+
     end
 
     # Routes
@@ -472,6 +480,41 @@ module MarkdownServer
       send_file real_path, disposition: "attachment"
     end
 
+    get "/preview/*" do
+      content_type :json
+      halt 404, '{"error":"disabled"}' unless settings.link_tooltips
+
+      requested = params["splat"].first.to_s
+      base = File.realpath(root_dir)
+      full = File.join(base, requested)
+
+      begin
+        real = File.realpath(full)
+      rescue Errno::ENOENT
+        halt 404, '{"error":"not found"}'
+      end
+
+      halt 403, '{"error":"forbidden"}' unless real.start_with?(base)
+
+      relative = real.sub("#{base}/", "")
+      first_segment = relative.split("/").first
+      halt 403, '{"error":"forbidden"}' if EXCLUDED.include?(first_segment) || first_segment&.start_with?(".")
+
+      halt 404, '{"error":"not found"}' unless File.file?(real) && File.extname(real).downcase == ".md"
+
+      begin
+        content = File.read(real, encoding: "utf-8")
+      rescue
+        halt 404, '{"error":"not found"}'
+      end
+
+      meta, body = parse_frontmatter(content)
+      title = (meta.is_a?(Hash) && meta["title"]) || File.basename(real, ".md")
+      html = render_markdown(body)
+
+      JSON.dump({ title: title.to_s, html: html })
+    end
+
     get "/search/?*" do
       requested = params["splat"].first.to_s.chomp("/")
       @query = params[:q].to_s.strip

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/views/layout.erb

@@ -678,6 +678,87 @@
     /* Footnote list — hide numeric markers; labels are inline via <strong> */
     .footnotes ol { list-style: none; padding-left: 1.2em; }
 
+    /* Link preview popup */
+    .link-tooltip-anchor { position: relative; }
+    .link-preview-popup {
+      position: absolute;
+      bottom: 100%;
+      left: 0;
+      width: 460px;
+      max-width: 90vw;
+      max-height: 55vh;
+      overflow-y: auto;
+      z-index: 150;
+      background: #faf8f4;
+      border: 1px solid #d4b96a;
+      border-radius: 6px;
+      box-shadow: 0 4px 20px rgba(0,0,0,0.18);
+      padding: 0.8rem 1rem;
+      font-family: Georgia, "Times New Roman", serif;
+      font-size: 0.85rem;
+      line-height: 1.6;
+      color: #2c2c2c;
+      cursor: auto;
+      -webkit-overflow-scrolling: touch;
+    }
+    .link-preview-popup-title {
+      font-weight: 700;
+      font-size: 0.95rem;
+      margin-bottom: 0.6rem;
+      padding-bottom: 0.5rem;
+      border-bottom: 1px solid #e0d8c8;
+      color: #3a3a3a;
+    }
+    .link-preview-popup h1, .link-preview-popup h2, .link-preview-popup h3,
+    .link-preview-popup h4, .link-preview-popup h5, .link-preview-popup h6 {
+      margin: 0.7rem 0 0.3rem;
+      color: #3a3a3a;
+    }
+    .link-preview-popup h1 { font-size: 1.2rem; }
+    .link-preview-popup h2 { font-size: 1.05rem; border-bottom: none; padding-bottom: 0; }
+    .link-preview-popup h3 { font-size: 0.95rem; }
+    .link-preview-popup p { margin: 0 0 0.5rem; }
+    .link-preview-popup p:last-child { margin-bottom: 0; }
+    .link-preview-popup a { color: #8b6914; text-decoration: none; border-bottom: 1px solid #d4b96a; }
+    .link-preview-popup a.wiki-link { color: #6a8e3e; border-bottom-color: #6a8e3e; }
+    .link-preview-popup code {
+      font-family: "SF Mono", Menlo, Consolas, monospace;
+      font-size: 0.82em;
+      background: #f0ece3;
+      padding: 0.1em 0.3em;
+      border-radius: 3px;
+    }
+    .link-preview-popup pre {
+      background: #2d2d2d;
+      color: #f0f0f0;
+      padding: 0.6rem 0.8rem;
+      border-radius: 4px;
+      font-size: 0.78rem;
+      line-height: 1.4;
+      overflow-x: auto;
+      margin: 0.4rem 0;
+    }
+    .link-preview-popup pre code { background: none; padding: 0; font-size: 1em; }
+    .link-preview-popup ul, .link-preview-popup ol { padding-left: 1.4rem; margin: 0.3rem 0; }
+    .link-preview-popup li { margin-bottom: 0.2rem; }
+    .link-preview-popup blockquote {
+      border-left: 3px solid #d4b96a;
+      margin: 0.5rem 0;
+      padding: 0.3rem 0.8rem;
+      color: #4a4a4a;
+      font-style: italic;
+    }
+    .link-preview-popup table {
+      border-collapse: collapse;
+      font-size: 0.8rem;
+      margin: 0.5rem 0;
+    }
+    .link-preview-popup th, .link-preview-popup td {
+      border: 1px solid #ddd;
+      padding: 0.3rem 0.5rem;
+    }
+    .link-preview-popup th { background: #f5f0e4; }
+
     /* Footnote tooltips */
     .footnote-tooltip {
       position: absolute;
@@ -1241,6 +1322,136 @@
       }, { passive: true });
     })();
 
+    <% if settings.link_tooltips %>
+    // Link preview popup for local markdown links
+    (function() {
+      var content = document.querySelector('.md-content');
+      if (!content) return;
+
+      var cache = Object.create(null);
+      var activePopup = null;
+      var activeAnchor = null;
+      var hideTimer = null;
+
+      function escHtml(s) {
+        return String(s)
+          .replace(/&/g, '&amp;').replace(/</g, '&lt;')
+          .replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+      }
+
+      function isLocalMdLink(a) {
+        if (a.classList.contains('broken')) return false;
+        var href = a.getAttribute('href');
+        if (!href) return false;
+        if (/^https?:\/\//i.test(href)) return false;
+        var path = href.split('?')[0].split('#')[0];
+        return /\.md$/i.test(path);
+      }
+
+      function previewUrl(a) {
+        var resolved = new URL(a.getAttribute('href'), location.href);
+        return '/preview/' + resolved.pathname.replace(/^\/browse\//, '');
+      }
+
+      function showPopup(anchor, html) {
+        hidePopup();
+        var pop = document.createElement('div');
+        pop.className = 'link-preview-popup';
+        pop.innerHTML = html;
+        anchor.appendChild(pop);
+        activePopup = pop;
+        activeAnchor = anchor;
+
+        // Clamp right edge to viewport
+        var vw = Math.min(window.innerWidth, document.documentElement.clientWidth);
+        var rect = pop.getBoundingClientRect();
+        if (rect.right > vw - 8) {
+          pop.style.left = Math.max(0, parseFloat(pop.style.left || 0) - (rect.right - (vw - 8))) + 'px';
+        }
+        // If top goes off screen, flip below the link instead
+        rect = pop.getBoundingClientRect();
+        if (rect.top < 8) {
+          pop.style.bottom = 'auto';
+          pop.style.top = '100%';
+        }
+
+        // Keep popup open while hovering over it
+        pop.addEventListener('mouseenter', function() { clearTimeout(hideTimer); });
+        pop.addEventListener('mouseleave', function() { hideTimer = setTimeout(hidePopup, 10); });
+
+        // Stop clicks/touches inside the popup from triggering the outer link
+        pop.addEventListener('click', function(e) {
+          e.stopPropagation();
+          if (!e.target.closest('a')) e.preventDefault();
+        });
+        pop.addEventListener('touchstart', function(e) { e.stopPropagation(); }, { passive: true });
+        pop.addEventListener('touchmove', function(e) { e.stopPropagation(); }, { passive: true });
+        pop.addEventListener('touchend', function(e) {
+          e.stopPropagation();
+          if (!e.target.closest('a')) e.preventDefault();
+        });
+      }
+
+      function hidePopup() {
+        if (activePopup && activePopup.parentNode) activePopup.parentNode.removeChild(activePopup);
+        activePopup = null;
+        activeAnchor = null;
+      }
+
+      function fetchAndShow(anchor) {
+        var url = previewUrl(anchor);
+        var cached = cache[url];
+        if (cached === undefined) {
+          cache[url] = null; // in-flight
+          showPopup(anchor, '<p style="opacity:0.5;margin:0">Loading\u2026</p>');
+          fetch(url)
+            .then(function(r) { return r.ok ? r.json() : null; })
+            .then(function(data) {
+              if (!data) { cache[url] = false; if (activeAnchor === anchor) hidePopup(); return; }
+              var html = '<div class="link-preview-popup-title">' + escHtml(data.title) + '</div>' + data.html;
+              cache[url] = html;
+              if (activeAnchor === anchor) showPopup(anchor, html);
+            })
+            .catch(function() { cache[url] = false; if (activeAnchor === anchor) hidePopup(); });
+        } else if (typeof cached === 'string') {
+          showPopup(anchor, cached);
+        }
+      }
+
+      content.querySelectorAll('a').forEach(function(a) {
+        if (!isLocalMdLink(a)) return;
+        a.classList.add('link-tooltip-anchor');
+
+        var hoverTimer = null;
+        a.addEventListener('click', hidePopup);
+        a.addEventListener('mouseenter', function() {
+          hoverTimer = setTimeout(function() { fetchAndShow(a); }, 300);
+        });
+        a.addEventListener('mouseleave', function() {
+          clearTimeout(hoverTimer);
+          hideTimer = setTimeout(hidePopup, 10);
+        });
+
+        var touchMoved = false;
+        a.addEventListener('touchstart', function() { touchMoved = false; }, { passive: true });
+        a.addEventListener('touchmove', function() { touchMoved = true; }, { passive: true });
+        a.addEventListener('touchend', function(e) {
+          if (touchMoved) return;
+          if (activeAnchor === a && activePopup) return; // second tap → navigate
+          e.preventDefault();
+          document.querySelectorAll('.link-preview-popup').forEach(function(p) {
+            if (p.parentNode) p.parentNode.removeChild(p);
+          });
+          fetchAndShow(a);
+        });
+      });
+
+      document.addEventListener('click', function(e) {
+        if (activePopup && activeAnchor && !activeAnchor.contains(e.target)) hidePopup();
+      });
+    })();
+    <% end %>
+
   </script>
 </body>
 </html>

metadata

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