Skip to content

Commit 4f6da15

Browse files
dkorolevdkorolev
authored
Merge pull request #19 from dimacurrentai/main
Created a shared lib, moved JSON+HTML into it, made it work under Docker as well.
2 parents b685256 + e2a8ab0 commit 4f6da15

File tree

5 files changed

+155
-120
lines changed

5 files changed

+155
-120
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ target/
66

77
# Using the `Dockerfile.template` in the root directory now.
88
Dockerfile
9+
10+
# To make sure all `lib` directories are effectively symlinks to `$REPO_ROOT/lib`.
11+
# Unless they are explicit copies, since otherwise Docker-based builds would not succeed.
12+
step*/code/lib

‎lib/http.rs

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
use askama::Template;
2+
use axum::response::{Html, IntoResponse, Response};
3+
use hyper::{
4+
header::{self, HeaderMap},
5+
StatusCode,
6+
};
7+
8+
#[derive(Template)]
9+
#[template(path = "jsontemplate.html", escape = "none")]
10+
pub struct DataHtmlTemplate<'a> {
11+
pub raw_json_as_string: &'a str,
12+
}
13+
14+
pub async fn json_or_html(headers: HeaderMap, raw_json_as_string: &str) -> impl IntoResponse {
15+
if accept_header_contains_text_html(&headers) {
16+
let template = DataHtmlTemplate { raw_json_as_string };
17+
match template.render() {
18+
Ok(html) => Html(html).into_response(),
19+
Err(_) => axum::http::StatusCode::INTERNAL_SERVER_ERROR.into_response(),
20+
}
21+
} else {
22+
Response::builder()
23+
.status(StatusCode::OK)
24+
.header("content-type", "application/json")
25+
.body(raw_json_as_string.to_string())
26+
.unwrap()
27+
.into_response()
28+
}
29+
}
30+
31+
pub fn accept_header_contains_text_html(headers: &HeaderMap) -> bool {
32+
headers
33+
.get_all(header::ACCEPT)
34+
.iter()
35+
.filter_map(|s| s.to_str().ok())
36+
.flat_map(|s| s.split(','))
37+
.map(|s| s.split(';').next().unwrap_or("").trim())
38+
.any(|s| s.eq_ignore_ascii_case("text/html"))
39+
}
40+
41+
#[cfg(test)]
42+
mod tests {
43+
use super::*;
44+
use axum::{
45+
http::{self, Request, StatusCode},
46+
routing::get,
47+
Router,
48+
};
49+
use tower::util::ServiceExt;
50+
51+
#[tokio::test]
52+
async fn test_getting_json() {
53+
let app =
54+
Router::new().route("/json", get(|headers| async move { json_or_html(headers, r#"{"test":"data"}"#).await }));
55+
56+
let response = app
57+
.oneshot(
58+
Request::builder()
59+
.method(http::Method::GET)
60+
.uri("/json")
61+
.header(http::header::ACCEPT, mime::APPLICATION_JSON.as_ref())
62+
.body(String::new())
63+
.unwrap(),
64+
)
65+
.await
66+
.unwrap();
67+
68+
assert_eq!(response.status(), StatusCode::OK);
69+
assert!(response
70+
.headers()
71+
.get(http::header::CONTENT_TYPE)
72+
.unwrap()
73+
.to_str()
74+
.unwrap()
75+
.split(";")
76+
.any(|x| x.trim() == "application/json"));
77+
}
78+
79+
#[tokio::test]
80+
async fn test_getting_html() {
81+
let app =
82+
Router::new().route("/json", get(|headers| async move { json_or_html(headers, r#"{"test":"data"}"#).await }));
83+
84+
let response = app
85+
.oneshot(
86+
Request::builder()
87+
.method(http::Method::GET)
88+
.uri("/json")
89+
.header(http::header::ACCEPT, mime::TEXT_HTML.as_ref())
90+
.body(String::new())
91+
.unwrap(),
92+
)
93+
.await
94+
.unwrap();
95+
96+
assert_eq!(response.status(), StatusCode::OK);
97+
assert!(response
98+
.headers()
99+
.get(http::header::CONTENT_TYPE)
100+
.unwrap()
101+
.to_str()
102+
.unwrap()
103+
.split(";")
104+
.any(|x| x.trim() == "text/html"));
105+
}
106+
107+
#[test]
108+
fn test_accept_header_contains_text_html() {
109+
let mut headers = HeaderMap::new();
110+
headers.insert(header::ACCEPT, "text/html".parse().unwrap());
111+
assert!(accept_header_contains_text_html(&headers));
112+
113+
headers.insert(header::ACCEPT, "application/json, Text/Html; q=0.5".parse().unwrap());
114+
assert!(accept_header_contains_text_html(&headers));
115+
116+
headers.clear();
117+
headers.insert(header::ACCEPT, "application/xml".parse().unwrap());
118+
assert!(!accept_header_contains_text_html(&headers));
119+
}
120+
}

‎step02_httpserver/code/build.rs

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
use std::fs;
2+
use std::os::unix::fs::symlink;
3+
use std::path::Path;
4+
5+
fn is_dir_or_symlink_to_dir(path: &Path) -> bool {
6+
match fs::metadata(path) {
7+
Ok(meta) => meta.is_dir(),
8+
Err(_) => false,
9+
}
10+
}
11+
fn main() {
12+
let link = Path::new("lib");
13+
if !is_dir_or_symlink_to_dir(link) {
14+
symlink("../../lib", Path::new("lib")).expect("Failed to create symlink");
15+
}
16+
}

‎step02_httpserver/code/src/main.rs

+7-120
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,19 @@
1-
use askama::Template;
2-
use axum::{
3-
response::{Html, IntoResponse, Response},
4-
routing::get,
5-
serve, Router,
6-
};
7-
use hyper::{
8-
header::{self, HeaderMap},
9-
StatusCode,
10-
};
1+
use axum::{response::IntoResponse, routing::get, serve, Router};
2+
use hyper::header::HeaderMap;
113
use std::net::SocketAddr;
124
use tokio::{
135
net::TcpListener,
146
signal::unix::{signal, SignalKind},
157
sync::mpsc,
168
};
179

18-
#[derive(Template)]
19-
#[template(path = "jsontemplate.html", escape = "none")]
20-
struct DataHtmlTemplate<'a> {
21-
raw_json_as_string: &'a str,
22-
}
23-
2410
const SAMPLE_JSON: &str = include_str!("sample.json");
2511

26-
async fn json_or_html(headers: HeaderMap) -> impl IntoResponse {
27-
let raw_json_as_string = SAMPLE_JSON;
28-
if accept_header_contains_text_html(&headers) {
29-
let template = DataHtmlTemplate { raw_json_as_string };
30-
match template.render() {
31-
Ok(html) => Html(html).into_response(),
32-
Err(_) => axum::http::StatusCode::INTERNAL_SERVER_ERROR.into_response(),
33-
}
34-
} else {
35-
Response::builder()
36-
.status(StatusCode::OK)
37-
.header("content-type", "application/json")
38-
.body(raw_json_as_string.to_string())
39-
.unwrap()
40-
.into_response()
41-
}
42-
}
12+
#[path = "../lib/http.rs"]
13+
mod http;
4314

44-
fn accept_header_contains_text_html(headers: &HeaderMap) -> bool {
45-
headers
46-
.get_all(header::ACCEPT)
47-
.iter()
48-
.filter_map(|s| s.to_str().ok())
49-
.flat_map(|s| s.split(','))
50-
.map(|s| s.split(';').next().unwrap_or("").trim())
51-
.any(|s| s.eq_ignore_ascii_case("text/html"))
15+
async fn json_handler(headers: HeaderMap) -> impl IntoResponse {
16+
http::json_or_html(headers, SAMPLE_JSON).await
5217
}
5318

5419
#[tokio::main]
@@ -68,7 +33,7 @@ async fn main() {
6833
}
6934
}),
7035
)
71-
.route("/json", get(json_or_html));
36+
.route("/json", get(json_handler));
7237

7338
let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
7439
let listener = TcpListener::bind(addr).await.unwrap();
@@ -89,81 +54,3 @@ async fn main() {
8954

9055
println!("rust http server down");
9156
}
92-
93-
#[cfg(test)]
94-
mod tests {
95-
use super::*;
96-
use axum::{
97-
http::{self, Request, StatusCode},
98-
Router,
99-
};
100-
use tower::util::ServiceExt;
101-
102-
#[tokio::test]
103-
async fn test_getting_json() {
104-
let app = Router::new().route("/json", get(json_or_html));
105-
106-
let response = app
107-
.oneshot(
108-
Request::builder()
109-
.method(http::Method::GET)
110-
.uri("/json")
111-
.header(http::header::ACCEPT, mime::APPLICATION_JSON.as_ref())
112-
.body(String::new())
113-
.unwrap(),
114-
)
115-
.await
116-
.unwrap();
117-
118-
assert_eq!(response.status(), StatusCode::OK);
119-
assert!(response
120-
.headers()
121-
.get(http::header::CONTENT_TYPE)
122-
.unwrap()
123-
.to_str()
124-
.unwrap()
125-
.split(";")
126-
.any(|x| x.trim() == "application/json"));
127-
}
128-
129-
#[tokio::test]
130-
async fn test_getting_html() {
131-
let app = Router::new().route("/json", get(json_or_html));
132-
133-
let response = app
134-
.oneshot(
135-
Request::builder()
136-
.method(http::Method::GET)
137-
.uri("/json")
138-
.header(http::header::ACCEPT, mime::TEXT_HTML.as_ref())
139-
.body(String::new())
140-
.unwrap(),
141-
)
142-
.await
143-
.unwrap();
144-
145-
assert_eq!(response.status(), StatusCode::OK);
146-
assert!(response
147-
.headers()
148-
.get(http::header::CONTENT_TYPE)
149-
.unwrap()
150-
.to_str()
151-
.unwrap()
152-
.split(";")
153-
.any(|x| x.trim() == "text/html"));
154-
}
155-
156-
#[test]
157-
fn test_accept_header_contains_text_html() {
158-
let mut headers = HeaderMap::new();
159-
headers.insert(header::ACCEPT, "text/html".parse().unwrap());
160-
assert!(accept_header_contains_text_html(&headers));
161-
162-
headers.insert(header::ACCEPT, "application/json, Text/Html; q=0.5".parse().unwrap());
163-
assert!(accept_header_contains_text_html(&headers));
164-
165-
headers.clear();
166-
headers.insert(header::ACCEPT, "application/xml".parse().unwrap());
167-
assert!(!accept_header_contains_text_html(&headers));
168-
}
169-
}

‎step02_httpserver/run.sh

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
set -e
44

5+
# Docker would correctly not follow symlinks outside the current directory,
6+
# but my goal remains that Docker-based builds are reproducible,
7+
# yet the `lib` directory from the root of the reposirory is shared.
8+
# Since the default Cargo-based build would create a symlink,
9+
# this symlink needs to be removed first. If there already is a dir, it's OK to stay.
10+
[ -L code/lib ] && (unlink code/lib && echo 'Symlink of `code/lib` removed.') || echo 'No symlink to remove.'
11+
[ -d code/lib ] && echo 'The `code/lib` dir exists, using it.' || (cp -r ../lib code && echo 'Copied `../lib` into `code/`.')
12+
513
docker build -f ../Dockerfile.template . -t demo
614

715
docker run --rm --network=bridge -p 3000:3000 -t demo &

0 commit comments

Comments
 (0)