jank/loadstar
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: jank:fd8f18de9ae0f38606a55d93c655cdf747fe8e2e
Branches Tags
jank:main
jank:renovate/actions-cache-digest
jank:renovate/lock-file-maintenance
..
compare: jank:4f0180321c5b29e075987364b5046f50cae53ecf
Branches Tags
jank:renovate/actions-cache-digest
jank:renovate/lock-file-maintenance
jank:main

No commits in common. "fd8f18de9ae0f38606a55d93c655cdf747fe8e2e" and "4f0180321c5b29e075987364b5046f50cae53ecf" have entirely different histories.
fd8f18de9a ... 4f0180321c

3 changed files with 2 additions and 85 deletions
Show Stats Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -22,7 +22,7 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "loadstar"
version = "0.0.6"
version = "0.0.5"
dependencies = [
"tiny_http",
]

2
Cargo.toml
View File

@ -2,7 +2,7 @@
name = "loadstar"
description = "A simple web framework for rust"
repository = "https://git.kjan.de/jank/loadstar"
version = "0.0.6"
version = "0.0.5"
license = "GPL-3.0-only"
edition = "2021"

83
src/entities/request.rs
View File

@ -1,5 +1,3 @@
use std::collections::HashMap;
use tiny_http::Request;
pub trait Url {
@ -12,51 +10,6 @@ impl Url for Request {
}
}
pub trait Parameters {
fn get_post_parameters(&mut self) -> HashMap<String, String>;
fn get_get_parameters(&mut self) -> Option<HashMap<String, String>>;
}
impl Parameters for Request {
fn get_post_parameters(&mut self) -> HashMap<String, String> {
let mut content = String::new();
self.as_reader().read_to_string(&mut content).unwrap();
let mut key_value_pairs = HashMap::new();
let parts = content.split("&");
for part in parts {
let mut key_value = part.split("=");
key_value_pairs.insert(key_value.next().unwrap().to_string(), key_value.next().unwrap().to_string());
}
key_value_pairs
}
fn get_get_parameters(&mut self) -> Option<HashMap<String, String>> {
let content = self.url().split("?").nth(1);
if content.is_none() {
return None;
}
let content = content.unwrap();
let mut key_value_pairs = HashMap::new();
let parts = content.split("&");
for part in parts {
let mut key_value = part.split("=");
key_value_pairs.insert(key_value.next().unwrap().to_string(), key_value.next().unwrap().to_string());
}
Some(key_value_pairs)
}
}
#[cfg(test)]
mod tests {
use crate::entities::request::*;
@ -74,40 +27,4 @@ mod tests {
assert_eq!(request2.get_url_without_parameters(), "/test2");
}
#[test]
fn test_get_post_parameters() {
let test_request = TestRequest::new();
let test_request = test_request.with_body("a=b&c=d");
let actual = Request::from(test_request).get_post_parameters();
let mut expected = HashMap::new();
expected.insert("a".to_string(), "b".to_string());
expected.insert("c".to_string(), "d".to_string());
assert_eq!(actual, expected);
}
#[test]
fn test_get_get_parameters_with_no_get_parameters() {
let test_request = TestRequest::new();
let test_request = test_request.with_path("/test");
let actual = Request::from(test_request).get_get_parameters();
assert_eq!(actual, None);
}
#[test]
fn test_get_get_parameters() {
let test_request = TestRequest::new();
let test_request = test_request.with_path("/test?a=b&c=d");
let actual = Request::from(test_request).get_get_parameters();
let mut expected = HashMap::new();
expected.insert("a".to_string(), "b".to_string());
expected.insert("c".to_string(), "d".to_string());
assert_eq!(actual, Some(expected));
}
}