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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81

Extract CodeRay calls to Redmine::SyntaxHighlighting (#2985).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
c03b4c2e · Jean-Philippe Lang · 51d790b2 · c03b4c2e · c03b4c2e · c03b4c2e
Commit c03b4c2e authored Mar 14, 2010 by Jean-Philippe Lang
Showing with 58 additions and 6 deletions

application_helper.rb app/helpers/application_helper.rb +1 -4

syntax_highlighting.rb lib/redmine/syntax_highlighting.rb +56 -0

formatter.rb lib/redmine/wiki_formatting/textile/formatter.rb +1 -2

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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)

--- a/lib/redmine/syntax_highlighting.rb
+++ b/lib/redmine/syntax_highlighting.rb
+# 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
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
@@ -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