markdownr 0.6.8 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4810bebbf882744a15ecd5efd2a62c7041a4e82333090ff48a436263b8a7d72c
-  data.tar.gz: 4539d9a60c57059548e5a83ce48bd4a2308c786994a600cbc826c1ce966ac91d
+  metadata.gz: 352e2d418a6bf94404763caeaa5b8e43c5f07fa2bff53c208a60972b16420a7e
+  data.tar.gz: e2b8d84227484fca2134dc9a1cffa67bebf3022134377945a9081dc19c6c3fe0
 SHA512:
-  metadata.gz: 826f2424b808693da846ec0f8683440b811977c8901e3afe1a170941731c7e654905d6359a5bf58965d268d4c487f7a1b911254a5461f4bde1667fd13d46bd11
-  data.tar.gz: 58aaacd2425f0a229fefca93e0f6e0b30b062bde8ae0a25dc4e43f1c76ae8a849c44fc003516afc43f8dd09fdac3e70ba8364d8bf9adb5e5ee6dc093327d06f4
+  metadata.gz: 15653576feb66ee4cb2dd259ed2ce21e11ce6dd6872e5533b8d7c28eb5eafa2aa471b61d8997afcacfb86aa21ff7f442366ec16157014321feba7ed3627059d4
+  data.tar.gz: ee7ea43025abdd7cc04a1238660985480664c7220fd98327331be5e93682d896e470525c4c9dc1186d235c3dc5885cde770012e29111e62e42d4bf99d1397494

data/bin/markdownr

@@ -60,6 +60,10 @@ OptionParser.new do |opts|
     )
   end
 
+  opts.on("--dictionary-url URL", "URL to dictionary.json for Strong's number popup resolution") do |u|
+    options[:dictionary_url] = u
+  end
+
   opts.on("-v", "--version", "Show version") do
     puts "markdownr #{MarkdownServer::VERSION}"
     exit
@@ -86,6 +90,7 @@ MarkdownServer::App.set :port, options[:port]
 MarkdownServer::App.set :bind, options[:bind]
 MarkdownServer::App.set :server_settings, { max_threads: options[:threads], min_threads: 1 }
 MarkdownServer::App.set :plugin_overrides, options[:plugin_overrides] || {}
+MarkdownServer::App.set :dictionary_url, options[:dictionary_url] if options[:dictionary_url]
 
 # Load .markdownr.yml popup settings
 config_path = File.join(dir, ".markdownr.yml")
@@ -98,6 +103,9 @@ if File.exist?(config_path)
     MarkdownServer::App.set :popup_external, popups.fetch("external", true)
     MarkdownServer::App.set :popup_external_domains, popups.fetch("external_domains", [])
   end
+  if yaml && yaml["dictionary_url"]
+    MarkdownServer::App.set :dictionary_url, yaml["dictionary_url"]
+  end
 end
 
 MarkdownServer::App.load_plugins!

data/lib/markdown_server/app.rb

@@ -38,8 +38,15 @@ module MarkdownServer
       set :popup_local_html, false
       set :popup_external, true
       set :popup_external_domains, []
+      set :dictionary_url, nil
     end
 
+    # Server-side Strong's dictionary cache
+    @@strongs_cache = nil
+    @@strongs_cache_url = nil
+    @@strongs_fetched_at = nil
+    DICTIONARY_TTL = 3600 # 1 hour
+
     def self.load_plugins!
       Dir[File.join(__dir__, "plugins", "*", "plugin.rb")].sort.each { |f| require f }
       set :plugins, PluginRegistry.load_plugins(settings.root_dir, settings.plugin_overrides)
@@ -485,6 +492,83 @@ module MarkdownServer
       FETCH_MAX_BYTES = 512_000
       FETCH_TIMEOUT   = 5
 
+      def strongs_map
+        url = settings.dictionary_url
+        return {} unless url
+
+        now = Time.now
+        if @@strongs_cache && @@strongs_cache_url == url && @@strongs_fetched_at
+          if url.match?(/\Ahttps?:\/\//i)
+            return @@strongs_cache if (now - @@strongs_fetched_at) < DICTIONARY_TTL
+          else
+            path = File.expand_path(url, root_dir)
+            mtime = File.mtime(path) rescue nil
+            return @@strongs_cache if mtime && mtime <= @@strongs_fetched_at
+          end
+        end
+
+        begin
+          raw = if url.match?(/\Ahttps?:\/\//i)
+            uri = URI.parse(url)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = (uri.scheme == "https")
+            http.open_timeout = FETCH_TIMEOUT
+            http.read_timeout = 10
+            req = Net::HTTP::Get.new(uri.request_uri)
+            req["Accept"] = "application/json"
+            resp = http.request(req)
+            return @@strongs_cache || {} unless resp.is_a?(Net::HTTPSuccess)
+            resp.body
+          else
+            path = File.expand_path(url, root_dir)
+            return @@strongs_cache || {} unless File.exist?(path)
+            File.read(path, encoding: "utf-8")
+          end
+
+          data = JSON.parse(raw)
+          url_tpl = data["url"] || ""
+          map = {}
+          %w[greek hebrew].each do |lang|
+            stems = data.dig("stems", lang)
+            next unless stems.is_a?(Hash)
+            stems.each_value do |entry|
+              sn = entry["strongs"].to_s.strip.upcase
+              next if sn.empty?
+              map[sn] = url_tpl.gsub("{filename}", entry["filename"].to_s)
+            end
+          end
+          @@strongs_cache = map
+          @@strongs_cache_url = url
+          @@strongs_fetched_at = now
+          map
+        rescue StandardError
+          @@strongs_cache || {}
+        end
+      end
+
+      def strongs_popup_url(strongs)
+        sn = strongs.to_s.strip.upcase
+        return nil unless sn.match?(/\A[GH]\d+\z/)
+        url = strongs_map[sn]
+        return url if url
+        # Fallback: Blue Letter Bible
+        prefix = sn.start_with?("H") ? "wlc" : "tr"
+        "https://www.blueletterbible.org/lexicon/#{sn.downcase}/nasb20/#{prefix}/0-1/"
+      end
+
+      def inject_strongs_urls(html)
+        return html unless settings.dictionary_url
+        html.gsub(/<span\s+class="subst"([^>]*data-strongs="([^"]+)"[^>]*)>/) do
+          attrs, strongs = $1, $2
+          popup_url = strongs_popup_url(strongs)
+          if popup_url && !attrs.include?("data-popup-url")
+            %(<span class="subst" data-popup-url="#{h(popup_url)}"#{attrs}>)
+          else
+            $&
+          end
+        end
+      end
+
       # Tags kept as-is (attributes stripped)
       ALLOWED_HTML = %w[p h1 h2 h3 h4 h5 h6 blockquote ul ol li
                         pre br hr strong b em i sup sub code
@@ -607,6 +691,19 @@ module MarkdownServer
         out.length > 10_000 ? out[0, 10_000] : out
       end
 
+      def markdownr_html(html)
+        # Extract .md-content from a trusted markdownr page, preserving HTML as-is
+        content = html[/<div[^>]+class="md-content"[^>]*>([\s\S]*?)<\/div>\s*(?:<div\s+class="frontmatter"|<\/div>\s*<\/div>|\z)/im, 1]
+        return page_html(html) unless content && content.length > 10
+
+        # Also extract frontmatter if present
+        fm = html[/<div\s+class="frontmatter">([\s\S]*?)<\/div>\s*<\/div>/im, 0] || ""
+
+        result = content.strip
+        result += "\n#{fm}" unless fm.empty?
+        result.length > 15_000 ? result[0, 15_000] : result
+      end
+
       def blueletterbible_html(html, url)
         base = "https://www.blueletterbible.org"
 
@@ -781,6 +878,7 @@ module MarkdownServer
           </style>
         CSS
 
+        content = inject_strongs_urls(content)
         css + '<div style="font-family:Georgia,serif;line-height:1.7">' + content + "</div>"
       end
 
@@ -856,6 +954,7 @@ btn._loading=false;btn.style.opacity='1';});})(this)">&#128266;</button>)
       # Falls back to appending before </html>, then to end of document.
       def inject_markdownr_assets(html_content)
         settings.plugins.each { |p| html_content = p.transform_html(html_content) }
+        html_content = inject_strongs_urls(html_content)
 
         popup_config_script = "<script>var __popupConfig = {" \
           "localMd:#{settings.popup_local_md}," \
@@ -1172,6 +1271,9 @@ btn._loading=false;btn.style.opacity='1';});})(this)">&#128266;</button>)
         title = raw.match(/^([GH]\d+ - \w+)/i)&.[](1)&.sub(" - ", " – ") ||
                 raw.sub(/ [-–] .*/, "").strip
         JSON.dump({ title: title, html: blueletterbible_html(html, url) })
+      elsif url.match?(%r{/definitions/[^/]+\.md(\?|#|\z)}i)
+        title = page_title(html).sub(/ [-–] .*/, "").strip
+        JSON.dump({ title: title, html: markdownr_html(html) })
       elsif url.match?(/scrip\.risensavior\.com/i)
         title = page_title(html).sub(/ [-–] .*/, "").strip
         JSON.dump({ title: title, html: scrip_html(html) })

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.8"
+  VERSION = "0.6.10"
 end

data/views/popup_assets.erb

@@ -882,53 +882,11 @@
       document.head.appendChild(style);
     })();
 
-    // Substitution span popups — look up Strong's numbers in dictionary.json
+    // Substitution span popups — use server-injected data-popup-url
     (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';
@@ -941,60 +899,48 @@
 
         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;
-          }
+        var href = el.dataset.popupUrl || blbFallbackUrl(strongs);
+        var title = replacement || strongs;
 
-          // Show popup with loading state and correct title/href
+        // 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,
-            '<p style="opacity:0.5;margin:0;font-family:sans-serif">Loading\u2026</p>', href, rect);
+            '<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;
+        }
 
-          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() {
+        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:#c44;font-family:sans-serif;font-size:0.82rem">Could not fetch page content.</p>');
-              });
-          }
-        });
+                  '<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) {

metadata

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