markdownr 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22318ff27259abe3a66849439a50b48103e0a7d2bea077290fd9b8d4a6329716
-  data.tar.gz: ce38b5daf5f53c9cf56ae41e1f343bd1db39a1af25a7d04f3fdd1205538ac0bd
+  metadata.gz: 01f55ab4612df6c57dc37c6632765cdced4f4a18d19965eca28db4c653c262d6
+  data.tar.gz: 3b3cd87a76bd220fc998557978c240aab570705df3b890beba2459b8634feac5
 SHA512:
-  metadata.gz: 9996ded48092a440241e924b914a0ad12c054fd02b68e06debaf21cdfbfce6cd74f5f4f5e4657357aff00ae8f3824fc1eb8dc8fb62efdea9153c5ff55ac9b5e0
-  data.tar.gz: d9bca1a6f76dd9f578af6b135cfac6d0a12626a4a4720661ef2c46bfdd1c06b7228c73a1ee0f008b29f1ce32709e0ecdd5f060435044b17ee1c79c6f55a51044
+  metadata.gz: 914d2a3a8bb19aff817d29c2f2bb651ad6175a084faca1c261554eee64daad795e7a7e65a5e3ac1631ea0d1eaad5bca43b5a9751b56f3412734d268c58ee4763
+  data.tar.gz: e1afd582d417c7170accd7fbb95b00c896f920a910a4d6ab0c04727834819e5f5fcdb8a58946cae7ef156a8fe552c215ba87b0b17fe8042e798e81c8215f8a23

data/lib/markdown_server/app.rb

@@ -189,13 +189,48 @@ module MarkdownServer
         nil
       end
 
+      def render_inline_wiki_links(str)
+        result = ""
+        last_end = 0
+        str.scan(/\[\[([^\]]+)\]\]/) do |match|
+          raw = match[0]
+          m_start = $~.begin(0)
+          result += h(str[last_end...m_start])
+          target, display = raw.include?("|") ? raw.split("|", 2) : [raw, nil]
+          label = display || target
+          if target.start_with?("#")
+            anchor = target[1..].downcase.gsub(/\s+/, "-").gsub(/[^\w-]/, "")
+            result += %(<a class="wiki-link" href="##{h(anchor)}">#{h(label)}</a>)
+          else
+            resolved = resolve_wiki_link(target)
+            if resolved
+              result += %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}">#{h(label)}</a>)
+            else
+              result += %(<span class="wiki-link broken">#{h(label)}</span>)
+            end
+          end
+          last_end = $~.end(0)
+        end
+        result += h(str[last_end..])
+        result
+      end
+
       def render_frontmatter_value(value)
         case value
         when Array
-          value.map { |v| %(<span class="tag">#{h(v)}</span>) }.join(" ")
+          value.map { |v|
+            str = v.to_s
+            if str =~ /\A\[\[([^\]]+)\]\]\z/
+              render_inline_wiki_links(str)
+            else
+              %(<span class="tag">#{h(str)}</span>)
+            end
+          }.join(" ")
         when String
           if value =~ /\Ahttps?:\/\//
             %(<a href="#{h(value)}" target="_blank" rel="noopener">#{h(value)}</a>)
+          elsif value.include?("[[")
+            render_inline_wiki_links(value)
           elsif value.length > 120
             render_markdown(value)
           else

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

data/views/layout.erb

@@ -113,14 +113,13 @@
     }
 
     /* Frontmatter */
-    details.frontmatter {
+    div.frontmatter {
       margin-bottom: 1.5rem;
       border: 1px solid #e0d8c8;
       border-radius: 6px;
       background: #fdfcf9;
     }
-    details.frontmatter summary {
-      cursor: pointer;
+    .frontmatter-heading {
       padding: 0.6rem 1rem;
       font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
       font-size: 0.85rem;
@@ -128,9 +127,6 @@
       color: #8b6914;
       background: #f5f0e4;
       border-radius: 6px 6px 0 0;
-      user-select: none;
-    }
-    details.frontmatter[open] summary {
       border-bottom: 1px solid #e0d8c8;
     }
     .meta-table {
@@ -403,40 +399,6 @@
       min-width: 0;
     }
 
-    /* Mobile TOC (replaces sidebar) */
-    .toc-mobile {
-      display: none;
-      margin-bottom: 1rem;
-      border: 1px solid #e0d8c8;
-      border-radius: 6px;
-      background: #fdfcf9;
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
-      font-size: 0.82rem;
-    }
-    .toc-mobile summary {
-      cursor: pointer;
-      padding: 0.5rem 0.8rem;
-      font-weight: 600;
-      color: #8b6914;
-      font-size: 0.8rem;
-      user-select: none;
-    }
-    .toc-mobile ul {
-      list-style: none;
-      padding: 0 0.8rem 0.5rem;
-      margin: 0;
-    }
-    .toc-mobile li { margin-bottom: 0.2rem; }
-    .toc-mobile a {
-      color: #666;
-      text-decoration: none;
-      padding: 0.2rem 0;
-      display: block;
-    }
-    .toc-mobile a:hover { color: #8b6914; }
-    .toc-mobile .toc-h3 { padding-left: 0.8rem; }
-    .toc-mobile .toc-h4 { padding-left: 1.4rem; }
-
     /* TOC drawer (swipe-to-reveal on mobile) */
     .toc-overlay {
       display: none;
@@ -768,7 +730,6 @@
 
       .page-with-toc { display: block; }
       .toc-sidebar { display: none; }
-      .toc-mobile { display: block; }
 
       .meta-table th, .meta-table td {
         display: block;

data/views/markdown.erb

@@ -11,17 +11,6 @@
 </div>
 
 <% if @has_toc %>
-  <details class="toc-mobile">
-    <summary>Table of Contents</summary>
-    <ul>
-      <% @toc.each do |entry| %>
-        <li class="toc-h<%= entry[:level] %>">
-          <a href="#<%= h(entry[:id]) %>"><%= h(entry[:text]) %></a>
-        </li>
-      <% end %>
-    </ul>
-  </details>
-
   <button class="toc-fab" id="toc-fab" aria-label="Table of Contents">&#9776;</button>
   <div class="toc-overlay" id="toc-overlay"></div>
   <nav class="toc-drawer" id="toc-drawer">
@@ -55,8 +44,8 @@
 
   <div class="page-main">
     <% if @meta && !@meta.empty? %>
-      <details class="frontmatter" open>
-        <summary>Metadata</summary>
+      <div class="frontmatter">
+        <div class="frontmatter-heading">Frontmatter</div>
         <table class="meta-table">
           <% @meta.each do |key, value| %>
             <tr>
@@ -65,7 +54,7 @@
             </tr>
           <% end %>
         </table>
-      </details>
+      </div>
     <% end %>
 
     <div class="md-content" data-file="<%= h(@title) %>">

metadata

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