jro_apps/redmine Commit - r2717:bf0ddc2886f4

Fixes artefacts in truncated search results (#3622)....

Jean-Philippe Lang -

r2717:bf0ddc2886f4

parent child

Context file:

r2717:bf0ddc2886f4

Collapse all files

test/unit/helpers/search_helper_test.rb created 644 +45 0

@@ -0,0 +1,45
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../../test_helper'
	19
	20	class SearchHelperTest < HelperTestCase
	21	include SearchHelper
	22
	23	def test_highlight_single_token
	24	assert_equal 'This is a <span class="highlight token-0">token</span>.',
	25	highlight_tokens('This is a token.', %w(token))
	26	end
	27
	28	def test_highlight_multiple_tokens
	29	assert_equal 'This is a <span class="highlight token-0">token</span> and <span class="highlight token-1">another</span> <span class="highlight token-0">token</span>.',
	30	highlight_tokens('This is a token and another token.', %w(token another))
	31	end
	32
	33	def test_highlight_should_not_exceed_maximum_length
	34	s = (('1234567890' * 100) + ' token ') * 100
	35	r = highlight_tokens(s, %w(token))
	36	assert r.include?('<span class="highlight token-0">token</span>')
	37	assert r.length <= 1300
	38	end
	39
	40	def test_highlight_multibyte
	41	s = ('й' * 200) + ' token ' + ('й' * 200)
	42	r = highlight_tokens(s, %w(token))
	43	assert_equal ('й' * 45) + ' ... ' + ('й' * 44) + ' <span class="highlight token-0">token</span> ' + ('й' * 44) + ' ... ' + ('й' * 45), r
	44	end
	45	end

app/helpers/search_helper.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 SearchHelper
               def highlight_tokens(text, tokens)
                 return text unless text && tokens && !tokens.empty?
                 re_tokens = tokens.collect {|t| Regexp.escape(t)}
                 regexp = Regexp.new "(#{re_tokens.join('|')})", Regexp::IGNORECASE
                 result = ''
                 text.split(regexp).each_with_index do |words, i|
                   if result.length > 1200
                     # maximum length of the preview reached
                     result << '...'
                     break
                   end
+                  words = words.mb_chars
                   if i.even?
-                    result << h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words)
+                    result << h(words.length > 100 ? "#{words.slice(0..44)} ... #{words.slice(-45..-1)}" : words)
                   else
                     t = (tokens.index(words.downcase) || 0) % 4
                     result << content_tag('span', h(words), :class => "highlight token-#{t}")
                   end
                 end
                 result
               end
               def type_label(t)
                 l("label_#{t.singularize}_plural")
               end
               def project_select_tag
                 options = [[l(:label_project_all), 'all']]
                 options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
                 options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.descendants.active.empty?
                 options << [@project.name, ''] unless @project.nil?
                 select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
               end
               def render_results_by_type(results_by_type)
                 links = []
                 # Sorts types by results count
                 results_by_type.keys.sort {|a, b| results_by_type[b] <=> results_by_type[a]}.each do |t|
                   c = results_by_type[t]
                   next if c == 0
                   text = "#{type_label(t)} (#{c})"
                   links << link_to(text, :q => params[:q], :titles_only => params[:title_only], :all_words => params[:all_words], :scope => params[:scope], t => 1)
                 end
                 ('<ul>' + links.map {|link| content_tag('li', link)}.join(' ') + '</ul>') unless links.empty?
               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