jro_apps/redmine Commit - r3112:a54fa93b2e28

0

app/models/mail_handler.rb +18 -3

                 if issue.subject.blank?
                   issue.subject = '(no subject)'
                 end
-                issue.description = plain_text_body
                 # custom fields
                 issue.custom_field_values = issue.available_custom_fields.inject({}) do |h, c|
                   if value = get_keyword(c.name, :override => true)
                   end
                   h
                 end
+                issue.description = cleaned_up_text_body
                 # add To and Cc as watchers before saving so the watchers can reply to Redmine
                 add_watchers(issue)
                 issue.save!
                 end
                 # add the note
-                journal = issue.init_journal(user, plain_text_body)
+                journal = issue.init_journal(user, cleaned_up_text_body)
                 add_attachments(issue)
                 # check workflow
                 if status && issue.new_statuses_allowed_to(user).include?(status)
                   if !message.locked?
                     reply = Message.new(:subject => email.subject.gsub(%r{^.*msg\d+\]}, '').strip,
-                                        :content => plain_text_body)
+                                        :content => cleaned_up_text_body)
                     reply.author = user
                     reply.board = message.board
                     message.children << reply
                 @plain_text_body
               end
+              def cleaned_up_text_body
+                cleanup_body(plain_text_body)
+              end
               def self.full_sanitizer
                 @full_sanitizer ||= HTML::FullSanitizer.new
                   user.save ? user : nil
                 end
               end
+              private
+              # Removes the email body of text after the truncation configurations.
+              def cleanup_body(body)
+                delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}
+                unless delimiters.empty?
+                  regex = Regexp.new("^(#{ delimiters.join('|') })\s*$.*", Regexp::MULTILINE)
+                  body = body.gsub(regex, '')
+                end
+                body.strip
+              end
             end

0

app/views/settings/_mail_handler.rhtml +8 0

             <% form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
             <div class="box tabular settings">
+              <p>
+                <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
+                <br /><em><%= l(:text_line_separated) %></em>
+              </p>
+            </div>
+            <div class="box tabular settings">
             <p><%= setting_check_box :mail_handler_api_enabled,
             				 :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%></p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

0

config/locales/bg.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/bs.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/ca.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/cs.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/da.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/de.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/el.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/en.yml +2 0

               setting_activity_days_default: Days displayed on project activity
               setting_display_subprojects_issues: Display subprojects issues on main projects by default
               setting_enabled_scm: Enabled SCM
+              setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
               setting_mail_handler_api_enabled: Enable WS for incoming emails
               setting_mail_handler_api_key: API key
               setting_sequential_project_identifiers: Generate sequential project identifiers
               text_tracker_no_workflow: No workflow defined for this tracker
               text_unallowed_characters: Unallowed characters
               text_comma_separated: Multiple values allowed (comma separated).
+              text_line_separated: Multiple values allowed (one line for each value).
               text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
               text_issue_added: "Issue {{id}} has been reported by {{author}}."
               text_issue_updated: "Issue {{id}} has been updated by {{author}}."

0

config/locales/es.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/fi.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/fr.yml +2 0

               setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
               setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
               setting_enabled_scm: SCM activés
+              setting_mail_handler_body_delimiters: "Tronquer les emails après l'une de ces lignes"
               setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
               setting_mail_handler_api_key: Clé de protection de l'API
               setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
               text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
               text_unallowed_characters: Caractères non autorisés
               text_comma_separated: Plusieurs valeurs possibles (séparées par des virgules).
+              text_line_separated: Plusieurs valeurs possibles (une valeur par ligne).
               text_issues_ref_in_commit_messages: Référencement et résolution des demandes dans les commentaires de commits
               text_issue_added: "La demande {{id}} a été soumise par {{author}}."
               text_issue_updated: "La demande {{id}} a été mise à jour par {{author}}."

0

config/locales/gl.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/he.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/hu.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/it.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/ja.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/ko.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/lt.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/nl.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/no.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/pl.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

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

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/pt.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/ro.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/ru.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/sk.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/sl.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/sr.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/sv.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/th.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/tr.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/uk.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/vi.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

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

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/locales/zh.yml +2 0

               label_missing_api_access_key: Missing an API access key
               label_missing_feeds_access_key: Missing a RSS access key
               button_show: Show
+              text_line_separated: Multiple values allowed (one line for each value).
+              setting_mail_handler_body_delimiters: Truncate emails after one of these lines

0

config/settings.yml +2 0

               default:
               - issue_added
               - issue_updated
+            mail_handler_body_delimiters:
+              default: ''
             mail_handler_api_enabled:
               default: 0
             mail_handler_api_key:

0

public/stylesheets/application.css +1 0

             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
+            .tabular.settings textarea { width: 99%; }
             fieldset.settings label { display: block; }

0

test/fixtures/mail_handler/ticket_on_given_project.eml +13 -1

@@ -26,10 +26,22 in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras
26	sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum	26	sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum
27	id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus	27	id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus
28	eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique	28	eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique
29	sed, mauris. Pellentesque habitant morbi tristique senectus et netus et	29	sed, mauris --- Pellentesque habitant morbi tristique senectus et netus et
30	malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse	30	malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse
31	platea dictumst.	31	platea dictumst.
32		32
		33	--- This line starts with a delimiter and should not be stripped
		34
		35	This paragraph is before delimiters.
		36
		37	BREAK
		38
		39	This paragraph is between delimiters.
		40
		41	---
		42
		43	This paragraph is after the delimiter so it shouldn't appear.
		44
33	Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque	45	Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque
34	sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem.	46	sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem.
35	Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et,	47	Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et,

0

test/unit/mail_handler_test.rb +52 0

@@ -279,10 +279,62 class MailHandlerTest < ActiveSupport::TestCase
279	assert_equal 'This is a html-only email.', issue.description	279	assert_equal 'This is a html-only email.', issue.description
280	end	280	end
281		281
		282	context "truncate emails based on the Setting" do
		283	context "with no setting" do
		284	setup do
		285	Setting.mail_handler_body_delimiters = ''
		286	end
		287
		288	should "add the entire email into the issue" do
		289	issue = submit_email('ticket_on_given_project.eml')
		290	assert_issue_created(issue)
		291	assert issue.description.include?('---')
		292	assert issue.description.include?('This paragraph is after the delimiter')
		293	end
		294	end
		295
		296	context "with a single string" do
		297	setup do
		298	Setting.mail_handler_body_delimiters = '---'
		299	end
		300
		301	should "truncate the email at the delimiter for the issue" do
		302	issue = submit_email('ticket_on_given_project.eml')
		303	assert_issue_created(issue)
		304	assert issue.description.include?('This paragraph is before delimiters')
		305	assert issue.description.include?('--- This line starts with a delimiter')
		306	assert !issue.description.match(/^---$/)
		307	assert !issue.description.include?('This paragraph is after the delimiter')
		308	end
		309	end
		310
		311	context "with multiple strings" do
		312	setup do
		313	Setting.mail_handler_body_delimiters = "---\nBREAK"
		314	end
		315
		316	should "truncate the email at the first delimiter found (BREAK)" do
		317	issue = submit_email('ticket_on_given_project.eml')
		318	assert_issue_created(issue)
		319	assert issue.description.include?('This paragraph is before delimiters')
		320	assert !issue.description.include?('BREAK')
		321	assert !issue.description.include?('This paragraph is between delimiters')
		322	assert !issue.description.match(/^---$/)
		323	assert !issue.description.include?('This paragraph is after the delimiter')
		324	end
		325	end
		326	end
		327
282	private	328	private
283		329
284	def submit_email(filename, options={})	330	def submit_email(filename, options={})
285	raw = IO.read(File.join(FIXTURES_PATH, filename))	331	raw = IO.read(File.join(FIXTURES_PATH, filename))
286	MailHandler.receive(raw, options)	332	MailHandler.receive(raw, options)
287	end	333	end
		334
		335	def assert_issue_created(issue)
		336	assert issue.is_a?(Issue)
		337	assert !issue.new_record?
		338	issue.reload
		339	end
288	end	340	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