hematite 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 394cf1d6b7f212788ff66ad9dc2c60b1221cf49604145762a0f5db8dd2cd5032
-  data.tar.gz: cdc7d2cae9907ff2de79bb08ddecb259dbd4e6bf9ee2bc02f06da8cbb43d10e7
+  metadata.gz: f4b8f5537d27e5ffbcf75f2f7025cf8fb1aad2bb525e95fb6987e75e591313fa
+  data.tar.gz: 32705249f519772c0813700e2fe0b3e42bae9685df8a3b8e46c6fdaf8f9f800e
 SHA512:
-  metadata.gz: 58323b2f1fc1a8bc8cd445fd1da5f68ce6fee23ccf68c0b798f1c74452a276d8989585b995967e1bde31c0e38129383074eb7c87e9bfc53e616cf6a5c02b7abf
-  data.tar.gz: cc70aa6d874e4867c86a4f349aa8d8d0d62891e1a871d6fb0553e1cc039aac02d3fb2bfcc1737b6bf1ee96222a2dfa8bd46d85a94ce0fb7253cfacd9c3d679f6
+  metadata.gz: a80d098018413e4ed3aaa77f4ee81b381a36ac8388bb8b7939c4543ebb89f67db4fcc6eb498c9a3e19d593be8a5ad2a7dd3dddee35a0234f11734c2143883754
+  data.tar.gz: bd2c7f93936327e295a666056f26b83059c4af507242e6cb367d6bb312a2fe9d20714ee723ada04735b41f44f4cf76ee584b4c1c151477ef214552f2943e4fb4

data/_config.yml

@@ -27,6 +27,11 @@ hematite:
     # The full year
     year: numeric
 
+    parsing:
+      # True if the date should be parsed MM/DD/YYYY instead of
+      # DD/MM/YYYY
+      month_first: true
+
   sidebar:
     footer_html: 'This page was made with the Hematite Theme. <a href="https://github.com/personalizedrefrigerator/jekyll-hematite-theme">Contribute on GitHub</a>'
 

data/assets/js/DateUtil.mjs

@@ -1,6 +1,8 @@
 ---
 ---
 
+import { assertEq } from "./assertions.mjs";
+
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 const MS_PER_WEEK = MS_PER_DAY * 7;
 
@@ -94,12 +96,39 @@ var DateUtil = {
 
     /// Slightly more intelligent date parsing than new Date(string).
     parse(text) {
+        text = text.trim();
+
         // Remove -th, -rd, -ero suffexes
-        text = text.replaceAll(/(\d)(?:rd|th|ero)/g,
+        text = text.replaceAll(/(\d)(?:rd|st|th|ero)/g,
                 (fullMatch, group0) => group0);
-        console.log("Parsing", text);
+        let res = new Date(0);
+
+        let shortMatch = text.match(/^(\d+)\/(\d+)\/(\d{2,})$/);
+
+        // DD/MM/YY+ or MM/DD/YY+
+        if (shortMatch) {
+            let year = parseInt(shortMatch[3]);
+            {% if site.hematite.date_format.parsing.month_first %}
+            let month = parseInt(shortMatch[1]);
+            let day = parseInt(shortMatch[2]);
+            {% else %}
+            let month = parseInt(shortMatch[2]);
+            let day = parseInt(shortMatch[1]);
+            {% endif %}
+
+            if (shortMatch[3].length >= 4) {
+                res.setFullYear(year);
+            }
+            else if (shortMatch[3].length == 2){
+                res.setFullYear(2000 + year);
+            }
+            res.setMonth(month - 1, day);
+        }
+        else {
+            res = new Date(text);
+        }
 
-        return new Date(text);
+        return res;
     },
 
     /// Returns true iff the given object is a date object.
@@ -120,4 +149,13 @@ var DateUtil = {
     },
 };
 
+assertEq("Check if new Date() is a date",
+    DateUtil.isDate(new Date()), true);
+assertEq("Check if dates can be parsed",
+    DateUtil.parse("01/01/22").getFullYear(), 2022);
+assertEq("Same day test 1",
+    DateUtil.datesAreOnSameDay(DateUtil.parse("01/02/22"), DateUtil.parse("01/02/2022")), true);
+assertEq("Same day test 2",
+    DateUtil.datesAreOnSameDay(DateUtil.parse("01/01/22"), DateUtil.parse("January 1st, 2022")), true);
+
 export default DateUtil;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Henry Heino