markdownr 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1bd3ffb960e7f2e3750d7f70fe188c551d1fcf764a6517f65a4c45fee4634e4
-  data.tar.gz: 49a2c9f9a777fc280bc9bd98a38fb135873e9e2392edbe4d2ada07cd2d20e8b2
+  metadata.gz: 072ccb5cc0d25d1b06e7fc40cc51a6d4d71a03627fbf6569a822782a4151c8a4
+  data.tar.gz: '039ec59649a81611b158230190dee9c02343dc7fbbdf97008b8b05a116eecc66'
 SHA512:
-  metadata.gz: dc4bc27debd2a2093965e2bc46ce94364e18db6970659091ebe94febab5e37cefb1ddb0fcc64810006eeb1db1b72faef32543e3b186595c85619a85303b9b4bf
-  data.tar.gz: 54b2fbd599cdae2d6e582cdf73d8adb6363244ff9ecda175c9627bf9b1619f5ae510884f053f8d5d585551b539708db684de8a00ea51adce62e48c0946b93d8f
+  metadata.gz: eb6dab68fec96f02ff6c3c1243196d64166e489e78ea2ffc77423bb808d8737e52850fc51dadebe415a0258f8f53f2ed6bc42232efadca6b328620efe46853e5
+  data.tar.gz: 48f192f288f773f9fddc677fc68e0bc856f63780f4fa1e983bfbb2376d4b2be2ef2c4c520c95ba5988af2693cd2cced5ed599cea090948f28ae73d345a6db0a0

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)
@@ -209,23 +216,30 @@ module MarkdownServer
       def resolve_wiki_link(name)
         filename = "#{name}.md"
         base = File.realpath(root_dir)
+        # On case-sensitive filesystems (Linux/Docker), FNM_CASEFOLD doesn't help
+        # with directory listings. Try exact filename first, then lowercased variant.
+        candidates = [filename]
+        candidates << filename.downcase if filename != filename.downcase
 
         # 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
+          candidates.each do |fn|
+            Dir.glob(File.join(@current_wiki_dir, fn)).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
+            break if local_exact
           end
           return local_exact if local_exact
           return local_ci if local_ci
@@ -234,17 +248,20 @@ module MarkdownServer
         # Fall back to global recursive search
         exact_match = nil
         ci_match = nil
-        Dir.glob(File.join(base, "**", 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
-            exact_match ||= relative
-          else
-            ci_match ||= relative
+        candidates.each do |fn|
+          Dir.glob(File.join(base, "**", fn)).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
+              exact_match ||= relative
+            else
+              ci_match ||= relative
+            end
           end
+          break if exact_match
         end
 
         exact_match || ci_match
@@ -485,6 +502,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
@@ -794,6 +888,7 @@ module MarkdownServer
           </style>
         CSS
 
+        content = inject_strongs_urls(content)
         css + '<div style="font-family:Georgia,serif;line-height:1.7">' + content + "</div>"
       end
 
@@ -869,6 +964,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}," \

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.9"
+  VERSION = "0.6.11"
 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.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Brian Dunn