jro_apps/redmine Commit - r12178:a657a1245062

Don't load redcarpet with JRuby....

Jean-Philippe Lang -

r12178:a657a1245062

parent child

Context file:

r12178:a657a1245062

Gemfile +7 -3

             gem "coderay", "~> 1.1.0"
             gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
             gem "builder", "3.0.0"
-            # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
-            gem "redcarpet", "~> 2.3.0"
             # Optional gem for LDAP authentication
             group :ldap do
               gem "rack-openid"
             end
-            # Optional gem for exporting the gantt to a PNG file, not supported with jruby
             platforms :mri, :mingw do
+              # Optional gem for exporting the gantt to a PNG file, not supported with jruby
               group :rmagick do
                 # RMagick 2 supports ruby 1.9
                 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
                 # different requirements for the same gem on different platforms
                 gem "rmagick", ">= 2.0.0"
               end
+              # Optional Markdown support, not for JRuby
+              group :markdown do
+                # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
+                gem "redcarpet", "~> 2.3.0"
+              end
             end
             platforms :jruby do

lib/redmine.rb +9 -2

             rescue LoadError
               # RMagick is not available
             end
+            begin
+              require 'Redcarpet' unless Object.const_defined?(:Redcarpet)
+            rescue LoadError
+              # Redcarpet is not available
+            end
             require 'redmine/scm/base'
             require 'redmine/access_control'
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
-              format.register :markdown, Redmine::WikiFormatting::Markdown::Formatter, Redmine::WikiFormatting::Markdown::Helper,
+              if Object.const_defined?(:Redcarpet)
-                :label => 'Markdown (experimental)'
+                format.register :markdown, Redmine::WikiFormatting::Markdown::Formatter, Redmine::WikiFormatting::Markdown::Helper,
+                  :label => 'Markdown (experimental)'
+              end
             end
             ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

lib/redmine/scm/adapters/abstract_adapter.rb +1 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'cgi'
+            require 'redmine/scm/adapters'
             if RUBY_VERSION < '1.9'
               require 'iconv'

test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb +4 0

             class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
               include ApplicationHelper
+              if Object.const_defined?(:Redcarpet)
               def setup
                 @formatter = Redmine::WikiFormatting::Markdown::Formatter
               end
                 text = 'This is a [link](/issues)'
                 assert_equal '<p>This is a <a href="/issues">link</a></p>', @formatter.new(text).to_html.strip
               end
+              end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages