Merge pull request #559 from vbrandl/dependabot/cargo/ructe-0.16.1

chore(deps): Bump ructe from 0.15.0 to 0.16.1

CHANGELOG.md

@@ -9,8 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.24.1 to 1.24.2 ([#547])
 * Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.13 to 0.11.14 ([#549])
+* Updated [`ructe`](https://github.com/kaj/ructe) from 0.15.0 to 0.16.1 ([#559])
 
 [#547]: https://github.com/vbrandl/hoc/pull/547
+[#559]: https://github.com/vbrandl/hoc/pull/559
 
 
 ## [0.30.0] 2023-01-16

Cargo.lock

@@ -1680,11 +1680,11 @@ dependencies = [
 
 [[package]]
 name = "ructe"
-version = "0.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85517cd381cf0c34694881d8aaf173107c6af7670e66cec18d7a1a8bfce3b758"
+checksum = "79c86c1631418815c5947a34be5872806586c65398754ec91cc2df35a8e26ba8"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.21.0",
  "bytecount",
  "itertools",
  "md5",

Cargo.toml

@@ -37,11 +37,11 @@ tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
 
 [build-dependencies]
-ructe = { version = "0.15.0", features = ["mime03"] }
+ructe = { version = "0.16.1", features = ["mime03"] }
 vergen = { version = "7.5.0", default-features = false, features = ["git"] }
 
 [dev-dependencies]
 awc = "3.0.1"
-ructe = "0.15.0"
+ructe = "0.16.1"
 tempfile = "3.3.0"
 tokio = "1.24.2"

src/error.rs

@@ -43,11 +43,11 @@ impl ResponseError for Error {
         let mut buf = Vec::new();
         match self {
             Error::BranchNotFound => {
-                templates::p404_no_master(&mut buf, VERSION_INFO, 0).unwrap();
+                templates::p404_no_master_html(&mut buf, VERSION_INFO, 0).unwrap();
                 HttpResponse::NotFound().content_type("text/html").body(buf)
             }
             _ => {
-                templates::p500(&mut buf, VERSION_INFO, 0).unwrap();
+                templates::p500_html(&mut buf, VERSION_INFO, 0).unwrap();
                 HttpResponse::InternalServerError()
                     .content_type("text/html")
                     .body(buf)

src/lib.rs

@@ -408,7 +408,7 @@ async fn overview<T: Service>(
                 url: &url,
                 branch,
             };
-            templates::overview(
+            templates::overview_html(
                 &mut buf,
                 VERSION_INFO,
                 rc_clone.load(Ordering::Relaxed),
@@ -433,7 +433,7 @@ async fn index(
     repo_count: web::Data<AtomicUsize>,
 ) -> Result<HttpResponse> {
     let mut buf = Vec::new();
-    templates::index(
+    templates::index_html(
         &mut buf,
         VERSION_INFO,
         repo_count.load(Ordering::Relaxed),
@@ -459,7 +459,7 @@ async fn generate(
             .filter(|s| !s.is_empty())
             .unwrap_or("master"),
     };
-    templates::generate(
+    templates::generate_html(
         &mut buf,
         VERSION_INFO,
         repo_count.load(Ordering::Relaxed),
@@ -472,7 +472,7 @@ async fn generate(
 
 fn p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
     let mut buf = Vec::new();
-    templates::p404(&mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed))?;
+    templates::p404_html(&mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed))?;
     Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
 }
 

templates/generate.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::{statics::VersionInfo, template::RepoGeneratorInfo};
 
 @(version_info: VersionInfo, repo_count: usize, base_url: &str, repo_info: &RepoGeneratorInfo)
 
-@:base("Hits-of-Code Badges", "Badge Generator", {
+@:base_html("Hits-of-Code Badges", "Badge Generator", {
 
 <p>
 Here is the markdown for the badge for <a href="https://@repo_info.service.url()/@repo_info.user/@repo_info.repo">@repo_info.user/@repo_info.repo</a>

templates/index.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize, base_url: &str)
 
-@:base("Hits-of-Code Badges", "Hits-of-Code Badges", {
+@:base_html("Hits-of-Code Badges", "Hits-of-Code Badges", {
 
 <p>
 This API offers badges for the Hits-of-Code metric for your repositories. This metric was proposed by

templates/overview.rs.html

@@ -1,10 +1,10 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 @use crate::template::RepoInfo;
 
 @(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo, label: String)
 
-@:base("Hits-of-Code Badges", "Overview", {
+@:base_html("Hits-of-Code Badges", "Overview", {
 
 <p>
 The project <a href="@repo_info.url">@repo_info.url</a> has

templates/p404.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize)
 
-@:base("Page not Found - Hits-of-Code Badges", "404 - Page not Found", {
+@:base_html("Page not Found - Hits-of-Code Badges", "404 - Page not Found", {
 <p>
 <big>Sorry</big>. I couldn't find the page you are looking for. Please go <a href="/">back to the homepage</a>.
 </p>

templates/p404_no_master.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize)
 
-@:base("Branch not Found - Hits-of-Code Badges", "404 - Branch not Found", {
+@:base_html("Branch not Found - Hits-of-Code Badges", "404 - Branch not Found", {
 <p>
 <big>Sorry</big>. I couldn't find the requested branch of your repositroy.  Currently this service assumes the
 extistence of a branch named <code>master</code>. If you'd like to request a badge for another branch, you can do so by

templates/p500.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize)
 
-@:base("Internal Server Error - Hits-of-Code Badges", "500 - Internal Server Error", {
+@:base_html("Internal Server Error - Hits-of-Code Badges", "500 - Internal Server Error", {
 <p>
 <big>Oops</big>. Looks like a made a mistake. Please go <a href="/">back to the homepage</a> and try again.
 </p>