yard 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874e67d17c94b6c8537e39ec998abbe94f5c5ffc
-  data.tar.gz: 245011fea4112256d31eab954d5d8a6a54f4f156
+  metadata.gz: 81c76130fea5d80195cc0e8f500a672346c85400
+  data.tar.gz: 5afb557723706f69a06218b483b834bb86f9eb1a
 SHA512:
-  metadata.gz: f25ccfa7b086f9cb61830a0d66955b077cefe76cd9ff9b6e0a9dc93d81d573343ba094c9e3eac9204da94f68d26c80991e6a973ec47caa7403482da8c811a0b7
-  data.tar.gz: ced2f2fbe04e8af5afe4878ccd1f40f39928271d44c2c4d5b9878b4b57e1cc2665635f89e4b74ed484a5ff78b8a9d1eea0b5d50a9b0ecc29cbb0f6b1d036d01d
+  metadata.gz: 4cc7185c859e475c3460c7f7f0e9a8f7f3fa5617f64cbbcf93c7255e897a9e1304a8d5cfe4e8038c29ea6a746cca81f977b306e45f38e08e868d85b0142a12fb
+  data.tar.gz: 75eff8b37ee76c18d952cfa2de40c797addac6b4f5cec97871d633970b182e6fbb964cf1e59f11cd6851156f3b85034c1f68bd70977c5395a92d2633de521a35

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.9.3 - July 20th, 2016
+
+- Added support for {YARD::Server::RackAdapter} to be mounted under prefix URIs.
+- Fixed regression in `yard server -g` that caused static file assets on index
+  page to return 404 errors.
+- Fixed regression in `yard server -g` index page that disabled scrolling and
+  caused other HTML rendering glitches.
+
 # 0.9.2 - July 19th, 2016
 
 - Added `yard config --gem-install-[yri|yard]` commands which auto-configure

data/Rakefile

@@ -6,6 +6,21 @@ YARD::VERSION.replace(ENV['YARD_VERSION']) if ENV['YARD_VERSION']
 
 task :default => :travis_ci
 
+desc "Publish gem"
+task :publish do
+  ver = ENV['VERSION']
+
+  if ver.nil? || ver.empty?
+    fail "missing VERSION=x.y.z"
+  elsif ver < YARD::VERSION
+    fail "invalid version `#{ver}' (must be >= `#{YARD::VERSION}')"
+  end
+
+  file = "release-v#{ver}.tar.gz"
+  cmd = "bundle exec samus"
+  sh "#{cmd} build #{ver} && #{cmd} publish #{file} && rm #{file}"
+end
+
 desc "Builds the gem"
 task :gem do
   sh "gem build yard.gemspec"

data/lib/yard/autoload.rb

@@ -220,6 +220,7 @@ module YARD
       autoload :RootRequestCommand,   __p('server/commands/root_request_command')
       autoload :SearchCommand,        __p('server/commands/search_command')
       autoload :StaticFileCommand,    __p('server/commands/static_file_command')
+      autoload :StaticFileHelpers,    __p('server/commands/static_file_helpers')
     end
 
     autoload :Adapter,                __p('server/adapter')

data/lib/yard/server/commands/base.rb

@@ -87,7 +87,7 @@ module YARD
         #   of status, headers, and body wrapped in an array.
         def call(request)
           self.request = request
-          self.path ||= request.path[1..-1]
+          self.path ||= request.path_info[1..-1]
           self.headers = {'Content-Type' => 'text/html'}
           self.body = ''
           self.status = 200
@@ -96,9 +96,12 @@ module YARD
           rescue FinishRequest
           rescue NotFoundError => e
             self.body = e.message if e.message != e.class.to_s
-            self.status = 404
+            not_found
           end
+
+          # keep this to support commands setting status manually.
           not_found if status == 404
+
           [status, headers, body.is_a?(Array) ? body : [body]]
         end
 
@@ -158,7 +161,7 @@ module YARD
         # @see StaticCaching
         def cache(data)
           if caching && adapter.document_root
-            path = File.join(adapter.document_root, request.path.sub(/\.html$/, '') + '.html')
+            path = File.join(adapter.document_root, request.path_info.sub(/\.html$/, '') + '.html')
             path = path.sub(%r{/\.html$}, '.html')
             FileUtils.mkdir_p(File.dirname(path))
             log.debug "Caching data to #{path}"
@@ -167,11 +170,12 @@ module YARD
           self.body = data
         end
 
-        # Sets the body and headers (but not status) for a 404 response. Does
-        # nothing if the body is already set.
+        # Sets the body and headers for a 404 response. Does not modify the
+        # body if already set.
         #
         # @return [void]
         def not_found
+          self.status = 404
           return unless body.empty?
           self.body = "Not found: #{request.path}"
           self.headers['Content-Type'] = 'text/plain'

data/lib/yard/server/commands/display_object_command.rb

@@ -26,7 +26,7 @@ module YARD
             options.update(:type => :layout)
             render(object)
           else
-            self.status = 404
+            not_found
           end
         end
 

data/lib/yard/server/commands/library_index_command.rb

@@ -1,6 +1,13 @@
 module YARD
   module Server
     module Commands
+      class LibraryIndexOptions < CLI::YardocOptions
+        attr_accessor :adapter, :libraries
+        default_attr :template, :doc_server
+        default_attr :type, :library_list
+        default_attr :serialize, false
+      end
+
       # Returns the index of libraries served by the server.
       class LibraryIndexCommand < Base
         attr_accessor :options
@@ -8,14 +15,10 @@ module YARD
         def run
           return unless path.empty?
 
-          self.options = SymbolHash.new(false).update(
-            :markup => :rdoc,
-            :format => :html,
-            :libraries => adapter.libraries,
-            :adapter => adapter,
-            :template => :doc_server,
-            :type => :library_list
-          )
+          self.options = LibraryIndexOptions.new
+          self.options.adapter = adapter
+          self.options.libraries = adapter.libraries
+          self.options.reset_defaults
           render
         end
       end

data/lib/yard/server/commands/root_request_command.rb

@@ -3,23 +3,10 @@ module YARD
     module Commands
       # Serves requests from the root of the server
       class RootRequestCommand < Base
-        def run
-          favicon?
-
-          self.body = "Could not find: #{request.path}"
-          self.status = 404
-        end
+        include StaticFileHelpers
 
-        private
-
-        # Return an empty favicon.ico if it does not exist so that
-        # browsers don't complain.
-        def favicon?
-          return unless request.path == '/favicon.ico'
-          self.headers['Content-Type'] = 'image/png'
-          self.status = 200
-          self.body = ''
-          raise FinishRequest
+        def run
+          static_template_file? || favicon? || not_found
         end
       end
     end

data/lib/yard/server/commands/search_command.rb

@@ -13,7 +13,7 @@ module YARD
         def run
           Registry.load_all
           self.query = request.query['q']
-          redirect("/#{adapter.router.docs_prefix}/#{single_library ? library : ''}") if query.nil? || query =~ /\A\s*\Z/
+          redirect(abs_url(adapter.router.docs_prefix, single_library ? library : '')) if query.nil? || query =~ /\A\s*\Z/
           if found = Registry.at(query)
             redirect(url_for(found))
           end
@@ -28,7 +28,7 @@ module YARD
         private
 
         def url_for(object)
-          File.join('', base_path(router.docs_prefix),
+          abs_url(base_path(router.docs_prefix),
             serializer.serialized_path(object))
         end
 

data/lib/yard/server/commands/static_file_command.rb

@@ -1,11 +1,9 @@
-require 'webrick/httputils'
-
 module YARD
   module Server
     module Commands
       # Serves static content when no other router matches a request
       class StaticFileCommand < LibraryCommand
-        include WEBrick::HTTPUtils
+        include StaticFileHelpers
 
         DefaultMimeTypes['js'] = 'text/javascript'
 
@@ -16,27 +14,7 @@ module YARD
         STATIC_PATHS = []
 
         def run
-          assets_template = Templates::Engine.template(:default, :fulldoc, :html)
-
-          file = nil
-          ([adapter.document_root] + STATIC_PATHS.reverse).compact.each do |path_prefix|
-            file = File.join(path_prefix, path)
-            break if File.exist?(file)
-            file = nil
-          end
-
-          # Search in default/fulldoc/html template if nothing in static asset paths
-          file ||= assets_template.find_file(path)
-
-          if file
-            ext = "." + (path[/\.(\w+)$/, 1] || "html")
-            headers['Content-Type'] = mime_type(ext, DefaultMimeTypes)
-            self.body = File.read(file)
-            return
-          end
-
-          self.body = "Could not find: #{request.path}"
-          self.status = 404
+          static_template_file? || not_found
         end
       end
     end

data/lib/yard/server/commands/static_file_helpers.rb

@@ -0,0 +1,53 @@
+require 'webrick/httputils'
+
+module YARD
+  module Server
+    module Commands
+      # Include this module to get access to {#static_template_file?}
+      # and {favicon?} helpers.
+      module StaticFileHelpers
+        include WEBrick::HTTPUtils
+        
+        # Serves an empty favicon.
+        # @raise [FinishRequest] finalizes an empty body if the path matches
+        #   /favicon.ico so browsers don't complain.
+        def favicon?
+          return unless request.path == '/favicon.ico'
+          self.headers['Content-Type'] = 'image/png'
+          self.status = 200
+          self.body = ''
+          raise FinishRequest
+        end
+
+        # Attempts to route a path to a static template file.
+        #
+        # @raise [FinishRequest] if a file was found and served
+        # @return [void]
+        def static_template_file?
+          # these consts were defined in StaticFileCommand originally 
+          static_paths = StaticFileCommand::STATIC_PATHS
+          default_mime_types = StaticFileCommand::DefaultMimeTypes
+
+          assets_template = Templates::Engine.template(:default, :fulldoc, :html)
+
+          file = nil
+          ([adapter.document_root] + static_paths.reverse).compact.each do |path_prefix|
+            file = File.join(path_prefix, path)
+            break if File.exist?(file)
+            file = nil
+          end
+
+          # Search in default/fulldoc/html template if nothing in static asset paths
+          file ||= assets_template.find_file(path)
+
+          if file
+            ext = "." + (path[/\.(\w+)$/, 1] || "html")
+            headers['Content-Type'] = mime_type(ext, default_mime_types)
+            self.body = File.read(file)
+            raise FinishRequest
+          end
+        end
+      end
+    end
+  end
+end

data/lib/yard/server/doc_server_helper.rb

@@ -10,10 +10,10 @@ module YARD
       def url_for(obj, anchor = nil, relative = false)
         return '' if obj.nil?
         return url_for_index if obj == '_index.html'
-        return "/#{base_path(router.static_prefix)}/#{obj}" if String === obj
+        return abs_url(base_path(router.static_prefix), obj) if String === obj
         url = super(obj, anchor, false)
         return unless url
-        File.join('', base_path(router.docs_prefix), url)
+        abs_url(base_path(router.docs_prefix), url)
       end
 
       # Modifies {Templates::Helpers::HtmlHelper#url_for_file} to return a URL instead
@@ -24,8 +24,9 @@ module YARD
         if filename.is_a?(CodeObjects::ExtraFileObject)
           filename = filename.filename
         end
-        "/#{base_path(router.docs_prefix)}/file/" + filename.sub(%r{^#{@library.source_path.to_s}/}, '') +
-          (anchor ? "##{anchor}" : "")
+        fname = filename.sub(%r{^#{@library.source_path.to_s}/}, '')
+        fname += "##{anchor}" if anchor && !anchor.empty?
+        abs_url(base_path(router.docs_prefix), 'file', fname)
       end
 
       # Modifies {Templates::Helpers::HtmlHelper#url_for_list} to return a URL
@@ -33,7 +34,7 @@ module YARD
       # @param (see Templates::Helpers::HtmlHelper#url_for_list)
       # @return (see Templates::Helpers::HtmlHelper#url_for_list)
       def url_for_list(type)
-        File.join('', base_path(router.list_prefix), type.to_s)
+        abs_url(base_path(router.list_prefix), type.to_s)
       end
 
       # Returns the frames URL for the page
@@ -51,7 +52,13 @@ module YARD
       # Returns the URL for the alphabetic index page
       # @return (see Templates::Helpers::HtmlHelper#url_for_index)
       def url_for_index
-        File.join('', base_path(router.docs_prefix), 'index')
+        abs_url(base_path(router.docs_prefix), 'index')
+      end
+
+      # @param path_components [Array<String>] components of a URL
+      # @return [String] the absolute path from any mounted base URI.
+      def abs_url(*path_components)
+        File.join(router.request.script_name, *path_components)
       end
 
       # @example The base path for a library 'foo'

data/lib/yard/server/router.rb

@@ -101,7 +101,7 @@ module YARD
       #
       # @return [Array(Numeric,Hash,Array<String>)] the Rack-style response
       # @return [nil] if no route is matched
-      def route(path = request.path)
+      def route(path = request.path_info)
         path = path.gsub(%r{//+}, '/').gsub(%r{^/|/$}, '')
         return route_index if path.empty? || path == docs_prefix
         case path

data/lib/yard/server/templates/default/layout/html/breadcrumb.erb

@@ -1,4 +1,4 @@
-<form class="search" method="get" action="/<%= base_path(router.search_prefix) %>">
+<form class="search" method="get" action="<%= abs_url base_path(router.search_prefix) %>">
   <input name="q" type="search" placeholder="Search" id="search_box" size="30" value="<%= h @query %>" />
 </form>
 <script type="text/javascript" charset="utf-8">
@@ -20,7 +20,7 @@
 
 <div id="menu">
   <% unless @single_library %>
-    <a href="/<%= router.docs_prefix %>" target="_top">Libraries</a> &raquo;
+    <a href="<%= abs_url router.docs_prefix %>" target="_top">Libraries</a> &raquo;
     <span class="title"><%= @library.name %> <% if @library.version %><small>(<%= @library.version %>)</small><% end %></span>
   <% end %>
   <% if object.is_a?(CodeObjects::Base) && @file.nil? %>
@@ -35,4 +35,3 @@
     <span class='title'><%= @breadcrumb_title %></span>
   <% end %>
 </div>
-

data/lib/yard/server/templates/default/layout/html/script_setup.erb

@@ -1,7 +1,7 @@
 <script type="text/javascript" charset="utf-8">
   pathId = <%= @path ? @path.inspect : 'null' %>
   relpath = '/';
-  docsPrefix = '<%= base_path(router.docs_prefix) %>';
-  listPrefix = '<%= base_path(router.list_prefix) %>';
-  searchPrefix = '<%= base_path(router.search_prefix) %>';
+  docsPrefix = '<%= abs_url base_path(router.docs_prefix) %>';
+  listPrefix = '<%= abs_url base_path(router.list_prefix) %>';
+  searchPrefix = '<%= abs_url base_path(router.search_prefix) %>';
 </script>

data/lib/yard/server/templates/default/method_details/html/permalink.erb

@@ -1,4 +1,4 @@
 <script>
 $(document.getElementById("<%= anchor_for(object) %>")).prepend(
-  '<a class="permalink" href="/<%= base_path(router.docs_prefix) %>/<%= urlencode serializer.serialized_path(object) %>">permalink</a>');
+  '<a class="permalink" href="<%= abs_url base_path(router.docs_prefix) %>/<%= urlencode serializer.serialized_path(object) %>">permalink</a>');
 </script>

data/lib/yard/server/templates/doc_server/library_list/html/headers.erb

@@ -1,25 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>YARD Documentation Server <%= YARD::VERSION %> - Library Listing</title>
-<link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="/css/custom.css" type="text/css" media="screen" charset="utf-8" />
-<script type="text/javascript" charset="utf-8" src="/js/jquery.js"></script>
-<script type="text/javascript">
-  function framesLinks() {
-    $('#framelink').toggle(function() {
-      $(this).text('links with frames');
-      $('ul li a').each(function() {
-        $(this).attr('href', $(this).attr('href').replace(/\/frames$/, ''));
-      });
-    }, function() {
-      $(this).text('links without frames');
-      $('ul li a').each(function() {
-        $(this).attr('href', $(this).attr('href') + '/frames');
-      });
-    })
-  }
-
-  $(framesLinks);
-</script>
+<link rel="stylesheet" href="<%= abs_url('css', 'style.css') %>" type="text/css" media="screen" charset="utf-8" />
+<link rel="stylesheet" href="<%= abs_url('css', 'custom.css') %>" type="text/css" media="screen" charset="utf-8" />
 <style type="text/css" media="screen">
   ul { list-style: circle inside none; padding: 0; }
   li { font-size: 1.2em; line-height: 1.4em; padding: 3px 5px; }

data/lib/yard/server/templates/doc_server/library_list/html/library_list.erb

@@ -5,8 +5,10 @@
     <%= erb(:headers) %>
   </head>
   <body>
-    <div id="content">
-      <%= yieldall %>
+    <div id="main">
+      <div id="content">
+        <%= yieldall %>
+      </div>
     </div>
   </body>
 </html>

data/lib/yard/server/templates/doc_server/library_list/html/{contents.erb → listing.erb}

@@ -3,10 +3,10 @@
   <li class="r<%= @row = @row == 1 ? 2 : 1 %>">
     <% library_versions = library_versions.dup %>
     <% first_lib = library_versions.pop %>
-    <a href="/<%= router.docs_prefix %>/<%= first_lib.name %>/frames"><%= name %></a>
+    <a href="<%= abs_url(router.docs_prefix, first_lib.name) %>"><%= name %></a>
     <% if first_lib.version %>
       <small>(<%= first_lib.version %><% if library_versions.size > 0 %>,
-        <%= library_versions.reverse.map {|lib| "<a href=\"/#{router.docs_prefix}/#{lib}/frames\">#{lib.version}</a>" }.join(', ') %><% end %>)</small>
+        <%= library_versions.reverse.map {|lib| "<a href=\"#{abs_url(router.docs_prefix, lib.to_s)}\">#{lib.version}</a>" }.join(', ') %><% end %>)</small>
     <% end %>
   </li>
   <% end %>

data/lib/yard/server/templates/doc_server/library_list/html/setup.rb

@@ -1,3 +1,5 @@
+include T('default/layout/html')
+
 def init
-  sections :library_list, [:title, :contents]
+  sections :library_list, [:title, :listing, :footer]
 end

data/lib/yard/server/templates/doc_server/library_list/html/title.erb

@@ -1,2 +1,2 @@
 <h1>YARD Documentation Server <%= YARD::VERSION %></h1>
-<h2>Library Listing <small>(<a id="framelink" href="#">links without frames</a>)</small></h2>
+<h2>Library Listing</h2>

data/lib/yard/server/templates/doc_server/processing/html/processing.erb

@@ -2,9 +2,9 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" charset="utf-8" />
-    <link rel="stylesheet" href="/css/custom.css" type="text/css" media="screen" charset="utf-8" />
-    <script type="text/javascript" charset="utf-8" src="/js/jquery.js"></script>
+    <link rel="stylesheet" href="<%= abs_url('css', 'style.css') %>" type="text/css" media="screen" charset="utf-8" />
+    <link rel="stylesheet" href="<%= abs_url('css', 'custom.css') %>" type="text/css" media="screen" charset="utf-8" />
+    <script type="text/javascript" charset="utf-8" src="<%= abs_url('js', 'jquery.js') %>"></script>
     <script type="text/javascript" charset="utf-8">
       function checkPage(process) {
         $.ajax({cache: false, url: "<%= router.request.path %>" + (process ? "?process=true" : ""),
@@ -35,7 +35,7 @@
   <body>
     <div id="menu">
       <% unless @single_library %>
-        <a href="/<%= router.docs_prefix %>" target="_top">Libraries</a> &raquo;
+        <a href="<%= abs_url(router.docs_prefix) %>" target="_top">Libraries</a> &raquo;
         <span class="title"><%= @library.name %> <% if @library.version %><small>(<%= @library.version %>)</small><% end %></span>
       <% end %>
     </div>
@@ -46,7 +46,7 @@
         <strong><%= @library.name %></strong> <% if @library.version %>(<%= @library.version %>)<% end %> is being processed.
         You'll be redirected when the pages are built, it shouldn't take much longer.
       </p>
-      <img src="/images/processing.gif" align="center" />
+      <img src="<%= abs_url('images', 'processing.gif') %>" align="center" />
     </div>
   </body>
-</html>
+</html>

data/lib/yard/version.rb

@@ -1,3 +1,3 @@
 module YARD
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/spec/server/commands/base_spec.rb

@@ -12,7 +12,7 @@ describe YARD::Server::Commands::Base do
   describe "#cache" do
     before do
       @command = MyCacheCommand.new(:adapter => mock_adapter, :caching => true)
-      @command.request = OpenStruct.new
+      @command.request = mock_request(nil)
     end
 
     it "does not cache if caching == false" do
@@ -30,7 +30,7 @@ describe YARD::Server::Commands::Base do
     it "caches to path/to/file.html and create directories" do
       expect(FileUtils).to receive(:mkdir_p).with('/public/path/to')
       expect(File).to receive(:open).with('/public/path/to/file.html', anything)
-      @command.request.path = '/path/to/file.html'
+      @command.request.path_info = '/path/to/file.html'
       @command.run
     end
   end
@@ -84,4 +84,4 @@ describe YARD::Server::Commands::Base do
       expect(h['Foo']).to eq 'BAR'
     end
   end
-end
+end

data/spec/server/commands/library_command_spec.rb

@@ -10,7 +10,7 @@ describe YARD::Server::Commands::LibraryCommand do
     allow(Registry).to receive(:save)
 
     @cmd = LibraryCommand.new(:adapter => mock_adapter)
-    @request = OpenStruct.new(:xhr? => false, :path => "/foo")
+    @request = mock_request("/foo", :xhr? => false)
     @library = OpenStruct.new(:source_path => '.')
     @cmd.library = @library
     allow(@cmd).to receive(:load_yardoc).and_return(nil)
@@ -36,4 +36,4 @@ describe YARD::Server::Commands::LibraryCommand do
       expect(@cmd.options[:markup]).to eq :rdoc
     end
   end
-end
+end

data/spec/server/doc_server_helper_spec.rb

@@ -42,6 +42,13 @@ describe YARD::Server::DocServerHelper do
       @helper.adapter.router.request.version_supplied = true
       expect(@helper.url_for(P('A'))).to eq '/PREFIX/foo/bar/A'
     end
+
+    it "uses script name prefix if set" do
+      @helper.adapter.router.request.script_name = '/mount/point' 
+      @helper.library = LibraryVersion.new('foo', 'bar')
+      @helper.adapter.router.request.version_supplied = true
+      expect(@helper.url_for(P('A'))).to eq '/mount/point/PREFIX/foo/bar/A'
+    end
   end
 
   describe "#url_for_file" do
@@ -49,5 +56,16 @@ describe YARD::Server::DocServerHelper do
       file = CodeObjects::ExtraFileObject.new('a/b/FooBar.md', '')
       expect(@helper.url_for_file(file)).to eq '/PREFIX/foo/file/a/b/FooBar.md'
     end
+
+    it "properly links anchor portion" do
+      file = CodeObjects::ExtraFileObject.new('a/b/FooBar.md', '')
+      expect(@helper.url_for_file(file, 'anchor')).to eq '/PREFIX/foo/file/a/b/FooBar.md#anchor'
+    end
+
+    it "uses script name prefix if set" do
+      @helper.adapter.router.request.script_name = '/mount/point' 
+      file = CodeObjects::ExtraFileObject.new('a/b/FooBar.md', '')
+      expect(@helper.url_for_file(file)).to eq '/mount/point/PREFIX/foo/file/a/b/FooBar.md'
+    end
   end
-end
+end

data/spec/server/router_spec.rb

@@ -17,7 +17,7 @@ describe YARD::Server::Router do
 
   describe "#parse_library_from_path" do
     def parse(*args)
-      @request.path = '/' + args.join('/')
+      @request.path_info = '/' + args.join('/')
       @router = MyRouterSpecRouter.new(@adapter)
       @router.request = @request
       @router.parse_library_from_path(args.flatten)
@@ -49,8 +49,8 @@ describe YARD::Server::Router do
   end
 
   describe "#route" do
-    def route_to(route, command, *args)
-      req = mock_request(route)
+    def route_to(route, command, script_name = '')
+      req = mock_request(route, script_name)
       router = MyRouterSpecRouter.new(@adapter)
       expect(command).to receive(:new) do |*args|
         @command = command.allocate
@@ -119,4 +119,4 @@ describe YARD::Server::Router do
       route_to('/mydocs/foo/notproject', RootRequestCommand)
     end
   end
-end
+end

data/spec/server/spec_helper.rb

@@ -12,6 +12,11 @@ def mock_adapter(opts = {})
   OpenStruct.new(opts)
 end
 
-def mock_request(path = '/')
-  OpenStruct.new(:path => path)
+class MockRequest < OpenStruct
+  def path; "#{script_name}#{path_info}" end
+end
+
+def mock_request(path_info = '/', script_name = '', extra_env = {})
+  opts = { :path_info => path_info, :script_name => script_name }
+  MockRequest.new(extra_env.merge(opts))
 end

data/spec/server/static_caching_spec.rb

@@ -5,7 +5,7 @@ describe YARD::Server::StaticCaching do
 
   describe "#check_static_cache" do
     def adapter; @adapter ||= mock_adapter end
-    def request; @request ||= OpenStruct.new end
+    def request; @request ||= MockRequest.new end
 
     it "returns nil if document root is not set" do
       adapter.document_root = nil
@@ -13,7 +13,7 @@ describe YARD::Server::StaticCaching do
     end
 
     it "reads a file from document root if path matches file on system" do
-      request.path = '/hello/world.html'
+      request.path_info = '/hello/world.html'
       expect(File).to receive(:file?).with('/public/hello/world.html').and_return(true)
       expect(File).to receive(:open).with('/public/hello/world.html', anything).and_return('body')
       s, h, b = *check_static_cache
@@ -22,7 +22,7 @@ describe YARD::Server::StaticCaching do
     end
 
     it "reads a file if path matches file on system + .html" do
-      request.path = '/hello/world'
+      request.path_info = '/hello/world'
       expect(File).to receive(:file?).with('/public/hello/world.html').and_return(true)
       expect(File).to receive(:open).with('/public/hello/world.html', anything).and_return('body')
       s, h, b = *check_static_cache
@@ -31,9 +31,16 @@ describe YARD::Server::StaticCaching do
     end
 
     it "returns nil if no matching file is found" do
-      request.path = '/hello/foo'
+      request.path_info = '/hello/foo'
       expect(File).to receive(:file?).with('/public/hello/foo.html').and_return(false)
       expect(check_static_cache).to eq nil
     end
+
+    it "adds mount point to cache location" do
+      request.path_info = '/hello/world.html'
+      request.script_name = '/mount/point'
+      expect(File).to receive(:file?).with('/public/mount/point/hello/world.html').and_return(false)
+      expect(check_static_cache).to eq nil
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Loren Segal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies: []
 description: |2
       YARD is a documentation generation tool for the Ruby programming language.
@@ -221,6 +221,7 @@ files:
 - lib/yard/server/commands/root_request_command.rb
 - lib/yard/server/commands/search_command.rb
 - lib/yard/server/commands/static_file_command.rb
+- lib/yard/server/commands/static_file_helpers.rb
 - lib/yard/server/doc_server_helper.rb
 - lib/yard/server/doc_server_serializer.rb
 - lib/yard/server/library_version.rb
@@ -235,9 +236,9 @@ files:
 - lib/yard/server/templates/default/layout/html/setup.rb
 - lib/yard/server/templates/default/method_details/html/permalink.erb
 - lib/yard/server/templates/default/method_details/html/setup.rb
-- lib/yard/server/templates/doc_server/library_list/html/contents.erb
 - lib/yard/server/templates/doc_server/library_list/html/headers.erb
 - lib/yard/server/templates/doc_server/library_list/html/library_list.erb
+- lib/yard/server/templates/doc_server/library_list/html/listing.erb
 - lib/yard/server/templates/doc_server/library_list/html/setup.rb
 - lib/yard/server/templates/doc_server/library_list/html/title.erb
 - lib/yard/server/templates/doc_server/processing/html/processing.erb