markdownr 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5ca823262d9a08f16b3b6d7a569708cf443e3602afde1eb70c473be51c82f8
-  data.tar.gz: 708b342c781158b34a5e0ecc9117dd84a497f4abb0415d80e7748f2867124369
+  metadata.gz: e25bef09e610cf90ddade4977a1ab04e69c5eff89e1904e7f25edebeacd11d05
+  data.tar.gz: ef7183813e31254cc73a8be5776e445dc67830c3387629724c3110707205ed50
 SHA512:
-  metadata.gz: 8c85abe0fcdf961cfe3869ff3f770b5ac803c6ba861cf9f1164ff4d583c02a01ecf37949fe8ff435bc4e8a0b6e17ee9506a3907b815f5989b4d78692b8399a5e
-  data.tar.gz: bdc41fdf3128d47ff1c55f38aff3f94e576fc906f83e511c661035a2f206dd05ad8d6fa7c6ca4e988a4edc6de92d22b9dfe30a1929db9b4fcb84a843564620d6
+  metadata.gz: e9528e7bf4f77ebf68486cf0ae3ac72042084365a6e8853a0ea638b6af1bc7edb2986c46ce0612c42880e38c34e9f169ce5ec93759af79253ad93a0f7f5d38ed
+  data.tar.gz: 4ccd4fac98ce2a4ce78d04bc1dec843be9648baa949cc5510f8da559aeb2b59d8db5a980b5a4da50cd60873f5c15662e066e793b0a151da14723e894056bc8e7

data/bin/Dockerfile.markdownr

@@ -1,4 +1,4 @@
-FROM ruby:3.4-slim
+FROM ruby:3.4.5-slim
 RUN apt-get update && apt-get install -y build-essential && gem install markdownr
 WORKDIR /data
 CMD ["markdownr", "--behind-proxy", "-b", "0.0.0.0", "/data"]

data/bin/markdownr

@@ -32,6 +32,14 @@ OptionParser.new do |opts|
     options[:behind_proxy] = true
   end
 
+  opts.on("--admin", "Grant admin access to every visitor (use only on trusted local networks)") do
+    options[:admin_all] = true
+  end
+
+  opts.on("--admin-only", "Block all routes except /admin/login until logged in as admin") do
+    options[:admin_only] = true
+  end
+
   opts.on("-i", "--index-file FILENAME", "Render this file instead of the directory listing when present (e.g. index.md, moc.md)") do |f|
     options[:index_file] = f
   end
@@ -48,6 +56,18 @@ OptionParser.new do |opts|
     options[:verbose] = true
   end
 
+  opts.on("--default-vim", "Open the in-browser editor in vim mode by default (per-user toggle still wins via localStorage)") do
+    options[:default_vim] = true
+  end
+
+  opts.on("--allow-editor", "Enable the in-browser file editor (markdown / source). Without this flag, the Edit button is hidden and all editor write/preview/source routes return errors, even for admins.") do
+    options[:allow_editor] = true
+  end
+
+  opts.on("--allow-csv-editor", "Enable CSV editing (row update, duplicate, delete, add-on actions). Without this flag, CSV tables are forced read-only on the server and in the UI, even for admins.") do
+    options[:allow_csv_editor] = true
+  end
+
   opts.on("--plugin NAME", "Enable a plugin by name (can be specified multiple times)") do |name|
     options[:plugin_overrides] = (options[:plugin_overrides] || {}).merge(
       name => (options.dig(:plugin_overrides, name) || {}).merge("enabled" => true)
@@ -58,6 +78,14 @@ OptionParser.new do |opts|
     (options[:plugin_dirs] ||= []) << d
   end
 
+  opts.on("--follow-link PATH", Array, "Allow this symlink (inside the served dir) to escape to its target. Repeatable; comma-separated values also accepted.") do |paths|
+    (options[:follow_links] ||= []).concat(paths)
+  end
+
+  opts.on("--unhide ENTRY", "Show a normally-hidden entry (repeatable). Bare name matches anywhere; @/path is project-root-anchored; multi-segment narrows the listing.") do |v|
+    (options[:unhide] ||= []) << v
+  end
+
   opts.on("-v", "--version", "Show version") do
     puts "markdownr #{MarkdownServer::VERSION}"
     exit
@@ -74,18 +102,39 @@ end
 
 MarkdownServer::App.set :root_dir, dir
 MarkdownServer::App.set :behind_proxy, options[:behind_proxy] || false
+MarkdownServer::App.set :admin_all, options[:admin_all] || false
+MarkdownServer::App.set :admin_only, options[:admin_only] || false
 MarkdownServer::App.set :custom_title, options[:title]
 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 :default_vim, options[:default_vim] || false
+MarkdownServer::App.set :allow_editor, options[:allow_editor] || false
+MarkdownServer::App.set :allow_csv_editor, options[:allow_csv_editor] || 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 }
 MarkdownServer::App.set :plugin_overrides, options[:plugin_overrides] || {}
 MarkdownServer::App.set :plugin_dirs, options[:plugin_dirs] || []
 
+root_real = File.realpath(dir)
+followed_links = (options[:follow_links] || []).filter_map do |p|
+  expanded = File.expand_path(p, dir)
+  unless File.exist?(expanded)
+    $stderr.puts "Warning: --follow-link path does not exist, skipping: #{p}"
+    next nil
+  end
+  link_real = File.realpath(expanded)
+  unless expanded == root_real || expanded.start_with?("#{root_real}/")
+    $stderr.puts "Warning: --follow-link path is outside the served dir, skipping: #{p}"
+    next nil
+  end
+  link_real
+end.uniq
+MarkdownServer::App.set :followed_links, followed_links
+
 # Load .markdownr.yml popup settings
 config_path = File.join(dir, ".markdownr.yml")
 if File.exist?(config_path)
@@ -101,6 +150,36 @@ if File.exist?(config_path)
     existing = MarkdownServer::App.settings.plugin_dirs
     MarkdownServer::App.set :plugin_dirs, (yaml["plugin_dirs"] + existing).uniq
   end
+
+  if yaml && yaml.key?("admin_only") && !options[:admin_only]
+    MarkdownServer::App.set :admin_only, yaml["admin_only"] == true
+  end
+
+  # Load CSV database config (top-level key or legacy plugin key)
+  csv_db_paths = yaml&.dig("csv_databases") || yaml&.dig("plugins", "csv_browser", "databases")
+  if csv_db_paths.is_a?(Array) && !csv_db_paths.empty?
+    require_relative "../lib/markdown_server/csv_browser/config_loader"
+    loader = MarkdownServer::CsvBrowser::ConfigLoader.new(csv_db_paths, dir)
+    MarkdownServer::App.set :csv_browser_config, loader
+  end
+
+  # Load CSV add-on files (absolute paths keyed by add-on name)
+  csv_addons = yaml&.dig("csv_addons")
+  if csv_addons.is_a?(Hash) && !csv_addons.empty?
+    require_relative "../lib/markdown_server/csv_browser/addon_registry"
+    MarkdownServer::CsvBrowser::CsvAddonRegistry.load(csv_addons, dir)
+  end
+end
+
+# Compile and apply unhide rules (YAML + CLI, additive merge).
+yaml_unhide = (defined?(yaml) && yaml.is_a?(Hash) && yaml["unhide"].is_a?(Array)) ? yaml["unhide"] : []
+combined_unhide = (yaml_unhide + (options[:unhide] || [])).uniq
+unless combined_unhide.empty?
+  begin
+    MarkdownServer::App.set :unhide_rules, MarkdownServer::Unhide.compile(combined_unhide)
+  rescue MarkdownServer::Unhide::CompileError => e
+    abort "Invalid unhide config: #{e.message}"
+  end
 end
 
 MarkdownServer::App.load_plugins!

data/bin/markdownr-servers.yaml

@@ -0,0 +1,39 @@
+# Orchestrates local markdownr servers.
+#
+# Start:           docker compose -f bin/markdownr-servers.yaml up -d --build
+# Restart:         docker compose -f bin/markdownr-servers.yaml restart
+# Rebuild (after publishing a new markdownr gem):
+#                  docker compose -f bin/markdownr-servers.yaml up -d --build --force-recreate
+# Stop:            docker compose -f bin/markdownr-servers.yaml down
+#
+x-markdownr: &markdownr
+  build:
+    context: .
+    dockerfile: Dockerfile.markdownr
+  restart: unless-stopped
+  command: ["markdownr", "--behind-proxy", "-b", "0.0.0.0", "/data"]
+
+services:
+  lofts:
+    <<: *markdownr
+    container_name: markdownr-lofts
+    ports:
+      - "4444:4567"
+    volumes:
+      - ~/code/claude/lofts/projects:/data
+
+  bible-repo:
+    <<: *markdownr
+    container_name: markdownr-bible-repo
+    ports:
+      - "4569:4567"
+    volumes:
+      - ~/code/claude/bible/bible-repo:/data
+
+  scripture:
+    <<: *markdownr
+    container_name: markdownr-scripture
+    ports:
+      - "4568:4567"
+    volumes:
+      - ~/code/claude/bible/scripture/resource/books/bible:/data

data/bin/start-claude

@@ -0,0 +1,2 @@
+#!/bin/sh
+claude --chrome