From 671189b769b7ea1ec1a0b503e6a37107305c530c Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 7 Jun 2021 11:02:26 -0400 Subject: [PATCH] updated slate files --- slate/Gemfile | 18 ++-- slate/Gemfile.lock | 215 ++++++++++++++++++++++++----------------- slate/lib/multilang.rb | 12 ++- 3 files changed, 146 insertions(+), 99 deletions(-) diff --git a/slate/Gemfile b/slate/Gemfile index 22cef24d..9dda513a 100644 --- a/slate/Gemfile +++ b/slate/Gemfile @@ -1,10 +1,14 @@ +ruby '>= 2.5' source 'https://rubygems.org' # Middleman -gem 'middleman', '~>4.1.0' -gem 'middleman-syntax', '~> 3.0.0' -gem 'middleman-autoprefixer', '~> 2.7.0' -gem "middleman-sprockets", "~> 4.0.0" -gem "middleman-livereload", "~> 3.4.3" -gem 'rouge', '~> 2.0.5' -gem 'redcarpet', '~> 3.3.2' +gem 'middleman', :github => 'middleman/middleman', :branch => '4.x' +gem 'middleman-syntax', '~> 3.2' +gem 'middleman-autoprefixer', '~> 2.7' +gem 'middleman-sprockets', '~> 4.1' +gem 'rouge', '~> 3.21' +gem 'redcarpet', '~> 3.5.0' +gem 'nokogiri', '~> 1.11.0' +gem 'sass' +gem 'webrick' +gem 'middleman-livereload' # NOTE: breaks if placed inside a group! diff --git a/slate/Gemfile.lock b/slate/Gemfile.lock index 97d853dc..69824903 100644 --- a/slate/Gemfile.lock +++ b/slate/Gemfile.lock @@ -1,64 +1,21 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/middleman/middleman.git + revision: d180ca337202873f2601310c74ba2b6b4cf063ec + branch: 4.x specs: - activesupport (5.2.4.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - autoprefixer-rails (6.7.7.1) - execjs - backports (3.7.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - concurrent-ruby (1.0.5) - contracts (0.13.0) - dotenv (2.2.0) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - erubis (2.7.0) - eventmachine (1.2.3) - execjs (2.7.0) - fast_blank (1.0.0) - fastimage (2.1.0) - ffi (1.9.18) - haml (4.0.7) - tilt - hamster (3.0.0) - concurrent-ruby (~> 1.0) - hashie (3.5.5) - http_parser.rb (0.6.0) - i18n (0.7.0) - kramdown (1.13.2) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - memoist (0.15.0) - middleman (4.1.14) + middleman (4.3.11) coffee-script (~> 2.2) - compass-import-once (= 1.0.5) haml (>= 4.0.5) - kramdown (~> 1.2) - middleman-cli (= 4.1.14) - middleman-core (= 4.1.14) - sass (>= 3.4.0, < 4.0) - middleman-autoprefixer (2.7.1) - autoprefixer-rails (>= 6.5.2, < 7.0.0) - middleman-core (>= 3.3.3) - middleman-cli (4.1.14) + kramdown (>= 2.3.0) + middleman-cli (= 4.3.11) + middleman-core (= 4.3.11) + middleman-cli (4.3.11) thor (>= 0.17.0, < 2.0) - middleman-core (4.1.14) - activesupport (>= 4.2, < 5.1) + middleman-core (4.3.11) + activesupport (>= 4.2, < 6.1) addressable (~> 2.3) backports (~> 3.6) - bundler (~> 1.1) + bundler (~> 2.0) contracts (~> 0.13.0) dotenv erubis @@ -67,67 +24,149 @@ GEM fastimage (~> 2.0) hamster (~> 3.0) hashie (~> 3.4) - i18n (~> 0.7.0) + i18n (~> 0.9.0) listen (~> 3.0.0) memoist (~> 0.14) padrino-helpers (~> 0.13.0) parallel rack (>= 1.4.5, < 3) - sass (>= 3.4) + sassc (~> 2.0) servolux - tilt (~> 2.0) + tilt (~> 2.0.9) + toml uglifier (~> 3.0) - middleman-livereload (3.4.6) + webrick + +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.3.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + autoprefixer-rails (9.5.1.1) + execjs + backports (3.21.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.1.8) + contracts (0.13.0) + dotenv (2.7.6) + em-websocket (0.5.2) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + erubis (2.7.0) + eventmachine (1.2.7) + eventmachine (1.2.7-x64-mingw32) + execjs (2.7.0) + fast_blank (1.0.0) + fastimage (2.2.3) + ffi (1.15.0) + ffi (1.15.0-x64-mingw32) + haml (5.2.1) + temple (>= 0.8.0) + tilt + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.6.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + kramdown (2.3.1) + rexml + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.16.2) + middleman-autoprefixer (2.10.1) + autoprefixer-rails (~> 9.1) + middleman-core (>= 3.3.3) + middleman-livereload (3.4.7) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-sprockets (4.0.0) + middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) - middleman-syntax (3.0.0) + middleman-syntax (3.2.0) middleman-core (>= 3.2) - rouge (~> 2.0) - minitest (5.10.1) - padrino-helpers (0.13.3.3) + rouge (~> 3.2) + mini_portile2 (2.5.0) + minitest (5.14.4) + nokogiri (1.11.3) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + nokogiri (1.11.3-x64-mingw32) + racc (~> 1.4) + padrino-helpers (0.13.3.4) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.13.3.3) + padrino-support (= 0.13.3.4) tilt (>= 1.4.1, < 3) - padrino-support (0.13.3.3) + padrino-support (0.13.3.4) activesupport (>= 3.1) - parallel (1.11.1) - public_suffix (2.0.5) - rack (2.0.8) - rack-livereload (0.3.16) + parallel (1.20.1) + parslet (1.8.2) + public_suffix (4.0.6) + racc (1.5.2) + rack (2.2.3) + rack-livereload (0.3.17) rack - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - redcarpet (3.3.4) - rouge (2.0.7) - sass (3.4.23) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + redcarpet (3.5.1) + rexml (3.2.5) + rouge (3.26.0) + 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) + sassc (2.4.0) + ffi (~> 1.9) + sassc (2.4.0-x64-mingw32) + ffi (~> 1.9) servolux (0.13.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - thor (0.19.4) + temple (0.8.2) + thor (1.1.0) thread_safe (0.3.6) - tilt (2.0.7) - tzinfo (1.2.3) + tilt (2.0.10) + toml (0.2.0) + parslet (~> 1.8.0) + tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (3.1.12) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) + webrick (1.7.0) + zeitwerk (2.4.2) PLATFORMS ruby + x64-mingw32 DEPENDENCIES - middleman (~> 4.1.0) - middleman-autoprefixer (~> 2.7.0) - middleman-livereload (~> 3.4.3) - middleman-sprockets (~> 4.0.0) - middleman-syntax (~> 3.0.0) - redcarpet (~> 3.3.2) - rouge (~> 2.0.5) + middleman! + middleman-autoprefixer (~> 2.7) + middleman-livereload + middleman-sprockets (~> 4.1) + middleman-syntax (~> 3.2) + nokogiri (~> 1.11.0) + redcarpet (~> 3.5.0) + rouge (~> 3.21) + sass + webrick + +RUBY VERSION + ruby 2.7.2p137 BUNDLED WITH - 1.14.3 + 2.2.19 diff --git a/slate/lib/multilang.rb b/slate/lib/multilang.rb index 624c6e49..36fbe5b1 100644 --- a/slate/lib/multilang.rb +++ b/slate/lib/multilang.rb @@ -1,9 +1,13 @@ module Multilang def block_code(code, full_lang_name) - parts = full_lang_name.split('--') - rouge_lang_name = parts[0] || "" - super(code, rouge_lang_name).sub("highlight #{rouge_lang_name}") do |match| - match + " tab-" + full_lang_name + if full_lang_name + parts = full_lang_name.split('--') + rouge_lang_name = (parts) ? parts[0] : "" # just parts[0] here causes null ref exception when no language specified + super(code, rouge_lang_name).sub("highlight #{rouge_lang_name}") do |match| + match + " tab-" + full_lang_name + end + else + super(code, full_lang_name) end end end