al_folio_cv 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735f4f1219fb50c22009f42027dd424035eff20e82146b91f0f94670a3df1951
-  data.tar.gz: '0428b2b70e9be220422a77c22f6fa84f1b84e0bbdc1bf0e01628f03ab26aa948'
+  metadata.gz: 3cead7bc9a05a081de11d4bd0b62ac19ca18833025fc81f64815d0a6ef202ce5
+  data.tar.gz: fc8bc915b837f1c35322a0ccda8e10477c6ee924fd0daff74dc9eb2cc8604f41
 SHA512:
-  metadata.gz: 7c6b922f64ad0b897b5f3664b27cbe88517007fdc0760cdf246e297dc70b206e8ac52581097316c63fc4703c19b6471b430210b328f9a9f7ec528ab50fe0d1ac
-  data.tar.gz: 5dd93c83a958cc31996e325b2f0d40cca98de5c1f708bb5314870dc723d51cbbf7801461fa8bd60c6b717d05d0547f99ba0c6c0fb657a24a6d89e7bd2854df40
+  metadata.gz: 6e3de176b7a1d3601ec9beeddf6a26d94baf4994bdd2bae22dd1ae0ad1e0ce99f48b7e6b9c5bbf1bf5e017ef9f604daaf7effbed71a2308929a9efcab56b1a26
+  data.tar.gz: 74d66603d87eabd077dafa318bfe72125754f984eee3a47bdd006c0fee3c4c21a09b621da15df17c90dd5c5e8d2956efb94feaa15f9d8a54d0f8440bf50c5196

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.2
+
+- Render a date badge for CV entries that carry a single point-in-time `date` instead of a `start_date`/`end_date` pair (ports `alshedivat/al-folio#3339`). `al_cv_sort_by_date` has understood a bare `date` since 1.0.1, so such entries were already being ordered by it while the templates dropped the badge without any warning. The experience and education templates now fall back to `date` (and the JSONResume `releaseDate`) when no start date is set, rendering it as a single year — a standalone date is a point in time, so it is never labelled `Present`. An explicit `start_date`/`startDate` still wins, and closed ranges render exactly as before.
+- Render dates in the projects section, which previously rendered none at all (`alshedivat/al-folio#3339`). Projects now accept the same inputs as the other sections — a `start_date`/`end_date` pair, its `startDate`/`endDate` camelCase equivalent, or a bare `date` — and gain a date badge column when any of them is set. Undated projects keep their existing full-width markup.
+- Strip the captured date in the awards and publications templates, so an entry with no date no longer renders an empty badge and no longer leaves stray whitespace inside a populated one. This is the same `capture`-keeps-its-whitespace bug fixed for experience and education in 1.0.1.
+
 ## 1.0.1
 
 - Sort experience, volunteering, and education entries by date instead of rendering them in source order, so volunteering is no longer always appended after work history (#3, ports `alshedivat/al-folio#3272`). Ordering is handled by the new `al_cv_sort_by_date` Liquid filter, which understands both RenderCV and JSONResume key names, partial dates (`2020`, `2020-06`), YAML date objects, textual `present` end dates, and undated entries.

data/lib/al_folio_cv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AlFolioCv
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/templates/cv/awards.liquid

@@ -6,9 +6,11 @@
   {% for entry in entries %}
     <li class="list-group-item">
       <div class="row">
+        {% comment %} `capture` keeps the surrounding whitespace, so strip before testing for emptiness {% endcomment %}
         {% capture start_date %}
           {% if entry.date %}{{ entry.date }}{% endif %}
         {% endcapture %}
+        {% assign start_date = start_date | strip %}
 
         {% if start_date != '' %}
           <div class="col-xs-2 col-sm-2 col-md-2 text-center">

data/templates/cv/education.liquid

@@ -19,12 +19,23 @@
             {% if entry.end_date %}{{ entry.end_date }}{% elsif entry.endDate %}{{ entry.endDate }}{% endif %}
           {% endcapture %}
           {% assign end_date = end_date | strip %}
+          {% comment %}
+            An entry may carry a single point-in-time `date` instead of a start/end pair. `al_cv_sort_by_date` already
+            orders on it, so render it too rather than silently dropping the badge.
+          {% endcomment %}
+          {% capture point_date %}
+            {% if entry.date %}{{ entry.date }}{% elsif entry.releaseDate %}{{ entry.releaseDate }}{% endif %}
+          {% endcapture %}
+          {% assign point_date = point_date | strip %}
 
           {% if start_date != '' %}
             {% comment %} Extract year only from dates like "1933-01-01" or just use "1933" as is {% endcomment %}
             {% assign startDate = start_date | split: '-' | first %}
             {% assign endDate = end_date | split: '-' | first | default: 'Present' %}
             {% assign date = startDate | append: ' - ' | append: endDate %}
+          {% elsif point_date != '' %}
+            {% comment %} A standalone date is a point in time, never an open-ended range, so it renders as a single year {% endcomment %}
+            {% assign date = point_date | split: '-' | first %}
           {% else %}
             {% assign date = null %}
           {% endif %}

data/templates/cv/experience.liquid

@@ -19,12 +19,23 @@
             {% if entry.end_date %}{{ entry.end_date }}{% elsif entry.endDate %}{{ entry.endDate }}{% endif %}
           {% endcapture %}
           {% assign end_date = end_date | strip %}
+          {% comment %}
+            An entry may carry a single point-in-time `date` instead of a start/end pair. `al_cv_sort_by_date` already
+            orders on it, so render it too rather than silently dropping the badge.
+          {% endcomment %}
+          {% capture point_date %}
+            {% if entry.date %}{{ entry.date }}{% elsif entry.releaseDate %}{{ entry.releaseDate }}{% endif %}
+          {% endcapture %}
+          {% assign point_date = point_date | strip %}
 
           {% if start_date != '' %}
             {% comment %} Extract year only from dates like "1933-01-01" or just use "1933" as is {% endcomment %}
             {% assign startDate = start_date | split: '-' | first %}
             {% assign endDate = end_date | split: '-' | first | default: 'Present' %}
             {% assign date = startDate | append: ' - ' | append: endDate %}
+          {% elsif point_date != '' %}
+            {% comment %} A standalone date is a point in time, never an open-ended range, so it renders as a single year {% endcomment %}
+            {% assign date = point_date | split: '-' | first %}
           {% else %}
             {% assign date = null %}
           {% endif %}

data/templates/cv/projects.liquid

@@ -1,30 +1,84 @@
 {% comment %}
   Unified projects entry renderer for both formats
+  Handles both:
+  - RenderCV: name, date (or start_date/end_date), url, summary, highlights
+  - JSONResume: name, startDate/endDate, url, summary, highlights
 {% endcomment %}
 
 <ul class="card-text font-weight-light list-group list-group-flush">
   {% for entry in entries %}
     <li class="list-group-item">
-      {% if entry.url %}
-        <h6 class="title font-weight-bold">
-          <a href="{{ entry.url }}" target="_blank">{{ entry.name }}</a>
-        </h6>
+      {% comment %} `capture` keeps the surrounding whitespace, so strip before testing for emptiness {% endcomment %}
+      {% capture start_date %}
+        {% if entry.start_date %}{{ entry.start_date }}{% elsif entry.startDate %}{{ entry.startDate }}{% endif %}
+      {% endcapture %}
+      {% assign start_date = start_date | strip %}
+      {% capture end_date %}
+        {% if entry.end_date %}{{ entry.end_date }}{% elsif entry.endDate %}{{ entry.endDate }}{% endif %}
+      {% endcapture %}
+      {% assign end_date = end_date | strip %}
+      {% comment %}
+        A project usually carries a single point-in-time `date` rather than a start/end pair. `al_cv_sort_by_date`
+        already orders on it, so render it too rather than silently dropping the badge.
+      {% endcomment %}
+      {% capture point_date %}
+        {% if entry.date %}{{ entry.date }}{% elsif entry.releaseDate %}{{ entry.releaseDate }}{% endif %}
+      {% endcapture %}
+      {% assign point_date = point_date | strip %}
+
+      {% if start_date != '' %}
+        {% comment %} Extract year only from dates like "1933-01-01" or just use "1933" as is {% endcomment %}
+        {% assign startDate = start_date | split: '-' | first %}
+        {% assign endDate = end_date | split: '-' | first | default: 'Present' %}
+        {% assign date = startDate | append: ' - ' | append: endDate %}
+      {% elsif point_date != '' %}
+        {% comment %} A standalone date is a point in time, never an open-ended range, so it renders as a single year {% endcomment %}
+        {% assign date = point_date | split: '-' | first %}
       {% else %}
-        <h6 class="title font-weight-bold">{{ entry.name }}</h6>
+        {% assign date = null %}
       {% endif %}
 
-      {% if entry.summary %}
-        <p>{{ entry.summary | markdownify | remove: '<p>' | remove: '</p>' }}</p>
-      {% endif %}
+      {% capture entry_body %}
+        {% if entry.url %}
+          <h6 class="title font-weight-bold">
+            <a href="{{ entry.url }}" target="_blank">{{ entry.name }}</a>
+          </h6>
+        {% else %}
+          <h6 class="title font-weight-bold">{{ entry.name }}</h6>
+        {% endif %}
+
+        {% if entry.summary %}
+          <p>{{ entry.summary | markdownify | remove: '<p>' | remove: '</p>' }}</p>
+        {% endif %}
 
-      {% if entry.highlights %}
-        <ul class="items">
-          {% for item in entry.highlights %}
-            <li>
-              <span class="item">{{ item | markdownify | remove: '<p>' | remove: '</p>' }}</span>
-            </li>
-          {% endfor %}
-        </ul>
+        {% if entry.highlights %}
+          <ul class="items">
+            {% for item in entry.highlights %}
+              <li>
+                <span class="item">{{ item | markdownify | remove: '<p>' | remove: '</p>' }}</span>
+              </li>
+            {% endfor %}
+          </ul>
+        {% endif %}
+      {% endcapture %}
+
+      {% if date %}
+        <div class="row">
+          <div class="col-xs-2 col-sm-2 col-md-2 text-center date-column">
+            <table class="table-cv">
+              <tbody>
+                <tr>
+                  <td>
+                    <span class="badge font-weight-bold danger-color-dark text-uppercase align-middle" style="min-width: 75px">{{ date }}</span>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div class="col-xs-10 col-sm-10 col-md-10 mt-2 mt-md-0">{{ entry_body }}</div>
+        </div>
+      {% else %}
+        {{ entry_body }}
       {% endif %}
     </li>
   {% endfor %}

data/templates/cv/publications.liquid

@@ -6,9 +6,11 @@
   {% for entry in entries %}
     <li class="list-group-item">
       <div class="row">
+        {% comment %} `capture` keeps the surrounding whitespace, so strip before testing for emptiness {% endcomment %}
         {% capture pub_date %}
           {% if entry.releaseDate %}{{ entry.releaseDate }}{% elsif entry.date %}{{ entry.date }}{% endif %}
         {% endcapture %}
+        {% assign pub_date = pub_date | strip %}
 
         {% if pub_date != '' %}
           <div class="col-xs-2 col-sm-2 col-md-2 text-center">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: al_folio_cv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - al-folio maintainers