RubyGems - mail - Versions diffs - 2.6.6 → 2.7.0.rc1 - Mend

mail 2.6.6 → 2.7.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (105) hide show

checksums.yaml +4 -4
data/CHANGELOG.rdoc +25 -6
data/Dependencies.txt +0 -1
data/Gemfile +5 -8
data/MIT-LICENSE +1 -1
data/README.md +22 -11
data/Rakefile +0 -6
data/lib/mail.rb +2 -10
data/lib/mail/attachments_list.rb +3 -2
data/lib/mail/body.rb +3 -3
data/lib/mail/core_extensions/smtp.rb +19 -16
data/lib/mail/core_extensions/string.rb +0 -4
data/lib/mail/elements/address.rb +9 -4
data/lib/mail/elements/address_list.rb +10 -18
data/lib/mail/elements/content_disposition_element.rb +8 -15
data/lib/mail/elements/content_location_element.rb +5 -10
data/lib/mail/elements/content_transfer_encoding_element.rb +5 -10
data/lib/mail/elements/content_type_element.rb +8 -19
data/lib/mail/elements/date_time_element.rb +6 -14
data/lib/mail/elements/envelope_from_element.rb +14 -21
data/lib/mail/elements/message_ids_element.rb +8 -12
data/lib/mail/elements/mime_version_element.rb +6 -14
data/lib/mail/elements/phrase_list.rb +6 -9
data/lib/mail/elements/received_element.rb +9 -15
data/lib/mail/encodings.rb +12 -14
data/lib/mail/field.rb +7 -4
data/lib/mail/fields/common/parameter_hash.rb +1 -1
data/lib/mail/fields/content_type_field.rb +2 -7
data/lib/mail/fields/unstructured_field.rb +2 -2
data/lib/mail/header.rb +1 -0
data/lib/mail/message.rb +23 -25
data/lib/mail/multibyte.rb +51 -0
data/lib/mail/multibyte/chars.rb +27 -27
data/lib/mail/network/delivery_methods/exim.rb +10 -6
data/lib/mail/network/delivery_methods/sendmail.rb +2 -6
data/lib/mail/network/delivery_methods/smtp.rb +14 -6
data/lib/mail/parsers.rb +16 -24
data/lib/mail/parsers/address_lists_parser.rb +15321 -112
data/lib/mail/parsers/address_lists_parser.rl +166 -0
data/lib/mail/parsers/content_disposition_parser.rb +698 -55
data/lib/mail/parsers/content_disposition_parser.rl +76 -0
data/lib/mail/parsers/content_location_parser.rb +565 -23
data/lib/mail/parsers/content_location_parser.rl +65 -0
data/lib/mail/parsers/content_transfer_encoding_parser.rb +410 -22
data/lib/mail/parsers/content_transfer_encoding_parser.rl +58 -0
data/lib/mail/parsers/content_type_parser.rb +841 -54
data/lib/mail/parsers/content_type_parser.rl +77 -0
data/lib/mail/parsers/date_time_parser.rb +773 -26
data/lib/mail/parsers/date_time_parser.rl +56 -0
data/lib/mail/parsers/envelope_from_parser.rb +2051 -36
data/lib/mail/parsers/envelope_from_parser.rl +76 -0
data/lib/mail/parsers/message_ids_parser.rb +1494 -25
data/lib/mail/parsers/message_ids_parser.rl +76 -0
data/lib/mail/parsers/mime_version_parser.rb +393 -26
data/lib/mail/parsers/mime_version_parser.rl +55 -0
data/lib/mail/parsers/phrase_lists_parser.rb +529 -19
data/lib/mail/parsers/phrase_lists_parser.rl +77 -0
data/lib/mail/parsers/received_parser.rb +4711 -38
data/lib/mail/parsers/received_parser.rl +78 -0
data/lib/mail/parsers/rfc2045_content_transfer_encoding.rl +12 -0
data/lib/mail/parsers/rfc2045_content_type.rl +24 -0
data/lib/mail/parsers/rfc2045_mime.rl +15 -0
data/lib/mail/parsers/rfc2183_content_disposition.rl +14 -0
data/lib/mail/parsers/rfc5234_abnf_core_rules.rl +16 -0
data/lib/mail/parsers/rfc5322.rl +57 -0
data/lib/mail/parsers/rfc5322_address.rl +70 -0
data/lib/mail/parsers/{ragel/date_time.rl → rfc5322_date_time.rl} +7 -1
data/lib/mail/parsers/rfc5322_lexical_tokens.rl +56 -0
data/lib/mail/part.rb +1 -1
data/lib/mail/parts_list.rb +5 -6
data/lib/mail/utilities.rb +4 -2
data/lib/mail/version.rb +3 -3
data/lib/mail/version_specific/ruby_1_8.rb +28 -2
data/lib/mail/version_specific/ruby_1_9.rb +48 -8
metadata +28 -45
data/lib/mail/core_extensions/string/access.rb +0 -146
data/lib/mail/core_extensions/string/multibyte.rb +0 -79
data/lib/mail/parsers/ragel.rb +0 -18
data/lib/mail/parsers/ragel/common.rl +0 -185
data/lib/mail/parsers/ragel/parser_info.rb +0 -61
data/lib/mail/parsers/ragel/ruby.rb +0 -40
data/lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb +0 -14864
data/lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb +0 -751
data/lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb +0 -614
data/lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb +0 -447
data/lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb +0 -825
data/lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb +0 -817
data/lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb +0 -2149
data/lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb +0 -1570
data/lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb +0 -440
data/lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb +0 -564
data/lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/machines/rb_actions.rl +0 -51
data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb +0 -5144
data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl +0 -37
data/lib/mail/parsers/ragel/ruby/parser.rb.rl.erb +0 -37

data/lib/mail/parsers/address_lists_parser.rl ADDED Viewed

@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+require 'mail/utilities'
+%%{
+  machine address_lists;
+  # Phrase
+  action phrase_s { phrase_s = p }
+  action phrase_e { phrase_e = p-1 }
+  # Quoted String.
+  action qstr_s { qstr_s = p }
+  action qstr_e { qstr = data[qstr_s..(p-1)] }
+  # Comment
+  action comment_s { comment_s = p unless comment_s }
+  action comment_e {
+    if address
+      address.comments << data[comment_s..(p-2)]
+    end
+    comment_s = nil
+  }
+  # Group Name
+  action group_name_s { group_name_s = p }
+  action group_name_e {
+    if qstr
+      group = qstr
+      qstr = nil
+    else
+      group = data[group_name_s..(p-1)]
+      group_name_s = nil
+    end
+    address_list.group_names << group
+    group_name = group
+    # Start next address
+    address = AddressStruct.new(nil, nil, [], nil, nil, nil, nil)
+    address_s = p
+    address.group = group_name
+  }
+  # Address
+  action address_s { address_s = p }
+  action address_e {
+    # Ignore address end events if they don't have
+    # a matching address start event.
+    if address_s
+      if address.local.nil? && local_dot_atom_pre_comment_e && local_dot_atom_s && local_dot_atom_e
+        if address.domain
+          address.local = data[local_dot_atom_s..local_dot_atom_e] if address
+        else
+          address.local = data[local_dot_atom_s..local_dot_atom_pre_comment_e] if address
+        end
+      end
+      address.raw = data[address_s..(p-1)]
+      address_list.addresses << address if address
+      # Start next address
+      address = AddressStruct.new(nil, nil, [], nil, nil, nil, nil)
+      address.group = group_name
+      address_s = nil
+    end
+  }
+  # Don't set the display name until the address has actually started. This
+  # allows us to choose quoted_s version if it exists and always use the
+  # 'full' phrase version.
+  action angle_addr_s {
+    if qstr
+      address.display_name = Mail::Utilities.unescape(qstr)
+      qstr = nil
+    elsif phrase_e
+      address.display_name = data[phrase_s..phrase_e].strip
+      phrase_e = phrase_s = nil
+    end
+  }
+  # Domain
+  action domain_s { domain_s = p }
+  action domain_e {
+    address.domain = data[domain_s..(p-1)].rstrip if address
+  }
+  # Local
+  action local_dot_atom_s { local_dot_atom_s = p }
+  action local_dot_atom_e { local_dot_atom_e = p-1 }
+  action local_dot_atom_pre_comment_e { local_dot_atom_pre_comment_e = p-1 }
+  action local_quoted_string_e { address.local = '"' + qstr + '"' if address }
+  # obs_domain_list
+  action obs_domain_list_s { obs_domain_list_s = p }
+  action obs_domain_list_e { address.obs_domain_list = data[obs_domain_list_s..(p-1)] }
+  # Junk actions
+  action addr_spec { }
+  action ctime_date_e { }
+  action ctime_date_s { }
+  action date_e { }
+  action date_s { }
+  action disp_type_e { }
+  action disp_type_s { }
+  action encoding_e { }
+  action encoding_s { }
+  action main_type_e { }
+  action main_type_s { }
+  action major_digits_e { }
+  action major_digits_s { }
+  action minor_digits_e { }
+  action minor_digits_s { }
+  action msg_id_e { }
+  action msg_id_s { }
+  action param_attr_e { }
+  action param_attr_s { }
+  action param_val_e { }
+  action param_val_s { }
+  action received_tokens_e { }
+  action received_tokens_s { }
+  action sub_type_e { }
+  action sub_type_s { }
+  action time_e { }
+  action time_s { }
+  action token_string_e { }
+  action token_string_s { }
+  include rfc5322 "rfc5322.rl";
+  main := address_lists;
+}%%
+module Mail::Parsers
+  module AddressListsParser
+    AddressListStruct = Struct.new(:addresses, :group_names, :error)
+    AddressStruct = Struct.new(:raw, :domain, :comments, :local,
+                             :obs_domain_list, :display_name, :group, :error)
+    %%write data noprefix;
+    def self.parse(data)
+      address_list = AddressListStruct.new([], [])
+      return address_list if Mail::Utilities.blank?(data)
+      phrase_s = phrase_e = qstr_s = qstr = comment_s = nil
+      group_name_s = domain_s = group_name = nil
+      local_dot_atom_s = local_dot_atom_e = nil
+      local_dot_atom_pre_comment_e = nil
+      obs_domain_list_s = nil
+      address_s = 0
+      address = AddressStruct.new(nil, nil, [], nil, nil, nil, nil)
+      # 5.1 Variables Used by Ragel
+      p = 0
+      eof = pe = data.length
+      stack = []
+      %%write init;
+      %%write exec;
+      if p != eof || cs < %%{ write first_final; }%%
+        raise Mail::Field::ParseError.new(Mail::AddressList, data, "Only able to parse up to #{data[0..p]}")
+      end
+      address_list
+    end
+  end
+end

data/lib/mail/parsers/content_disposition_parser.rb CHANGED Viewed

@@ -1,68 +1,711 @@
 # frozen_string_literal: true
+require 'mail/utilities'
 module Mail::Parsers
-  class ContentDispositionParser
-    include Mail::Utilities
+  module ContentDispositionParser
+    ContentDispositionStruct = Struct.new(:disposition_type, :parameters, :error)
-    def parse(s)
-      content_disposition = ContentDispositionStruct.new("", nil)
-      if Mail::Utilities.blank?(s)
-        return content_disposition
-      end
+class << self
+	attr_accessor :_trans_keys
+	private :_trans_keys, :_trans_keys=
+end
+self._trans_keys = [
+	0, 0, 33, 126, 9, 126,
+	10, 10, 9, 32, 33,
+	126, 9, 126, 9, 40,
+	10, 10, 9, 32, 1, 127,
+	1, 127, 10, 10, 9,
+	32, 10, 10, 9, 32,
+	-128, -1, 9, 40, 10, 10,
+	9, 32, 9, 126, 1,
+	127, 1, 127, 10, 10,
+	9, 32, -128, -1, 33, 126,
+	9, 59, 9, 59, 9,
+	126, 9, 59, 9, 59,
+	0, 0, 0
+]
-      actions, error = Ragel.parse(:content_disposition, s)
-      if error
-        raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, error)
-      end
+class << self
+	attr_accessor :_key_spans
+	private :_key_spans, :_key_spans=
+end
+self._key_spans = [
+	0, 94, 118, 1, 24, 94, 118, 32,
+	1, 24, 127, 127, 1, 24, 1, 24,
+	128, 32, 1, 24, 118, 127, 127, 1,
+	24, 128, 94, 51, 51, 118, 51, 51,
+	0
+]
-      content_disposition.parameters = []
+class << self
+	attr_accessor :_index_offsets
+	private :_index_offsets, :_index_offsets=
+end
+self._index_offsets = [
+	0, 0, 95, 214, 216, 241, 336, 455,
+	488, 490, 515, 643, 771, 773, 798, 800,
+	825, 954, 987, 989, 1014, 1133, 1261, 1389,
+	1391, 1416, 1545, 1640, 1692, 1744, 1863, 1915,
+	1967
+]
+class << self
+	attr_accessor :_indicies
+	private :_indicies, :_indicies=
+end
+self._indicies = [
+	0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 1, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 1, 1, 1, 1, 1, 1, 1,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1, 1, 1, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1, 2,
+	1, 1, 1, 3, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 2, 4,
+	4, 4, 4, 4, 4, 4, 5, 1,
+	4, 4, 4, 4, 4, 1, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	1, 1, 1, 1, 1, 1, 1, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	4, 1, 1, 1, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 4, 4, 4,
+	4, 4, 4, 4, 4, 1, 6, 1,
+	2, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 2,
+	1, 7, 7, 7, 7, 7, 7, 7,
+	1, 1, 7, 7, 7, 7, 7, 1,
+	7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 1, 1, 1, 8, 1, 1,
+	1, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 1, 1, 1, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 1,
+	9, 1, 1, 1, 10, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 9,
+	11, 12, 11, 11, 11, 11, 11, 13,
+	1, 11, 11, 11, 11, 11, 1, 11,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 1, 1, 1, 11, 1, 1, 1,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 1, 1, 1, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 1, 14,
+	1, 1, 1, 15, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 14, 1,
+	16, 1, 1, 1, 1, 1, 17, 1,
+	18, 1, 14, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 14, 1, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 1, 19, 19, 20,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 21, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 22, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 19, 19, 19, 19, 19, 19,
+	19, 19, 1, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 1, 23, 23, 24,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 25, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 26, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 1, 27, 1, 23, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 23, 1, 28, 1,
+	29, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 29,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 23, 30, 1, 1, 1, 31, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 30, 1, 32, 1, 1, 1, 1,
+	1, 33, 1, 34, 1, 35, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 35, 1, 36, 1,
+	1, 1, 37, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 36, 38, 38,
+	38, 38, 38, 38, 38, 39, 1, 38,
+	38, 38, 38, 38, 1, 38, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 1,
+	1, 1, 1, 1, 1, 1, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 38,
+	1, 1, 1, 38, 38, 38, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 38,
+	38, 38, 38, 38, 38, 38, 38, 38,
+	38, 38, 38, 38, 1, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 1, 40,
+	40, 41, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 42, 43, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	44, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 40, 40, 40, 40,
+	40, 40, 40, 40, 1, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 1, 45,
+	45, 46, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 47, 48, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	49, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 45, 45, 45, 45,
+	45, 45, 45, 45, 1, 50, 1, 45,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 45, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	45, 51, 51, 51, 51, 51, 51, 51,
+	1, 1, 51, 51, 51, 51, 51, 1,
+	51, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 1, 52, 1, 1, 1, 1,
+	1, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 51, 1, 1, 1, 51, 51,
+	51, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 51, 51, 51, 51, 51, 51,
+	51, 51, 51, 51, 51, 51, 51, 1,
+	53, 1, 1, 1, 54, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 53,
+	1, 1, 1, 1, 1, 1, 1, 55,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 56, 1, 57, 1, 1, 1,
+	58, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 57, 1, 1, 1, 1,
+	1, 1, 1, 59, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 60, 1,
+	61, 1, 1, 1, 62, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 61,
+	63, 1, 63, 63, 63, 63, 63, 64,
+	1, 63, 63, 63, 63, 63, 1, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 1, 56, 1, 63, 1, 1, 1,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 1, 1, 1, 63, 63, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 63, 63, 63, 63, 1, 35,
+	1, 1, 1, 65, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 35, 1,
+	1, 1, 1, 1, 1, 1, 66, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 2, 1, 67, 1, 1, 1, 68,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 67, 1, 1, 1, 1, 1,
+	1, 1, 69, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 36, 1, 1,
+	0
+]
+class << self
+	attr_accessor :_trans_targs
+	private :_trans_targs, :_trans_targs=
+end
+self._trans_targs = [
+	26, 0, 2, 3, 5, 20, 4, 5,
+	6, 7, 8, 29, 10, 17, 7, 8,
+	10, 17, 9, 11, 12, 27, 16, 11,
+	12, 27, 16, 13, 15, 27, 7, 8,
+	10, 17, 19, 30, 2, 3, 5, 20,
+	22, 23, 22, 32, 25, 22, 23, 22,
+	32, 25, 24, 26, 2, 27, 14, 28,
+	2, 27, 14, 28, 2, 30, 18, 29,
+	31, 18, 31, 30, 18, 31
+]
+class << self
+	attr_accessor :_trans_actions
+	private :_trans_actions, :_trans_actions=
+end
+self._trans_actions = [
+	1, 0, 0, 0, 2, 3, 0, 0,
+	4, 5, 5, 5, 5, 6, 0, 0,
+	0, 3, 0, 7, 7, 8, 7, 0,
+	0, 9, 0, 0, 0, 0, 10, 10,
+	10, 11, 0, 0, 10, 10, 12, 11,
+	13, 13, 14, 15, 13, 0, 0, 3,
+	16, 0, 0, 0, 17, 18, 18, 19,
+	18, 20, 20, 21, 20, 18, 18, 0,
+	22, 0, 3, 10, 10, 11
+]
+class << self
+	attr_accessor :_eof_actions
+	private :_eof_actions, :_eof_actions=
+end
+self._eof_actions = [
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 17, 18, 20, 18, 0, 10,
+	0
+]
+class << self
+	attr_accessor :start
+end
+self.start = 1;
+class << self
+	attr_accessor :first_final
+end
+self.first_final = 26;
+class << self
+	attr_accessor :error
+end
+self.error = 0;
+class << self
+	attr_accessor :en_comment_tail
+end
+self.en_comment_tail = 21;
+class << self
+	attr_accessor :en_main
+end
+self.en_main = 1;
+    def self.parse(data)
+      content_disposition = ContentDispositionStruct.new('', [])
+      return content_disposition if Mail::Utilities.blank?(data)
+      # Parser state
       disp_type_s = param_attr_s = param_attr = qstr_s = qstr = param_val_s = nil
-      actions.each_slice(2) do |action_id, p|
-        action = Mail::Parsers::Ragel::ACTIONS[action_id]
-        case action
-        # Disposition Type
-        when :disp_type_s then disp_type_s = p
-        when :disp_type_e
-          content_disposition.disposition_type = s[disp_type_s..(p-1)].downcase
-        # Parameter Attribute
-        when :param_attr_s then param_attr_s = p
-        when :param_attr_e then param_attr = s[param_attr_s..(p-1)]
-        # Quoted String.
-        when :qstr_s then qstr_s = p
-        when :qstr_e then qstr = s[qstr_s..(p-1)]
-        # Parameter Value
-        when :param_val_s then param_val_s = p
-        when :param_val_e
-          if param_attr.nil?
-            raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, "no attribute for value")
-          end
-          # Use quoted string value if one exists, otherwise use parameter value
-          if qstr
-            value = qstr
-          else
-            value = s[param_val_s..(p-1)]
-          end
-          content_disposition.parameters <<  { param_attr => value }
-          param_attr = nil
-          qstr = nil
-        else
-          raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, "Failed to process unknown action: #{action}")
-        end
-      end
-      content_disposition
+      # 5.1 Variables Used by Ragel
+      p = 0
+      eof = pe = data.length
+      stack = []
+begin
+	p ||= 0
+	pe ||= data.length
+	cs = start
+	top = 0
+end
+begin
+	testEof = false
+	_slen, _trans, _keys, _inds, _acts, _nacts = nil
+	_goto_level = 0
+	_resume = 10
+	_eof_trans = 15
+	_again = 20
+	_test_eof = 30
+	_out = 40
+	while true
+	if _goto_level <= 0
+	if p == pe
+		_goto_level = _test_eof
+		next
+	end
+	if cs == 0
+		_goto_level = _out
+		next
+	end
+	end
+	if _goto_level <= _resume
+	_keys = cs << 1
+	_inds = _index_offsets[cs]
+	_slen = _key_spans[cs]
+	_wide = data[p].ord
+	_trans = if (   _slen > 0 &&
+			_trans_keys[_keys] <= _wide &&
+			_wide <= _trans_keys[_keys + 1]
+		    ) then
+			_indicies[ _inds + _wide - _trans_keys[_keys] ]
+		 else
+			_indicies[ _inds + _slen ]
+		 end
+	cs = _trans_targs[_trans]
+	if _trans_actions[_trans] != 0
+	case _trans_actions[_trans]
+	when 1 then
+		begin
+ disp_type_s = p 		end
+	when 17 then
+		begin
+ content_disposition.disposition_type = data[disp_type_s..(p-1)].downcase 		end
+	when 2 then
+		begin
+ param_attr_s = p 		end
+	when 4 then
+		begin
+ param_attr = data[param_attr_s..(p-1)] 		end
+	when 7 then
+		begin
+ qstr_s = p 		end
+	when 9 then
+		begin
+ qstr = data[qstr_s..(p-1)] 		end
+	when 5 then
+		begin
+ param_val_s = p 		end
+	when 18 then
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+    end
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+	when 10 then
+		begin
+ 		end
+	when 13 then
+		begin
+ 		end
+	when 3 then
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 16 then
+		begin
+ 	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 8 then
+		begin
+ qstr_s = p 		end
+		begin
+ qstr = data[qstr_s..(p-1)] 		end
+	when 6 then
+		begin
+ param_val_s = p 		end
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 22 then
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+    end
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 12 then
+		begin
+ 		end
+		begin
+ param_attr_s = p 		end
+	when 20 then
+		begin
+ 		end
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+    end
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+	when 11 then
+		begin
+ 		end
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 14 then
+		begin
+ 		end
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 15 then
+		begin
+ 		end
+		begin
+ 	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+ 		end
+	when 19 then
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+    end
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+	when 21 then
+		begin
+ 		end
+		begin
+ 	begin
+		stack[top] = cs
+		top+= 1
+		cs = 21
+		_goto_level = _again
+		next
+	end
+ 		end
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
     end
-    private
-    def cleaned(string)
-      string =~ /(.+);\s*$/ ? $1 : string
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+	end
+	end
+	end
+	if _goto_level <= _again
+	if cs == 0
+		_goto_level = _out
+		next
+	end
+	p += 1
+	if p != pe
+		_goto_level = _resume
+		next
+	end
+	end
+	if _goto_level <= _test_eof
+	if p == eof
+	  case _eof_actions[cs]
+	when 17 then
+		begin
+ content_disposition.disposition_type = data[disp_type_s..(p-1)].downcase 		end
+	when 18 then
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+    end
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+	when 10 then
+		begin
+ 		end
+	when 20 then
+		begin
+ 		end
+		begin
+    if param_attr.nil?
+      raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+    end
+    # Use quoted string value if one exists, otherwise use parameter value
+    value = qstr || data[param_val_s..(p-1)]
+    content_disposition.parameters << { param_attr => value }
+    param_attr = nil
+    qstr = nil
+  		end
+	  end
+	end
+	end
+	if _goto_level <= _out
+		break
+	end
+end
+	end
+      if p != eof || cs < 26
+        raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "Only able to parse up to #{data[0..p]}")
+      end
+      content_disposition
     end
   end
 end