jro_apps/redmine Commit - r3474:a179f261cde4

Extract parsing of inline attachments, wiki links and redmine links....

Jean-Philippe Lang -

r3474:a179f261cde4

parent child

Context file:

r3474:a179f261cde4

Collapse all files

app/helpers/application_helper.rb +21 -21

                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
+                project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
+                only_path = options.delete(:only_path) == false ? false : true
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr) { |macro, args| exec_macro(macro, obj, args) }
-                only_path = options.delete(:only_path) == false ? false : true
+                [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].each do |method_name|
+                  send method_name, text, project, obj, attr, only_path, options
+                end
+                text
+              end
+              def parse_inline_attachments(text, project, obj, attr, only_path, options)
                 # when using an image link, try to use an attachment, if possible
                 if options[:attachments] || (obj && obj.respond_to?(:attachments))
                   attachments = nil
                     end
                   end
                 end
-                # different methods for formatting wiki links
-                case options[:wiki_links]
-                when :local
-                  # used for local links to html files
-                  format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
-                when :anchor
-                  # used for single-file wiki export
-                  format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
-                else
-                  format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
               end
-                project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
               # Wiki links
               #
               # Examples:
               #   [[project:|mytext]]
               #   [[project:mypage]]
               #   [[project:mypage|mytext]]
-                text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
+              def parse_wiki_links(text, project, obj, attr, only_path, options)
+                text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                       end
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
-                      link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
+                      url = case options[:wiki_links]
-                                               :class => ('wiki-page' + (wiki_page ? '' : ' new')))
+                        when :local; "#{title}.html"
+                        when :anchor; "##{title}"   # used for single-file wiki export
+                        else
+                          url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => link_project, :page => Wiki.titleize(page), :anchor => anchor)
+                        end
+                      link_to((title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     all
                   end
                 end
+              end
               # Redmine links
               #
               #     export:some/file -> Force the download of the file
               #  Forum messages:
               #     message#1218 -> Link to message with id 1218
-                text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
+              def parse_redmine_links(text, project, obj, attr, only_path, options)
+                text.gsub!(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, identifier = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                   end
                   leading + (link || "#{prefix}#{sep}#{identifier}")
                 end
-                text
               end
               # Same as Rails' simple_format helper without using paragraphs

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