markdownr 0.5.16 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9701699dcaa5bb10ddddcff543dace0bc75184e86529ac048efbb0337e61b63c
-  data.tar.gz: 5156b2929f5c6195007c2755d387c6df17f0b33e8ca162045bad9f0618bec62a
+  metadata.gz: 1186498f524f4e5d50aa1d9ddb93f4d48e3dcfb327b6d4e10bb530be747179a3
+  data.tar.gz: 2d6131e668d24603309ae2b25893b3bdde2d1764f971e18acec87b1fbb26250a
 SHA512:
-  metadata.gz: d77b2e509c1516c496f05f134f342d083d5e6c007d24796dfe370f8f0884aca81f62885e02b111f222e630e28d644674a6839225c711219d3dee702c4dd93faf
-  data.tar.gz: e7dd49dc45652b516b688e4066c0577cfb4ed39f5e7bb314de40366d85680e82403a74d6bf244ce75ce6228f157c7c47a960667c2de0c46fed6696fd83b64e86
+  metadata.gz: 92d7e42dffe104f2c5e8a3c6289962af0ea643f27ecac103e714298b11827dd1089bd71503116bacd044cb779fca5acd192cba47d59314d991ff4d3c5514d39e
+  data.tar.gz: 8ca0350721e961e55d556bf67a9fa8a8b940e21578ac1faba965d1e9fe34968f06c4f5e5ec3ea729d7305581396be595a1fa8cd8a6664f2f97502e99cbeaf93c

data/bin/markdownr

@@ -43,6 +43,10 @@ OptionParser.new do |opts|
     options[:hard_wrap] = false
   end
 
+  opts.on("--verbose", "Print each request (time, IP, method, path) to stdout") do
+    options[:verbose] = true
+  end
+
   opts.on("-v", "--version", "Show version") do
     puts "markdownr #{MarkdownServer::VERSION}"
     exit
@@ -64,6 +68,7 @@ MarkdownServer::App.set :allow_robots, options[:allow_robots] || false
 MarkdownServer::App.set :index_file, options[:index_file]
 MarkdownServer::App.set :link_tooltips, options.fetch(:link_tooltips, true)
 MarkdownServer::App.set :hard_wrap, options.fetch(:hard_wrap, true)
+MarkdownServer::App.set :verbose, options[:verbose] || false
 MarkdownServer::App.set :port, options[:port]
 MarkdownServer::App.set :bind, options[:bind]
 MarkdownServer::App.set :server_settings, { max_threads: options[:threads], min_threads: 1 }

data/lib/markdown_server/app.rb

@@ -31,6 +31,7 @@ module MarkdownServer
       set :protection, false
       set :host_authorization, { permitted_hosts: [] }
       set :behind_proxy, false
+      set :verbose, false
       set :session_secret, ENV.fetch("MARKDOWNR_SESSION_SECRET", SecureRandom.hex(64))
       set :sessions, key: "markdownr_session", same_site: :strict, httponly: true
     end
@@ -817,6 +818,13 @@ module MarkdownServer
       end
     end
 
+    before do
+      if settings.verbose
+        $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} #{client_ip} #{request.request_method} #{request.fullpath}"
+        $stdout.flush
+      end
+    end
+
     get "/" do
       redirect "/browse/"
     end
@@ -1167,6 +1175,15 @@ module MarkdownServer
       when ".epub"
         redirect @download_href
 
+      when ".html"
+        send_file real_path, type: "text/html"
+
+      when ".css"
+        send_file real_path, type: "text/css"
+
+      when ".js"
+        send_file real_path, type: "application/javascript"
+
       else
         content = File.read(real_path, encoding: "utf-8") rescue nil
         if content.nil? || content.encoding == Encoding::BINARY || !content.valid_encoding?

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.5.16"
+  VERSION = "0.5.18"
 end

data/views/layout.erb

@@ -756,16 +756,16 @@
       width: 460px;
       max-width: calc(100vw - 16px);
       max-height: 60vh;
-      overflow-y: auto;
       background: #faf8f4;
       border: 1px solid #d4b96a;
       border-radius: 6px;
       box-shadow: 0 4px 20px rgba(0,0,0,0.22);
-      -webkit-overflow-scrolling: touch;
       cursor: auto;
-      resize: both;
       min-width: 280px;
       min-height: 80px;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
     }
     .link-ctx-popup-header {
       display: flex;
@@ -774,11 +774,10 @@
       gap: 0.5rem;
       padding: 0.5rem 0.9rem;
       border-bottom: 1px solid #e0d8c8;
-      position: sticky;
-      top: 0;
       background: #faf8f4;
-      z-index: 1;
+      flex-shrink: 0;
       cursor: grab;
+      touch-action: none;
     }
     .link-ctx-popup-header.is-dragging {
       cursor: grabbing;
@@ -854,6 +853,22 @@
     }
     .link-ctx-popup-body {
       padding: 0.75rem 1rem;
+      flex: 1;
+      min-height: 0;
+      overflow-y: auto;
+      -webkit-overflow-scrolling: touch;
+    }
+    .link-ctx-popup-resize {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      width: 36px;
+      height: 36px;
+      cursor: nwse-resize;
+      touch-action: none;
+      border-bottom-right-radius: 5px;
+      background: repeating-linear-gradient(-45deg, transparent, transparent 2px, rgba(0,0,0,0.18) 2px, rgba(0,0,0,0.18) 3px);
+      z-index: 2;
     }
     .link-ctx-popup-url {
       font-family: "SF Mono", Menlo, Consolas, monospace;
@@ -968,7 +983,9 @@
     .blb-usage li { margin-bottom: 0.15rem; }
     .blb-usage p { margin: 0; }
 
+
     /* Footnote tooltips */
+    sup[id^="fnref:"] { position: relative; }
     .footnote-tooltip {
       position: absolute;
       bottom: 100%;
@@ -985,8 +1002,8 @@
       z-index: 150;
       box-shadow: 0 2px 8px rgba(0,0,0,0.25);
       margin-bottom: 6px;
+      cursor: pointer;
     }
-    .footnote-tooltip { cursor: pointer; }
     .footnote-tooltip::after {
       content: '';
       position: absolute;
@@ -1001,9 +1018,6 @@
     .footnote-tooltip a { color: #d4b96a; }
     .footnote-tooltip p { margin: 0; }
     .footnote-tooltip p + p { margin-top: 0.3rem; }
-    sup[id^="fnref:"] {
-      position: relative;
-    }
 
     /* Responsive */
     @media (max-width: 768px) {
@@ -1412,10 +1426,6 @@
           tooltip.style.left = '50%';
           tooltip.style.transform = 'translateX(-50%)';
           tooltip.style.removeProperty('--arrow-offset');
-          // Clamp tooltip to viewport.
-          // document.documentElement.clientWidth is more reliable than window.innerWidth
-          // on Android browsers (e.g. EinkBro) which may return a pre-scaled layout
-          // viewport width for window.innerWidth rather than the CSS viewport width.
           var viewportWidth = Math.min(window.innerWidth, document.documentElement.clientWidth);
           var rect = tooltip.getBoundingClientRect();
           var shift = 0;
@@ -1439,19 +1449,16 @@
         sup.addEventListener('mouseleave', hideTooltip);
 
         // Touch: first tap shows tooltip, second tap navigates
-        // Using touchend instead of click so no hover media query check is needed —
-        // touchend only fires on real touch, regardless of what (hover:none) reports.
         var linkTouchMoved = false;
         link.addEventListener('touchstart', function() { linkTouchMoved = false; }, { passive: true });
         link.addEventListener('touchmove', function() { linkTouchMoved = true; }, { passive: true });
         link.addEventListener('touchend', function(e) {
-          if (linkTouchMoved) return; // scroll, not a tap
+          if (linkTouchMoved) return;
           if (tooltip.parentNode === sup) {
             // Tooltip already showing — let the link navigate
             return;
           }
           e.preventDefault();
-          // Dismiss any other open tooltip
           document.querySelectorAll('.footnote-tooltip').forEach(function(t) {
             if (t.parentNode) t.parentNode.removeChild(t);
           });
@@ -1468,7 +1475,7 @@
           window.location.hash = fnHref;
         });
 
-        // Dismiss tooltip when tapping elsewhere
+        // Dismiss tooltip when clicking elsewhere
         document.addEventListener('click', function(e) {
           if (tooltip.parentNode === sup && !sup.contains(e.target)) {
             hideTooltip();
@@ -1672,7 +1679,8 @@
             '<button class="link-ctx-popup-pin" aria-label="Pin" title="Pin popup">' + pinIcon + '</button>' +
             '<button class="link-ctx-popup-close" aria-label="Close">\u00d7</button>' +
           '</div>' +
-          '<div class="link-ctx-popup-body">' + bodyHtml + '</div>';
+          '<div class="link-ctx-popup-body">' + bodyHtml + '</div>' +
+          '<div class="link-ctx-popup-resize" aria-hidden="true"></div>';
         document.body.appendChild(popup);
 
         clearTimeout(mouseLeaveTimer);
@@ -1687,13 +1695,7 @@
 
         repositionPopup();
         makeDraggable(popup);
-        // Lock explicit dimensions on first interaction so resize can grow past max-height
-        thisPopup.addEventListener('mousedown', function lockSize() {
-          thisPopup.style.width = thisPopup.offsetWidth + 'px';
-          thisPopup.style.height = thisPopup.offsetHeight + 'px';
-          thisPopup.style.maxHeight = 'none';
-          thisPopup.removeEventListener('mousedown', lockSize);
-        }, true);
+        makeResizable(popup);
         runMermaidIn(popup);
 
         var backBtnEl = popup.querySelector('.link-ctx-popup-back');
@@ -1851,27 +1853,95 @@
         var header = el.querySelector('.link-ctx-popup-header');
         if (!header) return;
         var startX, startY, startLeft, startTop;
-        header.addEventListener('mousedown', function(e) {
-          if (e.target.closest('button') || e.target.closest('a')) return;
-          e.preventDefault();
-          startX = e.clientX;
-          startY = e.clientY;
-          startLeft = el.offsetLeft;
-          startTop = el.offsetTop;
+
+        function onDragStart(clientX, clientY) {
+          startX = clientX; startY = clientY;
+          startLeft = el.offsetLeft; startTop = el.offsetTop;
+          el.style.width = el.offsetWidth + 'px';
+          el.style.height = el.offsetHeight + 'px';
+          el.style.maxHeight = 'none';
           popupDragging = true;
           header.classList.add('is-dragging');
-          document.addEventListener('mousemove', onMove);
-          document.addEventListener('mouseup', onUp);
-        });
-        function onMove(e) {
-          el.style.left = (startLeft + e.clientX - startX) + 'px';
-          el.style.top = (startTop + e.clientY - startY) + 'px';
         }
-        function onUp() {
+        function onDragMove(clientX, clientY) {
+          el.style.left = (startLeft + clientX - startX) + 'px';
+          el.style.top  = (startTop  + clientY - startY) + 'px';
+        }
+        function onDragEnd() {
           popupDragging = false;
           header.classList.remove('is-dragging');
-          document.removeEventListener('mousemove', onMove);
-          document.removeEventListener('mouseup', onUp);
+        }
+
+        header.addEventListener('mousedown', function(e) {
+          if (e.target.closest('button') || e.target.closest('a')) return;
+          e.preventDefault();
+          onDragStart(e.clientX, e.clientY);
+          document.addEventListener('mousemove', onMouseMove);
+          document.addEventListener('mouseup', onMouseUp);
+        });
+        function onMouseMove(e) { onDragMove(e.clientX, e.clientY); }
+        function onMouseUp() {
+          onDragEnd();
+          document.removeEventListener('mousemove', onMouseMove);
+          document.removeEventListener('mouseup', onMouseUp);
+        }
+
+        header.addEventListener('touchstart', function(e) {
+          if (e.target.closest('button') || e.target.closest('a')) return;
+          e.preventDefault();
+          var t = e.touches[0];
+          onDragStart(t.clientX, t.clientY);
+          document.addEventListener('touchmove', onTouchMove, { passive: false });
+          document.addEventListener('touchend', onTouchEnd);
+        }, { passive: false });
+        function onTouchMove(e) { e.preventDefault(); var t = e.touches[0]; onDragMove(t.clientX, t.clientY); }
+        function onTouchEnd() {
+          onDragEnd();
+          document.removeEventListener('touchmove', onTouchMove);
+          document.removeEventListener('touchend', onTouchEnd);
+        }
+      }
+
+      function makeResizable(el) {
+        var handle = el.querySelector('.link-ctx-popup-resize');
+        if (!handle) return;
+        var startX, startY, startW, startH;
+
+        function onResizeStart(clientX, clientY) {
+          startX = clientX; startY = clientY;
+          startW = el.offsetWidth; startH = el.offsetHeight;
+          el.style.width = startW + 'px';
+          el.style.height = startH + 'px';
+          el.style.maxHeight = 'none';
+        }
+        function onResizeMove(clientX, clientY) {
+          el.style.width  = Math.max(280, startW + clientX - startX) + 'px';
+          el.style.height = Math.max(80,  startH + clientY - startY) + 'px';
+        }
+
+        handle.addEventListener('mousedown', function(e) {
+          e.preventDefault(); e.stopPropagation();
+          onResizeStart(e.clientX, e.clientY);
+          document.addEventListener('mousemove', onMouseMove);
+          document.addEventListener('mouseup', onMouseUp);
+        });
+        function onMouseMove(e) { onResizeMove(e.clientX, e.clientY); }
+        function onMouseUp() {
+          document.removeEventListener('mousemove', onMouseMove);
+          document.removeEventListener('mouseup', onMouseUp);
+        }
+
+        handle.addEventListener('touchstart', function(e) {
+          e.preventDefault(); e.stopPropagation();
+          var t = e.touches[0];
+          onResizeStart(t.clientX, t.clientY);
+          document.addEventListener('touchmove', onTouchMove, { passive: false });
+          document.addEventListener('touchend', onTouchEnd);
+        }, { passive: false });
+        function onTouchMove(e) { e.preventDefault(); onResizeMove(e.touches[0].clientX, e.touches[0].clientY); }
+        function onTouchEnd() {
+          document.removeEventListener('touchmove', onTouchMove);
+          document.removeEventListener('touchend', onTouchEnd);
         }
       }
 

metadata

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