Merge pull request #1258 from coolshaurya/2021_01_22

Make /crate/:crate/latest/builds.json not strip .json suffix

Author: jyn514

src/web/builds.rs

@@ -43,18 +43,26 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
     let mut conn = extension!(req, Pool).get()?;
     let limits = ctry!(req, Limits::for_crate(&mut conn, name));
 
+    let is_json = req
+        .url
+        .path()
+        .last()
+        .map_or(false, |segment| segment.ends_with(".json"));
+
     let version =
         match match_version(&mut conn, name, req_version).and_then(|m| m.assume_exact())? {
             MatchSemver::Exact((version, _)) => version,
 
             MatchSemver::Semver((version, _)) => {
+                let ext = if is_json { ".json" } else { "" };
                 let url = ctry!(
                     req,
                     Url::parse(&format!(
-                        "{}/crate/{}/{}/builds",
+                        "{}/crate/{}/{}/builds{}",
                         redirect_base(req),
                         name,
-                        version
+                        version,
+                        ext,
                     )),
                 );
 
@@ -95,7 +103,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
         })
         .collect();
 
-    if req.url.path().join("/").ends_with(".json") {
+    if is_json {
         let mut resp = Response::with((status::Ok, serde_json::to_string(&builds).unwrap()));
         resp.headers.set(ContentType::json());
         resp.headers.set(Expires(HttpDate(time::now())));
@@ -302,23 +310,39 @@ mod tests {
     fn latest_redirect() {
         wrapper(|env| {
             env.fake_release()
-                .name("foo")
+                .name("aquarelle")
                 .version("0.1.0")
                 .builds(vec![FakeBuild::default()
                     .rustc_version("rustc 1.0.0")
                     .docsrs_version("docs.rs 1.0.0")])
                 .create()?;
 
             env.fake_release()
-                .name("foo")
+                .name("aquarelle")
                 .version("0.2.0")
                 .builds(vec![FakeBuild::default()
                     .rustc_version("rustc 1.0.0")
                     .docsrs_version("docs.rs 1.0.0")])
                 .create()?;
 
-            let resp = env.frontend().get("/crate/foo/latest/builds").send()?;
-            assert!(resp.url().as_str().ends_with("/crate/foo/0.2.0/builds"));
+            let resp = env
+                .frontend()
+                .get("/crate/aquarelle/latest/builds")
+                .send()?;
+            assert!(resp
+                .url()
+                .as_str()
+                .ends_with("/crate/aquarelle/0.2.0/builds"));
+
+            let resp_json = env
+                .frontend()
+                .get("/crate/aquarelle/latest/builds.json")
+                .send()?;
+            assert!(resp_json
+                .url()
+                .as_str()
+                .ends_with("/crate/aquarelle/0.2.0/builds.json"));
+
             Ok(())
         });
     }