- Change how static files are served and add base_uri config

Author: DannyBen

app/views/_mobile_search.slim

@@ -1,2 +1,2 @@
-a#mobile-search href="/_search"
+a#mobile-search href="#{config.base_uri}/_search"
   i.icon-search 

app/views/_nav.slim

@@ -1,10 +1,10 @@
 nav
   .icon-bar
-    a.icon href="/" accesskey='h' class=('wide' unless nav.with_search?)
+    a.icon href="#{config.base_uri}/" accesskey='h' class=('wide' unless nav.with_search?)
       i.icon-home
 
     - if nav.with_search?
-      a.icon href="/_search" accesskey='s' style='text-align:right'
+      a.icon href="#{config.base_uri}/_search" accesskey='s' style='text-align:right'
         i.icon-search 
 
   - if nav.caption

app/views/layout.slim

@@ -8,14 +8,14 @@ html
     title = locals[:title]
     meta name="HandheldFriendly" content="true"
     meta name="viewport" content="width=device-width, initial-scale=1"
-    link href='/css/main.css' rel='stylesheet' type='text/css'
+    link href='#{config.base_uri}/css/main.css' rel='stylesheet' type='text/css'
     - custom_css.each do |file|
-      link href="/#{file}" rel='stylesheet' type='text/css'
+      link href="#{config.base_uri}/#{file}" rel='stylesheet' type='text/css'
 
     - if config.copy_code
-      script src="/js/vendor/jquery.min.js"
-      script src="/js/vendor/clipboard.min.js"
-      script src="/js/clipboard.js"
+      script src="#{config.base_uri}/js/vendor/jquery.min.js"
+      script src="#{config.base_uri}/js/vendor/clipboard.min.js"
+      script src="#{config.base_uri}/js/clipboard.js"
 
   body
     == yield

lib/madness.rb

@@ -6,5 +6,6 @@
 require 'requires'
 
 requires 'madness/refinements'
+requires 'madness/settings'
 requires 'madness/server_helper'
 requires 'madness'

lib/madness/breadcrumbs.rb

@@ -17,7 +17,7 @@ def links
   private
 
     def breadcrumbs
-      home = OpenStruct.new({ label: 'Home', href: '/' })
+      home = OpenStruct.new({ label: 'Home', href: "#{config.base_uri}/" })
       result = breadcrumbs_maker(path).reverse.unshift home
       result.last.last = true
       result
@@ -28,12 +28,16 @@ def breadcrumbs_maker(partial_path)
       item = OpenStruct.new(
         {
           label: basename.to_label,
-          href:  "/#{partial_path}",
+          href:  "#{config.base_uri}/#{partial_path}",
         }
       )
       result = [item]
       result += breadcrumbs_maker parent unless parent == '.'
       result
     end
+
+    def config
+      Settings.instance
+    end
   end
 end

lib/madness/item.rb

@@ -15,7 +15,7 @@ def label
     end
 
     def href
-      path_without_extension.sub(/^#{docroot}/, '').to_href
+      path_without_extension.sub(/^#{docroot}/, config.base_uri).to_href
     end
 
     def dir?

lib/madness/server.rb

@@ -5,7 +5,13 @@ module Madness
   class Server < ServerBase
     using StringRefinements
 
-    get '/_search' do
+    if config.base_uri
+      get "#{config.base_uri}" do
+        redirect "#{config.base_uri}/"
+      end
+    end
+
+    get "#{config.base_uri}/_search" do
       query = params[:q]
       results = query ? Search.new.search(query) : false
       nav = Navigation.new docroot
@@ -15,8 +21,11 @@ class Server < ServerBase
       }
     end
 
-    get '/*' do
+    get "#{config.base_uri}/*" do
       path = params[:splat].first
+      static_file = find_static_file path
+
+      next send_file static_file if static_file
 
       doc     = Document.new path
       dir     = doc.dir

lib/madness/server_base.rb

@@ -19,30 +19,26 @@ class ServerBase < Sinatra::Application
     # on the config values just before running the server.
     # The CommandLine class and the test suite should both call
     # `Server.prepare` before calling Server.run!
-    def self.prepare
-      use Madness::Static, root: "#{config.path}/", urls: %w[/], cascade: true
-      set :bind, config.bind
-      set :port, config.port
+    class << self
+      include ServerHelper
 
-      set_basic_auth if config.auth
-      set_tempalate_locations
-    end
-
-    def self.set_tempalate_locations
-      theme = Theme.new config.theme
+      def prepare
+        set :bind, config.bind
+        set :port, config.port
 
-      set :views, theme.views_path
-      set :public_folder, theme.public_path
-    end
+        set_basic_auth if config.auth
+        set_tempalate_locations
+      end
 
-    def self.set_basic_auth
-      use Rack::Auth::Basic, config.auth_zone do |username, password|
-        config.auth.split(':') == [username, password]
+      def set_tempalate_locations
+        set :views, theme.views_path
       end
-    end
 
-    def self.config
-      Settings.instance
+      def set_basic_auth
+        use Rack::Auth::Basic, config.auth_zone do |username, password|
+          config.auth.split(':') == [username, password]
+        end
+      end
     end
   end
 end

lib/madness/server_helper.rb

@@ -10,12 +10,31 @@ def docroot
       @docroot ||= File.expand_path(config.path, Dir.pwd)
     end
 
+    def theme
+      @theme ||= Theme.new config.theme
+    end
+
     def log(obj)
       # :nocov:
       open('madness.log', 'a') do |f|
         f.puts obj.inspect
       end
       # :nocov:
     end
+
+    # Search for static file, first in the users docroot, then in the template
+    # directory. 
+    def find_static_file(path)
+      candidates = [
+        "#{config.path}/#{path}",
+        "#{theme.public_path}/#{path}",
+      ]
+      
+      candidates.each do |candidate|
+        return candidate if File.file? candidate
+      end
+
+      nil
+    end
   end
 end

lib/madness/settings.rb

@@ -56,6 +56,7 @@ def defaults
         path:              '.',
         port:              3000,
         bind:              '0.0.0.0',
+        base_uri:          nil,
         sidebar:           true,
         auto_h1:           true,
         auto_nav:          true,