From b8f787867133fd8af0fd3c04bc5b4dd443b66351 Mon Sep 17 00:00:00 2001 From: Joey Cody Date: Tue, 30 Jul 2024 17:43:36 -0700 Subject: [PATCH] Bump deps + fix REXML CVE --- Gemfile | 4 ++ Gemfile.lock | 48 +++++++++++-------- README.md | 8 ++-- _config.yml | 1 - _includes/scripts.html | 8 ++-- _layouts/location.html | 2 +- {location => locations}/brainwash.markdown | 0 {location => locations}/darwin_cafe.markdown | 0 .../durso_italian.markdown | 0 {location => locations}/farleys.markdown | 0 {location => locations}/four_barrel.markdown | 0 {location => locations}/freewheel.markdown | 0 {location => locations}/greco.markdown | 0 {location => locations}/mad_wills.markdown | 0 .../pizzeria_delfina.markdown | 0 {location => locations}/revolution.markdown | 0 16 files changed, 42 insertions(+), 29 deletions(-) rename {location => locations}/brainwash.markdown (100%) rename {location => locations}/darwin_cafe.markdown (100%) rename {location => locations}/durso_italian.markdown (100%) rename {location => locations}/farleys.markdown (100%) rename {location => locations}/four_barrel.markdown (100%) rename {location => locations}/freewheel.markdown (100%) rename {location => locations}/greco.markdown (100%) rename {location => locations}/mad_wills.markdown (100%) rename {location => locations}/pizzeria_delfina.markdown (100%) rename {location => locations}/revolution.markdown (100%) diff --git a/Gemfile b/Gemfile index 7395111..f3867cd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,7 @@ source "https://rubygems.org" gem 'jekyll', '~> 3' + +# Explicit dependencies (over the years of breaking changes): +gem "kramdown-parser-gfm" +gem "webrick" diff --git a/Gemfile.lock b/Gemfile.lock index afec9a7..9e28bde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,24 +1,26 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) colorator (1.1.0) - concurrent-ruby (1.1.7) - em-websocket (0.5.1) + concurrent-ruby (1.3.3) + csv (3.3.0) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.13.1) + ffi (1.17.0) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (0.9.5) + http_parser.rb (0.8.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (3.10.0) addressable (~> 2.4) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) kramdown (>= 1.17, < 3) @@ -27,26 +29,29 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) + webrick (>= 1.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml - liquid (4.0.3) - listen (3.2.1) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) + public_suffix (6.0.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.8) - strscan (>= 3.0.9) - rouge (3.23.0) + rexml (3.3.2) + strscan + rouge (3.30.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -54,12 +59,15 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) strscan (3.1.0) + webrick (1.8.1) PLATFORMS ruby DEPENDENCIES jekyll (~> 3) + kramdown-parser-gfm + webrick BUNDLED WITH - 1.17.3 + 2.5.16 diff --git a/README.md b/README.md index 3406565..ecbccd5 100644 --- a/README.md +++ b/README.md @@ -3,19 +3,21 @@ jekyllmap A simple jekyll site that generates a map! +- 🗺️ **Demo:** [jcody.github.io/jekyllmap](https://jcody.github.io/jekyllmap) + Installation ------------- $ git clone https://github.com/jcody/jekyllmap.git $ bundle install $ bundle exec jekyll serve -Jekyll should then serve the app locally at http://127.0.0.1:4000. +Jekyll should then serve the app locally at [http://127.0.0.1:4000/jekyllmap/](http://127.0.0.1:4000/jekyllmap/) (configurable in [`_config.yml`](/_config.yml)). -Note the site is built and served from the `_site` directory. To make any changes, look at the `_layouts/`, `_includes/` directories and `config.yml`. All changes will be reflected into a newly built `_site/` static set of HTML pages. +Note the site is built and served from the [`_site`](/_site/) directory. To make any changes, look at the [`_layouts/`](/_layouts/), [`_includes/`](/_includes/) directories and [`_config.yml`](/_config.yml). All changes will be reflected into a newly built `_site/` static set of HTML pages. Adding Locations ----------------- -Locations live in the `/locations` folder as .txt files, supporting images reside in `/images`. Jekyll will compile all text files by default regardless of filename. +Locations live in the [`locations/`](/locations/) folder as `.markdown` files, supporting images reside in [`images/`](/images/). Jekyll will compile all markdown files by default regardless of filename. The text file must be structured as follows: diff --git a/_config.yml b/_config.yml index 6111c5c..df1707a 100644 --- a/_config.yml +++ b/_config.yml @@ -4,4 +4,3 @@ baseurl: /jekyllmap permalink: pretty markdown: kramdown - diff --git a/_includes/scripts.html b/_includes/scripts.html index 79e8f94..753cfb4 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,12 +1,12 @@ {% capture lvl %}{{ page.url | append:'index.html' | split:'/' | size }}{% endcapture %} - - + + - + - + diff --git a/_layouts/location.html b/_layouts/location.html index e4cd9f9..a17553e 100644 --- a/_layouts/location.html +++ b/_layouts/location.html @@ -58,7 +58,7 @@

Ammenities:

color: 'blue' }); - var popupContent = '
{{ page.address }}
Host: {{ page.title }}
Opened: {{ page.install_date }}
Get Directions
'; + var popupContent = '
{{ page.address }}
Host: {{ page.title }}
Opened: {{ page.install_date }}
Get Directions
'; var map = L.map('map', {scrollWheelZoom: false}).setView([ {{ page.latitude }}, {{ page.longitude }} ], 14); diff --git a/location/brainwash.markdown b/locations/brainwash.markdown similarity index 100% rename from location/brainwash.markdown rename to locations/brainwash.markdown diff --git a/location/darwin_cafe.markdown b/locations/darwin_cafe.markdown similarity index 100% rename from location/darwin_cafe.markdown rename to locations/darwin_cafe.markdown diff --git a/location/durso_italian.markdown b/locations/durso_italian.markdown similarity index 100% rename from location/durso_italian.markdown rename to locations/durso_italian.markdown diff --git a/location/farleys.markdown b/locations/farleys.markdown similarity index 100% rename from location/farleys.markdown rename to locations/farleys.markdown diff --git a/location/four_barrel.markdown b/locations/four_barrel.markdown similarity index 100% rename from location/four_barrel.markdown rename to locations/four_barrel.markdown diff --git a/location/freewheel.markdown b/locations/freewheel.markdown similarity index 100% rename from location/freewheel.markdown rename to locations/freewheel.markdown diff --git a/location/greco.markdown b/locations/greco.markdown similarity index 100% rename from location/greco.markdown rename to locations/greco.markdown diff --git a/location/mad_wills.markdown b/locations/mad_wills.markdown similarity index 100% rename from location/mad_wills.markdown rename to locations/mad_wills.markdown diff --git a/location/pizzeria_delfina.markdown b/locations/pizzeria_delfina.markdown similarity index 100% rename from location/pizzeria_delfina.markdown rename to locations/pizzeria_delfina.markdown diff --git a/location/revolution.markdown b/locations/revolution.markdown similarity index 100% rename from location/revolution.markdown rename to locations/revolution.markdown