jro_apps/redmine Commit - r4832:d06f4d013d32

Extracts a diff helper from the WikiDiff class....

Jean-Philippe Lang -

r4832:d06f4d013d32

parent child

Context file:

r4832:d06f4d013d32

Collapse all files

lib/redmine/helpers/diff.rb created 644 +72 0

@@ -0,0 +1,72
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2011 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 << ' ' + h(change[2])
	54	words_del += 1
	55	end
	56	end
	57	if add_at
	58	words[add_at] = '<span class="diff_in">' + words[add_at]
	59	words[add_to] = words[add_to] + '</span>'
	60	end
	61	if del_at
	62	words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
	63	dels += 1
	64	del_off += words_del
	65	words_del = 0
	66	end
	67	end
	68	simple_format(words.join(' '))
	69	end
	70	end
	71	end
	72	end

app/helpers/wiki_helper.rb +2 -39

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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 WikiHelper
               def wiki_page_options_for_select(pages, selected = nil, parent = nil, level = 0)
                 s = ''
                 pages.select {|p| p.parent == parent}.each do |page|
                   attrs = "value='#{page.id}'"
                   attrs << " selected='selected'" if selected == page
                   indent = (level > 0) ? ('&nbsp;' * level * 2 + '&#187; ') : nil
                   s << "<option #{attrs}>#{indent}#{h page.pretty_title}</option>\n" +
                          wiki_page_options_for_select(pages, selected, page, level + 1)
                 end
                 s
               end
-              def html_diff(wdiff)
-                words = wdiff.words.collect{|word| h(word)}
-                words_add = 0
-                words_del = 0
-                dels = 0
-                del_off = 0
-                wdiff.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 << ' ' + h(change[2])
-                      words_del	 += 1
-                    end
-                  end
-                  if add_at
-                    words[add_at] = '<span class="diff_in">' + words[add_at]
-                    words[add_to] = words[add_to] + '</span>'
-                  end
-                  if del_at
-                    words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
-                    dels += 1
-                    del_off += words_del
-                    words_del = 0
-                  end
-                end
-                simple_format_without_paragraph(words.join(' '))
-              end
             end

app/models/wiki_page.rb +4 -8

             # Redmine - project management software
-            # Copyright (C) 2006-2009  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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'
             require 'enumerator'
             class WikiPage < ActiveRecord::Base
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               acts_as_tree :dependent => :nullify, :order => 'title'
               acts_as_watchable
               acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                             :description => :text,
                             :datetime => :created_on,
                             :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
               acts_as_searchable :columns => ['title', 'text'],
                                  :include => [{:wiki => :project}, :content],
                                  :project_key => "#{Wiki.table_name}.project_id"
               attr_accessor :redirect_existing_links
               validates_presence_of :title
               validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
               # Wiki pages that are protected by default
               DEFAULT_PROTECTED_PAGES = %w(sidebar)
               def after_initialize
                 if new_record? && DEFAULT_PROTECTED_PAGES.include?(title.to_s.downcase)
                   self.protected = true
                 end
               end
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_wiki_pages, project)
               end
               def title=(value)
                 value = Wiki.titleize(value)
                 @previous_title = read_attribute(:title) if @previous_title.blank?
                 write_attribute(:title, value)
               end
               def before_save
                 self.title = Wiki.titleize(title)
                 # Manage redirects if the title has changed
                 if !@previous_title.blank? && (@previous_title != title) && !new_record?
                   # Update redirects that point to the old title
                   wiki.redirects.find_all_by_redirects_to(@previous_title).each do |r|
                     r.redirects_to = title
                     r.title == r.redirects_to ? r.destroy : r.save
                   end
                   # Remove redirects for the new title
                   wiki.redirects.find_all_by_title(title).each(&:destroy)
                   # Create a redirect to the new title
                   wiki.redirects << WikiRedirect.new(:title => @previous_title, :redirects_to => title) unless redirect_existing_links == "0"
                   @previous_title = nil
                 end
               end
               def before_destroy
                 # Remove redirects to this page
                 wiki.redirects.find_all_by_redirects_to(title).each(&:destroy)
               end
               def pretty_title
                 WikiPage.pretty_title(title)
               end
               def content_for_version(version=nil)
                 result = content.versions.find_by_version(version.to_i) if version
                 result ||= content
                 result
               end
               def diff(version_to=nil, version_from=nil)
                 version_to = version_to ? version_to.to_i : self.content.version
                 version_from = version_from ? version_from.to_i : version_to - 1
                 version_to, version_from = version_from, version_to unless version_from < version_to
                 content_to = content.versions.find_by_version(version_to)
                 content_from = content.versions.find_by_version(version_from)
                 (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
               end
               def annotate(version=nil)
                 version = version ? version.to_i : self.content.version
                 c = content.versions.find_by_version(version)
                 c ? WikiAnnotate.new(c) : nil
               end
               def self.pretty_title(str)
                 (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
               def project
                 wiki.project
               end
               def text
                 content.text if content
               end
               # Returns true if usr is allowed to edit the page, otherwise false
               def editable_by?(usr)
                 !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
               end
               def attachments_deletable?(usr=User.current)
                 editable_by?(usr) && super(usr)
               end
               def parent_title
                 @parent_title || (self.parent && self.parent.pretty_title)
               end
               def parent_title=(t)
                 @parent_title = t
                 parent_page = t.blank? ? nil : self.wiki.find_page(t)
                 self.parent = parent_page
               end
               protected
               def validate
                 errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
                 errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
                 errors.add(:parent_title, :not_same_project) if parent && (parent.wiki_id != wiki_id)
               end
             end
-            class WikiDiff
+            class WikiDiff < Redmine::Helpers::Diff
-              attr_reader :diff, :words, :content_to, :content_from
+              attr_reader :content_to, :content_from
               def initialize(content_to, content_from)
                 @content_to = content_to
                 @content_from = content_from
-                @words = content_to.text.split(/(\s+)/)
+                super(content_to.text, content_from.text)
-                @words = @words.select {|word| word != ' '}
-                words_from = content_from.text.split(/(\s+)/)
-                words_from = words_from.select {|word| word != ' '}
-                @diff = words_from.diff @words
               end
             end
             class WikiAnnotate
               attr_reader :lines, :content
               def initialize(content)
                 @content = content
                 current = content
                 current_lines = current.text.split(/\r?\n/)
                 @lines = current_lines.collect {|t| [nil, nil, t]}
                 positions = []
                 current_lines.size.times {|i| positions << i}
                 while (current.previous)
                   d = current.previous.text.split(/\r?\n/).diff(current.text.split(/\r?\n/)).diffs.flatten
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '+' && positions[line] && positions[line] != -1
                       if @lines[positions[line]][0].nil?
                         @lines[positions[line]][0] = current.version
                         @lines[positions[line]][1] = current.author
                       end
                     end
                   end
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '-'
                       positions.insert(line, -1)
                     else
                       positions[line] = nil
                     end
                   end
                   positions.compact!
                   # Stop if every line is annotated
                   break unless @lines.detect { |line| line[0].nil? }
                   current = current.previous
                 end
                 @lines.each { |line| line[0] ||= current.version }
               end
             end

app/views/wiki/diff.rhtml +3 -3

             <div class="contextual">
             <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
             <h2><%= @page.pretty_title %></h2>
             <p>
             <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
             <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
             &#8594;
             <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
             <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
             </p>
-            <hr />
+            <div class="text-diff">
+            <%= @diff.to_html %>
-            <%= html_diff(@diff) %>
+            </div>

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