RubyGems - mail - Versions diffs - 2.6.6 → 2.7.1 - Mend

mail 2.6.6 → 2.7.1

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 (160) hide show

checksums.yaml +5 -5
data/MIT-LICENSE +1 -1
data/README.md +74 -90
data/lib/mail/attachments_list.rb +8 -4
data/lib/mail/body.rb +50 -38
data/lib/mail/check_delivery_params.rb +8 -6
data/lib/mail/configuration.rb +2 -0
data/lib/mail/constants.rb +1 -1
data/lib/mail/core_extensions/smtp.rb +19 -16
data/lib/mail/core_extensions/string.rb +0 -4
data/lib/mail/elements/address.rb +28 -22
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/7bit.rb +5 -15
data/lib/mail/encodings/8bit.rb +2 -21
data/lib/mail/encodings/base64.rb +11 -12
data/lib/mail/encodings/binary.rb +3 -22
data/lib/mail/encodings/identity.rb +24 -0
data/lib/mail/encodings/quoted_printable.rb +6 -6
data/lib/mail/encodings/transfer_encoding.rb +38 -29
data/lib/mail/encodings/unix_to_unix.rb +3 -1
data/lib/mail/encodings.rb +99 -43
data/lib/mail/envelope.rb +1 -1
data/lib/mail/field.rb +96 -59
data/lib/mail/fields/bcc_field.rb +2 -2
data/lib/mail/fields/cc_field.rb +1 -1
data/lib/mail/fields/comments_field.rb +1 -1
data/lib/mail/fields/common/common_address.rb +32 -7
data/lib/mail/fields/common/common_field.rb +1 -10
data/lib/mail/fields/common/parameter_hash.rb +1 -1
data/lib/mail/fields/content_description_field.rb +1 -1
data/lib/mail/fields/content_disposition_field.rb +3 -3
data/lib/mail/fields/content_id_field.rb +2 -2
data/lib/mail/fields/content_location_field.rb +1 -1
data/lib/mail/fields/content_transfer_encoding_field.rb +1 -1
data/lib/mail/fields/content_type_field.rb +4 -9
data/lib/mail/fields/date_field.rb +2 -3
data/lib/mail/fields/from_field.rb +1 -1
data/lib/mail/fields/in_reply_to_field.rb +1 -1
data/lib/mail/fields/keywords_field.rb +1 -1
data/lib/mail/fields/message_id_field.rb +1 -1
data/lib/mail/fields/mime_version_field.rb +1 -1
data/lib/mail/fields/optional_field.rb +4 -1
data/lib/mail/fields/received_field.rb +1 -1
data/lib/mail/fields/references_field.rb +1 -1
data/lib/mail/fields/reply_to_field.rb +1 -1
data/lib/mail/fields/resent_bcc_field.rb +1 -1
data/lib/mail/fields/resent_cc_field.rb +1 -1
data/lib/mail/fields/resent_date_field.rb +0 -1
data/lib/mail/fields/resent_from_field.rb +1 -1
data/lib/mail/fields/resent_message_id_field.rb +1 -1
data/lib/mail/fields/resent_sender_field.rb +1 -1
data/lib/mail/fields/resent_to_field.rb +1 -1
data/lib/mail/fields/return_path_field.rb +1 -1
data/lib/mail/fields/sender_field.rb +1 -1
data/lib/mail/fields/subject_field.rb +1 -1
data/lib/mail/fields/to_field.rb +1 -1
data/lib/mail/fields/unstructured_field.rb +21 -4
data/lib/mail/header.rb +10 -8
data/lib/mail/mail.rb +2 -10
data/lib/mail/matchers/has_sent_mail.rb +21 -1
data/lib/mail/message.rb +78 -68
data/lib/mail/multibyte/chars.rb +29 -28
data/lib/mail/multibyte/unicode.rb +10 -10
data/lib/mail/multibyte.rb +64 -15
data/lib/mail/network/delivery_methods/logger_delivery.rb +37 -0
data/lib/mail/network/delivery_methods/sendmail.rb +8 -5
data/lib/mail/network/delivery_methods/smtp.rb +58 -49
data/lib/mail/network/delivery_methods/smtp_connection.rb +9 -1
data/lib/mail/network/retriever_methods/imap.rb +18 -5
data/lib/mail/network/retriever_methods/pop3.rb +3 -1
data/lib/mail/network.rb +1 -0
data/lib/mail/parser_tools.rb +15 -0
data/lib/mail/parsers/address_lists_parser.rb +33207 -104
data/lib/mail/parsers/address_lists_parser.rl +172 -0
data/lib/mail/parsers/content_disposition_parser.rb +876 -49
data/lib/mail/parsers/content_disposition_parser.rl +82 -0
data/lib/mail/parsers/content_location_parser.rb +803 -23
data/lib/mail/parsers/content_location_parser.rl +71 -0
data/lib/mail/parsers/content_transfer_encoding_parser.rb +501 -19
data/lib/mail/parsers/content_transfer_encoding_parser.rl +64 -0
data/lib/mail/parsers/content_type_parser.rb +1023 -48
data/lib/mail/parsers/content_type_parser.rl +83 -0
data/lib/mail/parsers/date_time_parser.rb +870 -24
data/lib/mail/parsers/date_time_parser.rl +62 -0
data/lib/mail/parsers/envelope_from_parser.rb +3569 -34
data/lib/mail/parsers/envelope_from_parser.rl +82 -0
data/lib/mail/parsers/message_ids_parser.rb +2839 -25
data/lib/mail/parsers/message_ids_parser.rl +82 -0
data/lib/mail/parsers/mime_version_parser.rb +491 -26
data/lib/mail/parsers/mime_version_parser.rl +61 -0
data/lib/mail/parsers/phrase_lists_parser.rb +860 -18
data/lib/mail/parsers/phrase_lists_parser.rl +83 -0
data/lib/mail/parsers/received_parser.rb +8764 -37
data/lib/mail/parsers/received_parser.rl +84 -0
data/lib/mail/parsers/rfc2045_content_transfer_encoding.rl +13 -0
data/lib/mail/parsers/rfc2045_content_type.rl +25 -0
data/lib/mail/parsers/rfc2045_mime.rl +16 -0
data/lib/mail/parsers/rfc2183_content_disposition.rl +15 -0
data/lib/mail/parsers/rfc3629_utf8.rl +19 -0
data/lib/mail/parsers/rfc5234_abnf_core_rules.rl +22 -0
data/lib/mail/parsers/rfc5322.rl +59 -0
data/lib/mail/parsers/rfc5322_address.rl +72 -0
data/lib/mail/parsers/{ragel/date_time.rl → rfc5322_date_time.rl} +8 -1
data/lib/mail/parsers/rfc5322_lexical_tokens.rl +60 -0
data/lib/mail/parsers.rb +16 -24
data/lib/mail/part.rb +3 -3
data/lib/mail/parts_list.rb +5 -6
data/lib/mail/utilities.rb +59 -28
data/lib/mail/version.rb +2 -2
data/lib/mail/version_specific/ruby_1_8.rb +40 -3
data/lib/mail/version_specific/ruby_1_9.rb +61 -9
data/lib/mail.rb +3 -16
metadata +44 -53
data/CHANGELOG.rdoc +0 -803
data/CONTRIBUTING.md +0 -60
data/Dependencies.txt +0 -2
data/Gemfile +0 -14
data/Rakefile +0 -29
data/TODO.rdoc +0 -9
data/lib/mail/core_extensions/string/access.rb +0 -146
data/lib/mail/core_extensions/string/multibyte.rb +0 -79
data/lib/mail/multibyte/exceptions.rb +0 -9
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/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/ragel/ruby.rb +0 -40
data/lib/mail/parsers/ragel.rb +0 -18

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

@@ -1,68 +1,895 @@
 # frozen_string_literal: true
+require "mail/utilities"
+require "mail/parser_tools"
 module Mail::Parsers
-  class ContentDispositionParser
-    include Mail::Utilities
+  module ContentDispositionParser
+    extend Mail::ParserTools
-    def parse(s)
-      content_disposition = ContentDispositionStruct.new("", nil)
-      if Mail::Utilities.blank?(s)
-        return content_disposition
-      end
+    ContentDispositionStruct = Struct.new(:disposition_type, :parameters, :error)
-      actions, error = Ragel.parse(:content_disposition, s)
-      if error
-        raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, error)
-      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, 244,
+      1, 244, 10, 10, 9,
+      32, 10, 10, 9, 32,
+      0, 244, 128, 191, 160, 191,
+      128, 191, 128, 159, 144,
+      191, 128, 191, 128, 143,
+      9, 40, 10, 10, 9, 32,
+      9, 126, 1, 244, 1,
+      244, 10, 10, 9, 32,
+      0, 244, 128, 191, 160, 191,
+      128, 191, 128, 159, 144,
+      191, 128, 191, 128, 143,
+      33, 126, 9, 59, 9, 59,
+      9, 126, 9, 59, 9,
+      59, 0, 0, 0,
+    ]
+    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, 244, 244, 1, 24, 1, 24,
+      245, 64, 32, 64, 32, 48, 64, 16,
+      32, 1, 24, 118, 244, 244, 1, 24,
+      245, 64, 32, 64, 32, 48, 64, 16,
+      94, 51, 51, 118, 51, 51, 0,
+    ]
+    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, 760, 1005, 1007, 1032, 1034,
+      1059, 1305, 1370, 1403, 1468, 1501, 1550, 1615,
+      1632, 1665, 1667, 1692, 1811, 2056, 2301, 2303,
+      2328, 2574, 2639, 2672, 2737, 2770, 2819, 2884,
+      2901, 2996, 3048, 3100, 3219, 3271, 3323,
+    ]
+    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, 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, 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, 24, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 26,
+      25, 25, 27, 28, 28, 28, 29, 1,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 1, 30, 30, 31, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 32, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 33, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 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, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 35,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 37, 36, 36, 38,
+      39, 39, 39, 40, 1, 41, 1, 30,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 30, 1,
+      42, 1, 43, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 43, 1, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 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, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 35, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      37, 36, 36, 38, 39, 39, 39, 40,
+      1, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 30, 30, 30, 30, 30, 30, 30,
+      30, 1, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 1, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 1, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 34, 34, 34, 34,
+      34, 34, 34, 34, 1, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 1, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 1, 36,
+      36, 36, 36, 36, 36, 36, 36, 36,
+      36, 36, 36, 36, 36, 36, 36, 1,
+      44, 1, 1, 1, 45, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 44,
+      1, 46, 1, 1, 1, 1, 1, 47,
+      1, 48, 1, 49, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 49, 1, 50, 1, 1, 1,
+      51, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 50, 52, 52, 52, 52,
+      52, 52, 52, 53, 1, 52, 52, 52,
+      52, 52, 1, 52, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 1, 1, 1,
+      1, 1, 1, 1, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 52, 1, 1,
+      1, 52, 52, 52, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 52, 52, 52,
+      52, 52, 52, 52, 52, 52, 52, 52,
+      52, 52, 1, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 1, 54, 54, 55,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 56, 57, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 58, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 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, 59, 59, 59, 59,
+      59, 59, 59, 59, 59, 59, 59, 59,
+      59, 59, 59, 59, 59, 59, 59, 59,
+      59, 59, 59, 59, 59, 59, 59, 59,
+      59, 59, 60, 61, 61, 61, 61, 61,
+      61, 61, 61, 61, 61, 61, 61, 62,
+      61, 61, 63, 64, 64, 64, 65, 1,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 1, 66, 66, 67, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 68,
+      69, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 70, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 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, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 72,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 74, 73, 73, 75,
+      76, 76, 76, 77, 1, 78, 1, 66,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 66, 1,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      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, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      72, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 74, 73, 73,
+      75, 76, 76, 76, 77, 1, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 66, 66,
+      66, 66, 66, 66, 66, 66, 1, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 1,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      1, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 71, 71, 71, 71, 71, 71, 71,
+      71, 1, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 1, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 1, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 73, 73, 73,
+      73, 73, 73, 73, 1, 79, 79, 79,
+      79, 79, 79, 79, 1, 1, 79, 79,
+      79, 79, 79, 1, 79, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 1, 80,
+      1, 1, 1, 1, 1, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 79, 1,
+      1, 1, 79, 79, 79, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 79, 79,
+      79, 79, 79, 79, 79, 79, 79, 79,
+      79, 79, 79, 1, 81, 1, 1, 1,
+      82, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 81, 1, 1, 1, 1,
+      1, 1, 1, 83, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 84, 1,
+      85, 1, 1, 1, 86, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 85,
+      1, 1, 1, 1, 1, 1, 1, 87,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 88, 1, 89, 1, 1, 1,
+      90, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 89, 91, 1, 91, 91,
+      91, 91, 91, 92, 1, 91, 91, 91,
+      91, 91, 1, 91, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 1, 84, 1,
+      91, 1, 1, 1, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 91, 1, 1,
+      1, 91, 91, 91, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 91, 91, 91,
+      91, 91, 91, 91, 91, 91, 91, 91,
+      91, 91, 1, 49, 1, 1, 1, 93,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 49, 1, 1, 1, 1, 1,
+      1, 1, 94, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 2, 1, 95,
+      1, 1, 1, 96, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 95, 1,
+      1, 1, 1, 1, 1, 1, 97, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 1, 1, 1, 1, 1, 1, 1,
+      1, 50, 1, 1, 0,
+    ]
+    class << self
+      attr_accessor :_trans_targs
+      private :_trans_targs, :_trans_targs=
+    end
+    self._trans_targs = [
+      40, 0, 2, 3, 5, 27, 4, 5,
+      6, 7, 8, 43, 10, 24, 7, 8,
+      10, 24, 9, 11, 12, 41, 16, 17,
+      18, 19, 20, 21, 22, 23, 11, 12,
+      41, 16, 17, 18, 19, 20, 21, 22,
+      23, 13, 15, 41, 7, 8, 10, 24,
+      26, 44, 2, 3, 5, 27, 29, 30,
+      29, 46, 32, 33, 34, 35, 36, 37,
+      38, 39, 29, 30, 29, 46, 32, 33,
+      34, 35, 36, 37, 38, 39, 31, 40,
+      2, 41, 14, 42, 2, 41, 14, 42,
+      2, 44, 25, 43, 45, 25, 45, 44,
+      25, 45,
+    ]
+    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, 7,
+      7, 7, 7, 7, 7, 7, 0, 0,
+      9, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 10, 10, 10, 11,
+      0, 0, 10, 10, 12, 11, 13, 13,
+      14, 15, 13, 13, 13, 13, 13, 13,
+      13, 13, 0, 0, 3, 16, 0, 0,
+      0, 0, 0, 0, 0, 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, 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 = 40
+    class << self
+      attr_accessor :error
+    end
+    self.error = 0
+    class << self
+      attr_accessor :en_comment_tail
+    end
+    self.en_comment_tail = 28
+    class << self
+      attr_accessor :en_main
+    end
+    self.en_main = 1
-      content_disposition.parameters = []
+    def self.parse(data)
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+      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")
+      # 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])
+                       _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
+                begin
+                  disp_type_s = p
+                end
+              when 17
+                begin
+                  content_disposition.disposition_type = chars(data, disp_type_s, p - 1).downcase
+                end
+              when 2
+                begin
+                  param_attr_s = p
+                end
+              when 4
+                begin
+                  param_attr = chars(data, param_attr_s, p - 1)
+                end
+              when 7
+                begin
+                  qstr_s = p
+                end
+              when 9
+                begin
+                  qstr = chars(data, qstr_s, p - 1)
+                end
+              when 5
+                begin
+                  param_val_s = p
+                end
+              when 18
+                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 || chars(data, param_val_s, p - 1)
+                  content_disposition.parameters << {param_attr => value}
+                  param_attr = nil
+                  qstr = nil
+                end
+              when 10
+                begin
+                end
+              when 13
+                begin
+                end
+              when 3
+                begin
+                  begin
+                    stack[top] = cs
+                    top += 1
+                    cs = 28
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 16
+                begin
+                  begin
+                    top -= 1
+                    cs = stack[top]
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 8
+                begin
+                  qstr_s = p
+                end
+                begin
+                  qstr = chars(data, qstr_s, p - 1)
+                end
+              when 6
+                begin
+                  param_val_s = p
+                end
+                begin
+                  begin
+                    stack[top] = cs
+                    top += 1
+                    cs = 28
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 22
+                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 || chars(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 = 28
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 12
+                begin
+                end
+                begin
+                  param_attr_s = p
+                end
+              when 20
+                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 || chars(data, param_val_s, p - 1)
+                  content_disposition.parameters << {param_attr => value}
+                  param_attr = nil
+                  qstr = nil
+                end
+              when 11
+                begin
+                end
+                begin
+                  begin
+                    stack[top] = cs
+                    top += 1
+                    cs = 28
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 14
+                begin
+                end
+                begin
+                  begin
+                    stack[top] = cs
+                    top += 1
+                    cs = 28
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 15
+                begin
+                end
+                begin
+                  begin
+                    top -= 1
+                    cs = stack[top]
+                    _goto_level = _again
+                    next
+                  end
+                end
+              when 19
+                begin
+                  begin
+                    stack[top] = cs
+                    top += 1
+                    cs = 28
+                    _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 || chars(data, param_val_s, p - 1)
-          # Use quoted string value if one exists, otherwise use parameter value
-          if qstr
-            value = qstr
-          else
-            value = s[param_val_s..(p-1)]
+                  content_disposition.parameters << {param_attr => value}
+                  param_attr = nil
+                  qstr = nil
+                end
+              when 21
+                begin
+                end
+                begin
+                  begin
+                    stack[top] = cs
+                    top += 1
+                    cs = 28
+                    _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 || chars(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
+                begin
+                  content_disposition.disposition_type = chars(data, disp_type_s, p - 1).downcase
+                end
+              when 18
+                begin
+                  if param_attr.nil?
+                    raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "no attribute for value")
+                  end
-          content_disposition.parameters <<  { param_attr => value }
-          param_attr = nil
-          qstr = nil
+                  # Use quoted string value if one exists, otherwise use parameter value
+                  value = qstr || chars(data, param_val_s, p - 1)
-        else
-          raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, "Failed to process unknown action: #{action}")
+                  content_disposition.parameters << {param_attr => value}
+                  param_attr = nil
+                  qstr = nil
+                end
+              when 10
+                begin
+                end
+              when 20
+                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 || chars(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
-      content_disposition
-    end
+      if p != eof || cs < 40
+        raise Mail::Field::IncompleteParseError.new(Mail::ContentDispositionElement, data, p)
+      end
-    private
-    def cleaned(string)
-      string =~ /(.+);\s*$/ ? $1 : string
+      content_disposition
     end
   end
 end