Added back the functionality for the Crate's holding their licensing information.

Author: baileyn

src/krate.rs

@@ -103,6 +103,7 @@ pub struct EncodableCrate {
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub documentation: Option<String>,
+    pub license: Option<String>,
     pub repository: Option<String>,
     pub links: CrateLinks,
     pub exact_match: bool,
@@ -132,13 +133,14 @@ pub struct NewCrate<'a> {
 
 impl<'a> NewCrate<'a> {
     pub fn create_or_update(
-        self,
+        mut self,
         conn: &PgConnection,
+        license_file: Option<&'a str>,
         uploader: i32,
     ) -> CargoResult<Crate> {
         use diesel::update;
 
-        self.validate()?;
+        self.validate(license_file)?;
         self.ensure_name_not_reserved(conn)?;
 
         conn.transaction(|| {
@@ -159,7 +161,7 @@ impl<'a> NewCrate<'a> {
         })
     }
 
-    fn validate(&self) -> CargoResult<()> {
+    fn validate(&mut self, license_file: Option<&'a str>) -> CargoResult<()> {
         fn validate_url(url: Option<&str>, field: &str) -> CargoResult<()> {
             let url = match url {
                 Some(s) => s,
@@ -193,6 +195,24 @@ impl<'a> NewCrate<'a> {
         validate_url(self.homepage, "homepage")?;
         validate_url(self.documentation, "documentation")?;
         validate_url(self.repository, "repository")?;
+        self.validate_license(license_file)?;
+        Ok(())
+    }
+
+    fn validate_license(&mut self, license_file: Option<&str>) -> CargoResult<()> {
+        if let Some(ref license) = self.license {
+            for part in license.split('/') {
+               license_exprs::validate_license_expr(part)
+                   .map_err(|e| human(&format_args!("{}; see http://opensource.org/licenses \
+                                                    for options, and http://spdx.org/licenses/ \
+                                                    for their identifiers", e)))?;
+            }
+        } else if license_file.is_some() {
+            // If no license is given, but a license file is given, flag this
+            // crate as having a nonstandard license. Note that we don't
+            // actually do anything else with license_file currently.
+            self.license = Some("non-standard");
+        }
         Ok(())
     }
 
@@ -480,6 +500,7 @@ impl Crate {
             homepage,
             documentation,
             repository,
+            license,
             ..
         } = self;
         let versions_link = match versions {
@@ -505,6 +526,7 @@ impl Crate {
             exact_match: exact_match,
             description: description,
             repository: repository,
+            license: license,
             links: CrateLinks {
                 version_downloads: format!("/api/v1/crates/{}/downloads", name),
                 versions: versions_link,
@@ -1059,7 +1081,7 @@ pub fn new(req: &mut Request) -> CargoResult<Response> {
         };
 
         let license_file = new_crate.license_file.as_ref().map(|s| &**s);
-        let krate = persist.create_or_update(&conn, user.id)?;
+        let krate = persist.create_or_update(&conn, license_file, user.id)?;
 
         let owners = krate.owners(&conn)?;
         if rights(req.app(), &owners, &user)? < Rights::Publish {

src/tests/all.rs

@@ -325,6 +325,7 @@ impl<'a> CrateBuilder<'a> {
 
         let mut krate = self.krate.create_or_update(
             connection,
+            None,
             self.owner_id,
         )?;