Reorganize into separate library crate

This will make it easier to test

.gitignore

@@ -1,2 +1,3 @@
 /target
+/microblog-lib/target
 .env

Cargo.lock

@@ -931,6 +931,22 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 [[package]]
 name = "microblog"
 version = "0.1.0"
+dependencies = [
+ "async-std",
+ "chrono",
+ "dotenv",
+ "microblog-lib",
+ "serde 1.0.115",
+ "serde_json",
+ "tera",
+ "tide 0.13.0",
+ "tide-tera",
+ "uuid",
+]
+
+[[package]]
+name = "microblog-lib"
+version = "0.1.0"
 dependencies = [
  "async-std",
  "chrono",

Cargo.toml

@@ -6,13 +6,16 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[workspace]
+
 [dependencies]
 async-std = { version = "1.6.0", features = ["attributes"] }
 chrono = { version = "0.4", features = ["serde", "rustc-serialize"] }
 dotenv = "0.15.0"
 serde = "1.0.115"
+serde_json = "1.0.57"
 tera = "1.5.0"
 tide = "0.13.0"
 tide-tera = "0.1.1"
 uuid = { version = "0.4", features = ["serde", "v4"] }
-serde_json = "1.0.57"
+microblog-lib = { path = "microblog-lib" }

microblog-lib/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "microblog-lib"
+version = "0.1.0"
+authors = ["Dylan Baker <dylan@simulacrum.party>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-std = { version = "1.6.0", features = ["attributes"] }
+chrono = { version = "0.4", features = ["serde", "rustc-serialize"] }
+dotenv = "0.15.0"
+serde = "1.0.115"
+serde_json = "1.0.57"
+tera = "1.5.0"
+tide = "0.13.0"
+tide-tera = "0.1.1"
+uuid = { version = "0.4", features = ["serde", "v4"] }

microblog-lib/src/lib.rs

@@ -0,0 +1,47 @@
+use dotenv;
+use tide::utils::After;
+
+mod fs;
+mod middleware;
+mod post;
+mod routes;
+
+use middleware::*;
+
+#[derive(Clone)]
+pub struct State {
+    pub login_path: String,
+}
+
+pub async fn build_app() -> Result<tide::Server<State>, tide::Error> {
+    dotenv::dotenv().ok();
+
+    let login_path = std::env::var("LOGIN_PATH").unwrap_or(String::from("/login"));
+    let mut app = tide::with_state(State {
+        login_path: login_path.clone(),
+    });
+
+    app.at("/static").serve_dir("static")?;
+
+    app.with(After(errors));
+    app.with(session());
+
+    app.at("/").get(routes::index);
+    app.at("/posts")
+        .with(require_auth)
+        .post(routes::create_post);
+    app.at("/posts/:id")
+        .get(routes::single_post)
+        .post(routes::update_post)
+        .delete(routes::delete_post);
+    app.at("/posts/:id/edit")
+        .with(require_auth)
+        .get(routes::edit_post);
+    app.at(&login_path)
+        .with(require_guest)
+        .get(routes::login_page)
+        .post(routes::login);
+    app.at("/logout").with(require_auth).post(routes::logout);
+
+    Ok(app)
+}

src/routes.rs → microblog-lib/src/routes.rs

@@ -52,14 +52,16 @@ pub async fn create_post(mut req: Request<State>) -> Result {
 pub async fn update_post(mut req: Request<State>) -> Result {
     let mut post: Post = req.body_form().await?;
     post.save().await?;
-    req.session_mut().insert("flash_success", String::from("Post updated successfully"))?;
+    req.session_mut()
+        .insert("flash_success", String::from("Post updated successfully"))?;
     redirect(&format!("/posts/{}", post.id))
 }
 
 pub async fn delete_post(mut req: Request<State>) -> Result {
     let id: String = req.param("id")?;
     fs::delete_post(id)?;
-    req.session_mut().insert("flash_success", String::from("Post deleted successfully"))?;
+    req.session_mut()
+        .insert("flash_success", String::from("Post deleted successfully"))?;
     render_json_response(json!({ "success": "true" }))
 }
 
@@ -129,7 +131,6 @@ pub fn render_template(template: &str, context: &Context) -> Result<String> {
     Ok(html)
 }
 
-
 fn prepare_flash_messages(mut req: Request<State>) -> Context {
     let mut context = Context::new();
     context.insert("flash_error", &false);

src/main.rs

@@ -1,52 +1,12 @@
-use dotenv;
-
-use middleware::*;
-use tide::utils::After;
-
-mod fs;
-mod middleware;
-mod post;
-mod routes;
-
-#[derive(Clone)]
-pub struct State {
-    pub login_path: String,
-}
+use microblog_lib::build_app;
+use tide::Result;
 
 #[async_std::main]
-async fn main() -> std::io::Result<()> {
-    dotenv::dotenv().ok();
+async fn main() -> Result<()> {
     tide::log::start();
-
-    let login_path = std::env::var("LOGIN_PATH").unwrap_or(String::from("/login"));
     let hostname = std::env::var("HOSTNAME").unwrap_or(String::from("127.0.0.1"));
     let port = std::env::var("PORT").unwrap_or(String::from("8080"));
-    let mut app = tide::with_state(State {
-        login_path: login_path.clone(),
-    });
-
-    app.at("/static").serve_dir("static")?;
-
-    app.with(After(errors));
-    app.with(session());
-
-    app.at("/").get(routes::index);
-    app.at("/posts")
-        .with(require_auth)
-        .post(routes::create_post);
-    app.at("/posts/:id")
-        .get(routes::single_post)
-        .post(routes::update_post)
-        .delete(routes::delete_post);
-    app.at("/posts/:id/edit")
-        .with(require_auth)
-        .get(routes::edit_post);
-    app.at(&login_path)
-        .with(require_guest)
-        .get(routes::login_page)
-        .post(routes::login);
-    app.at("/logout").with(require_auth).post(routes::logout);
-
+    let app = build_app().await?;
     app.listen(format!("{}:{}", hostname, port)).await?;
 
     Ok(())