From d17b8760bdc688ab333ef717a2cf6ad23e2743b2 Mon Sep 17 00:00:00 2001 From: Kapil Sachdev Date: Sun, 30 Aug 2020 15:46:33 +0530 Subject: [PATCH] fix(docs): Migrate to rouge [ci skip] --- Gemfile | 2 +- Gemfile.lock | 6 ++---- doc_config/yard/setup.rb | 10 +++++----- gemfiles/rails_4_2.gemfile | 2 +- gemfiles/rails_4_2.gemfile.lock | 6 ++---- gemfiles/rails_5_0.gemfile | 2 +- gemfiles/rails_5_0.gemfile.lock | 6 ++---- gemfiles/rails_5_1.gemfile | 2 +- gemfiles/rails_5_1.gemfile.lock | 6 ++---- gemfiles/rails_5_2.gemfile | 2 +- gemfiles/rails_5_2.gemfile.lock | 6 ++---- gemfiles/rails_6_0.gemfile | 2 +- gemfiles/rails_6_0.gemfile.lock | 6 ++---- 13 files changed, 23 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index 20ae645f3..1704bcd26 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,6 @@ gem 'zeus', require: false # YARD gem 'fssm' -gem 'pygments.rb' +gem 'rouge' gem 'redcarpet' gem 'yard' diff --git a/Gemfile.lock b/Gemfile.lock index 6dbe283a0..f1a9e2618 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,6 @@ GEM fssm (0.2.10) jaro_winkler (1.5.4) method_source (1.0.0) - multi_json (1.14.1) parallel (1.19.1) parser (2.6.5.0) ast (~> 2.4.0) @@ -22,12 +21,11 @@ GEM pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rack (2.2.2) rainbow (3.0.0) rake (13.0.1) redcarpet (3.5.0) + rouge (3.22.0) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -68,9 +66,9 @@ DEPENDENCIES fssm pry pry-byebug - pygments.rb rake (= 13.0.1) redcarpet + rouge rspec (~> 3.9) rubocop rubocop-rails diff --git a/doc_config/yard/setup.rb b/doc_config/yard/setup.rb index eb654f5b6..6483b4c22 100644 --- a/doc_config/yard/setup.rb +++ b/doc_config/yard/setup.rb @@ -1,20 +1,20 @@ YARD::Templates::Engine.register_template_path(File.dirname(__FILE__) + '/templates') -require 'pygments.rb' +require 'rouge' module YARD module Templates module Helpers module HtmlSyntaxHighlightHelper def html_syntax_highlight_ruby(source) - highlight_with_pygments(:ruby, source) + highlight(:ruby, source) end private - def highlight_with_pygments(language, source) - html = Pygments.highlight(source, lexer: language.to_s) - html.sub(%r{\A
\s*
}, '').sub(%r{
\s*
\Z}, '') + def highlight(language, source) + lexer = Rouge::Lexers.const_get(language.capitalize) + Rouge::Formatters::HTML.new.format(lexer.new.lex(source)) end end end diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile index b90bb032c..b58c8b2fe 100644 --- a/gemfiles/rails_4_2.gemfile +++ b/gemfiles/rails_4_2.gemfile @@ -13,7 +13,7 @@ gem "rubocop-rails", require: false gem "warnings_logger" gem "zeus", require: false gem "fssm" -gem "pygments.rb" +gem "rouge" gem "redcarpet" gem "yard" gem "spring" diff --git a/gemfiles/rails_4_2.gemfile.lock b/gemfiles/rails_4_2.gemfile.lock index d736ee532..04da28534 100644 --- a/gemfiles/rails_4_2.gemfile.lock +++ b/gemfiles/rails_4_2.gemfile.lock @@ -84,7 +84,6 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) - multi_json (1.14.1) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) parallel (1.19.1) @@ -99,8 +98,6 @@ GEM pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) @@ -137,6 +134,7 @@ GEM ffi (~> 1.0) rdoc (4.3.0) redcarpet (3.5.0) + rouge (3.22.0) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -228,10 +226,10 @@ DEPENDENCIES protected_attributes (~> 1.0.6) pry pry-byebug - pygments.rb rails (= 4.2.11.1) rake (= 13.0.1) redcarpet + rouge rspec (~> 3.9) rspec-rails (~> 3.9) rubocop diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile index 8295baca9..0bb6362fe 100644 --- a/gemfiles/rails_5_0.gemfile +++ b/gemfiles/rails_5_0.gemfile @@ -13,7 +13,7 @@ gem "rubocop-rails", require: false gem "warnings_logger" gem "zeus", require: false gem "fssm" -gem "pygments.rb" +gem "rouge" gem "redcarpet" gem "yard" gem "spring" diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock index 714c4f7a7..ced9b22d3 100644 --- a/gemfiles/rails_5_0.gemfile.lock +++ b/gemfiles/rails_5_0.gemfile.lock @@ -77,7 +77,6 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) - multi_json (1.14.1) nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) @@ -92,8 +91,6 @@ GEM byebug (~> 11.0) pry (~> 0.13.0) puma (3.12.2) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rack (2.2.2) rack-test (0.6.3) rack (>= 1.0) @@ -130,6 +127,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + rouge (3.22.0) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -220,11 +218,11 @@ DEPENDENCIES pry pry-byebug puma (~> 3.0) - pygments.rb rails (= 5.0.7.2) rails-controller-testing (>= 1.0.1) rake (= 13.0.1) redcarpet + rouge rspec (~> 3.9) rspec-rails (~> 3.9) rubocop diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile index ebe601837..ac7a944d6 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_5_1.gemfile @@ -13,7 +13,7 @@ gem "rubocop-rails", require: false gem "warnings_logger" gem "zeus", require: false gem "fssm" -gem "pygments.rb" +gem "rouge" gem "redcarpet" gem "yard" gem "spring" diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock index 60e3819c0..05e46b4d0 100644 --- a/gemfiles/rails_5_1.gemfile.lock +++ b/gemfiles/rails_5_1.gemfile.lock @@ -84,7 +84,6 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) - multi_json (1.14.1) nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) @@ -100,8 +99,6 @@ GEM pry (~> 0.13.0) public_suffix (4.0.1) puma (3.12.2) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -138,6 +135,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + rouge (3.22.0) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -235,11 +233,11 @@ DEPENDENCIES pry pry-byebug puma (~> 3.7) - pygments.rb rails (= 5.1.7) rails-controller-testing (>= 1.0.1) rake (= 13.0.1) redcarpet + rouge rspec (~> 3.9) rspec-rails (~> 3.9) rubocop diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index c53dac15c..7a253fe31 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -13,7 +13,7 @@ gem "rubocop-rails", require: false gem "warnings_logger" gem "zeus", require: false gem "fssm" -gem "pygments.rb" +gem "rouge" gem "redcarpet" gem "yard" gem "spring" diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index dd4f1fe19..0b5d68163 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -100,7 +100,6 @@ GEM mini_portile2 (2.4.0) minitest (5.13.0) msgpack (1.3.1) - multi_json (1.14.1) nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) @@ -116,8 +115,6 @@ GEM pry (~> 0.13.0) public_suffix (4.0.1) puma (3.12.2) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -155,6 +152,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + rouge (3.22.0) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -254,11 +252,11 @@ DEPENDENCIES pry pry-byebug puma (~> 3.11) - pygments.rb rails (= 5.2.4.1) rails-controller-testing (>= 1.0.1) rake (= 13.0.1) redcarpet + rouge rspec (~> 3.9) rspec-rails (~> 3.9) rubocop diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index f7d5c94d5..c702b8203 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -13,7 +13,7 @@ gem "rubocop-rails", require: false gem "warnings_logger" gem "zeus", require: false gem "fssm" -gem "pygments.rb" +gem "rouge" gem "redcarpet" gem "yard" gem "spring" diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock index e68a298a1..e5986a1f7 100644 --- a/gemfiles/rails_6_0.gemfile.lock +++ b/gemfiles/rails_6_0.gemfile.lock @@ -108,7 +108,6 @@ GEM mini_portile2 (2.4.0) minitest (5.13.0) msgpack (1.3.1) - multi_json (1.14.1) nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) @@ -125,8 +124,6 @@ GEM public_suffix (4.0.1) puma (4.3.1) nio4r (~> 2.0) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -167,6 +164,7 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) regexp_parser (1.6.0) + rouge (3.22.0) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -270,11 +268,11 @@ DEPENDENCIES pry pry-byebug puma (~> 4.1) - pygments.rb rails (= 6.0.2.1) rails-controller-testing (>= 1.0.1) rake (= 13.0.1) redcarpet + rouge rspec (~> 3.9) rspec-rails (~> 3.9) rubocop