Switch to using toml for categories instead of plain text

Author: carols10cents

Cargo.lock

@@ -35,6 +35,7 @@ env_logger = "0.3"
 rustc-serialize = "0.3"
 license-exprs = "^1.3"
 dotenv = "0.8.0"
+toml = "0.2"
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"

Cargo.toml

@@ -1,30 +1,96 @@
-// Sync available crate categories from `src/categories.txt`.
+// Sync available crate categories from `src/categories.toml`.
 // Runs when the server is started.
 
+use toml;
 use pg;
 use env;
-use util::errors::CargoResult;
+use util::errors::{CargoResult, ChainError, internal};
+
+struct Category {
+    name: String,
+    slug: String,
+}
+
+impl Category {
+    fn concat(&self, child: &Category) -> Category {
+        Category {
+            name: format!("{}::{}", self.name, child.name),
+            slug: format!("{}::{}", self.slug, child.slug),
+        }
+    }
+}
+
+fn concat_parent_and_child(parent: Option<&Category>, child: Category)
+                           -> Category {
+    parent.map(|p| p.concat(&child)).unwrap_or(child)
+}
+
+fn required_string_from_toml(toml: &toml::Table, key: &str)
+                             -> CargoResult<String> {
+    toml.get(key)
+        .and_then(toml::Value::as_str)
+        .map(str::to_string)
+        .chain_error(|| {
+            internal("Expected Category toml attribute to be a String")
+        })
+}
+
+fn category_from_toml(toml: &toml::Value, parent: Option<&Category>)
+                      -> CargoResult<Vec<Category>> {
+    let toml = toml.as_table().chain_error(|| {
+        internal("Category isn't a toml Table")
+    })?;
+
+    let category = Category {
+        slug: required_string_from_toml(&toml, "slug")?,
+        name: required_string_from_toml(&toml, "name")?,
+    };
+
+    let category = concat_parent_and_child(parent, category);
+
+    let mut children: Vec<_> = toml.get("categories")
+        .and_then(toml::Value::as_slice)
+        .map(|children| {
+            children.iter()
+                .flat_map(|ref child| {
+                    category_from_toml(child, Some(&category))
+                        .expect("Could not create child from toml")
+                }).collect()
+        }).unwrap_or(Vec::new());
+
+    children.push(category);
+
+    Ok(children)
+}
 
 pub fn sync() -> CargoResult<()> {
     let conn = pg::Connection::connect(&env("DATABASE_URL")[..],
                                              pg::TlsMode::None).unwrap();
     let tx = conn.transaction().unwrap();
 
-    let categories = include_str!("./categories.txt");
+    let categories = include_str!("./categories.toml");
+    let toml = toml::Parser::new(categories).parse().expect(
+        "Could not parse categories.toml"
+    );
+
+    let categories = toml.get("categories")
+                         .expect("No categories key found")
+                         .as_slice()
+                         .expect("Categories isn't a toml::Array");
 
-    let slug_categories: Vec<_> = categories.lines().map(|c| {
-        let mut parts = c.splitn(2, ' ');
-        let slug = parts.next().expect("No slug found!");
-        let name = parts.next().expect("No display name found!");
-        (slug, name)
-    }).collect();
+    let categories: Vec<_> = categories
+        .iter()
+        .flat_map(|c| {
+            category_from_toml(c, None)
+                .expect("Categories from toml failed")
+        }).collect();
 
-    let insert = slug_categories.iter().map(|&(ref slug, ref name)| {
-        format!("(LOWER('{}'), '{}')", slug, name)
+    let insert = categories.iter().map(|ref category| {
+        format!("(LOWER('{}'), '{}')", category.slug, category.name)
     }).collect::<Vec<_>>().join(",");
 
-    let in_clause = slug_categories.iter().map(|&(slug, _)| {
-        format!("LOWER('{}')", slug)
+    let in_clause = categories.iter().map(|ref category| {
+        format!("LOWER('{}')", category.slug)
     }).collect::<Vec<_>>().join(",");
 
     try!(tx.batch_execute(

src/categories.rs

@@ -0,0 +1,27 @@
+[[categories]]
+slug = "development-tools"
+name = "Development Tools"
+
+[[categories.categories]]
+  slug = "testing"
+  name = "Testing"
+
+  [[categories.categories.categories]]
+    slug = "mocking"
+    name = "Mocking"
+
+[[categories]]
+slug = "libraries"
+name = "Libraries"
+
+[[categories.categories]]
+  slug = "async"
+  name = "Async"
+
+[[categories.categories]]
+  slug = "date-and-time"
+  name = "Date and Time"
+
+[[categories]]
+slug = "games"
+name = "Games"

src/categories.toml

@@ -21,6 +21,7 @@ extern crate s3;
 extern crate semver;
 extern crate time;
 extern crate url;
+extern crate toml;
 
 extern crate conduit;
 extern crate conduit_conditional_get;