Merge #1016 #1023

1016: Give tables in readmes a bit of padding and a border r=carols10cents

Before:

<img width="253" alt="before" src="https://user-images.githubusercontent.com/193874/29745854-40021ae6-8a94-11e7-868c-80e5e350b6f2.png">

After:

<img width="278" alt="after" src="https://user-images.githubusercontent.com/193874/29745855-43dfb466-8a94-11e7-8e0e-e3fc5cb12b48.png">


1023: Add query to display recent_downloads on krates::show r=carols10cents

Additionally, we've updated the join for this data on krate::index to
use the new public API Diesel added for this in the most recent version,
and made sure that any other endpoints which *don't* include this data
are returning NULL instead of 0

/cc @natboehm

Author: bors-voyager[bot]

app/styles/crate.scss

@@ -320,6 +320,15 @@
                 padding: 0 2px;
             }
         }
+
+        table {
+            border-collapse: collapse;
+
+            th, td {
+                border: 1px solid #dfe2e5;
+                padding: 6px 13px;
+            }
+        }
     }
     .last-update {
         color: $main-color-light;

src/krate.rs

@@ -573,7 +573,6 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
     use diesel::types::{Bool, BigInt, Nullable};
     use diesel::expression::functions::date_and_time::{now, date};
     use diesel::expression::sql_literal::sql;
-    use diesel::query_source::joins::LeftOuter;
 
     let conn = req.db_conn()?;
     let (offset, limit) = req.pagination(10, 100)?;
@@ -585,13 +584,11 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
     let recent_downloads = sql::<Nullable<BigInt>>("SUM(crate_downloads.downloads)");
 
     let mut query = crates::table
-        .join(
-            crate_downloads::table,
-            LeftOuter,
+        .left_join(crate_downloads::table.on(
             crates::id.eq(crate_downloads::crate_id).and(
                 crate_downloads::date.gt(date(now - 90.days())),
             ),
-        )
+        ))
         .group_by(crates::id)
         .select((
             ALL_COLUMNS,
@@ -775,7 +772,7 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
             .map(|versions| Version::max(versions.into_iter().map(|v| v.num)))
             .zip(krates)
             .map(|(max_version, krate)| {
-                Ok(krate.minimal_encodable(max_version, None, false, Some(0)))
+                Ok(krate.minimal_encodable(max_version, None, false, None))
             })
             .collect()
     };
@@ -833,6 +830,8 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
 
 /// Handles the `GET /crates/:crate_id` route.
 pub fn show(req: &mut Request) -> CargoResult<Response> {
+    use diesel::expression::dsl::*;
+
     let name = &req.params()["crate_id"];
     let conn = req.db_conn()?;
     let krate = Crate::by_name(name).first::<Crate>(&*conn)?;
@@ -849,6 +848,10 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
         .inner_join(categories::table)
         .select(categories::all_columns)
         .load(&*conn)?;
+    let recent_downloads = CrateDownload::belonging_to(&krate)
+        .filter(crate_downloads::date.gt(date(now - 90.days())))
+        .select(sum(crate_downloads::downloads))
+        .get_result(&*conn)?;
 
     let badges = badges::table.filter(badges::crate_id.eq(krate.id)).load(
         &*conn,
@@ -872,7 +875,7 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
                 Some(&cats),
                 Some(badges),
                 false,
-                Some(0),
+                recent_downloads,
             ),
             versions: versions
                 .into_iter()
@@ -1037,7 +1040,7 @@ pub fn new(req: &mut Request) -> CargoResult<Response> {
             warnings: Warnings<'a>,
         }
         Ok(req.json(&R {
-            krate: krate.minimal_encodable(max_version, None, false, Some(0)),
+            krate: krate.minimal_encodable(max_version, None, false, None),
             warnings: warnings,
         }))
     })

src/tests/krate.rs

@@ -404,6 +404,8 @@ fn show() {
             .version(::VersionBuilder::new("0.5.0"))
             .version(::VersionBuilder::new("0.5.1"))
             .keyword("kw1")
+            .downloads(20)
+            .recent_downloads(10)
             .expect_build(&conn);
     }
 
@@ -415,6 +417,7 @@ fn show() {
     assert_eq!(json.krate.homepage, krate.homepage);
     assert_eq!(json.krate.documentation, krate.documentation);
     assert_eq!(json.krate.keywords, Some(vec!["kw1".into()]));
+    assert_eq!(json.krate.recent_downloads, Some(10));
     let versions = json.krate.versions.as_ref().unwrap();
     assert_eq!(versions.len(), 3);
     assert_eq!(json.versions.len(), 3);