jro_apps/redmine Commit - r7709:6fc245327ce5

Wiki: allows single section edit (#2222)....

Jean-Philippe Lang -

r7709:6fc245327ce5

parent child

Context file:

r7709:6fc245327ce5

Expand all files

app/controllers/wiki_controller.rb +19 -2

                 # To prevent StaleObjectError exception when reverting to a previous version
                 @content.version = @page.content.version
+                @text = @content.text
+                if params[:section].present?
+                  @section = params[:section].to_i
+                  @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
+                  render_404 if @text.blank?
+                end
               end
               verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                   return
                 end
-                @content.attributes = params[:content]
+                @content.comments = params[:content][:comments]
+                @text = params[:content][:text]
+                if params[:section].present?
+                  @section = params[:section].to_i
+                  @section_hash = params[:section_hash]
+                  @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)
+                else
+                  @content.version = params[:content][:version]
+                  @content.text = @text
+                end
                 @content.author = User.current
                 # if page is new @page.save will also save content, but not if page isn't a new record
                 if (@page.new_record? ? @page.save : @content.save)
                   render :action => 'edit'
                 end
-              rescue ActiveRecord::StaleObjectError
+              rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
                 render :action => 'edit'

app/helpers/application_helper.rb +47 -4

@@ -486,11 +486,11 module ApplicationHelper
486	project = options[:project] \|\| @project \|\| (obj && obj.respond_to?(:project) ? obj.project : nil)	486	project = options[:project] \|\| @project \|\| (obj && obj.respond_to?(:project) ? obj.project : nil)
487	only_path = options.delete(:only_path) == false ? false : true	487	only_path = options.delete(:only_path) == false ? false : true
488		488
489	text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr) { \|~~macro~~, ~~args~~\| ~~exec_macro~~(~~macro~~, ~~obj~~, ~~args~~) }	489	text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr)
490		490
491	@parsed_headings = []	491	@parsed_headings = []
492	text = parse_non_pre_blocks(text) do \|text\|	492	text = parse_non_pre_blocks(text) do \|text\|
493	[:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_headings].each do \|method_name\|	493	[:parse_sections, :parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_macros, :parse_headings].each do \|method_name\|
494	send method_name, text, project, obj, attr, only_path, options	494	send method_name, text, project, obj, attr, only_path, options
495	end	495	end
496	end	496	end
@@ -728,7 +728,23 module ApplicationHelper
728	end	728	end
729	end	729	end
730		730
731	HEADING_RE = /<h(1\|2\|3\|4)( [^>]+)?>(.+?)<\/h(1\|2\|3\|4)>/i unless const_defined?(:HEADING_RE)	731	HEADING_RE = /(<h(1\|2\|3\|4)( [^>]+)?>(.+?)<\/h(1\|2\|3\|4)>)/i unless const_defined?(:HEADING_RE)
		732
		733	def parse_sections(text, project, obj, attr, only_path, options)
		734	return unless options[:edit_section_links]
		735	section = 0
		736	text.gsub!(HEADING_RE) do
		737	section += 1
		738	if section > 1
		739	content_tag('div',
		740	link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => section)),
		741	:class => 'contextual',
		742	:title => l(:button_edit_section)) + $1
		743	else
		744	$1
		745	end
		746	end
		747	end
732		748
733	# Headings and TOC	749	# Headings and TOC
734	# Adds ids and links to headings unless options[:headings] is set to false	750	# Adds ids and links to headings unless options[:headings] is set to false
@@ -736,7 +752,7 module ApplicationHelper
736	return if options[:headings] == false	752	return if options[:headings] == false
737		753
738	text.gsub!(HEADING_RE) do	754	text.gsub!(HEADING_RE) do
739	level, attrs, content = $1.to_i, $2, $3	755	level, attrs, content = $2.to_i, $3, $4
740	item = strip_tags(content).strip	756	item = strip_tags(content).strip
741	anchor = sanitize_anchor_name(item)	757	anchor = sanitize_anchor_name(item)
742	# used for single-file wiki export	758	# used for single-file wiki export
@@ -746,6 +762,33 module ApplicationHelper
746	end	762	end
747	end	763	end
748		764
		765	MACROS_RE = /
		766	(!)? # escaping
		767	(
		768	\{\{ # opening tag
		769	([\w]+) # macro name
		770	($([^\}]*)$)? # optional arguments
		771	\}\} # closing tag
		772	)
		773	/x unless const_defined?(:MACROS_RE)
		774
		775	# Macros substitution
		776	def parse_macros(text, project, obj, attr, only_path, options)
		777	text.gsub!(MACROS_RE) do
		778	esc, all, macro = $1, $2, $3.downcase
		779	args = ($5 \|\| '').split(',').each(&:strip)
		780	if esc.nil?
		781	begin
		782	exec_macro(macro, obj, args)
		783	rescue => e
		784	"<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
		785	end \|\| all
		786	else
		787	all
		788	end
		789	end
		790	end
		791
749	TOC_RE = /<p>\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)	792	TOC_RE = /<p>\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
750		793
751	# Renders the TOC with given headings	794	# Renders the TOC with given headings

app/views/wiki/_content.html.erb +3 -2

@@ -1,3 +1,4
1	<div class="wiki">	1	<div class="wiki wiki-page">
2	<%= textilizable content, :text, :attachments => content.page.attachments %>	2	<%= textilizable content, :text, :attachments => content.page.attachments,
		3	:edit_section_links => (content.is_a?(WikiContent) && @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
3	</div>	4	</div>

app/views/wiki/edit.html.erb +5 -1

             <% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
+            <% if @section %>
+            <%= hidden_field_tag 'section', @section %>
+            <%= hidden_field_tag 'section_hash', @section_hash %>
+            <% end %>
             <%= error_messages_for 'content' %>
-            <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
+            <p><%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
             <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
             <p><label><%=l(:label_attachment_plural)%></label><br /><%= render :partial => 'attachments/form' %></p>

config/locales/bg.yml +1 0

               description_date_range_interval: Изберете диапазон чрез задаване на начална и крайна дати
               description_date_from: Въведете начална дата
               description_date_to: Въведете крайна дата
+              button_edit_section: Edit this section

config/locales/bs.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/ca.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/cs.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/da.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/de.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/el.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/en-GB.yml +1 0

               description_selected_columns: Selected Columns
               label_parent_revision: Parent
               label_child_revision: Child
+              button_edit_section: Edit this section

config/locales/en.yml +1 0

               button_quote: Quote
               button_duplicate: Duplicate
               button_show: Show
+              button_edit_section: Edit this section
               status_active: active
               status_registered: registered

config/locales/es.yml +1 0

               label_parent_revision: Parent
               label_child_revision: Child
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/eu.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/fa.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/fi.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/fr.yml +1 0

               button_quote: Citer
               button_duplicate: Dupliquer
               button_show: Afficher
+              button_edit_section: Modifier cette section
               status_active: actif
               status_registered: enregistré

config/locales/gl.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/he.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/hr.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/hu.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/id.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/it.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/ja.yml +1 0

               description_selected_columns: Selected Columns
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/ko.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/lt.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/lv.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/mk.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/mn.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/nl.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/no.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/pl.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/pt-BR.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/pt.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/ro.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/ru.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/sk.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/sl.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/sr-YU.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/sr.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/sv.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/th.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/tr.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/uk.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/vi.yml +1 0

               label_child_revision: Child
               error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              button_edit_section: Edit this section

config/locales/zh-TW.yml +1 0

               description_date_range_interval: 選擇起始與結束日期以設定範圍區間
               description_date_from: 輸入起始日期
               description_date_to: 輸入結束日期
+              button_edit_section: Edit this section

config/locales/zh.yml +1 0

               label_child_revision: 子修订
               error_scm_annotate_big_text_file: 输入文本内容超长，无法输入。
               setting_default_issue_start_date_to_creation_date: 使用当前日期作为新问题的开始日期
+              button_edit_section: Edit this section

lib/redmine/wiki_formatting.rb +7 -31

             module Redmine
               module WikiFormatting
+                class StaleSectionError < Exception; end
                 @@formatters = {}
                 class << self
                     @@formatters[name.to_s] = {:formatter => formatter, :helper => helper}
                   end
+                  def formatter
+                    formatter_for(Setting.text_formatting)
+                  end
                   def formatter_for(name)
                     entry = @@formatters[name.to_s]
                     (entry && entry[:formatter]) || Redmine::WikiFormatting::NullFormatter::Formatter
                     @@formatters.keys.map
                   end
-                  def to_html(format, text, options = {}, &block)
+                  def to_html(format, text, options = {})
                     text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && cache_key = cache_key_for(format, options[:object], options[:attribute])
                       # Text retrieved from the cache store may be frozen
                       # We need to dup it so we can do in-place substitutions with gsub!
                     else
                       formatter_for(format).new(text).to_html
                     end
-                    if block_given?
-                      execute_macros(text, block)
-                    end
                     text
                   end
                   def cache_store
                     ActionController::Base.cache_store
                   end
-                  MACROS_RE = /
-                                (!)?                        # escaping
-                                \{\{                        # opening tag
-                                ([\w]+)                     # macro name
-                                (\(([^\}]*)\))?             # optional arguments
-                                \}\}                        # closing tag
-                              /x unless const_defined?(:MACROS_RE)
-                  # Macros substitution
-                  def execute_macros(text, macros_runner)
-                    text.gsub!(MACROS_RE) do
-                      esc, all, macro = $1, $2, $3.downcase
-                      args = ($5 || '').split(',').each(&:strip)
-                      if esc.nil?
-                        begin
-                          macros_runner.call(macro, args)
-                        rescue => e
-                          "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
-                        end || all
-                      else
-                        all
-                      end
-                    end
-                  end
                 end
                 # Default formatter module

lib/redmine/wiki_formatting/textile/formatter.rb +63 0

@@ -16,6 +16,7
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		17
18	require 'redcloth3'	18	require 'redcloth3'
		19	require 'digest/md5'
19		20
20	module Redmine	21	module Redmine
21	module WikiFormatting	22	module WikiFormatting
@@ -38,6 +39,68 module Redmine
38	super(*RULES).to_s	39	super(*RULES).to_s
39	end	40	end
40		41
		42	def get_section(index)
		43	section = extract_sections(index)[1]
		44	hash = Digest::MD5.hexdigest(section)
		45	return section, hash
		46	end
		47
		48	def update_section(index, update, hash=nil)
		49	t = extract_sections(index)
		50	if hash.present? && hash != Digest::MD5.hexdigest(t[1])
		51	raise Redmine::WikiFormatting::StaleSectionError
		52	end
		53	t[1] = update unless t[1].blank?
		54	t.reject(&:blank?).join "\n\n"
		55	end
		56
		57	def extract_sections(index)
		58	@pre_list = []
		59	text = self.dup
		60	rip_offtags text
		61	before = ''
		62	s = ''
		63	after = ''
		64	i = 0
		65	l = 1
		66	started = false
		67	ended = false
		68	text.scan(/(((?:.?)(\A\|\r?\n\r?\n))(h(\d+)(#{A}#{C})\.(?::(\S+))? (.?)$)\|.*)/m).each do \|all, content, lf, heading, level\|
		69	if heading.nil?
		70	if ended
		71	after << all
		72	elsif started
		73	s << all
		74	else
		75	before << all
		76	end
		77	break
		78	end
		79	i += 1
		80	if ended
		81	after << all
		82	elsif i == index
		83	l = level.to_i
		84	before << content
		85	s << heading
		86	started = true
		87	elsif i > index
		88	s << content
		89	if level.to_i > l
		90	s << heading
		91	else
		92	after << heading
		93	ended = true
		94	end
		95	else
		96	before << all
		97	end
		98	end
		99	sections = [before.strip, s.strip, after.strip]
		100	sections.each {\|section\| smooth_offtags section}
		101	sections
		102	end
		103
41	private	104	private
42		105
43	# Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet.	106	# Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet.

public/stylesheets/application.css +3 0

             table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
             table#time-report .hours-dec { font-size: 0.9em; }
+            div.wiki-page .contextual a {opacity: 0.4}
+            div.wiki-page .contextual a:hover {opacity: 1}
             form .attributes { margin-bottom: 8px; }
             form .attributes p { padding-top: 1px; padding-bottom: 2px; }
             form .attributes select { width: 60%; }

test/fixtures/wiki_contents.yml +22 -1

@@ -103,4 +103,25 wiki_contents_010:
103	version: 1	103	version: 1
104	author_id: 1	104	author_id: 1
105	comments:	105	comments:
106	No newline at end of file	106	wiki_contents_011:
		107	text: \|-
		108	h1. Title
		109
		110	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
		111
		112	h2. Heading 1
		113
		114	Maecenas sed elit sit amet mi accumsan vestibulum non nec velit. Proin porta tincidunt lorem, consequat rhoncus dolor fermentum in.
		115
		116	Cras ipsum felis, ultrices at porttitor vel, faucibus eu nunc.
		117
		118	h2. Heading 2
		119
		120	Morbi facilisis accumsan orci non pharetra.
		121	updated_on: 2007-03-08 00:18:07 +01:00
		122	page_id: 11
		123	id: 11
		124	version: 3
		125	author_id: 1
		126	comments:
		127

test/fixtures/wiki_pages.yml +7 0

@@ -69,3 +69,10 wiki_pages_010:
69	wiki_id: 1	69	wiki_id: 1
70	protected: false	70	protected: false
71	parent_id:	71	parent_id:
		72	wiki_pages_011:
		73	created_on: 2007-03-08 00:18:07 +01:00
		74	title: Page_with_sections
		75	id: 11
		76	wiki_id: 1
		77	protected: false
		78	parent_id:

test/functional/wiki_controller_test.rb +115 0

@@ -118,6 +118,44 class WikiControllerTest < ActionController::TestCase
118	assert_equal 'testfile.txt', page.attachments.first.filename	118	assert_equal 'testfile.txt', page.attachments.first.filename
119	end	119	end
120		120
		121	def test_edit_page
		122	@request.session[:user_id] = 2
		123	get :edit, :project_id => 'ecookbook', :id => 'Another_page'
		124
		125	assert_response :success
		126	assert_template 'edit'
		127
		128	assert_tag 'textarea',
		129	:attributes => { :name => 'content[text]' },
		130	:content => WikiPage.find_by_title('Another_page').content.text
		131	end
		132
		133	def test_edit_section
		134	@request.session[:user_id] = 2
		135	get :edit, :project_id => 'ecookbook', :id => 'Page_with_sections', :section => 2
		136
		137	assert_response :success
		138	assert_template 'edit'
		139
		140	page = WikiPage.find_by_title('Page_with_sections')
		141	section, hash = Redmine::WikiFormatting::Textile::Formatter.new(page.content.text).get_section(2)
		142
		143	assert_tag 'textarea',
		144	:attributes => { :name => 'content[text]' },
		145	:content => section
		146	assert_tag 'input',
		147	:attributes => { :name => 'section', :type => 'hidden', :value => '2' }
		148	assert_tag 'input',
		149	:attributes => { :name => 'section_hash', :type => 'hidden', :value => hash }
		150	end
		151
		152	def test_edit_invalid_section_should_respond_with_404
		153	@request.session[:user_id] = 2
		154	get :edit, :project_id => 'ecookbook', :id => 'Page_with_sections', :section => 10
		155
		156	assert_response 404
		157	end
		158
121	def test_update_page	159	def test_update_page
122	@request.session[:user_id] = 2	160	@request.session[:user_id] = 2
123	assert_no_difference 'WikiPage.count' do	161	assert_no_difference 'WikiPage.count' do
@@ -200,6 +238,83 class WikiControllerTest < ActionController::TestCase
200	assert_equal 2, c.version	238	assert_equal 2, c.version
201	end	239	end
202		240
		241	def test_update_section
		242	@request.session[:user_id] = 2
		243	page = WikiPage.find_by_title('Page_with_sections')
		244	section, hash = Redmine::WikiFormatting::Textile::Formatter.new(page.content.text).get_section(2)
		245	text = page.content.text
		246
		247	assert_no_difference 'WikiPage.count' do
		248	assert_no_difference 'WikiContent.count' do
		249	assert_difference 'WikiContent::Version.count' do
		250	put :update, :project_id => 1, :id => 'Page_with_sections',
		251	:content => {
		252	:text => "New section content",
		253	:version => 3
		254	},
		255	:section => 2,
		256	:section_hash => hash
		257	end
		258	end
		259	end
		260	assert_redirected_to '/projects/ecookbook/wiki/Page_with_sections'
		261	assert_equal Redmine::WikiFormatting::Textile::Formatter.new(text).update_section(2, "New section content"), page.reload.content.text
		262	end
		263
		264	def test_update_section_should_allow_stale_page_update
		265	@request.session[:user_id] = 2
		266	page = WikiPage.find_by_title('Page_with_sections')
		267	section, hash = Redmine::WikiFormatting::Textile::Formatter.new(page.content.text).get_section(2)
		268	text = page.content.text
		269
		270	assert_no_difference 'WikiPage.count' do
		271	assert_no_difference 'WikiContent.count' do
		272	assert_difference 'WikiContent::Version.count' do
		273	put :update, :project_id => 1, :id => 'Page_with_sections',
		274	:content => {
		275	:text => "New section content",
		276	:version => 2 # Current version is 3
		277	},
		278	:section => 2,
		279	:section_hash => hash
		280	end
		281	end
		282	end
		283	assert_redirected_to '/projects/ecookbook/wiki/Page_with_sections'
		284	page.reload
		285	assert_equal Redmine::WikiFormatting::Textile::Formatter.new(text).update_section(2, "New section content"), page.content.text
		286	assert_equal 4, page.content.version
		287	end
		288
		289	def test_update_section_should_not_allow_stale_section_update
		290	@request.session[:user_id] = 2
		291
		292	assert_no_difference 'WikiPage.count' do
		293	assert_no_difference 'WikiContent.count' do
		294	assert_no_difference 'WikiContent::Version.count' do
		295	put :update, :project_id => 1, :id => 'Page_with_sections',
		296	:content => {
		297	:comments => 'My comments',
		298	:text => "Text should not be lost",
		299	:version => 3
		300	},
		301	:section => 2,
		302	:section_hash => Digest::MD5.hexdigest("wrong hash")
		303	end
		304	end
		305	end
		306	assert_response :success
		307	assert_template 'edit'
		308	assert_tag :div,
		309	:attributes => { :class => /error/ },
		310	:content => /Data has been updated by another user/
		311	assert_tag 'textarea',
		312	:attributes => { :name => 'content[text]' },
		313	:content => /Text should not be lost/
		314	assert_tag 'input',
		315	:attributes => { :name => 'content[comments]', :value => 'My comments' }
		316	end
		317
203	def test_preview	318	def test_preview
204	@request.session[:user_id] = 2	319	@request.session[:user_id] = 2
205	xhr :post, :preview, :project_id => 1, :id => 'CookBook_documentation',	320	xhr :post, :preview, :project_id => 1, :id => 'CookBook_documentation',

test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +105 0

@@ -16,6 +16,7
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		17
18	require File.expand_path('../../../../../test_helper', __FILE__)	18	require File.expand_path('../../../../../test_helper', __FILE__)
		19	require 'digest/md5'
19		20
20	class Redmine::WikiFormatting::TextileFormatterTest < ActionView::TestCase	21	class Redmine::WikiFormatting::TextileFormatterTest < ActionView::TestCase
21		22
@@ -203,6 +204,101 EXPECTED
203	expected = '<p><img src="/images/comment.png"onclick=&#x61;&#x6c;&#x65;&#x72;&#x74;&#x28;&#x27;&#x58;&#x53;&#x53;&#x27;&#x29;;&#x22;" alt="" /></p>'	204	expected = '<p><img src="/images/comment.png"onclick=&#x61;&#x6c;&#x65;&#x72;&#x74;&#x28;&#x27;&#x58;&#x53;&#x53;&#x27;&#x29;;&#x22;" alt="" /></p>'
204	assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')	205	assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
205	end	206	end
		207
		208
		209	STR_WITHOUT_PRE = [
		210	# 0
		211	"h1. Title
		212
		213	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.",
		214	# 1
		215	"h2. Heading 2
		216
		217	Maecenas sed elit sit amet mi accumsan vestibulum non nec velit. Proin porta tincidunt lorem, consequat rhoncus dolor fermentum in.
		218
		219	Cras ipsum felis, ultrices at porttitor vel, faucibus eu nunc.",
		220	# 2
		221	"h2. Heading 2
		222
		223	Morbi facilisis accumsan orci non pharetra.
		224
		225	h3. Heading 3
		226
		227	Nulla nunc nisi, egestas in ornare vel, posuere ac libero.",
		228	# 3
		229	"h3. Heading 3
		230
		231	Praesent eget turpis nibh, a lacinia nulla.",
		232	# 4
		233	"h2. Heading 2
		234
		235	Ut rhoncus elementum adipiscing."]
		236
		237	TEXT_WITHOUT_PRE = STR_WITHOUT_PRE.join("\n\n").freeze
		238
		239	def test_get_section_should_return_the_requested_section_and_its_hash
		240	assert_section_with_hash STR_WITHOUT_PRE[1], TEXT_WITHOUT_PRE, 2
		241	assert_section_with_hash STR_WITHOUT_PRE[2..3].join("\n\n"), TEXT_WITHOUT_PRE, 3
		242	assert_section_with_hash STR_WITHOUT_PRE[3], TEXT_WITHOUT_PRE, 5
		243	assert_section_with_hash STR_WITHOUT_PRE[4], TEXT_WITHOUT_PRE, 6
		244
		245	assert_section_with_hash '', TEXT_WITHOUT_PRE, 0
		246	assert_section_with_hash '', TEXT_WITHOUT_PRE, 10
		247	end
		248
		249	def test_update_section_should_update_the_requested_section
		250	replacement = "New text"
		251
		252	assert_equal [STR_WITHOUT_PRE[0], replacement, STR_WITHOUT_PRE[2..4]].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(2, replacement)
		253	assert_equal [STR_WITHOUT_PRE[0..1], replacement, STR_WITHOUT_PRE[4]].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(3, replacement)
		254	assert_equal [STR_WITHOUT_PRE[0..2], replacement, STR_WITHOUT_PRE[4]].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(5, replacement)
		255	assert_equal [STR_WITHOUT_PRE[0..3], replacement].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(6, replacement)
		256
		257	assert_equal TEXT_WITHOUT_PRE, @formatter.new(TEXT_WITHOUT_PRE).update_section(0, replacement)
		258	assert_equal TEXT_WITHOUT_PRE, @formatter.new(TEXT_WITHOUT_PRE).update_section(10, replacement)
		259	end
		260
		261	def test_update_section_with_hash_should_update_the_requested_section
		262	replacement = "New text"
		263
		264	assert_equal [STR_WITHOUT_PRE[0], replacement, STR_WITHOUT_PRE[2..4]].flatten.join("\n\n"),
		265	@formatter.new(TEXT_WITHOUT_PRE).update_section(2, replacement, Digest::MD5.hexdigest(STR_WITHOUT_PRE[1]))
		266	end
		267
		268	def test_update_section_with_wrong_hash_should_raise_an_error
		269	assert_raise Redmine::WikiFormatting::StaleSectionError do
		270	@formatter.new(TEXT_WITHOUT_PRE).update_section(2, "New text", Digest::MD5.hexdigest("Old text"))
		271	end
		272	end
		273
		274	STR_WITH_PRE = [
		275	# 0
		276	"h1. Title
		277
		278	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.",
		279	# 1
		280	"h2. Heading 2
		281
		282	Morbi facilisis accumsan orci non pharetra.
		283
		284	<pre>
		285	Pre Content:
		286
		287	h2. Inside pre
		288
		289	Morbi facilisis accumsan orci non pharetra.
		290	</pre>",
		291	# 2
		292	"h3. Heading 3
		293
		294	Nulla nunc nisi, egestas in ornare vel, posuere ac libero."]
		295
		296	def test_get_section_should_ignore_pre_content
		297	text = STR_WITH_PRE.join("\n\n")
		298
		299	assert_section_with_hash STR_WITH_PRE[1..2].join("\n\n"), text, 2
		300	assert_section_with_hash STR_WITH_PRE[2], text, 3
		301	end
206		302
207	private	303	private
208		304
@@ -215,4 +311,13 EXPECTED
215	def to_html(text)	311	def to_html(text)
216	@formatter.new(text).to_html	312	@formatter.new(text).to_html
217	end	313	end
		314
		315	def assert_section_with_hash(expected, text, index)
		316	result = @formatter.new(text).get_section(index)
		317
		318	assert_kind_of Array, result
		319	assert_equal 2, result.size
		320	assert_equal expected, result.first, "section content did not match"
		321	assert_equal Digest::MD5.hexdigest(expected), result.last, "section hash did not match"
		322	end
218	end	323	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