comparison .svn/pristine/1f/1f0cbd778ac799db40d158f816d90f939c73e314.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
1 # Redmine - project management software
2 # Copyright (C) 2006-2013 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 module Redmine
19 module Helpers
20 class Diff
21 include ERB::Util
22 include ActionView::Helpers::TagHelper
23 include ActionView::Helpers::TextHelper
24 attr_reader :diff, :words
25
26 def initialize(content_to, content_from)
27 @words = content_to.to_s.split(/(\s+)/)
28 @words = @words.select {|word| word != ' '}
29 words_from = content_from.to_s.split(/(\s+)/)
30 words_from = words_from.select {|word| word != ' '}
31 @diff = words_from.diff @words
32 end
33
34 def to_html
35 words = self.words.collect{|word| h(word)}
36 words_add = 0
37 words_del = 0
38 dels = 0
39 del_off = 0
40 diff.diffs.each do |diff|
41 add_at = nil
42 add_to = nil
43 del_at = nil
44 deleted = ""
45 diff.each do |change|
46 pos = change[1]
47 if change[0] == "+"
48 add_at = pos + dels unless add_at
49 add_to = pos + dels
50 words_add += 1
51 else
52 del_at = pos unless del_at
53 deleted << ' ' unless deleted.empty?
54 deleted << h(change[2])
55 words_del += 1
56 end
57 end
58 if add_at
59 words[add_at] = '<span class="diff_in">'.html_safe + words[add_at]
60 words[add_to] = words[add_to] + '</span>'.html_safe
61 end
62 if del_at
63 words.insert del_at - del_off + dels + words_add, '<span class="diff_out">'.html_safe + deleted + '</span>'.html_safe
64 dels += 1
65 del_off += words_del
66 words_del = 0
67 end
68 end
69 words.join(' ').html_safe
70 end
71 end
72 end
73 end