markdownr 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecda563bb6ae0b22bb608e65f195cb9008db45856aa2027710fbfd34a0d61808
-  data.tar.gz: c92343f2c54e0d48d2f754f81b81f86a92dd30ac872eaa5ca1b5390b003131b1
+  metadata.gz: c1bd3ffb960e7f2e3750d7f70fe188c551d1fcf764a6517f65a4c45fee4634e4
+  data.tar.gz: 49a2c9f9a777fc280bc9bd98a38fb135873e9e2392edbe4d2ada07cd2d20e8b2
 SHA512:
-  metadata.gz: 930394dda20505d2b3e0e21188563000a5481bcf5423992491b3f8cc080ff6403c63084b4083c2069d6995bff25b7353bd1591cb2bdf16083126f498b9e69dbe
-  data.tar.gz: 3acb3a0135fe081c1827c4994df0f376c8afb7a9d65a0b1c335825ba00327ffb64516099b6f4cf2c2763a10d617bc73a0f43c6be9d87ba7f28ea4327fe87762d
+  metadata.gz: dc4bc27debd2a2093965e2bc46ce94364e18db6970659091ebe94febab5e37cefb1ddb0fcc64810006eeb1db1b72faef32543e3b186595c85619a85303b9b4bf
+  data.tar.gz: 54b2fbd599cdae2d6e582cdf73d8adb6363244ff9ecda175c9627bf9b1619f5ae510884f053f8d5d585551b539708db684de8a00ea51adce62e48c0946b93d8f

data/lib/markdown_server/app.rb

@@ -607,6 +607,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"
 
@@ -827,6 +840,24 @@ module MarkdownServer
         end
       end
 
+      def inject_pronunciation_icon(html, meta)
+        return html unless meta.is_a?(Hash) && meta["strongs"] && meta["language"]
+        strongs = meta["strongs"].to_s.strip
+        lang = meta["language"].to_s.strip.downcase
+        return html unless strongs.match?(/\A[GH]\d+\z/i) && %w[hebrew greek].include?(lang)
+
+        icon = %(<button class="pronunciation-btn" data-strongs="#{h(strongs.upcase)}" ) +
+          %(title="Play pronunciation" ) +
+          %(style="background:none;border:none;cursor:pointer;padding:0 0 0 6px;font-size:1.1em;vertical-align:middle;line-height:1;color:#888;" ) +
+          %(onclick="(function(btn){if(btn._loading)return;var a=btn._audio;if(a){a.currentTime=0;a.play();return;}btn._loading=true;btn.style.opacity='0.4';\
+fetch('/pronunciation?strongs='+btn.dataset.strongs).then(function(r){return r.json()}).then(function(d){\
+if(d.audio){a=new Audio(d.audio);btn._audio=a;a.play();}btn._loading=false;btn.style.opacity='1';}).catch(function(){\
+btn._loading=false;btn.style.opacity='1';});})(this)">&#128266;</button>)
+
+        # Insert before the closing tag of the first <h2>
+        html.sub(%r{</h2>}) { " #{icon}</h2>" }
+      end
+
       # Returns true when serving an HTML file that should have popup assets injected.
       # Add additional path prefixes here as needed.
       def inject_assets_for_html_path?(_relative_path)
@@ -1085,6 +1116,7 @@ module MarkdownServer
       title = (meta.is_a?(Hash) && meta["title"]) || File.basename(real, ".md")
       @current_wiki_dir = File.dirname(real)
       html = render_markdown(body)
+      html = inject_pronunciation_icon(html, meta)
 
       frontmatter_html = ""
       if meta && !meta.empty?
@@ -1097,6 +1129,26 @@ module MarkdownServer
       JSON.dump({ title: title.to_s, html: html, frontmatter_html: frontmatter_html })
     end
 
+    get "/pronunciation" do
+      content_type :json
+      strongs = params[:strongs].to_s.strip.upcase
+      halt 400, '{"error":"invalid strongs"}' unless strongs.match?(/\A[GH]\d+\z/)
+
+      prefix = strongs.start_with?("H") ? "wlc" : "tr"
+      blb_url = "https://www.blueletterbible.org/lexicon/#{strongs.downcase}/nasb20/#{prefix}/0-1/"
+      html = fetch_external_page(blb_url)
+      halt 502, '{"error":"fetch failed"}' unless html
+
+      data_pronunc = html[/data-pronunc="([a-fA-F0-9]{20,})"/i, 1]
+      halt 404, '{"error":"no audio found"}' unless data_pronunc
+
+      audio_url = "https://www.blueletterbible.org/lang/lexicon/lexPronouncePlayer.cfm?skin=#{data_pronunc}"
+      headers "Cache-Control" => "public, max-age=86400"
+      JSON.dump({ audio: audio_url })
+    rescue StandardError
+      halt 502, '{"error":"fetch failed"}'
+    end
+
     get "/fetch-json" do
       content_type :json
       url = params[:url].to_s.strip
@@ -1133,6 +1185,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?(%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) })
@@ -1240,6 +1295,7 @@ module MarkdownServer
         @meta, body = parse_frontmatter(content)
         @current_wiki_dir = File.dirname(real_path)
         @content = render_markdown(body)
+        @content = inject_pronunciation_icon(@content, @meta)
         relative_dir = File.dirname(relative_path)
         relative_dir = "" if relative_dir == "."
         listing = -> { inline_directory_html(File.dirname(real_path), relative_dir) }

data/lib/markdown_server/version.rb

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

metadata

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