diff options
| -rw-r--r-- | src/lib.rs | 58 | ||||
| -rw-r--r-- | src/main.rs | 28 | ||||
| -rw-r--r-- | tests/room_tests.rs | 27 |
3 files changed, 87 insertions, 26 deletions
diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..09e092c --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,58 @@ +/* + Social program for Ramaskrik. + Copyright (C) 2019 Harald Eilertsen <haraldei@anduin.net> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. +*/ +#![feature(proc_macro_hygiene, decl_macro)] + +use rocket::{ + get, + response::content::Json, + routes, +}; +use rocket_contrib::{ + database, + databases::diesel, +}; +use std::collections::HashMap; +use std::error::Error; +use std::result::Result; + +#[database("main")] +struct DbConn(diesel::PgConnection); + +#[get("/")] +fn get_rooms(_db: DbConn) -> Json<String> { + Json("[]".into()) +} + +pub fn build_rocket() -> Result<rocket::Rocket, Box<dyn Error>> { + let db_url = dotenv::var("DATABASE_URL") + .map_err(|_| "No database! Set DATABASE_URL env var and try again.")?; + + let mut db_config = HashMap::new(); + db_config.insert("url", rocket::config::Value::from(db_url)); + + let mut databases = HashMap::new(); + databases.insert("main", rocket::config::Value::from(db_config)); + + let mut config = rocket::Config::active()?; + config.extras.insert("databases".into(), rocket::config::Value::from(databases)); + + Ok(rocket::custom(config) + .attach(DbConn::fairing()) + .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) + .mount("/rooms", routes![get_rooms])) +} diff --git a/src/main.rs b/src/main.rs index e031e73..fdc8ff3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,36 +15,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#![feature(proc_macro_hygiene, decl_macro)] -use rocket_contrib::{ - database, - databases::diesel, -}; -use std::collections::HashMap; +use ramaskrik; use std::error::Error; use std::result::Result; -#[database("main")] -struct DbConn(diesel::PgConnection); - fn main() -> Result<(), Box<dyn Error>> { - let db_url = dotenv::var("DATABASE_URL") - .map_err(|_| "No database! Set DATABASE_URL env var and try again.")?; - - let mut db_config = HashMap::new(); - db_config.insert("url", rocket::config::Value::from(db_url)); - - let mut databases = HashMap::new(); - databases.insert("main", rocket::config::Value::from(db_config)); - - let mut config = rocket::Config::active()?; - config.extras.insert("databases".into(), rocket::config::Value::from(databases)); - - rocket::custom(config) - .attach(DbConn::fairing()) - .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) - .launch(); - + ramaskrik::build_rocket()?.launch(); Ok(()) } diff --git a/tests/room_tests.rs b/tests/room_tests.rs new file mode 100644 index 0000000..7415fd5 --- /dev/null +++ b/tests/room_tests.rs @@ -0,0 +1,27 @@ +/* + Social program for Ramaskrik. + Copyright (C) 2019 Harald Eilertsen <haraldei@anduin.net> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. +*/ + +use ramaskrik; + +#[test] +fn getting_rooms_from_api() { + let server = ramaskrik::build_rocket().unwrap(); + let client = rocket::local::Client::new(server).unwrap(); + let mut response = client.get("/rooms").dispatch(); + assert_eq!(response.body_string(), Some("[]".into())); +} |