Redirect to documentation in the version link

Previously it would redirect to /crate, which no one wanted to look at.

Author: jyn514

src/web/rustdoc.rs

@@ -181,6 +181,7 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
 struct RustdocPage {
     latest_path: String,
     latest_version: String,
+    target: String,
     inner_path: String,
     is_latest_version: bool,
     is_prerelease: bool,
@@ -400,23 +401,29 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     }
 
     // The path within this crate version's rustdoc output
-    let inner_path = {
+    let (target, inner_path) = {
         let mut inner_path = req_path.clone();
 
         // Drop the `rustdoc/:crate/:version[/:platform]` prefix
         inner_path.drain(..3).for_each(drop);
 
-        if inner_path.len() > 1 && krate.doc_targets.iter().any(|s| s == inner_path[0]) {
-            inner_path.remove(0);
-        }
+        let target = if inner_path.len() > 1 && krate.doc_targets.iter().any(|s| s == inner_path[0])
+        {
+            let mut target = inner_path.remove(0).to_string();
+            target.push('/');
+            target
+        } else {
+            String::new()
+        };
 
-        inner_path.join("/")
+        (target, inner_path.join("/"))
     };
 
     rendering_time.step("rewrite html");
     RustdocPage {
         latest_path,
         latest_version,
+        target,
         inner_path,
         is_latest_version,
         is_prerelease,
@@ -1513,7 +1520,7 @@ mod test {
             let status = |version| -> Result<_, failure::Error> {
                 let page =
                     kuchiki::parse_html().one(web.get("/crate/hexponent/0.3.0").send()?.text()?);
-                let selector = format!(r#"ul > li a[href="/crate/hexponent/{}""#, version);
+                let selector = format!(r#"ul > li a[href="/crate/hexponent/{}"]"#, version);
                 let anchor = page
                     .select(&selector)
                     .unwrap()
@@ -1569,4 +1576,52 @@ mod test {
             Ok(())
         });
     }
+
+    #[test]
+    fn test_version_link_goes_to_docs() {
+        wrapper(|env| {
+            env.fake_release()
+                .name("hexponent")
+                .version("0.3.0")
+                .rustdoc_file("hexponent/index.html")
+                .create()?;
+            env.fake_release()
+                .name("hexponent")
+                .version("0.3.1")
+                .rustdoc_file("hexponent/index.html")
+                .create()?;
+
+            // test rustdoc pages stay on the documentation
+            let page = kuchiki::parse_html().one(
+                env.frontend()
+                    .get("/hexponent/0.3.0/hexponent/")
+                    .send()?
+                    .text()?,
+            );
+            let selector = format!(
+                r#"ul > li a[href="/crate/hexponent/0.3.1/target-redirect/hexponent/index.html"]"#
+            );
+            assert_eq!(
+                page.select(&selector).unwrap().count(),
+                1,
+                "link to /target-redirect/ not found"
+            );
+
+            // test /crate pages stay on /crate
+            let page = kuchiki::parse_html().one(
+                env.frontend()
+                    .get("/crate/hexponent/0.3.0/")
+                    .send()?
+                    .text()?,
+            );
+            let selector = format!(r#"ul > li a[href="/crate/hexponent/0.3.1"]"#);
+            assert_eq!(
+                page.select(&selector).unwrap().count(),
+                1,
+                "link to /crate not found"
+            );
+
+            Ok(())
+        })
+    }
 }

templates/crate/details.html

@@ -103,7 +103,7 @@
                             <div class="pure-menu pure-menu-scrollable sub-menu">
                                 <ul class="pure-menu-list">
                                     {# Display all releases of this crate #}
-                                    {{ macros::releases_list(name=details.name, releases=details.releases) }}
+                                    {{ macros::releases_list(name=details.name, releases=details.releases, target="", inner_path="") }}
                                 </ul>
                             </div>
                         </li>

templates/macros.html

@@ -114,11 +114,18 @@
         * `yanked` A boolean of the release's yanked status
         * `build_status` A boolean of the crate's build status (true for built, false for failed build)
         * `is_library` A boolean that's true if the crate is a library and false if it's a binary
+    * `target` The target platform (empty string if the default or a `/crate` page)
+    * `inner_path` The current rustdoc page (empty string if a `/crate` page)
 #}
-{% macro releases_list(name, releases) %}
+{% macro releases_list(name, releases, target, inner_path) %}
     {%- for release in releases -%}
         {# The url for the release, `/crate/:name/:version` #}
-        {%- set release_url = "/crate/" ~ name ~ "/" ~ release.version -%}
+        {# NOTE: `/` is part of target if it exists (to avoid `target-direct//path`) #}
+        {% if inner_path == "" %} {# /crate #}
+            {%- set release_url = "/crate/" ~ name ~ "/" ~ release.version -%}
+        {% else %}
+            {%- set release_url = "/crate/" ~ name ~ "/" ~ release.version ~ "/target-redirect/" ~ target ~ inner_path -%}
+        {% endif %}
         {# The release's name and version, `:name-:version` #}
         {%- set release_name = name ~ "-" ~ release.version -%}
 

templates/rustdoc/header.html

@@ -147,7 +147,7 @@
                                             <div class="pure-menu pure-menu-scrollable sub-menu">
                                                 <ul class="pure-menu-list">
                                                     {# Display all releases of this crate #}
-                                                    {{ macros::releases_list(name=krate.name, releases=krate.releases) }}
+                                                    {{ macros::releases_list(name=krate.name, releases=krate.releases, target=target, inner_path=inner_path) }}
                                                 </ul>
                                             </div>
                                         </li>