jro_apps/redmine Commit - r11976:461342dd2ec9

1

# Redmine - project management software

1

# Redmine - project management software

2

3

#

3

#

4

# This program is free software; you can redistribute it and/or

4

# This program is free software; you can redistribute it and/or

5

# modify it under the terms of the GNU General Public License

5

# modify it under the terms of the GNU General Public License

6

# as published by the Free Software Foundation; either version 2

6

# as published by the Free Software Foundation; either version 2

7

# of the License, or (at your option) any later version.

7

# of the License, or (at your option) any later version.

8

#

8

#

9

# This program is distributed in the hope that it will be useful,

9

# This program is distributed in the hope that it will be useful,

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12

# GNU General Public License for more details.

12

# GNU General Public License for more details.

13

#

13

#

14

# You should have received a copy of the GNU General Public License

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

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.

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

17

18

require 'diff'

19

18

module Redmine

20

module Redmine

19

module Helpers

21

module Helpers

20

class Diff

22

class Diff

21

include ERB::Util

23

include ERB::Util

22

include ActionView::Helpers::TagHelper

24

include ActionView::Helpers::TagHelper

23

include ActionView::Helpers::TextHelper

25

include ActionView::Helpers::TextHelper

24

attr_reader :diff, :words

26

attr_reader :diff, :words

25

27

26

def initialize(content_to, content_from)

28

def initialize(content_to, content_from)

27

@words = content_to.to_s.split(/(\s+)/)

29

@words = content_to.to_s.split(/(\s+)/)

28

@words = @words.select {|word| word != ' '}

30

@words = @words.select {|word| word != ' '}

29

words_from = content_from.to_s.split(/(\s+)/)

31

words_from = content_from.to_s.split(/(\s+)/)

30

words_from = words_from.select {|word| word != ' '}

32

words_from = words_from.select {|word| word != ' '}

31

@diff = words_from.diff @words

33

@diff = words_from.diff @words

32

end

34

end

33

35

34

def to_html

36

def to_html

35

words = self.words.collect{|word| h(word)}

37

words = self.words.collect{|word| h(word)}

36

words_add = 0

38

words_add = 0

37

words_del = 0

39

words_del = 0

38

dels = 0

40

dels = 0

39

del_off = 0

41

del_off = 0

40

diff.diffs.each do |diff|

42

diff.diffs.each do |diff|

41

add_at = nil

43

add_at = nil

42

add_to = nil

44

add_to = nil

43

del_at = nil

45

del_at = nil

44

deleted = ""

46

deleted = ""

45

diff.each do |change|

47

diff.each do |change|

46

pos = change[1]

48

pos = change[1]

47

if change[0] == "+"

49

if change[0] == "+"

48

add_at = pos + dels unless add_at

50

add_at = pos + dels unless add_at

49

add_to = pos + dels

51

add_to = pos + dels

50

words_add += 1

52

words_add += 1

51

else

53

else

52

del_at = pos unless del_at

54

del_at = pos unless del_at

53

deleted << ' ' unless deleted.empty?

55

deleted << ' ' unless deleted.empty?

54

deleted << h(change[2])

56

deleted << h(change[2])

55

words_del += 1

57

words_del += 1

56

end

58

end

57

end

59

end

58

if add_at

60

if add_at

59

words[add_at] = ''.html_safe + words[add_at]

61

words[add_at] = ''.html_safe + words[add_at]

60

words[add_to] = words[add_to] + ''.html_safe

62

words[add_to] = words[add_to] + ''.html_safe

61

end

63

end

62

if del_at

64

if del_at

63

words.insert del_at - del_off + dels + words_add, ''.html_safe + deleted + ''.html_safe

65

words.insert del_at - del_off + dels + words_add, ''.html_safe + deleted + ''.html_safe

64

dels += 1

66

dels += 1

65

del_off += words_del

67

del_off += words_del

66

words_del = 0

68

words_del = 0

67

end

69

end

68

end

70

end

69

words.join(' ').html_safe

71

words.join(' ').html_safe

70

end

72

end

71

end

73

end

72

end

74

end

73

end

75

end

	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

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 'diff'
             module Redmine
               module Helpers
                 class Diff
                   include ERB::Util
                   include ActionView::Helpers::TagHelper
                   include ActionView::Helpers::TextHelper
                   attr_reader :diff, :words
                   def initialize(content_to, content_from)
                     @words = content_to.to_s.split(/(\s+)/)
                     @words = @words.select {|word| word != ' '}
                     words_from = content_from.to_s.split(/(\s+)/)
                     words_from = words_from.select {|word| word != ' '}
                     @diff = words_from.diff @words
                   end
                   def to_html
                     words = self.words.collect{|word| h(word)}
                     words_add = 0
                     words_del = 0
                     dels = 0
                     del_off = 0
                     diff.diffs.each do |diff|
                       add_at = nil
                       add_to = nil
                       del_at = nil
                       deleted = ""
                       diff.each do |change|
                         pos = change[1]
                         if change[0] == "+"
                           add_at = pos + dels unless add_at
                           add_to = pos + dels
                           words_add += 1
                         else
                           del_at = pos unless del_at
                           deleted << ' ' unless deleted.empty?
                           deleted << h(change[2])
                           words_del  += 1
                         end
                       end
                       if add_at
                         words[add_at] = '<span class="diff_in">'.html_safe + words[add_at]
                         words[add_to] = words[add_to] + '</span>'.html_safe
                       end
                       if del_at
                         words.insert del_at - del_off + dels + words_add, '<span class="diff_out">'.html_safe + deleted + '</span>'.html_safe
                         dels += 1
                         del_off += words_del
                         words_del = 0
                       end
                     end
                     words.join(' ').html_safe
                   end
                 end
               end
             end