markdownr 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae72dd628c263c9d8657afdb7e29d5449c0515e636494322dd9e9f256167c78
-  data.tar.gz: fd1996de9f2bb8bdd5460189d2aaae3448e30874facea35a653822f6916d3ebe
+  metadata.gz: 722e15f2df1b9be481803fab089a9cbcd03feca4074066af6e9c1fd32172eb95
+  data.tar.gz: 7a35e644b28724d93e14147688ed34f3a824d8eec1f2e972eb8dd2f599a94b8e
 SHA512:
-  metadata.gz: 07e413a60a5a9f8066ee9ad42f33528aa793e2f5d076eb7b5feb1d4beb214d0090d0715e7468cc962903a5a686a3d6a88a31be2c5632b4ef7721a432e6d3cbac
-  data.tar.gz: 63e6c9ba052569bccb6ca25452ddf77b8e88e94dd36f809326a3574113b54d580a2194c669040afb23c60b2fef7287155d908c2bf57511df255022c28357d51c
+  metadata.gz: 689bdd5757bec61a6284b63b3ab6b1a67dfa9e160b7343e63787962f9ed2cbf2c4b2ad677ec482d4e7712c445a17a94e068b80b551392f737eb1ec7546b55754
+  data.tar.gz: 74cfee882d280839673ee560c3dded04c6cc3ca7f605766f037ea531538c5a8a04b697928081a74480a8830cca07192cd5389629949a96cc16b8c6565390eb58

data/bin/markdownr

@@ -49,7 +49,15 @@ OptionParser.new do |opts|
   end
 
   opts.on("--no-bible-citations", "Disable Bible verse citation auto-linking") do
-    options[:plugin_overrides] = { "bible_citations" => { "enabled" => false } }
+    options[:plugin_overrides] = (options[:plugin_overrides] || {}).merge(
+      "bible_citations" => (options.dig(:plugin_overrides, "bible_citations") || {}).merge("enabled" => false)
+    )
+  end
+
+  opts.on("--biblegateway", "Link Bible citations to BibleGateway instead of scrip.risensavior.com") do
+    options[:plugin_overrides] = (options[:plugin_overrides] || {}).merge(
+      "bible_citations" => (options.dig(:plugin_overrides, "bible_citations") || {}).merge("link_target" => "biblegateway")
+    )
   end
 
   opts.on("-v", "--version", "Show version") do

data/lib/markdown_server/app.rb

@@ -748,6 +748,67 @@ module MarkdownServer
         info_html + infl_html + usage_html + conc_html
       end
 
+      def scrip_html(html)
+        # Extract the passage content block
+        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*?)<\/div>\s*(?:<nav|$)/im, 1] || ""
+        return page_html(html) if content.empty?
+
+        # Add data-verse attributes to verse spans for popup scrolling.
+        # Verse numbers live in <sup class="verse-number">N </sup> inside verse spans.
+        content = content.gsub(/<sup class="verse-number">(\d+)[^<]*<\/sup>/) do
+          %(<sup class="verse-number" data-verse="#{$1}">#{$1} </sup>)
+        end
+
+        # Inline the essential substitution CSS (show replacement mode by default)
+        css = <<~CSS
+          <style>
+          .subst { cursor: help; 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; }
+          .section-heading { font-size: 1rem; font-weight: bold; margin: 1.5rem 0 0.25rem; color: #444; }
+          .verse-number { font-size: 0.65em; font-weight: bold; color: #888; vertical-align: super; margin-right: 0.1em; line-height: 0; }
+          .chapter-number { font-size: 1.5em; font-weight: bold; vertical-align: 0.1em; margin-right: 0.15em; }
+          .footnotes { border-top: 1px solid #ddd; margin-top: 2rem; padding-top: 0.75rem; font-size: 0.85rem; color: #555; }
+          .footnotes ol { padding-left: 1.5rem; margin: 0.5rem 0 0; list-style-type: lower-alpha; }
+          .words-of-jesus { color: #8b0000; }
+          .poetry-stanza { margin: 0 0 0 3rem; }
+          .poetry-stanza.stanza-break { margin-top: 0.75rem; }
+          .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; }
+          </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
+      end
+
       def inline_directory_html(dir_path, relative_dir)
         entries = Dir.entries(dir_path).reject { |e| e.start_with?(".") || EXCLUDED.include?(e) }
         items = entries.map do |name|
@@ -848,6 +909,8 @@ module MarkdownServer
     end
 
     before do
+      cache_control :public, max_age: 14400
+
       if settings.verbose
         $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} #{client_ip} #{request.request_method} #{request.fullpath}"
         $stdout.flush
@@ -1072,6 +1135,9 @@ module MarkdownServer
         title = raw.match(/^([GH]\d+ - \w+)/i)&.[](1)&.sub(" - ", " – ") ||
                 raw.sub(/ [-–] .*/, "").strip
         JSON.dump({ title: title, html: blueletterbible_html(html, url) })
+      elsif url.match?(/scrip\.risensavior\.com/i)
+        title = page_title(html).sub(/ [-–] .*/, "").strip
+        JSON.dump({ title: title, html: scrip_html(html) })
       else
         title = page_title(html).sub(/ [-–] .*/, "").strip
         JSON.dump({ title: title, html: page_html(html, url) })

data/lib/markdown_server/plugins/bible_citations/citations.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "cgi"
+require "uri"
 
 module MarkdownServer
   module Plugins
@@ -88,6 +89,22 @@ module MarkdownServer
         "https://www.biblegateway.com/passage/?search=#{CGI.escape("#{canonical} #{verse}")}&version=#{version}"
       end
 
+      def self.scrip_url(canonical, verse, version: DEFAULT_VERSION)
+        # Parse chapter and optional starting verse from the verse string
+        # verse is e.g. "1:1", "1:1-5", "1", "1-2", "1:1,3,5"
+        if verse =~ /\A(\d+)(?::(\d+))?/
+          chapter = format("%03d", $1.to_i)
+          start_verse = $2
+        else
+          return biblegateway_url(canonical, verse, version: version)
+        end
+
+        encode = ->(s) { URI.encode_www_form_component(s).gsub("+", "%20") }
+        url = "https://scrip.risensavior.com/browse/biblegateway/etl/20.%20substitutions/#{encode[version]}/#{encode[canonical]}/#{chapter}.html"
+        url += "#v#{start_verse}" if start_verse
+        url
+      end
+
       def self.link_citations(text)
         text.gsub(BIBLE_CITATION_RE) do |m|
           next m if $1 || $2 || $3

data/lib/markdown_server/plugins/bible_citations/plugin.rb

@@ -13,20 +13,31 @@ module MarkdownServer
 
       def setup(config)
         @version = config.fetch("version", Citations::DEFAULT_VERSION)
+        @link_target = config.fetch("link_target", "scrip")
       end
 
       def transform_markdown(text)
         Citations.link_citations(text) do |canonical, verse, citation|
-          "[#{citation}](#{Citations.biblegateway_url(canonical, verse, version: @version)})"
+          "[#{citation}](#{citation_url(canonical, verse)})"
         end
       end
 
       def transform_html(html)
         Citations.link_citations_html(html) do |canonical, verse, citation|
-          url = Citations.biblegateway_url(canonical, verse, version: @version)
+          url = citation_url(canonical, verse)
           %(<a href="#{CGI.escapeHTML(url)}">#{CGI.escapeHTML(citation)}</a>)
         end
       end
+
+      private
+
+      def citation_url(canonical, verse)
+        if @link_target == "biblegateway"
+          Citations.biblegateway_url(canonical, verse, version: @version)
+        else
+          Citations.scrip_url(canonical, verse, version: @version)
+        end
+      end
     end
   end
 end

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.1"
+  VERSION = "0.6.3"
 end

data/views/layout.erb

@@ -316,13 +316,15 @@
     .md-content tr:nth-child(even) { background: #fdfcf9; }
 
     /* Bible Gateway citation links */
-    a[href*="biblegateway.com"] {
+    a[href*="biblegateway.com"],
+    a[href*="scrip.risensavior.com"] {
       color: #7b3fa0;
       font-weight: bold;
       text-decoration: none;
       border-bottom: 1px solid #b07fd4;
     }
-    a[href*="biblegateway.com"]:hover { color: #5a2c78; border-bottom-color: #5a2c78; }
+    a[href*="biblegateway.com"]:hover,
+    a[href*="scrip.risensavior.com"]:hover { color: #5a2c78; border-bottom-color: #5a2c78; }
 
     /* Wiki links */
     a.wiki-link {
@@ -1780,9 +1782,7 @@
           handleLink(anchor, savedPos.x, savedPos.y, true);
         }, { passive: false });
 
-        ['touchstart','touchmove','touchend'].forEach(function(ev) {
-          popup.addEventListener(ev, function(e) { e.stopPropagation(); }, { passive: true });
-        });
+        popup.addEventListener('touchstart', function(e) { e.stopPropagation(); }, { passive: true });
       }
 
       function pinPopup(el) {
@@ -2021,15 +2021,25 @@
         if (!hash || !popup) return;
         var id = hash.replace(/^#/, '');
         try {
-          var target = popup.querySelector('[id="' + id.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"]');
+          var eid = id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+          var target = popup.querySelector('[id="' + eid + '"]');
+          // For scrip verse anchors like #v15, find by data-verse attribute
+          if (!target) {
+            var vm = id.match(/^v(\d+)$/);
+            if (vm) {
+              target = popup.querySelector('[data-verse="' + vm[1] + '"]');
+              // Also match "Book Ch:Verse" format like data-verse="Acts 17:25"
+              if (!target) target = popup.querySelector('[data-verse$=":' + vm[1] + '"]');
+            }
+          }
           if (!target) return;
-          // Scroll the popup container (which has overflow-y:auto) to the target,
+          // Scroll the body container (which has overflow-y:auto) to the target,
           // accounting for the sticky header so the heading lands just below it
-          var header = popup.querySelector('.link-ctx-popup-header');
-          var headerHeight = header ? header.offsetHeight : 0;
+          var body = popup.querySelector('.link-ctx-popup-body');
+          if (!body) return;
+          var bodyTop = body.getBoundingClientRect().top;
           var targetTop = target.getBoundingClientRect().top;
-          var popupTop = popup.getBoundingClientRect().top;
-          popup.scrollTop += targetTop - popupTop - headerHeight - 8;
+          body.scrollTop += targetTop - bodyTop - 8;
           // Append section heading text to the popup title
           if (/^H[1-6]$/.test(target.tagName)) {
             var titleEl = popup.querySelector('.link-ctx-popup-title span');
@@ -2081,6 +2091,7 @@
           var extCached = cache[extKey];
           if (extCached && typeof extCached === 'object') {
             showPopup(x, y, extCached.title || label, extCached.html, href, linkRect);
+            applyPopupAnchor(linkHash);
           } else if (extCached === false) {
             showPopup(x, y, label,
               '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>' +
@@ -2101,6 +2112,7 @@
                   }
                   cache[extKey] = { title: data.title, html: data.html };
                   updatePopup(data.html, data.title || label);
+                  applyPopupAnchor(linkHash);
                 })
                 .catch(function() {
                   cache[extKey] = false;

data/views/popup_assets.erb

@@ -1,12 +1,14 @@
 <style>
   /* Bible Gateway citation links */
-  a[href*="biblegateway.com"] {
+  a[href*="biblegateway.com"],
+  a[href*="scrip.risensavior.com"] {
     color: #7b3fa0;
     font-weight: bold;
     text-decoration: none;
     border-bottom: 1px solid #b07fd4;
   }
-  a[href*="biblegateway.com"]:hover { color: #5a2c78; border-bottom-color: #5a2c78; }
+  a[href*="biblegateway.com"]:hover,
+  a[href*="scrip.risensavior.com"]:hover { color: #5a2c78; border-bottom-color: #5a2c78; }
 
   /* Left-click / tap link context popup */
   .link-ctx-popup {
@@ -362,9 +364,7 @@
         handleLink(anchor, savedPos.x, savedPos.y, true);
       }, { passive: false });
 
-      ['touchstart','touchmove','touchend'].forEach(function(ev) {
-        popup.addEventListener(ev, function(e) { e.stopPropagation(); }, { passive: true });
-      });
+      popup.addEventListener('touchstart', function(e) { e.stopPropagation(); }, { passive: true });
     }
 
     function pinPopup(el) {
@@ -593,13 +593,23 @@
       if (!hash || !popup) return;
       var id = hash.replace(/^#/, '');
       try {
-        var target = popup.querySelector('[id="' + id.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"]');
+        var eid = id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        var target = popup.querySelector('[id="' + eid + '"]');
+        // For scrip verse anchors like #v15, find by data-verse attribute
+        if (!target) {
+          var vm = id.match(/^v(\d+)$/);
+          if (vm) {
+            target = popup.querySelector('[data-verse="' + vm[1] + '"]');
+            // Also match "Book Ch:Verse" format like data-verse="Acts 17:25"
+            if (!target) target = popup.querySelector('[data-verse$=":' + vm[1] + '"]');
+          }
+        }
         if (!target) return;
-        var header = popup.querySelector('.link-ctx-popup-header');
-        var headerHeight = header ? header.offsetHeight : 0;
+        var body = popup.querySelector('.link-ctx-popup-body');
+        if (!body) return;
+        var bodyTop = body.getBoundingClientRect().top;
         var targetTop = target.getBoundingClientRect().top;
-        var popupTop = popup.getBoundingClientRect().top;
-        popup.scrollTop += targetTop - popupTop - headerHeight - 8;
+        body.scrollTop += targetTop - bodyTop - 8;
         if (/^H[1-6]$/.test(target.tagName)) {
           var titleEl = popup.querySelector('.link-ctx-popup-title span');
           if (titleEl) titleEl.textContent = titleEl.textContent + ' \u203a ' + target.textContent;
@@ -649,6 +659,7 @@
         var extCached = cache[extKey];
         if (extCached && typeof extCached === 'object') {
           showPopup(x, y, extCached.title || label, extCached.html, href, linkRect);
+          applyPopupAnchor(linkHash);
         } else if (extCached === false) {
           showPopup(x, y, label,
             '<div class="link-ctx-popup-url">' + escHtml(href) + '</div>' +
@@ -669,6 +680,7 @@
                 }
                 cache[extKey] = { title: data.title, html: data.html };
                 updatePopup(data.html, data.title || label);
+                applyPopupAnchor(linkHash);
               })
               .catch(function() {
                 cache[extKey] = false;

metadata

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