diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tmail_extensions.rb | 58 |
1 files changed, 54 insertions, 4 deletions
diff --git a/lib/tmail_extensions.rb b/lib/tmail_extensions.rb index c0ed1033b..6a5044cdb 100644 --- a/lib/tmail_extensions.rb +++ b/lib/tmail_extensions.rb @@ -5,8 +5,10 @@ # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # # $Id: tmail_extensions.rb,v 1.7 2009-10-02 23:31:01 francis Exp $ - +require 'racc/parser' require 'tmail' +require 'tmail/scanner' +require 'tmail/utils' require 'tmail/interface' # Monkeypatch! @@ -32,7 +34,7 @@ module TMail else return nil end - end + end # Monkeypatch! Generalisation of To:, Cc: def envelope_to(default = nil) @@ -72,7 +74,7 @@ module TMail # a name and an email def Address.address_from_name_and_email(name, email) if !MySociety::Validate.is_valid_email(email) - raise "invalid email " + email + " passed to address_from_name_and_email" + raise "invalid email " + email + " passed to address_from_name_and_email" end if name.nil? return TMail::Address.parse(email) @@ -84,7 +86,7 @@ module TMail end module TextUtils - # Monkeypatch! Much more aggressive list of characters to cause quoting + # Monkeypatch! Much more aggressive list of characters to cause quoting # than in normal TMail. e.g. Have found real cases where @ needs quoting. # We list characters to allow, rather than characters not to allow. NEW_PHRASE_UNSAFE=/[^A-Za-z0-9!#\$%&'*+\-\/=?^_`{|}~ ]/n @@ -94,4 +96,52 @@ module TMail end end +# Monkeypatch! TMail 1.2.7.1 will parse only one address out of a list of addresses with +# unquoted display parts https://github.com/mikel/tmail/issues#issue/9 - this monkeypatch +# fixes this issue. +module TMail + + class Parser < Racc::Parser + +module_eval <<'..end lib/tmail/parser.y modeval..id2dd1c7d21d', 'lib/tmail/parser.y', 340 + + def self.special_quote_address(str) #:nodoc: + # Takes a string which is an address and adds quotation marks to special + # edge case methods that the RACC parser can not handle. + # + # Right now just handles two edge cases: + # + # Full stop as the last character of the display name: + # Mikel L. <mikel@me.com> + # Returns: + # "Mikel L." <mikel@me.com> + # + # Unquoted @ symbol in the display name: + # mikel@me.com <mikel@me.com> + # Returns: + # "mikel@me.com" <mikel@me.com> + # + # Any other address not matching these patterns just gets returned as is. + case + # This handles the missing "" in an older version of Apple Mail.app + # around the display name when the display name contains a '@' + # like 'mikel@me.com <mikel@me.com>' + # Just quotes it to: '"mikel@me.com" <mikel@me.com>' + when str =~ /\A([^"][^<]+@[^>]+[^"])\s(<.*?>)\Z/ + return "\"#{$1}\" #{$2}" + # This handles cases where 'Mikel A. <mikel@me.com>' which is a trailing + # full stop before the address section. Just quotes it to + # '"Mikel A." <mikel@me.com>' + when str =~ /\A(.*?\.)\s(<.*?>)\s*\Z/ + return "\"#{$1}\" #{$2}" + else + str + end + end + +..end lib/tmail/parser.y modeval..id2dd1c7d21d + end # class Parser + +end # module TMail + |