hematite 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 893f10d4430904f93e1c546b2906340491a3ed429dffec87e0e3f9633c312e86
-  data.tar.gz: fac3b2e1aab02fcf932f49bbc04d5ba89ee9e3b81c6f6a25b5fbb5381d1363f6
+  metadata.gz: f4b8f5537d27e5ffbcf75f2f7025cf8fb1aad2bb525e95fb6987e75e591313fa
+  data.tar.gz: 32705249f519772c0813700e2fe0b3e42bae9685df8a3b8e46c6fdaf8f9f800e
 SHA512:
-  metadata.gz: c2de98b2f254eb5349571abeb295e1e640f9efcdd9a193414249d099b4ac463470bcbe1f51eb621c3d139a6c9d1ffb9ca5694f7ad6749d3b981e67de637d420b
-  data.tar.gz: 7d802505e816146b412af056db60a8a9dc82c312f7015181e036d440f6624bce662b99de84616a1a6f18fa324199b9aa251146bf649c1e49947844072c3d8f66
+  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/_layouts/calendar.html

@@ -21,10 +21,11 @@ layout: default
         null,
         {% endif %}
         {% if page.include_posts %}
-        true
+        true,
         {% else %}
-        false
+        false,
         {% endif %}
+        {{ page.calendar_date_elem | default: "h1" | jsonify }},
     );
 
     // Remove the title if we're not using it — it can mess with

data/_sass/_calendar.scss

@@ -58,6 +58,6 @@
     }
 
     &.today {
-        box-shadow: inset 1px -2px 3px var(--shadow-color-light);
+        box-shadow: inset 1px -1px 5px var(--shadow-color-light);
     }
 }

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;

data/assets/js/layout/calendar.mjs

@@ -15,8 +15,8 @@ const CALENDAR_DATE_FMT_OPTIONS =
 let nextViewModeSelectorId = 0;
 
 /// Pull calendar data from [elem]. If [formatElemLabels], apply special calendar markup
-/// to the contents of [elem], changing [elem].
-function getCalendarData(elem, formatElemLabels) {
+/// to the contents of [elem], fix missing ids on headers, etc., changing [elem].
+function getCalendarData(elem, formatElemLabels, dateHeaderTag) {
     let result = [];
 
     // Last date set by a header we've encountered
@@ -26,14 +26,28 @@ function getCalendarData(elem, formatElemLabels) {
     for (const child of elem.children) {
         let tagName = child.tagName.toLowerCase();
 
-        if (tagName == DATE_SPEC_ELEM_TAG) {
-            // Remove '-rd' and '-th' suffixes.
+        if (tagName == dateHeaderTag) {
+            let errored = false;
+
             try {
                 lastDate = DateUtil.parse(child.innerText);
-                lastHeaderId = child.getAttribute("id");
+                if (isNaN(lastDate)) {
+                    errored = true;
+                } else {
+                    lastHeaderId = child.getAttribute("id");
+
+                    if (lastHeaderId == null && formatElemLabels) {
+                        lastHeaderId = escape(child.innerText);
+                        child.setAttribute("id", lastHeaderId);
+                    }
+                }
             }
             catch (e) {
-                child.innerText = stringLookup(`invalid_date`, dateText);
+                 errored = true;
+            }
+
+            if (errored) {
+                child.innerText = stringLookup(`invalid_date`, child.innerText);
                 lastDate = null;
             }
         }
@@ -408,8 +422,8 @@ class Calendar {
 /// Creates a visual calendar, pulling input from [inputElem]
 /// and writing output to [outputElem]. If [includePosts], all post-formatted
 /// articles are also included.
-function calendarSetup(sourceElem, outputElem, calendarTitleElem, includePosts) {
-    let data = getCalendarData(sourceElem, true);
+function calendarSetup(sourceElem, outputElem, calendarTitleElem, includePosts, dateHeaderTag) {
+    let data = getCalendarData(sourceElem, true, dateHeaderTag ?? DATE_SPEC_ELEM_TAG);
 
     if (includePosts) {
         data = addPostData(data);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Henry Heino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll