New upstream version 13.9.4+ds1

This commit is contained in:
Pirate Praveen 2021-03-18 23:53:47 +05:30
parent 98b945ec52
commit 6a2d24fc29
7 changed files with 72 additions and 2 deletions

View file

@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own documentation](doc/development/changelog.md) for instructions on adding your own
entry. entry.
## 13.9.4 (2021-03-17)
### Security (1 change)
- Patch Kramdown syntax highlighter gem.
## 13.9.3 (2021-03-08) ## 13.9.3 (2021-03-08)
### Fixed (4 changes) ### Fixed (4 changes)

View file

@ -1 +1 @@
13.9.3 13.9.4

View file

@ -1 +1 @@
13.9.3 13.9.4

View file

@ -0,0 +1,25 @@
# frozen_string_literal: true
#
# This pulls in https://github.com/gettalong/kramdown/pull/708 for kramdown v2.3.0.
# Remove this file when that pull request is merged and released.
require 'kramdown/converter'
require 'kramdown/converter/syntax_highlighter/rouge'
module Kramdown::Converter::SyntaxHighlighter
module Rouge
def self.formatter_class(opts = {})
case formatter = opts[:formatter]
when Class
formatter
when /\A[[:upper:]][[:alnum:]_]*\z/
::Rouge::Formatters.const_get(formatter, false)
else
# Available in Rouge 2.0 or later
::Rouge::Formatters::HTMLLegacy
end
rescue NameError
# Fallback to Rouge 1.x
::Rouge::Formatters::HTML
end
end
end

View file

@ -0,0 +1,38 @@
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Kramdown patch for syntax highlighting formatters' do
subject { Kramdown::Document.new(options + "\n" + code).to_html }
let(:code) do
<<-RUBY
~~~ ruby
def what?
42
end
~~~
RUBY
end
context 'with invalid formatter' do
let(:options) { %({::options auto_ids="false" footnote_nr="5" syntax_highlighter="rouge" syntax_highlighter_opts="{formatter: CSV, line_numbers: true\\}" /}) }
it 'falls back to standard HTML and disallows CSV' do
expect(CSV).not_to receive(:new)
expect(::Rouge::Formatters::HTML).to receive(:new).and_call_original
expect(subject).to be_present
end
end
context 'with valid formatter' do
let(:options) { %({::options auto_ids="false" footnote_nr="5" syntax_highlighter="rouge" syntax_highlighter_opts="{formatter: HTMLLegacy\\}" /}) }
it 'allows formatter' do
expect(::Rouge::Formatters::HTMLLegacy).to receive(:new).and_call_original
expect(subject).to be_present
end
end
end

0
vendor/gitignore/C++.gitignore vendored Executable file → Normal file
View file

0
vendor/gitignore/Java.gitignore vendored Executable file → Normal file
View file