Merge pull request #7 from w-henderson/bug-fixes

Made a number of bug fixes
w-henderson · Nov 20, 2022 · 6265884 · 6265884
2 parents 65ea8c5 + 5d04f19
commit 6265884
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/stuart-core/Cargo.toml b/stuart-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stuart_core"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/w-henderson/Stuart"

diff --git a/stuart-core/src/functions/parsers/dateformat.rs b/stuart-core/src/functions/parsers/dateformat.rs
@@ -46,7 +46,7 @@ impl Function for DateFormatFunction {
 
     #[cfg(feature = "date")]
     fn execute(&self, scope: &mut Scope) -> Result<(), TracebackError<ProcessError>> {
-        use chrono::{Local, NaiveTime};
+        use chrono::{NaiveTime, Utc};
         use dateparser::parse_with;
 
         let self_token = scope.tokens.current().unwrap().clone();
@@ -64,7 +64,7 @@ impl Function for DateFormatFunction {
         })?;
 
         let date = std::panic::catch_unwind(|| {
-            parse_with(string, &Local, NaiveTime::from_hms(0, 0, 0))
+            parse_with(string, &Utc, NaiveTime::from_hms_opt(0, 0, 0).unwrap())
                 .ok()
                 .map(|d| d.format(&self.format).to_string())
                 .ok_or(ProcessError::InvalidDate)

diff --git a/stuart-core/src/parse/markdown.rs b/stuart-core/src/parse/markdown.rs
@@ -47,7 +47,7 @@ pub fn parse_markdown(
             };
 
             if dashed_lines == 1 {
-                let mut parts = line.split(':');
+                let mut parts = line.splitn(2, ':');
                 let key = parts.next().ok_or_else(e)?.trim().to_string();
 
                 let value = parts

diff --git a/stuart-core/src/tests/testcases/_base/posts/post_1.md b/stuart-core/src/tests/testcases/_base/posts/post_1.md
@@ -1,6 +1,7 @@
 ---
 title: "Post 1"
 date: "2022-09-01"
+other_field: "this has a : colon in it"
 ---
 
 This is post 1
diff --git a/stuart/Cargo.toml b/stuart/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stuart"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/w-henderson/Stuart"
@@ -15,7 +15,7 @@ name = "stuart"
 path = "src/main.rs"
 
 [dependencies]
-stuart_core = { version = "^0.2.1", path = "../stuart-core" }
+stuart_core = { version = "^0.2.2", path = "../stuart-core" }
 
 clap = "^3.2"
 toml = "^0.5"