Merge #1096

1096: Made the search feature -/_ insensitive. r=sgrif

The changes to the test crate descriptions are because the test enforces sort order.

Closes #1065

Author: bors-voyager[bot]

src/krate/mod.rs

@@ -6,6 +6,7 @@ use chrono::{NaiveDate, NaiveDateTime};
 use conduit::{Request, Response};
 use conduit_router::RequestParams;
 use diesel::associations::Identifiable;
+use diesel::expression::helper_types::Eq;
 use diesel::helper_types::Select;
 use diesel::pg::upsert::*;
 use diesel::pg::Pg;
@@ -281,14 +282,20 @@ impl<'a> NewCrate<'a> {
 impl Crate {
     pub fn by_name(name: &str) -> CrateQuery {
         Crate::all()
-            .filter(canon_crate_name(crates::name).eq(canon_crate_name(name)))
+            .filter(Crate::name_canonically_equals(name))
             .into_boxed()
     }
 
     pub fn all() -> Select<crates::table, AllColumns> {
         crates::table.select(ALL_COLUMNS)
     }
 
+    fn name_canonically_equals(
+        s: &str,
+    ) -> Eq<canon_crate_name<crates::name>, canon_crate_name<&str>> {
+        canon_crate_name(crates::name).eq(canon_crate_name(s))
+    }
+
     pub fn valid_name(name: &str) -> bool {
         let under_max_length = name.chars().take(MAX_NAME_LENGTH + 1).count() <= MAX_NAME_LENGTH;
         Crate::valid_ident(name) && under_max_length
@@ -620,15 +627,15 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
         let q = plainto_tsquery(q_string);
         query = query.filter(
             q.matches(crates::textsearchable_index_col)
-                .or(crates::name.eq(q_string)),
+                .or(Crate::name_canonically_equals(q_string)),
         );
 
         query = query.select((
             ALL_COLUMNS,
-            crates::name.eq(q_string),
+            Crate::name_canonically_equals(q_string),
             recent_downloads.clone(),
         ));
-        let perfect_match = crates::name.eq(q_string).desc();
+        let perfect_match = Crate::name_canonically_equals(q_string).desc();
         if sort == "downloads" {
             query = query.order((perfect_match, crates::downloads.desc()));
         } else if sort == "recent-downloads" {

src/tests/krate.rs

@@ -232,12 +232,12 @@ fn exact_match_first_on_queries() {
             .description("bar_exact baz_exact")
             .expect_build(&conn);
 
-        ::CrateBuilder::new("bar_exact", user.id)
-            .description("foo_exact baz_exact foo_exact baz_exact")
+        ::CrateBuilder::new("bar-exact", user.id)
+            .description("foo_exact baz_exact foo-exact baz_exact")
             .expect_build(&conn);
 
         ::CrateBuilder::new("baz_exact", user.id)
-            .description("foo_exact bar_exact foo_exact bar_exact foo_exact bar_exact")
+            .description("foo-exact bar_exact foo-exact bar_exact foo_exact bar_exact")
             .expect_build(&conn);
 
         ::CrateBuilder::new("other_exact", user.id)
@@ -247,25 +247,25 @@ fn exact_match_first_on_queries() {
 
     let mut req = ::req(app, Method::Get, "/api/v1/crates");
 
-    let mut response = ok_resp!(middle.call(req.with_query("q=foo_exact")));
+    let mut response = ok_resp!(middle.call(req.with_query("q=foo-exact")));
     let json: CrateList = ::json(&mut response);
     assert_eq!(json.meta.total, 3);
     assert_eq!(json.crates[0].name, "foo_exact");
     assert_eq!(json.crates[1].name, "baz_exact");
-    assert_eq!(json.crates[2].name, "bar_exact");
+    assert_eq!(json.crates[2].name, "bar-exact");
 
     let mut response = ok_resp!(middle.call(req.with_query("q=bar_exact")));
     let json: CrateList = ::json(&mut response);
     assert_eq!(json.meta.total, 3);
-    assert_eq!(json.crates[0].name, "bar_exact");
+    assert_eq!(json.crates[0].name, "bar-exact");
     assert_eq!(json.crates[1].name, "baz_exact");
     assert_eq!(json.crates[2].name, "foo_exact");
 
     let mut response = ok_resp!(middle.call(req.with_query("q=baz_exact")));
     let json: CrateList = ::json(&mut response);
     assert_eq!(json.meta.total, 3);
     assert_eq!(json.crates[0].name, "baz_exact");
-    assert_eq!(json.crates[1].name, "bar_exact");
+    assert_eq!(json.crates[1].name, "bar-exact");
     assert_eq!(json.crates[2].name, "foo_exact");
 }