docyard 0.5.0 → 0.7.0

data/lib/docyard/{server.rb → server/dev_server.rb}

@@ -4,30 +4,30 @@ require "webrick"
 require "stringio"
 require_relative "file_watcher"
 require_relative "rack_application"
-require_relative "config"
+require_relative "../config"
 
 module Docyard
   class Server
     DEFAULT_PORT = 4200
     DEFAULT_HOST = "localhost"
 
-    attr_reader :port, :host, :docs_path, :config
+    attr_reader :port, :host, :docs_path, :config, :search_enabled
 
-    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, docs_path: "docs")
+    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, docs_path: "docs", search: false)
       @port = port
       @host = host
       @docs_path = docs_path
+      @search_enabled = search
       @config = Config.load
       @file_watcher = FileWatcher.new(File.expand_path(docs_path))
-      @app = RackApplication.new(
-        docs_path: File.expand_path(docs_path),
-        file_watcher: @file_watcher,
-        config: @config
-      )
+      @search_indexer = nil
+      @app = nil
     end
 
     def start
       validate_docs_directory!
+      generate_search_index if @search_enabled
+      initialize_app
       print_server_info
       @file_watcher.start
 
@@ -35,11 +35,33 @@ module Docyard
       trap("INT") { shutdown_server }
 
       http_server.start
-      @file_watcher.stop
+      cleanup
     end
 
     private
 
+    def generate_search_index
+      @search_indexer = Search::DevIndexer.new(
+        docs_path: File.expand_path(docs_path),
+        config: @config
+      )
+      @search_indexer.generate
+    end
+
+    def initialize_app
+      @app = RackApplication.new(
+        docs_path: File.expand_path(docs_path),
+        file_watcher: @file_watcher,
+        config: @config,
+        pagefind_path: @search_indexer&.pagefind_path
+      )
+    end
+
+    def cleanup
+      @file_watcher.stop
+      @search_indexer&.cleanup
+    end
+
     def validate_docs_directory!
       return if File.directory?(docs_path)
 
@@ -51,6 +73,7 @@ module Docyard
       puts "Starting Docyard server..."
       puts "=> Serving docs from: #{docs_path}/"
       puts "=> Running at: http://#{host}:#{port}"
+      puts "=> Search: #{@search_enabled ? 'enabled' : 'disabled (use --search to enable)'}"
       puts "=> Press Ctrl+C to stop\n"
     end
 

data/lib/docyard/{preview_server.rb → server/preview_server.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "webrick"
-require_relative "config"
+require_relative "../config"
 
 module Docyard
   class PreviewServer

data/lib/docyard/{rack_application.rb → server/rack_application.rb}

@@ -2,18 +2,26 @@
 
 require "json"
 require "rack"
-require_relative "sidebar_builder"
-require_relative "prev_next_builder"
-require_relative "constants"
+require_relative "../navigation/sidebar_builder"
+require_relative "../navigation/prev_next_builder"
+require_relative "../config/branding_resolver"
+require_relative "../config/constants"
 
 module Docyard
   class RackApplication
-    def initialize(docs_path:, file_watcher:, config: nil)
+    PAGEFIND_CONTENT_TYPES = {
+      ".js" => "application/javascript; charset=utf-8",
+      ".css" => "text/css; charset=utf-8",
+      ".json" => "application/json; charset=utf-8"
+    }.freeze
+
+    def initialize(docs_path:, file_watcher:, config: nil, pagefind_path: nil)
       @docs_path = docs_path
       @file_watcher = file_watcher
       @config = config
+      @pagefind_path = pagefind_path
       @router = Router.new(docs_path: docs_path)
-      @renderer = Renderer.new(base_url: config&.build&.base_url || "/")
+      @renderer = Renderer.new(base_url: config&.build&.base_url || "/", config: config)
       @asset_handler = AssetHandler.new
     end
 
@@ -23,13 +31,14 @@ module Docyard
 
     private
 
-    attr_reader :docs_path, :file_watcher, :config, :router, :renderer, :asset_handler
+    attr_reader :docs_path, :file_watcher, :config, :pagefind_path, :router, :renderer, :asset_handler
 
     def handle_request(env)
       path = env["PATH_INFO"]
 
       return handle_reload_check(env) if path == Constants::RELOAD_ENDPOINT
       return asset_handler.serve(path) if path.start_with?(Constants::ASSETS_PREFIX)
+      return serve_pagefind(path) if path.start_with?(Constants::PAGEFIND_PREFIX)
 
       handle_documentation_request(path)
     rescue StandardError => e
@@ -91,50 +100,7 @@ module Docyard
     end
 
     def branding_options
-      return default_branding unless config
-
-      default_branding.merge(config_branding_options)
-    end
-
-    def default_branding
-      {
-        site_title: Constants::DEFAULT_SITE_TITLE,
-        site_description: "",
-        logo: Constants::DEFAULT_LOGO_PATH,
-        logo_dark: Constants::DEFAULT_LOGO_DARK_PATH,
-        favicon: nil,
-        display_logo: true,
-        display_title: true
-      }
-    end
-
-    def config_branding_options
-      site = config.site
-      branding = config.branding
-
-      {
-        site_title: site.title || Constants::DEFAULT_SITE_TITLE,
-        site_description: site.description || "",
-        logo: resolve_logo(branding.logo, branding.logo_dark),
-        logo_dark: resolve_logo_dark(branding.logo, branding.logo_dark),
-        favicon: branding.favicon
-      }.merge(appearance_options(branding.appearance))
-    end
-
-    def appearance_options(appearance)
-      appearance ||= {}
-      {
-        display_logo: appearance["logo"] != false,
-        display_title: appearance["title"] != false
-      }
-    end
-
-    def resolve_logo(logo, logo_dark)
-      logo || logo_dark || Constants::DEFAULT_LOGO_PATH
-    end
-
-    def resolve_logo_dark(logo, logo_dark)
-      logo_dark || logo || Constants::DEFAULT_LOGO_DARK_PATH
+      BrandingResolver.new(config).resolve
     end
 
     def handle_reload_check(env)
@@ -168,5 +134,42 @@ module Docyard
       [Constants::STATUS_INTERNAL_ERROR, { "Content-Type" => Constants::CONTENT_TYPE_HTML },
        [renderer.render_server_error(error)]]
     end
+
+    def serve_pagefind(path)
+      relative_path = path.delete_prefix(Constants::PAGEFIND_PREFIX)
+      return pagefind_not_found if relative_path.include?("..")
+
+      file_path = resolve_pagefind_file(relative_path)
+      return pagefind_not_found unless file_path && File.file?(file_path)
+
+      content = File.binread(file_path)
+      content_type = pagefind_content_type(file_path)
+
+      headers = {
+        "Content-Type" => content_type,
+        "Cache-Control" => "no-cache, no-store, must-revalidate",
+        "Pragma" => "no-cache",
+        "Expires" => "0"
+      }
+
+      [Constants::STATUS_OK, headers, [content]]
+    end
+
+    def resolve_pagefind_file(relative_path)
+      return File.join(pagefind_path, relative_path) if pagefind_path && Dir.exist?(pagefind_path)
+
+      output_dir = config&.build&.output_dir || "dist"
+      File.join(output_dir, "pagefind", relative_path)
+    end
+
+    def pagefind_content_type(file_path)
+      extension = File.extname(file_path)
+      PAGEFIND_CONTENT_TYPES.fetch(extension, "application/octet-stream")
+    end
+
+    def pagefind_not_found
+      message = "Pagefind not found. Run 'docyard build' first."
+      [Constants::STATUS_NOT_FOUND, { "Content-Type" => "text/plain" }, [message]]
+    end
   end
 end

data/lib/docyard/server/resolution_result.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Docyard
+  class ResolutionResult
+    attr_reader :file_path, :status
+
+    def self.found(file_path)
+      new(file_path: file_path, status: :found)
+    end
+
+    def self.not_found
+      new(file_path: nil, status: :not_found)
+    end
+
+    def initialize(file_path:, status:)
+      @file_path = file_path
+      @status = status
+      freeze
+    end
+
+    def found?
+      status == :found
+    end
+
+    def not_found?
+      status == :not_found
+    end
+  end
+end

data/lib/docyard/{router.rb → server/router.rb}

@@ -12,18 +12,18 @@ module Docyard
       clean_path = sanitize_path(request_path)
 
       file_path = File.join(docs_path, "#{clean_path}#{Constants::MARKDOWN_EXTENSION}")
-      return Routing::ResolutionResult.found(file_path) if File.file?(file_path)
+      return ResolutionResult.found(file_path) if File.file?(file_path)
 
       index_path = File.join(docs_path, clean_path, "#{Constants::INDEX_FILE}#{Constants::MARKDOWN_EXTENSION}")
-      return Routing::ResolutionResult.found(index_path) if File.file?(index_path)
+      return ResolutionResult.found(index_path) if File.file?(index_path)
 
-      Routing::ResolutionResult.not_found
+      ResolutionResult.not_found
     end
 
     private
 
     def sanitize_path(request_path)
-      clean = request_path.delete_prefix("/")
+      clean = request_path.delete_prefix("/").delete_suffix("/")
       clean = Constants::INDEX_FILE if clean.empty?
       clean.delete_suffix(Constants::MARKDOWN_EXTENSION)
     end

data/lib/docyard/templates/assets/css/code.css

@@ -42,12 +42,16 @@
   margin: 0;
 }
 
-.highlight,
-.highlight .w {
+.highlight {
   color: #24292f;
   background-color: #f6f8fa;
 }
 
+.highlight .w {
+  color: #24292f;
+  background-color: transparent;
+}
+
 /* Keywords */
 .highlight .k,
 .highlight .kd,
@@ -214,12 +218,16 @@
 }
 
 /* Dark Mode Syntax Highlighting - GitHub Dark */
-.dark .highlight,
-.dark .highlight .w {
+.dark .highlight {
   color: #e6edf3;
   background-color: #161b22;
 }
 
+.dark .highlight .w {
+  color: #e6edf3;
+  background-color: transparent;
+}
+
 /* Keywords */
 .dark .highlight .k,
 .dark .highlight .kd,