markdownr 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0a41eadcbe996f7165b92a56174857657a21698308b515a35a67ec81a9a3e0
-  data.tar.gz: 12f87ff3043049997f895f4dc0bde07d6d7e41c0195286b1abe29c91eada81e2
+  metadata.gz: ecda563bb6ae0b22bb608e65f195cb9008db45856aa2027710fbfd34a0d61808
+  data.tar.gz: c92343f2c54e0d48d2f754f81b81f86a92dd30ac872eaa5ca1b5390b003131b1
 SHA512:
-  metadata.gz: cc617683848f464907a1f8d4e17986a80842e631b9e68dcd6d3eb340bb0b658d080a9849c8f1a6ec952f8ceaa23cb95fda4760e44dc02b36a6620a7b30dcbf53
-  data.tar.gz: 73bbfe99e65f7c50b4c4ffca35b4ab98d9a706f3c8367451b115e61919391ec95d987396cb75f5cbf7890822f4ec4b0456255a47a9872af5745b2dc90737e92b
+  metadata.gz: 930394dda20505d2b3e0e21188563000a5481bcf5423992491b3f8cc080ff6403c63084b4083c2069d6995bff25b7353bd1591cb2bdf16083126f498b9e69dbe
+  data.tar.gz: 3acb3a0135fe081c1827c4994df0f376c8afb7a9d65a0b1c335825ba00327ffb64516099b6f4cf2c2763a10d617bc73a0f43c6be9d87ba7f28ea4327fe87762d

data/lib/markdown_server/app.rb

@@ -750,7 +750,7 @@ module MarkdownServer
 
       def scrip_html(html)
         # Extract the passage content block
-        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*?)<\/div>\s*(?:<nav|\z)/im, 1] || ""
+        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*)<\/div>\s*(?:<nav|<script|<style|\z)/im, 1] || ""
         return page_html(html) if content.empty?
 
         # Add data-verse attributes to verse spans for popup scrolling.
@@ -762,7 +762,7 @@ module MarkdownServer
         # Inline the essential substitution CSS (show replacement mode by default)
         css = <<~CSS
           <style>
-          .subst { cursor: help; border-radius: 2px; background: #f0ebff; position: relative; }
+          .subst { cursor: pointer; border-radius: 2px; background: #f0ebff; position: relative; }
           .subst:hover { background: #e0d4ff; outline: 1px solid #a78bfa; }
           .subst-t, .subst-o, .subst-x, .subst-s { display: none; }
           .subst-r { display: inline; color: #7c3aed; font-style: italic; }
@@ -777,36 +777,11 @@ module MarkdownServer
           .poetry-line { margin: 0; padding: 0; line-height: 1.5; }
           .poetry-line.indent-1 { padding-left: 2em; }
           .poetry-line.indent-2 { padding-left: 4em; }
-          .subst-tip { display: none; position: absolute; bottom: calc(100% + 4px); left: 50%; transform: translateX(-50%); background: #1e293b; color: #f8fafc; font-size: 0.78rem; line-height: 1.5; padding: 0.4rem 0.6rem; border-radius: 5px; white-space: nowrap; z-index: 100; pointer-events: none; font-style: normal; }
-          .subst-tip::after { content: ""; position: absolute; top: 100%; left: 50%; transform: translateX(-50%); border: 5px solid transparent; border-top-color: #1e293b; }
-          .subst:hover .subst-tip { display: block; }
+          .subst-tip { display: none; }
           </style>
         CSS
 
-        # Build tooltips for substitution spans via JS
-        js = <<~JS
-          <script>
-          document.querySelectorAll('.subst').forEach(function(el) {
-            var t = el.querySelector('.subst-t'), r = el.querySelector('.subst-r'),
-                o = el.querySelector('.subst-o'), x = el.querySelector('.subst-x'),
-                s = el.querySelector('.subst-s');
-            var lines = [];
-            if (t) lines.push(t.textContent);
-            if (r) lines.push(r.textContent);
-            if (o) lines.push(o.textContent);
-            if (x) lines.push(x.textContent);
-            if (s) lines.push(s.textContent);
-            if (lines.length > 1) {
-              var tip = document.createElement('span');
-              tip.className = 'subst-tip';
-              tip.innerHTML = lines.join('<br>');
-              el.appendChild(tip);
-            }
-          });
-          </script>
-        JS
-
-        css + '<div style="font-family:Georgia,serif;line-height:1.7">' + content + "</div>" + js
+        css + '<div style="font-family:Georgia,serif;line-height:1.7">' + content + "</div>"
       end
 
       def inline_directory_html(dir_path, relative_dir)
@@ -1122,6 +1097,29 @@ module MarkdownServer
       JSON.dump({ title: title.to_s, html: html, frontmatter_html: frontmatter_html })
     end
 
+    get "/fetch-json" do
+      content_type :json
+      url = params[:url].to_s.strip
+      halt 400, '{"error":"invalid url"}' unless url.match?(/\Ahttps?:\/\//i)
+
+      uri = URI.parse(url)
+      halt 400, '{"error":"invalid url"}' unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == "https")
+      http.open_timeout = FETCH_TIMEOUT
+      http.read_timeout = FETCH_TIMEOUT
+      req = Net::HTTP::Get.new(uri.request_uri)
+      req["Accept"] = "application/json"
+      resp = http.request(req)
+      halt 502, '{"error":"fetch failed"}' unless resp.is_a?(Net::HTTPSuccess)
+
+      headers "Cache-Control" => "public, max-age=3600"
+      resp.body
+    rescue StandardError
+      halt 502, '{"error":"fetch failed"}'
+    end
+
     get "/fetch" do
       content_type :json
       url = params[:url].to_s.strip

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.5"
+  VERSION = "0.6.7"
 end

data/views/layout.erb

@@ -99,6 +99,12 @@
       border-bottom: 2px solid #d4b96a;
       padding-bottom: 0.5rem;
     }
+    .page-title-download {
+      color: inherit;
+      text-decoration: none;
+      border-bottom: none;
+    }
+    .page-title-download:hover { color: inherit; }
 
     /* Directory listing */
     .dir-listing {
@@ -199,6 +205,7 @@
     .md-content {
       line-height: 1.8;
     }
+    .md-content > :first-child { margin-top: 0; }
     .md-content h1 { font-size: 1.5rem; margin: 1.5rem 0 0.8rem; color: #3a3a3a; }
     .md-content h2 {
       font-size: 1.25rem;

data/views/markdown.erb

@@ -1,15 +1,11 @@
 <% _file_path = @crumbs.map { |c| c[:name] }.drop(1).join("/") %>
 <div class="title-bar">
-  <h1 class="page-title"><%= h(@title) %></h1>
+  <h1 class="page-title"><a href="<%= @download_href %>" class="page-title-download"><%= h(@title) %></a></h1>
   <form class="search-form" action="<%= search_form_path(_file_path) %>" method="get">
     <input type="text" name="q" placeholder="Search this document..." value="">
   </form>
 </div>
 
-<div class="toolbar">
-  <a href="<%= @download_href %>">Download</a>
-</div>
-
 <% if @has_toc %>
   <button class="toc-fab" id="toc-fab" aria-label="Table of Contents">&#9776;</button>
   <div class="toc-overlay" id="toc-overlay"></div>
@@ -43,6 +39,10 @@
   <% end %>
 
   <div class="page-main">
+    <div class="md-content" data-file="<%= h(@title) %>">
+      <%= @content %>
+    </div>
+
     <% if @meta && !@meta.empty? %>
       <div class="frontmatter">
         <div class="frontmatter-heading">Frontmatter</div>
@@ -56,9 +56,5 @@
         </table>
       </div>
     <% end %>
-
-    <div class="md-content" data-file="<%= h(@title) %>">
-      <%= @content %>
-    </div>
   </div>
 </div>

data/views/popup_assets.erb

@@ -882,6 +882,167 @@
       document.head.appendChild(style);
     })();
 
+    // Substitution span popups — look up Strong's numbers in dictionary.json
+    (function() {
+      var substEls = document.querySelectorAll('.subst[data-strongs]');
+      if (!substEls.length) return;
+
+      var dictUrl = null;
+      var strongsMap = null; // strongs -> { url, blb, label }
+      var dictLoading = false;
+      var dictCallbacks = [];
+
+      function loadDict(cb) {
+        if (strongsMap) { cb(); return; }
+        dictCallbacks.push(cb);
+        if (dictLoading) return;
+        dictLoading = true;
+
+        // Discover dictionary.json URL from the first .subst's data-strongs
+        // Convention: definitions/dictionary.json on the bible server
+        var jsonUrl = 'https://bible2.risensavior.com/download/definitions/dictionary.json';
+        fetch('/fetch-json?url=' + encodeURIComponent(jsonUrl))
+          .then(function(r) { return r.ok ? r.json() : null; })
+          .then(function(data) {
+            if (!data || !data.stems) { strongsMap = {}; return; }
+            var urlTpl = data.url || '';
+            strongsMap = {};
+            ['greek', 'hebrew'].forEach(function(lang) {
+              var stems = data.stems[lang];
+              if (!stems) return;
+              Object.keys(stems).forEach(function(key) {
+                var entry = stems[key];
+                if (!entry.strongs) return;
+                var sn = entry.strongs.toUpperCase();
+                strongsMap[sn] = {
+                  url: urlTpl.replace('{filename}', entry.filename || ''),
+                  blb: entry.blueletterbible || null,
+                  label: entry.original || entry.transliteration || key
+                };
+              });
+            });
+          })
+          .catch(function() { strongsMap = {}; })
+          .then(function() {
+            dictCallbacks.forEach(function(fn) { fn(); });
+            dictCallbacks = [];
+          });
+      }
+
+      function blbFallbackUrl(strongs) {
+        var s = strongs.toLowerCase();
+        var prefix = s.charAt(0) === 'h' ? 'wlc' : 'tr';
+        return 'https://www.blueletterbible.org/lexicon/' + s + '/nasb20/' + prefix + '/0-1/';
+      }
+
+      function handleSubst(el, x, y) {
+        var strongs = (el.dataset.strongs || '').toUpperCase();
+        if (!strongs) return;
+
+        var rect = el.getBoundingClientRect();
+        var replacement = el.dataset.replacement || '';
+        var original = el.dataset.original || '';
+        var translit = el.dataset.translit || '';
+
+        // Show loading popup immediately
+        var loadingTitle = replacement || original || strongs;
+        showPopup(x, y, loadingTitle,
+          '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', null, rect);
+
+        loadDict(function() {
+          var entry = strongsMap[strongs];
+          var href = entry ? entry.url : blbFallbackUrl(strongs);
+          var title = replacement || (entry && entry.label) || strongs;
+
+          // Fetch the target page through the existing proxy
+          var cacheKey = 'ext:' + href;
+          var cached = cache[cacheKey];
+          if (cached && typeof cached === 'object') {
+            showPopup(x, y, cached.title || title, cached.html, href, rect);
+            return;
+          }
+          if (cached === false) {
+            showPopup(x, y, title,
+              '<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, rect);
+            return;
+          }
+
+          // Show popup with loading state and correct title/href
+          showPopup(x, y, title,
+            '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', href, rect);
+
+          if (cached === undefined) {
+            cache[cacheKey] = null;
+            fetch('/fetch?url=' + encodeURIComponent(href))
+              .then(function(r) { return r.ok ? r.json() : null; })
+              .then(function(data) {
+                if (!data || data.error) {
+                  cache[cacheKey] = false;
+                  updatePopup(
+                    '<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>');
+                  return;
+                }
+                cache[cacheKey] = { title: data.title, html: data.html };
+                updatePopup(data.html, data.title || title);
+              })
+              .catch(function() {
+                cache[cacheKey] = false;
+                updatePopup(
+                  '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>' +
+                  '<p style="margin:0.5rem 0 0;color:#c44;font-family:sans-serif;font-size:0.82rem">Could not fetch page content.</p>');
+              });
+          }
+        });
+      }
+
+      function findSubst(el) {
+        while (el && el.tagName !== 'BODY') {
+          if (el.classList && el.classList.contains('subst') && el.dataset.strongs) return el;
+          el = el.parentElement;
+        }
+        return null;
+      }
+
+      // Click
+      document.addEventListener('click', function(e) {
+        var el = findSubst(e.target);
+        if (!el) return;
+        e.preventDefault();
+        e.stopPropagation();
+        handleSubst(el, e.clientX, e.clientY);
+      });
+
+      // Touch
+      document.addEventListener('touchend', function(e) {
+        if (touchMoved) return;
+        var el = findSubst(e.target);
+        if (!el) return;
+        e.preventDefault();
+        e.stopPropagation();
+        var touch = e.changedTouches[0];
+        handleSubst(el, touch.clientX, touch.clientY);
+      }, { passive: false });
+
+      // Hover
+      var hoverTimer = null;
+      substEls.forEach(function(el) {
+        el.addEventListener('mouseenter', function(e) {
+          clearTimeout(hoverTimer);
+          if (popup) return;
+          var x = e.clientX, y = e.clientY;
+          hoverTimer = setTimeout(function() {
+            if (!popup) handleSubst(el, x, y);
+          }, 300);
+        });
+        el.addEventListener('mouseleave', function() {
+          clearTimeout(hoverTimer);
+          if (popup) mouseLeaveTimer = setTimeout(hidePopup, 150);
+        });
+      });
+    })();
+
   })();
 
   // Full-page verse highlighting from URL hash (#vN or #vN-M)
@@ -899,12 +1060,14 @@
       var spans;
       if (book && ch) {
         spans = document.querySelectorAll('.verse[data-verse="' + book + ' ' + ch + ':' + v + '"]');
-      } else {
-        // No meta tags — filter all .verse spans by exact verse number
+      }
+      if (!spans || !spans.length) {
+        // Fallback: match by plain verse number (e.g. data-verse="3")
         var all = document.querySelectorAll('.verse[data-verse]');
         spans = [];
         for (var i = 0; i < all.length; i++) {
-          if (all[i].getAttribute('data-verse').split(':').pop() === String(v)) spans.push(all[i]);
+          var dv = all[i].getAttribute('data-verse');
+          if (dv === String(v) || dv.split(':').pop() === String(v)) spans.push(all[i]);
         }
       }
       for (var j = 0; j < spans.length; j++) {

metadata

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