Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/rouge/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# to use this module, require 'rouge/cli'.

require 'rbconfig'
require 'uri'

module Rouge
class FileReader
Expand Down Expand Up @@ -348,7 +349,7 @@ def run
end

private_class_method def self.parse_cgi(str)
pairs = CGI.parse(str).map { |k, v| [k.to_sym, v.first] }
pairs = URI.decode_www_form(str).map { |k, v| [k.to_sym, v] }
Hash[pairs]
end
end
Expand Down
3 changes: 0 additions & 3 deletions lib/rouge/formatters/html_legacy.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# -*- coding: utf-8 -*- #
# frozen_string_literal: true

# stdlib
require 'cgi'

module Rouge
module Formatters
# Transforms a token stream into HTML output.
Expand Down
14 changes: 8 additions & 6 deletions lib/rouge/lexer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

# stdlib
require 'strscan'
require 'cgi'
require 'set'
require 'uri'

module Rouge
# @abstract
Expand Down Expand Up @@ -52,17 +52,19 @@ def lookup_fancy(str, code=nil, default_options={})
name, opts = str ? str.split('?', 2) : [nil, '']

# parse the options hash from a cgi-style string
opts = CGI.parse(opts || '').map do |k, vals|
val = case vals.size
cgi_opts = Hash.new { |hash, key| hash[key] = [] }
URI.decode_www_form(opts || '').each do |k, val|
cgi_opts[k] << val
end
cgi_opts.transform_values! do |vals|
case vals.size
when 0 then true
when 1 then vals[0]
else vals
end

[ k.to_s, val ]
end

opts = default_options.merge(Hash[opts])
opts = default_options.merge(cgi_opts)

lexer_class = case name
when 'guess', nil
Expand Down
Loading