hematite 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0b7b551f58a7671eec46167c18919a8ed1fe53f9c38eed9f15085c1db25cd9e
-  data.tar.gz: 755475373480a27f8f8a1fe4bc89b7368b40c76213c521995170f46cf5e16647
+  metadata.gz: ca054447d56a7d76f00b864906bce8cc2245ba03d089dca22246060f81142a2e
+  data.tar.gz: ba039823072585771bfcdd113454a3de8353219c935907b3b95ae9fb5e82cbe5
 SHA512:
-  metadata.gz: e2553c11c574e33d7e40c575e4282493444e9a0594d509537f1379fc10bb4531474f0ac67e1ea24a4564235a67fcc99612ad4e4da598086220397b92611933a4
-  data.tar.gz: d3985945ba30a12d51bc72e3110fc92dbe31747759971d4f958c763a3669b102916689c3ed8084f405a074464c68929f6a66656a61f62bfd9dbe1d764f3d0994
+  metadata.gz: a7d4189cc538c9fbd161458570fdeca378971746f33e9365e6ebe5b8806a754517424b1655cbd32994b206bcabd92440f5e462d89153584ee499cb4ccb5fa507
+  data.tar.gz: ca7eb2a71d1b4d6bc342fb2fec21e0bbd3628f78689f0d6728112b1a85842f26f3d90a51e58951e9a69c5871756a9840fc6d224abd600df3559c7bbbf33d276a

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/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,7 +26,7 @@ function getCalendarData(elem, formatElemLabels) {
     for (const child of elem.children) {
         let tagName = child.tagName.toLowerCase();
 
-        if (tagName == DATE_SPEC_ELEM_TAG) {
+        if (tagName == dateHeaderTag) {
             let errored = false;
 
             try {
@@ -35,6 +35,11 @@ function getCalendarData(elem, formatElemLabels) {
                     errored = true;
                 } else {
                     lastHeaderId = child.getAttribute("id");
+
+                    if (lastHeaderId == null && formatElemLabels) {
+                        lastHeaderId = escape(child.innerText);
+                        child.setAttribute("id", lastHeaderId);
+                    }
                 }
             }
             catch (e) {
@@ -86,8 +91,7 @@ function getCalendarData(elem, formatElemLabels) {
     }
 
     result.sort(AgendaItem.compare);
-
-    return result;
+    return joinDuplicateData(result);
 }
 
 /// Adds post data to the given calendar data item.
@@ -122,6 +126,14 @@ function addPostData(data) {
 
     data.sort(AgendaItem.compare);
 
+
+    return joinDuplicateData(data);
+}
+
+/// Ensures that there is only one entry per date (at most),
+/// returns an updated version with agenda items moved such that
+/// this is so.
+function joinDuplicateData(data) {
     let newData = [];
     let currentItem;
 
@@ -417,8 +429,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Henry Heino