Allow crate max_version to be null

This is required for the situation where the final non-yanked version is yanked leaving no non-yanked version.

Author: yodaldevoid

src/krate.rs

@@ -44,7 +44,7 @@ pub struct Crate {
     pub updated_at: Timespec,
     pub created_at: Timespec,
     pub downloads: i32,
-    pub max_version: semver::Version,
+    pub max_version: Option<semver::Version>,
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub documentation: Option<String>,
@@ -65,7 +65,7 @@ pub struct EncodableCrate {
     pub badges: Option<Vec<EncodableBadge>>,
     pub created_at: String,
     pub downloads: i32,
-    pub max_version: String,
+    pub max_version: Option<String>,
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub documentation: Option<String>,
@@ -266,7 +266,7 @@ impl Crate {
             keywords: keyword_ids,
             categories: category_ids,
             badges: badges,
-            max_version: max_version.to_string(),
+            max_version: max_version.map(|v| v.to_string()),
             documentation: documentation,
             homepage: homepage,
             description: description,
@@ -384,12 +384,17 @@ impl Crate {
             None => {}
         }
         let zero = semver::Version::parse("0.0.0").unwrap();
-        if *ver > self.max_version || self.max_version == zero {
-            self.max_version = ver.clone();
+        let new_max = match self.max_version {
+            Some(ref max_version) if *ver > *max_version || *max_version == zero => true,
+            _ => false,
+        };
+        if new_max {
+            self.max_version = Some(ver.clone());
         }
         let stmt = conn.prepare("UPDATE crates SET max_version = $1
                            WHERE id = $2 RETURNING updated_at")?;
-        let rows = stmt.query(&[&self.max_version.to_string(), &self.id])?;
+        let max_version = self.max_version.clone().map(|v| v.to_string());
+        let rows = stmt.query(&[&max_version, &self.id])?;
         self.updated_at = rows.get(0).get("updated_at");
         Version::insert(conn, self.id, ver, features, authors)
     }
@@ -460,7 +465,7 @@ impl Crate {
 
 impl Model for Crate {
     fn from_row(row: &Row) -> Crate {
-        let max: String = row.get("max_version");
+        let max: Option<String> = row.get("max_version");
         Crate {
             id: row.get("id"),
             name: row.get("name"),
@@ -471,7 +476,7 @@ impl Model for Crate {
             documentation: row.get("documentation"),
             homepage: row.get("homepage"),
             readme: row.get("readme"),
-            max_version: semver::Version::parse(&max).unwrap(),
+            max_version: max.map(|m| semver::Version::parse(&m).unwrap()),
             license: row.get("license"),
             repository: row.get("repository"),
             max_upload_size: row.get("max_upload_size"),

src/tests/all.rs

@@ -193,7 +193,7 @@ fn krate(name: &str) -> Crate {
         updated_at: time::now().to_timespec(),
         created_at: time::now().to_timespec(),
         downloads: 10,
-        max_version: semver::Version::parse("0.0.0").unwrap(),
+        max_version: Some(semver::Version::parse("0.0.0").unwrap()),
         documentation: None,
         homepage: None,
         description: None,

src/tests/krate.rs

@@ -347,7 +347,8 @@ fn new_krate() {
     let mut response = ok_resp!(middle.call(&mut req));
     let json: GoodCrate = ::json(&mut response);
     assert_eq!(json.krate.name, "foo_new");
-    assert_eq!(json.krate.max_version, "1.0.0");
+    assert!(json.krate.max_version.is_some());
+    assert_eq!(json.krate.max_version.unwrap(), "1.0.0");
 }
 
 #[test]
@@ -360,7 +361,8 @@ fn new_krate_weird_version() {
     let mut response = ok_resp!(middle.call(&mut req));
     let json: GoodCrate = ::json(&mut response);
     assert_eq!(json.krate.name, "foo_weird");
-    assert_eq!(json.krate.max_version, "0.0.0-pre");
+    assert!(json.krate.max_version.is_some());
+    assert_eq!(json.krate.max_version.unwrap(), "0.0.0-pre");
 }
 
 #[test]
@@ -917,7 +919,8 @@ fn good_categories() {
     let mut response = ok_resp!(middle.call(&mut req));
     let json: GoodCrate = ::json(&mut response);
     assert_eq!(json.krate.name, "foo_good_cat");
-    assert_eq!(json.krate.max_version, "1.0.0");
+    assert!(json.krate.max_version.is_some());
+    assert_eq!(json.krate.max_version.unwrap(), "1.0.0");
     assert_eq!(json.warnings.invalid_categories.len(), 0);
 }
 
@@ -931,7 +934,8 @@ fn ignored_categories() {
     let mut response = ok_resp!(middle.call(&mut req));
     let json: GoodCrate = ::json(&mut response);
     assert_eq!(json.krate.name, "foo_ignored_cat");
-    assert_eq!(json.krate.max_version, "1.0.0");
+    assert!(json.krate.max_version.is_some());
+    assert_eq!(json.krate.max_version.unwrap(), "1.0.0");
     assert_eq!(json.warnings.invalid_categories, vec!["bar".to_string()]);
 }
 
@@ -954,7 +958,8 @@ fn good_badges() {
 
     let json: GoodCrate = ::json(&mut response);
     assert_eq!(json.krate.name, "foobadger");
-    assert_eq!(json.krate.max_version, "1.0.0");
+    assert!(json.krate.max_version.is_some());
+    assert_eq!(json.krate.max_version.unwrap(), "1.0.0");
 
     let mut response = ok_resp!(
         middle.call(req.with_method(Method::Get)
@@ -1000,7 +1005,8 @@ fn ignored_badges() {
 
     let json: GoodCrate = ::json(&mut response);
     assert_eq!(json.krate.name, "foo_ignored_badge");
-    assert_eq!(json.krate.max_version, "1.0.0");
+    assert!(json.krate.max_version.is_some());
+    assert_eq!(json.krate.max_version.unwrap(), "1.0.0");
     assert_eq!(json.warnings.invalid_badges.len(), 2);
     assert!(json.warnings.invalid_badges.contains(&"travis-ci".to_string()));
     assert!(json.warnings.invalid_badges.contains(&"not-a-badge".to_string()));

src/version.rs

@@ -198,22 +198,25 @@ impl Version {
                                &[&self.crate_id])?;
         let max_version = rows.iter()
                               .next()
-                              .map(|r| r.get::<&str, String>("max_version"))
-                              .map(|v| semver::Version::parse(&v).unwrap())
-                              .unwrap();
-        let zero = semver::Version::parse("0.0.0").unwrap();
+                              .and_then(|r| r.get::<&str, Option<String>>("max_version"))
+                              .map(|v| semver::Version::parse(&v).unwrap());
         let max_update_stmt = conn.prepare("UPDATE crates SET max_version = $1 WHERE id = $2")?;
-        if yanked && max_version == self.num {
-            let new_max = conn.query("SELECT num FROM versions \
-                                      WHERE crate_id = $1 AND yanked = FALSE AND id != $2",
-                                     &[&self.crate_id, &self.id])?
-                              .iter()
-                              .map(|r| r.get::<&str, String>("num"))
-                              .filter_map(|v| semver::Version::parse(&v).ok())
-                              .max()
-                              .unwrap();
-            max_update_stmt.execute(&[&new_max.to_string(), &self.crate_id])?;
-        } else if !yanked && (self.num > max_version || max_version == zero) {
+        if let Some(max_version) = max_version {
+            let zero = semver::Version::parse("0.0.0").unwrap();
+            if yanked && max_version == self.num {
+                let new_max = conn.query("SELECT num FROM versions \
+                                          WHERE crate_id = $1 AND yanked = FALSE AND id != $2",
+                                         &[&self.crate_id, &self.id])?
+                                  .iter()
+                                  .map(|r| r.get::<&str, String>("num"))
+                                  .filter_map(|v| semver::Version::parse(&v).ok())
+                                  .max();
+                max_update_stmt.execute(&[&new_max.map(|v| v.to_string()), &self.crate_id])?;
+            } else if !yanked && (self.num > max_version || max_version == zero) {
+                max_update_stmt.execute(&[&self.num.to_string(), &self.crate_id])?;
+            }
+        } else if !yanked {
+            // no max version, all versions yanked
             max_update_stmt.execute(&[&self.num.to_string(), &self.crate_id])?;
         }