Skip to content

Commit

Permalink
Merge pull request #47 from h1alexbel/41
Browse files Browse the repository at this point in the history
feat(#41): latex.rs, puzzles
  • Loading branch information
h1alexbel authored Jun 26, 2024
2 parents 5fe43f5 + fac468e commit fe9cf78
Show file tree
Hide file tree
Showing 8 changed files with 115 additions and 31 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/copyrights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: yegor256/[email protected]
with:
ignore: >-
server/resources/report.tex
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/target
/out
### Rust template
# Generated by Cargo
# will have compiled files and executables
Expand Down
32 changes: 1 addition & 31 deletions .github/workflows/license.yml → .rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,4 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
---
name: license
on:
push:
pull_request:
jobs:
license:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- run: |
set -e
find . -type f \( \
-name "LICENSE.*" \
-o -name "*.yml" \
-o -name "*.xml" \
-o -name "*.rs" \
-o -name "*.toml" \) > files.txt
header="Copyright (c) 2024 Aliaksei Bialiauski"
failed="false"
while IFS= read -r file; do
if ! grep -q "$header" "$file"; then
failed="true"
echo "No license in: $file"
fi
done < files.txt
if [ "${failed}" == "true" ]; then
exit 1
fi
max_width = 90
4 changes: 4 additions & 0 deletions cli/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ use clap::Parser;
// We should process the port argument and
// pass it to the server on `start` command.
// Start command should be added also with clap
// @todo #41:15min Add --report argument.
// Let's add --report option for generating reports in desired formats:
// We should support following formats: xml, tex, and txt. User should have
// ability to generate report in multiple formats as well: --report tex,xml,txt.
#[derive(Parser, Debug)]
pub(crate) struct Args {
/// The port to run
Expand Down
7 changes: 7 additions & 0 deletions server/resources/report.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
\usepackage{to-be-determined}
\documentclass[12pt]{article}
\begin{document}

\section*{Fakehub report}
\tbd{History: TBD}
\end{document}
1 change: 1 addition & 0 deletions server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use tokio::net::TcpListener;
use crate::routes::home;
use crate::xml::storage::touch_storage;

pub mod report;
mod routes;
mod xml;

Expand Down
73 changes: 73 additions & 0 deletions server/src/report/latex.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// The MIT License (MIT)
//
// Copyright (c) 2024 Aliaksei Bialiauski
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
use std::fs;
use std::path::Path;

/// Read LaTeX template.
/// @todo #41:60min Add function for appending new content into the template.
/// We need to create new function that will append input into the template,
/// thus it will build a detailed report.
/// # Arguments
///
/// * `path`: Template path
///
/// returns: String
///
/// # Examples
///
/// ```
/// use crate::server::report::latex::template;
/// let content = template("resources/report.tex");
/// print!("{content}")
/// ```
pub fn template(path: &str) -> String {
return fs::read_to_string(Path::new(path)).expect("template should be read from");
}

#[cfg(test)]
mod tests {
use anyhow::Result;

use crate::report::latex::template;

#[test]
// @todo #41:60min Add support of @ExtendsWith from JUnit in order to pass expected as test parameter.
// We should use extensions in order to pass expected as parameters into
// test. If there is no crate with such functionality - let's develop and
// release one.
fn returns_template_content() -> Result<()> {
let content = template("resources/report.tex");
let expected = r"\usepackage{to-be-determined}
\documentclass[12pt]{article}
\begin{document}
\section*{Fakehub report}
\tbd{History: TBD}
\end{document}
";
assert_eq!(
content, expected,
"Template content '{content}' does not match with '{expected}'"
);
Ok(())
}
}
25 changes: 25 additions & 0 deletions server/src/report/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// The MIT License (MIT)
//
// Copyright (c) 2024 Aliaksei Bialiauski
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
// @todo #41:45min Create similar to latex.rs functions for XML and TXT formats.
// Let's create similar to latex.rs functions for generating reports in XML and TXT.
// Don't forget to remove this puzzle.
pub mod latex;

4 comments on commit fe9cf78

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on fe9cf78 Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 41-6875de44 discovered in cli/src/args.rs) and submitted as #52. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on fe9cf78 Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 41-a34da1fd discovered in server/src/report/latex.rs) and submitted as #53. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on fe9cf78 Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 41-8e9aa4b2 discovered in server/src/report/latex.rs) and submitted as #54. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on fe9cf78 Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 41-6165498f discovered in server/src/report/mod.rs) and submitted as #55. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.