jro_apps/redmine Commit - r4282:abf988ad69cc

Makes MailHandler ignore invalid keyword values to avoid validation failures....

Jean-Philippe Lang -

r4282:abf988ad69cc

parent child

Context file:

r4282:abf988ad69cc

Collapse all files

test/fixtures/mail_handler/ticket_with_invalid_attributes.eml created 644 +46 0

@@ -0,0 +1,46
	1	Return-Path: <jsmith@somenet.foo>
	2	Received: from osiris ([127.0.0.1])
	3	by OSIRIS
	4	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
	5	Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
	6	From: "John Smith" <jsmith@somenet.foo>
	7	To: <redmine@somenet.foo>
	8	Subject: New ticket on a given project
	9	Date: Sun, 22 Jun 2008 12:28:07 +0200
	10	MIME-Version: 1.0
	11	Content-Type: text/plain;
	12	format=flowed;
	13	charset="iso-8859-1";
	14	reply-type=original
	15	Content-Transfer-Encoding: 7bit
	16	X-Priority: 3
	17	X-MSMail-Priority: Normal
	18	X-Mailer: Microsoft Outlook Express 6.00.2900.2869
	19	X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
	20
	21	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet
	22	turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus
	23	blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti
	24	sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In
	25	in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras
	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
	28	eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique
	29	sed, mauris. Pellentesque habitant morbi tristique senectus et netus et
	30	malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse
	31	platea dictumst.
	32
	33	Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque
	34	sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem.
	35	Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et,
	36	dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed,
	37	massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo
	38	pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
	39
	40	Project: onlinestore
	41	Tracker: Feature request
	42	category: Stock management
	43	priority: foo
	44	done ratio: x
	45	start date: some day
	46	due date: never

app/models/mail_handler.rb +7 -6

                   @keywords[attr]
                 else
                   @keywords[attr] = begin
-                    if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && (v = extract_keyword!(plain_text_body, attr))
+                    if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && (v = extract_keyword!(plain_text_body, attr, options[:format]))
                       v
                     elsif !@@handler_options[:issue][attr].blank?
                       @@handler_options[:issue][attr]
               # Destructively extracts the value for +attr+ in +text+
               # Returns nil if no matching keyword found
-              def extract_keyword!(text, attr)
+              def extract_keyword!(text, attr, format=nil)
                 keys = [attr.to_s.humanize]
                 if attr.is_a?(Symbol)
                   keys << l("field_#{attr}", :default => '', :locale =>  user.language) if user
                 end
                 keys.reject! {|k| k.blank?}
                 keys.collect! {|k| Regexp.escape(k)}
-                text.gsub!(/^(#{keys.join('|')})[ \t]*:[ \t]*(.+)\s*$/i, '')
+                format ||= '.+'
+                text.gsub!(/^(#{keys.join('|')})[ \t]*:[ \t]*(#{format})\s*$/i, '')
                 $2 && $2.strip
               end
                   'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.find_by_name(k).try(:id),
                   'assigned_to_id' => (k = get_keyword(:assigned_to, :override => true)) && find_user_from_keyword(k).try(:id),
                   'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.find_by_name(k).try(:id),
-                  'start_date' => get_keyword(:start_date, :override => true),
+                  'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
-                  'due_date' => get_keyword(:due_date, :override => true),
+                  'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
                   'estimated_hours' => get_keyword(:estimated_hours, :override => true),
-                  'done_ratio' => get_keyword(:done_ratio, :override => true),
+                  'done_ratio' => get_keyword(:done_ratio, :override => true, :format => '(\d|10)?0')
                 }.delete_if {|k, v| v.blank? }
               end

test/unit/mail_handler_test.rb +12 0

@@ -229,6 +229,18 class MailHandlerTest < ActiveSupport::TestCase
229	assert_equal false, submit_email('ticket_without_from_header.eml')	229	assert_equal false, submit_email('ticket_without_from_header.eml')
230	end	230	end
231		231
		232	def test_add_issue_with_invalid_attributes
		233	issue = submit_email('ticket_with_invalid_attributes.eml', :allow_override => 'tracker,category,priority')
		234	assert issue.is_a?(Issue)
		235	assert !issue.new_record?
		236	issue.reload
		237	assert_nil issue.start_date
		238	assert_nil issue.due_date
		239	assert_equal 0, issue.done_ratio
		240	assert_equal 'Normal', issue.priority.to_s
		241	assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
		242	end
		243
232	def test_add_issue_with_localized_attributes	244	def test_add_issue_with_localized_attributes
233	User.find_by_mail('jsmith@somenet.foo').update_attribute 'language', 'fr'	245	User.find_by_mail('jsmith@somenet.foo').update_attribute 'language', 'fr'
234	issue = submit_email('ticket_with_localized_attributes.eml', :allow_override => 'tracker,category,priority')	246	issue = submit_email('ticket_with_localized_attributes.eml', :allow_override => 'tracker,category,priority')

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