Extract CodeRay calls to Redmine::SyntaxHighlighting (#2985).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-03-14 12:57:08 +00:00
parent 51d790b2f3
commit c03b4c2e1e
3 changed files with 58 additions and 6 deletions

View File

@ -15,8 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'coderay'
require 'coderay/helpers/file_type'
require 'forwardable'
require 'cgi'
@ -284,8 +282,7 @@ module ApplicationHelper
end
def syntax_highlight(name, content)
type = CodeRay::FileType[name]
type ? CodeRay.scan(content, type).html : h(content)
Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
end
def to_path_param(path)

View File

@ -0,0 +1,56 @@
# Redmine - project management software
# Copyright (C) 2006-2010 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module Redmine
module SyntaxHighlighting
class << self
attr_reader :highlighter
delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
def highlighter=(name)
if name.is_a?(Module)
@highlighter = name
else
@highlighter = const_get(name)
end
end
end
module CodeRay
require 'coderay'
require 'coderay/helpers/file_type'
class << self
# Highlights +text+ as the content of +filename+
# Should not return line numbers nor outer pre tag
def highlight_by_filename(text, filename)
language = ::CodeRay::FileType[filename]
language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text)
end
# Highlights +text+ using +language+ syntax
# Should not return outer pre tag
def highlight_by_language(text, language)
::CodeRay.scan(text, language).html(:line_numbers => :inline)
end
end
end
end
SyntaxHighlighting.highlighter = 'CodeRay'
end

View File

@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'redcloth3'
require 'coderay'
module Redmine
module WikiFormatting
@ -54,7 +53,7 @@ module Redmine
content = @pre_list[$1.to_i]
if content.match(/<code\s+class="(\w+)">\s?(.+)/m)
content = "<code class=\"#{$1} CodeRay\">" +
CodeRay.scan($2, $1.downcase).html(:line_numbers => :inline)
Redmine::SyntaxHighlighting.highlight_by_language($2, $1)
end
content
end