Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(#41): latex.rs, puzzles #47

Merged
merged 11 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
6 changes: 6 additions & 0 deletions cli/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ 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 together with content type flags.
// Together with --report option let's add flags for XML, TeX, and Text
// reports. So user can generate report in many formats like this: --report
// --tex --html.
// @todo #41:45min Parse content type flag from stdin. Let's pick report generation
// function based on provided flags, such as: --xml, --tex, --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
88 changes: 88 additions & 0 deletions server/src/report/latex.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// 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(None);
/// print!("{content}")
/// ```
pub fn template(path: Option<&str>) -> String {
Copy link
Collaborator

Choose a reason for hiding this comment

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

@h1alexbel i think in this case path should be required, you can add it to Args and set default value if nothing was provided to --report argument; txt would be fine for default value

Copy link
Owner Author

@h1alexbel h1alexbel Jun 25, 2024

Choose a reason for hiding this comment

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

@l3r8yJ yes, this function will be called only if cli parser will find non-empty --report option.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@h1alexbel can you add the puzzle or implementation?

Copy link
Owner Author

Choose a reason for hiding this comment

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

@l3r8yJ it's already added as puzzle in cli/src/args.rs

return fs::read_to_string(Path::new(path.unwrap_or("resources/report.tex")))
.unwrap();
Copy link
Collaborator

Choose a reason for hiding this comment

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

@h1alexbel it's not the best practice to use #unwrap, my suggestion is to setup clippy to exclude usage of #unwrap

Copy link
Owner Author

Choose a reason for hiding this comment

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

@l3r8yJ Should I use match instead?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@h1alexbel sure

}

#[cfg(test)]
mod tests {
use anyhow::Result;
use std::fs::File;
use std::io::Write;
use tempdir::TempDir;

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

#[test]
fn returns_default_template() -> Result<()> {
l3r8yJ marked this conversation as resolved.
Show resolved Hide resolved
let content = template(None);
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(())
}

#[test]
fn returns_custom_template() -> Result<()> {
let temp = TempDir::new("temp")?;
let path = &temp.path().join("custom.tex");
let expected = "$This is custom template!$";
let bytes = expected.to_string().into_bytes();
File::create(path).unwrap().write_all(bytes.as_slice())?;
let content = template(path.to_str());
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;
Loading