Merge pull request #12 from jcody/task/bump_deps

Bump dependencies + fix REXML CVE
jcody · Jul 31, 2024 · 9c1d478 · 9c1d478
2 parents e08e887 + b8f7878
commit 9c1d478
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 29 deletions.
diff --git 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
@@ -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,39 +29,45 @@ 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)
     sass-listen (4.0.0)
       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
@@ -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
@@ -4,4 +4,3 @@ baseurl: /jekyllmap
 
 permalink: pretty
 markdown: kramdown
-
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -1,12 +1,12 @@
 {% capture lvl %}{{ page.url | append:'index.html' | split:'/' | size }}{% endcapture %}
 
 <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/bootstrap.min.css" />
-<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.css" />
-<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/leaflet@0.6.4/dist/leaflet.css" />
+<script src="https://unpkg.com/jquery@1.11.3/dist/jquery.min.js"></script>
 <script src="{{ site.baseurl }}/assets/js/bootstrap.min.js"></script>
-<script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script>
+<script src="https://unpkg.com/leaflet@0.6.4/dist/leaflet.js"></script>
 
-<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
+<link href="https://unpkg.com/font-awesome@3.2.1/css/font-awesome.min.css" rel="stylesheet">
 <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/leaflet.awesome-markers.css">
 <script src="{{ site.baseurl }}/assets/js/leaflet.awesome-markers.min.js"></script>
 

diff --git a/_layouts/location.html b/_layouts/location.html
@@ -58,7 +58,7 @@ <h2 class="list-tags">Ammenities:</h2>
     color: 'blue'
   });
 
-  var popupContent = '<div class="popHead" class="text-center"><strong>{{ page.address }}</strong></div><div class="metadata"><strong>Host:</strong> {{ page.title }}<br /><strong>Opened:</strong> {{ page.install_date }}</div><div class="text-center"><a href="http://maps.google.com/?q={{page.latitude}},{{page.longitude}}" type="button" class="btn btn-default btn-xs">Get Directions <i class="icon-chevron-sign-right" style="color:#428bca;"></i></a></div>';
+  var popupContent = '<div class="popHead" class="text-center"><strong>{{ page.address }}</strong></div><div class="metadata"><strong>Host:</strong> {{ page.title }}<br /><strong>Opened:</strong> {{ page.install_date }}</div><div class="text-center"><a href="https://maps.google.com/?q={{page.latitude}},{{page.longitude}}" type="button" class="btn btn-default btn-xs">Get Directions <i class="icon-chevron-sign-right" style="color:#428bca;"></i></a></div>';
 
   var map = L.map('map', {scrollWheelZoom: false}).setView([ {{ page.latitude }}, {{ page.longitude }} ], 14);
 

diff --git a/location/brainwash.markdown → locations/brainwash.markdown b/location/brainwash.markdown → locations/brainwash.markdown
diff --git a/location/darwin_cafe.markdown → locations/darwin_cafe.markdown b/location/darwin_cafe.markdown → locations/darwin_cafe.markdown
diff --git a/location/durso_italian.markdown → locations/durso_italian.markdown b/location/durso_italian.markdown → locations/durso_italian.markdown
diff --git a/location/farleys.markdown → locations/farleys.markdown b/location/farleys.markdown → locations/farleys.markdown
diff --git a/location/four_barrel.markdown → locations/four_barrel.markdown b/location/four_barrel.markdown → locations/four_barrel.markdown
diff --git a/location/freewheel.markdown → locations/freewheel.markdown b/location/freewheel.markdown → locations/freewheel.markdown
diff --git a/location/greco.markdown → locations/greco.markdown b/location/greco.markdown → locations/greco.markdown
diff --git a/location/mad_wills.markdown → locations/mad_wills.markdown b/location/mad_wills.markdown → locations/mad_wills.markdown
diff --git a/location/pizzeria_delfina.markdown → locations/pizzeria_delfina.markdown b/location/pizzeria_delfina.markdown → locations/pizzeria_delfina.markdown
diff --git a/location/revolution.markdown → locations/revolution.markdown b/location/revolution.markdown → locations/revolution.markdown
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ baseurl: /jekyllmap

		permalink: pretty
		markdown: kramdown