al_folio_cv 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37c2fee391369069d49478404ddc88f4b69337992b96d7cba2ec39472c6c16c
-  data.tar.gz: 49c29ef1bbaccbff167e8d4a86dfad41efef7c5ec73beab5239cd81a1b619de2
+  metadata.gz: 735f4f1219fb50c22009f42027dd424035eff20e82146b91f0f94670a3df1951
+  data.tar.gz: '0428b2b70e9be220422a77c22f6fa84f1b84e0bbdc1bf0e01628f03ab26aa948'
 SHA512:
-  metadata.gz: 347cd226c6de23f5cc8797594643f61d02a274ad2ae0d011ceaf6b28ac04334c48dbe33deb69c5948c073a0ee7070b77a4a15a5314e66e810a1c3f0dccd6093c
-  data.tar.gz: 8d3ece2ff37d0298b3c2a9ea60fb261ed485d7a3713b7a76169690c40fef87ae12fb586b35e98f913b571cda5436958c37b074611fbcd11facca206b64b2c934
+  metadata.gz: 7c6b922f64ad0b897b5f3664b27cbe88517007fdc0760cdf246e297dc70b206e8ac52581097316c63fc4703c19b6471b430210b328f9a9f7ec528ab50fe0d1ac
+  data.tar.gz: 5dd93c83a958cc31996e325b2f0d40cca98de5c1f708bb5314870dc723d51cbbf7801461fa8bd60c6b717d05d0547f99ba0c6c0fb657a24a6d89e7bd2854df40

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 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.
+- Strip captured dates and locations in the experience and education entry templates (#2, ports `alshedivat/al-folio#3537`). An entry with no end date now renders `Present` instead of a dangling separator, an entry with no dates renders no date badge, and an entry with no location no longer renders a location row containing just the map pin icon.
+
 ## 1.0.0
 
 - Initial CV extraction from `al_folio_core`.

data/README.md

@@ -1,22 +1,20 @@
 # al-folio-cv
 
-CV rendering plugin for al-folio v1.x.
+`al_folio_cv` is the CV rendering plugin for `al-folio` v1.x.
 
 ## What it provides
 
-- Shared CV rendering templates used by `layout: cv`
+- Shared CV templates used by `layout: cv`
 - CV helper Liquid tag: `{% al_folio_cv_render %}`
 - Packaged stylesheet at `/assets/css/al-folio-cv.css`
 
-## Usage
-
-Add the gem and plugin:
+## Installation
 
 ```ruby
 gem 'al_folio_cv'
 ```
 
-```yml
+```yaml
 plugins:
   - al_folio_cv
 al_folio:
@@ -26,3 +24,12 @@ al_folio:
 ```
 
 `al_folio_core` delegates `layout: cv` rendering to this plugin.
+
+## Ecosystem context
+
+- Starter examples/docs live in `al-folio`.
+- CV runtime and rendering behavior are owned here.
+
+## Contributing
+
+CV layout/rendering changes should be proposed in this repository.

data/lib/al_folio_cv/date_sorting.rb

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+require "date"
+
+module AlFolioCv
+  # Orders CV entries the way a CV is normally read: most recent first, with
+  # ongoing entries at the top.
+  #
+  # CV data reaches the templates from two sources that disagree on key names
+  # (RenderCV uses `start_date`/`end_date`, JSONResume uses
+  # `startDate`/`endDate`) and both allow partial dates ("2020", "2020-06"),
+  # textual end dates ("present") and entries with no dates at all. Everything
+  # here is therefore total: an unrecognised value is treated as "no date"
+  # rather than raising.
+  module DateSorting
+    START_KEYS = %w[start_date startDate].freeze
+    END_KEYS = %w[end_date endDate].freeze
+    POINT_KEYS = %w[date releaseDate].freeze
+
+    ONGOING_VALUES = %w[present current ongoing now].freeze
+
+    # "2020", "2020-06", "2020-06-01" and the "/" and "." separated variants.
+    PARTIAL_DATE = %r{\A(\d{4})(?:[-/.](\d{1,2}))?(?:[-/.](\d{1,2}))?\z}
+    # Last-resort fallback for free-form values such as "Fall 2019".
+    BARE_YEAR = /(?<!\d)(\d{4})(?!\d)/
+
+    ONGOING_RANK = Float::INFINITY
+    UNDATED_RANK = -Float::INFINITY
+
+    module_function
+
+    # Returns a new array ordered by end date descending, then start date
+    # descending. Ongoing entries come first, undated entries last, and the
+    # original order breaks ties so the sort is stable.
+    def sort(entries)
+      return entries unless entries.is_a?(Array)
+
+      entries.each_with_index
+             .map { |entry, index| [entry, sort_key(entry, index)] }
+             .sort_by(&:last)
+             .map(&:first)
+    end
+
+    def sort_key(entry, index)
+      start_rank, end_rank = bounds(entry)
+      [-end_rank, -start_rank, index]
+    end
+
+    # Resolves an entry to a [start_rank, end_rank] pair of comparable numbers.
+    def bounds(entry)
+      start_raw = first_present(entry, START_KEYS)
+      end_raw = first_present(entry, END_KEYS)
+      point_raw = first_present(entry, POINT_KEYS)
+
+      start_rank = parse(start_raw, :start)
+
+      end_rank =
+        if ongoing?(end_raw)
+          ONGOING_RANK
+        elsif end_raw
+          parse(end_raw, :end)
+        elsif start_rank
+          # A start date with no end date means the entry is still running,
+          # which is also how the templates render it ("2020 - Present"). A
+          # standalone `date` is a point in time and never counts as ongoing.
+          ONGOING_RANK
+        else
+          parse(point_raw, :end)
+        end
+
+      [start_rank || parse(point_raw, :start) || UNDATED_RANK, end_rank || UNDATED_RANK]
+    end
+
+    def ongoing?(value)
+      value.is_a?(String) && ONGOING_VALUES.include?(value.strip.downcase)
+    end
+
+    # Turns a date value into an integer of the form YYYYMMDD. Missing
+    # components are padded to the start or the end of the period so that a
+    # year-only end date ("2020") sorts after a mid-year one ("2020-06").
+    def parse(value, boundary)
+      case value
+      when nil then nil
+      when Date, DateTime, Time then compose(value.year, value.month, value.day)
+      when Numeric then compose_partial(value.to_i, nil, nil, boundary)
+      when String, Symbol
+        text = value.to_s.strip
+        return nil if text.empty?
+
+        if (match = PARTIAL_DATE.match(text))
+          compose_partial(match[1].to_i, match[2]&.to_i, match[3]&.to_i, boundary)
+        elsif (match = BARE_YEAR.match(text))
+          compose_partial(match[1].to_i, nil, nil, boundary)
+        end
+        # Anything else (nested hashes, arrays, ...) counts as "no date"; its
+        # `to_s` could otherwise contribute a stray four-digit number.
+      end
+    end
+
+    def compose_partial(year, month, day, boundary)
+      if boundary == :end
+        compose(year, month || 12, day || 31)
+      else
+        compose(year, month || 1, day || 1)
+      end
+    end
+
+    def compose(year, month, day)
+      (year.to_i * 10_000) + (clamp(month, 1, 12) * 100) + clamp(day, 1, 31)
+    end
+
+    def clamp(value, min, max)
+      value = value.to_i
+      return min if value < min
+      return max if value > max
+
+      value
+    end
+
+    # First non-nil, non-blank value among the given keys.
+    def first_present(entry, keys)
+      keys.each do |key|
+        value = lookup(entry, key)
+        next if value.nil?
+        next if value.is_a?(String) && value.strip.empty?
+
+        return value
+      end
+      nil
+    end
+
+    def lookup(entry, key)
+      case entry
+      when Hash then entry[key].nil? ? entry[key.to_sym] : entry[key]
+      else
+        return nil unless entry.respond_to?(:[]) && entry.respond_to?(:key?)
+
+        entry[key]
+      end
+    end
+  end
+end

data/lib/al_folio_cv/filters.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative "date_sorting"
+
+module AlFolioCv
+  # Liquid filters made available to CV templates.
+  module Filters
+    # Orders CV entries most recent first. Non-array input is passed through
+    # unchanged so the filter is safe to chain onto an optional section.
+    def al_cv_sort_by_date(input)
+      AlFolioCv::DateSorting.sort(input)
+    end
+  end
+end

data/lib/al_folio_cv/version.rb

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

data/lib/al_folio_cv.rb

@@ -2,6 +2,7 @@
 
 require "jekyll"
 require_relative "al_folio_cv/version"
+require_relative "al_folio_cv/filters"
 
 module AlFolioCv
   PLUGIN_ROOT = File.expand_path("..", __dir__)
@@ -46,6 +47,7 @@ module AlFolioCv
 end
 
 Liquid::Template.register_tag("al_folio_cv_render", AlFolioCv::RenderTag)
+Liquid::Template.register_filter(AlFolioCv::Filters)
 
 Jekyll::Hooks.register :site, :after_init do |site|
   next unless site.respond_to?(:includes_load_paths)

data/templates/cv/education.liquid

@@ -10,12 +10,15 @@
     <li class="list-group-item">
       <div class="row">
         <div class="col-xs-2 col-sm-2 col-md-2 text-center date-column">
+          {% 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 %}
 
           {% if start_date != '' %}
             {% comment %} Extract year only from dates like "1933-01-01" or just use "1933" as is {% endcomment %}
@@ -38,6 +41,7 @@
               {% capture location %}
                 {% if entry.location %}{{ entry.location }}{% endif %}
               {% endcapture %}
+              {% assign location = location | strip %}
               {% if location != '' %}
                 <tr>
                   <td>

data/templates/cv/experience.liquid

@@ -10,12 +10,15 @@
     <li class="list-group-item">
       <div class="row">
         <div class="col-xs-2 col-sm-2 col-md-2 text-center date-column">
+          {% 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 %}
 
           {% if start_date != '' %}
             {% comment %} Extract year only from dates like "1933-01-01" or just use "1933" as is {% endcomment %}
@@ -23,19 +26,22 @@
             {% assign endDate = end_date | split: '-' | first | default: 'Present' %}
             {% assign date = startDate | append: ' - ' | append: endDate %}
           {% else %}
-            {% assign date = '' %}
+            {% assign date = null %}
           {% endif %}
 
           <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>
+                  {% if date %}
+                    <span class="badge font-weight-bold danger-color-dark text-uppercase align-middle" style="min-width: 75px">{{ date }}</span>
+                  {% endif %}
                 </td>
               </tr>
               {% capture location %}
                 {% if entry.location %}{{ entry.location }}{% endif %}
               {% endcapture %}
+              {% assign location = location | strip %}
               {% if location != '' %}
                 <tr>
                   <td>

data/templates/cv/render.liquid

@@ -122,7 +122,7 @@
         {% assign empty_array = '' | split: ',' %}
         {% assign exp = cv.sections.Experience | default: empty_array %}
         {% assign vol = cv.sections.Volunteer | default: empty_array %}
-        {% assign combined_experience = exp | concat: vol %}
+        {% assign combined_experience = exp | concat: vol | al_cv_sort_by_date %}
         {% if combined_experience.size > 0 %}
           <a class="anchor" id="experience"></a>
           <div class="card mt-3 p-3">
@@ -149,7 +149,7 @@
             <h3 class="card-title font-weight-medium">{{ section_title }}</h3>
             <div>
               {% if section_title == 'Education' %}
-                {% assign entries = section_entries %}
+                {% assign entries = section_entries | al_cv_sort_by_date %}
                 {% include cv/education.liquid %}
               {% elsif section_title == 'Awards' or section_title == 'Honors and Awards' %}
                 {% assign entries = section_entries %}
@@ -261,7 +261,7 @@
         {% assign empty_array = '' | split: ',' %}
         {% assign work = site.data.resume.work | default: empty_array %}
         {% assign vol = site.data.resume.volunteer | default: empty_array %}
-        {% assign combined_experience = work | concat: vol %}
+        {% assign combined_experience = work | concat: vol | al_cv_sort_by_date %}
         {% if combined_experience.size > 0 %}
           <a class="anchor" id="experience"></a>
           <div class="card mt-3 p-3">
@@ -279,7 +279,7 @@
           <div class="card mt-3 p-3">
             <h3 class="card-title font-weight-medium">Education</h3>
             <div>
-              {% assign entries = site.data.resume.education %}
+              {% assign entries = site.data.resume.education | al_cv_sort_by_date %}
               {% include cv/education.liquid %}
             </div>
           </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: al_folio_cv
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - al-folio maintainers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -111,6 +111,8 @@ files:
 - README.md
 - assets/css/al-folio-cv.css
 - lib/al_folio_cv.rb
+- lib/al_folio_cv/date_sorting.rb
+- lib/al_folio_cv/filters.rb
 - lib/al_folio_cv/version.rb
 - templates/cv/awards.liquid
 - templates/cv/certificates.liquid
@@ -145,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: CV rendering plugin for al-folio v1.x