composed multiple redmine commits (thanks goes to jpl) to let MailHandler tests pass.

app/models/mail_handler.rb

@@ -288,8 +288,7 @@ class MailHandler < ActionMailer::Base
 
   # Returns a Hash of issue attributes extracted from keywords in the email body
   def issue_attributes_from_keywords(issue)
-    assigned_to = (k = get_keyword(:assigned_to, :override => true)) && find_user_from_keyword(k)
-    assigned_to = nil if assigned_to && !issue.assignable_users.include?(assigned_to)
+    assigned_to = (k = get_keyword(:assigned_to, :override => true)) && find_assignee_from_keyword(k, issue)
 
     attrs = {
       'tracker_id' => (k = get_keyword(:tracker)) && issue.project.trackers.find_by_name(k).try(:id),
@@ -343,31 +342,47 @@ class MailHandler < ActionMailer::Base
     @full_sanitizer ||= HTML::FullSanitizer.new
   end
 
+  # Returns a User from an email address and a full name
+  def self.new_user_from_attributes(email_address, fullname=nil)
+    user = User.new
+    user.mail = email_address
+    user.login = user.mail
+    user.password = SecureRandom.hex [Setting.password_min_length.to_i, 10].max
+    user.language = Setting.default_language
+
+    names = fullname.blank? ? email_address.gsub(/@.*$/, '').split('.') : fullname.split
+    user.firstname = names.shift
+    user.lastname = names.join(' ')
+    user.lastname = '-' if user.lastname.blank?
+
+    unless user.valid?
+      user.login = "user#{SecureRandom.hex(6)}" unless user.errors[:login].blank?
+      user.firstname = "-" unless user.errors[:firstname].blank?
+      user.lastname  = "-" unless user.errors[:lastname].blank?
+    end
+
+    user
+  end
+
   # Creates a user account for the +email+ sender
   def self.create_user_from_email(email)
-    begin
-      addr = Mail::Address.new email.header['from'].to_s
-    rescue Mail::Field::ParseError
-      return
+    from = email.header['from'].to_s
+    addr, name = from, nil
+    if m = from.match(/^"?(.+?)"?\s+<(.+@.+)>$/)
+      addr, name = m[2], m[1]
     end
-
-    if addr.display_name
-      names = addr.display_name.split ' '
+    if addr.present?
+      user = new_user_from_attributes(addr, name)
+      if user.save
+        user
+      else
+        logger.error "MailHandler: failed to create User: #{user.errors.full_messages}" if logger
+        nil
+      end
     else
-      names = addr.address.split('@').first.split '.'
-      names.each &:capitalize!
+      logger.error "MailHandler: failed to create User: no FROM address found" if logger
+      nil
     end
-
-    user = User.new
-    user.mail = addr.address
-    user.firstname = names.first
-    user.lastname = names[1..-1].join ' '
-    user.lastname = '-' if user.lastname.blank?
-
-    user.login = user.mail
-    user.password = SecureRandom.hex(5)
-    user.language = Setting.default_language
-    user.save ? user : nil
   end
 
   private
@@ -382,13 +397,24 @@ class MailHandler < ActionMailer::Base
     body.strip
   end
 
-  def find_user_from_keyword(keyword)
-    user ||= User.find_by_mail(keyword)
-    user ||= User.find_by_login(keyword)
-    if user.nil? && keyword.match(/ /)
+  def find_assignee_from_keyword(keyword, issue)
+    keyword = keyword.to_s.downcase
+    assignable = issue.assignable_users
+    assignee = nil
+    assignee ||= assignable.detect {|a|
+                    a.mail.to_s.downcase == keyword ||
+                      a.login.to_s.downcase == keyword
+                 }
+    if assignee.nil? && keyword.match(/ /)
       firstname, lastname = *(keyword.split) # "First Last Throwaway"
-      user ||= User.find_by_firstname_and_lastname(firstname, lastname)
+      assignee ||= assignable.detect {|a| 
+                     a.is_a?(User) && a.firstname.to_s.downcase == firstname &&
+                       a.lastname.to_s.downcase == lastname
+                   }
     end
-    user
+    if assignee.nil?
+      assignee ||= assignable.detect {|a| a.name.downcase == keyword}
+    end
+    assignee
   end
 end

test/unit/mail_handler_test.rb

@@ -506,8 +506,11 @@ class MailHandlerTest < ActiveSupport::TestCase
       ['jsmith@example.net', 'John'] => ['jsmith@example.net', 'John', '-'],
       ['jsmith@example.net', 'John Smith'] => ['jsmith@example.net', 'John', 'Smith'],
       ['jsmith@example.net', 'John Paul Smith'] => ['jsmith@example.net', 'John', 'Paul Smith'],
-      ['jsmith@example.net', 'AVeryLongFirstnameThatExceedsTheMaximumLength Smith'] => ['jsmith@example.net', 'AVeryLongFirstnameThatExceedsT', 'Smith'],
-      ['jsmith@example.net', 'John AVeryLongLastnameThatExceedsTheMaximumLength'] => ['jsmith@example.net', 'John', 'AVeryLongLastnameThatExceedsTh']
+      # TODO: implement https://github.com/redmine/redmine/commit/a00f04886fac78e489bb030d20414ebdf10841e3
+      # ['jsmith@example.net', 'AVeryLongFirstnameThatExceedsTheMaximumLength Smith'] => ['jsmith@example.net', 'AVeryLongFirstnameThatExceedsT', 'Smith'],
+      # ['jsmith@example.net', 'John AVeryLongLastnameThatExceedsTheMaximumLength'] => ['jsmith@example.net', 'John', 'AVeryLongLastnameThatExceedsTh']
+      ['jsmith@example.net', 'AVeryLongFirstnameThatExceedsTheMaximumLength Smith'] => ['jsmith@example.net', '-', 'Smith'],
+      ['jsmith@example.net', 'John AVeryLongLastnameThatExceedsTheMaximumLength'] => ['jsmith@example.net', 'John', '-']
     }
 
     to_test.each do |attrs, expected|
@@ -538,7 +541,6 @@ class MailHandlerTest < ActiveSupport::TestCase
 
   def test_new_user_with_utf8_encoded_fullname_should_be_decoded
     assert_difference 'User.count' do
-      require 'pry'; binding.pry
       issue = submit_email(
                 'fullname_of_sender_as_utf8_encoded.eml',
                 :issue => {:project => 'ecookbook'},
@@ -560,6 +562,7 @@ class MailHandlerTest < ActiveSupport::TestCase
 
   def submit_email(filename, options={})
     raw = IO.read(File.join(FIXTURES_PATH, filename))
+    yield raw if block_given?
     MailHandler.receive(raw, options)
   end