Merge pull request #360 from awood/master

Fix broken links to assets. Fixes #359.
ruby · Mar 23, 2016 · deb68c8 · deb68c8
2 parents 23efe97 + cfde4f9
commit deb68c8
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
@@ -3,7 +3,8 @@
 <title><%= h @title %></title>
 
 <script type="text/javascript">
-  var rdoc_rel_prefix = "<%= rel_prefix %>/";
+  var rdoc_rel_prefix = "<%= asset_rel_prefix %>/";
+  var index_rel_prefix = "<%= rel_prefix %>/";
 </script>
 
 <script src="<%= asset_rel_prefix %>/js/jquery.js"></script>

diff --git a/lib/rdoc/generator/template/darkfish/css/fonts.css b/lib/rdoc/generator/template/darkfish/css/fonts.css
@@ -17,7 +17,7 @@
   font-weight: 400;
   src: local("Source Code Pro"),
        local("SourceCodePro-Regular"),
-       url("fonts/SourceCodePro-Regular.ttf") format("truetype");
+       url("../fonts/SourceCodePro-Regular.ttf") format("truetype");
 }
 
 @font-face {
@@ -26,7 +26,7 @@
   font-weight: 700;
   src: local("Source Code Pro Bold"),
        local("SourceCodePro-Bold"),
-       url("fonts/SourceCodePro-Bold.ttf") format("truetype");
+       url("../fonts/SourceCodePro-Bold.ttf") format("truetype");
 }
 
 /*
@@ -46,7 +46,7 @@
   font-weight: 300;
   src: local("Lato Light"),
        local("Lato-Light"),
-       url("fonts/Lato-Light.ttf") format("truetype");
+       url("../fonts/Lato-Light.ttf") format("truetype");
 }
 
 @font-face {
@@ -55,7 +55,7 @@
   font-weight: 300;
   src: local("Lato Light Italic"),
        local("Lato-LightItalic"),
-       url("fonts/Lato-LightItalic.ttf") format("truetype");
+       url("../fonts/Lato-LightItalic.ttf") format("truetype");
 }
 
 @font-face {
@@ -64,7 +64,7 @@
   font-weight: 700;
   src: local("Lato Regular"),
        local("Lato-Regular"),
-       url("fonts/Lato-Regular.ttf") format("truetype");
+       url("../fonts/Lato-Regular.ttf") format("truetype");
 }
 
 @font-face {
@@ -73,7 +73,7 @@
   font-weight: 700;
   src: local("Lato Italic"),
        local("Lato-Italic"),
-       url("fonts/Lato-RegularItalic.ttf") format("truetype");
+       url("../fonts/Lato-RegularItalic.ttf") format("truetype");
 }
 
 /*

diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -59,7 +59,7 @@ function hookSearch() {
     var html = '';
 
     // TODO add relative path to <script> per-page
-    html += '<p class="search-match"><a href="' + rdoc_rel_prefix + result.path + '">' + this.hlt(result.title);
+    html += '<p class="search-match"><a href="' + index_rel_prefix + result.path + '">' + this.hlt(result.title);
     if (result.params)
       html += '<span class="params">' + result.params + '</span>';
     html += '</a>';
@@ -121,9 +121,9 @@ function highlightClickTarget( event ) {
   };
 };
 
-function loadAsync(path, success) {
+function loadAsync(path, success, prefix) {
   $.ajax({
-    url: rdoc_rel_prefix + path,
+    url: prefix + path,
     dataType: 'script',
     success: success,
     cache: true
@@ -154,8 +154,8 @@ $(document).ready( function() {
     });
   }
 
-  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'));
-  loadAsync('js/search.js',       search_success_function('search_loaded'));
-  loadAsync('js/search_index.js', search_success_function('search_index_loaded'));
-  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'));
+  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search.js',       search_success_function('search_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search_index.js', search_success_function('search_index_loaded'), index_rel_prefix);
+  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'), rdoc_rel_prefix);
 });
diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb
@@ -116,8 +116,8 @@ def do_GET req, res
     case req.path
     when '/' then
       root req, res
-    when '/rdoc.css', '/js/darkfish.js', '/js/jquery.js', '/js/search.js',
-         %r%^/images/% then
+    when '/js/darkfish.js', '/js/jquery.js', '/js/search.js',
+         %r%^/css/%, %r%^/images/%, %r%^/fonts/% then
       asset :darkfish, req, res
     when '/js/navigation.js', '/js/searcher.js' then
       asset :json_index, req, res
@@ -204,7 +204,7 @@ def error exception, req, res
 
 <title>Error - #{ERB::Util.html_escape exception.class}</title>
 
-<link type="text/css" media="screen" href="#{@mount_path}/rdoc.css" rel="stylesheet">
+<link type="text/css" media="screen" href="#{@mount_path}/css/rdoc.css" rel="stylesheet">
 </head>
 <body>
 <h1>Error</h1>

diff --git a/test/test_rdoc_servlet.rb b/test/test_rdoc_servlet.rb
@@ -66,14 +66,15 @@ def teardown
 
   def test_asset
     temp_dir do
-      now = Time.now
+      FileUtils.mkdir 'css'
 
-      open 'rdoc.css', 'w' do |io| io.write 'h1 { color: red }' end
-      File.utime now, now, 'rdoc.css'
+      now = Time.now
+      open 'css/rdoc.css', 'w' do |io| io.write 'h1 { color: red }' end
+      File.utime now, now, 'css/rdoc.css'
 
       @s.asset_dirs[:darkfish] = '.'
 
-      @req.path = 'rdoc.css'
+      @req.path = '/css/rdoc.css'
 
       @s.asset :darkfish, @req, @res
 
@@ -95,11 +96,12 @@ def test_do_GET
 
   def test_do_GET_asset_darkfish
     temp_dir do
-      FileUtils.touch 'rdoc.css'
+      FileUtils.mkdir 'css'
+      FileUtils.touch 'css/rdoc.css'
 
       @s.asset_dirs[:darkfish] = '.'
 
-      @req.path = '/rdoc.css'
+      @req.path = '/css/rdoc.css'
 
       @s.do_GET @req, @res
 
@@ -136,11 +138,12 @@ def test_do_GET_mount_path
     @s = RDoc::Servlet.new @server, @stores, @cache, '/mount/path'
 
     temp_dir do
-      FileUtils.touch 'rdoc.css'
+      FileUtils.mkdir 'css'
+      FileUtils.touch 'css/rdoc.css'
 
       @s.asset_dirs[:darkfish] = '.'
 
-      @req.path = '/mount/path/rdoc.css'
+      @req.path = '/mount/path/css/rdoc.css'
 
       @s.do_GET @req, @res