jro_apps/redmine Commit - r12883:d548d9338e78

Merged r13105 (#16669)....

Jean-Philippe Lang -

r12883:d548d9338e78

parent child

Context file:

r12883:d548d9338e78

Collapse all files

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

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             require 'cgi'
             module Redmine
               module WikiFormatting
                 module Markdown
                   class HTML < Redcarpet::Render::HTML
                     include ActionView::Helpers::TagHelper
                     def link(link, title, content)
                       css = nil
                       unless link && link.starts_with?('/')
                         css = 'external'
                       end
                       content_tag('a', content.html_safe, :href => link, :title => title, :class => css)
                     end
                     def block_code(code, language)
                       if language.present?
                         "<pre><code class=\"#{CGI.escapeHTML language} syntaxhl\">" +
                           Redmine::SyntaxHighlighting.highlight_by_language(code, language) +
                           "</code></pre>"
                       else
                         "<pre>" + CGI.escapeHTML(code) + "</pre>"
                       end
                     end
                   end
                   class Formatter
                     def initialize(text)
                       @text = text
                     end
                     def to_html(*args)
                       html = formatter.render(@text)
                       # restore wiki links eg. [[Foo]]
                       html.gsub!(%r{\[<a href="(.*?)">(.*?)</a>\]}) do
                         "[[#{$2}]]"
                       end
                       # restore Redmine links with double-quotes, eg. version:"1.0"
                       html.gsub!(/(\w):&quot;(.+?)&quot;/) do
                         "#{$1}:\"#{$2}\""
                       end
                       html
                     end
                     def get_section(index)
                       section = extract_sections(index)[1]
                       hash = Digest::MD5.hexdigest(section)
                       return section, hash
                     end
                     def update_section(index, update, hash=nil)
                       t = extract_sections(index)
                       if hash.present? && hash != Digest::MD5.hexdigest(t[1])
                         raise Redmine::WikiFormatting::StaleSectionError
                       end
                       t[1] = update unless t[1].blank?
                       t.reject(&:blank?).join "\n\n"
                     end
                     def extract_sections(index)
                       sections = ['', '', '']
                       offset = 0
                       i = 0
                       l = 1
                       inside_pre = false
                       @text.split(/(^(?:.+\r?\n\r?(?:\=+|\-+)|#+.+|~~~.*)\s*$)/).each do |part|
                         level = nil
                         if part =~ /\A~{3,}(\S+)?\s*$/
                           if $1
                             if !inside_pre
                               inside_pre = true
                             end
                           else
                             inside_pre = !inside_pre
                           end
                         elsif inside_pre
                           # nop
                         elsif part =~ /\A(#+).+/
                           level = $1.size
                         elsif part =~ /\A.+\r?\n\r?(\=+|\-+)\s*$/
                           level = $1.include?('=') ? 1 : 2
                         end
                         if level
                           i += 1
                           if offset == 0 && i == index
                             # entering the requested section
                             offset = 1
                             l = level
                           elsif offset == 1 && i > index && level <= l
                             # leaving the requested section
                             offset = 2
                           end
                         end
                         sections[offset] << part
                       end
                       sections.map(&:strip)
                     end
                     private
                     def formatter
                       @@formatter ||= Redcarpet::Markdown.new(
                         Redmine::WikiFormatting::Markdown::HTML.new(
                           :filter_html => true,
                           :hard_wrap => true
                         ),
                         :autolink => true,
                         :fenced_code_blocks => true,
                         :space_after_headers => true,
                         :tables => true,
                         :strikethrough => true,
-                        :superscript => true
+                        :superscript => true,
+                        :no_intra_emphasis => true
                       )
                     end
                   end
                 end
               end
             end

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

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             require File.expand_path('../../../../../test_helper', __FILE__)
             class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
               if Object.const_defined?(:Redcarpet)
               def setup
                 @formatter = Redmine::WikiFormatting::Markdown::Formatter
               end
               def test_inline_style
                 assert_equal "<p><strong>foo</strong></p>", @formatter.new("**foo**").to_html.strip
               end
+              def test_not_set_intra_emphasis
+                assert_equal "<p>foo_bar_baz</p>", @formatter.new("foo_bar_baz").to_html.strip
+              end
               def test_wiki_links_should_be_preserved
                 text = 'This is a wiki link: [[Foo]]'
                 assert_include '[[Foo]]', @formatter.new(text).to_html
               end
               def test_redmine_links_with_double_quotes_should_be_preserved
                 text = 'This is a redmine link: version:"1.0"'
                 assert_include 'version:"1.0"', @formatter.new(text).to_html
               end
               def test_should_support_syntax_highligth
                 text = <<-STR
             ~~~ruby
             def foo
             end
             ~~~
             STR
                 assert_select_in @formatter.new(text).to_html, 'pre code.ruby.syntaxhl' do
                   assert_select 'span.keyword', :text => 'def'
                 end
               end
               def test_external_links_should_have_external_css_class
                 text = 'This is a [link](http://example.net/)'
                 assert_equal '<p>This is a <a class="external" href="http://example.net/">link</a></p>', @formatter.new(text).to_html.strip
               end
               def test_locals_links_should_not_have_external_css_class
                 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

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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