mail 2.5.4 → 2.6.0

data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl

@@ -0,0 +1,37 @@
+%%{
+  machine received;
+
+  include rb_actions "rb_actions.rl";
+  include common "../../common.rl";
+
+  getkey data_unpacked[p];
+
+  main := received;
+}%%
+
+module Mail
+  module Parsers
+    module Ragel
+      module ReceivedMachine
+        %%write data;
+
+        def self.parse(data)
+          p = 0
+          eof = data.length
+          stack = []
+
+          actions = []
+          data_unpacked = data.bytes.to_a
+          %%write init;
+          %%write exec;
+
+          if p == eof && cs >= %%{ write first_final; }%%
+            return actions, nil
+          else
+            return [], "Only able to parse up to #{data[0..p]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mail/parsers/ragel/ruby/parser.rb.rl.erb

@@ -0,0 +1,37 @@
+%%{
+  machine <%= parser_name %>;
+
+  include rb_actions "rb_actions.rl";
+  include common "../../common.rl";
+
+  getkey data_unpacked[p];
+
+  main := <%= parser_name %>;
+}%%
+
+module Mail
+  module Parsers
+    module Ragel
+      module <%= parser_name_cc %>
+        %%write data;
+
+        def self.parse(data)
+          p = 0
+          eof = data.length
+          stack = []
+
+          actions = []
+          data_unpacked = data.bytes.to_a
+          %%write init;
+          %%write exec;
+
+          if p == eof && cs >= %%{ write first_final; }%%
+            return actions, nil
+          else
+            return [], "Only able to parse up to #{data[0..p]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mail/parsers/ragel/ruby.rb

@@ -0,0 +1,29 @@
+module Mail
+  module Parsers
+    module Ragel
+      module Ruby
+        Mail::Parsers::Ragel::FIELD_PARSERS.each do |field_parser|
+          require "mail/parsers/ragel/ruby/machines/#{field_parser}_machine"
+        end
+
+        MACHINE_LIST = {
+          :address_lists => AddressListsMachine,
+          :phrase_lists => PhraseListsMachine,
+          :date_time => DateTimeMachine,
+          :received => ReceivedMachine,
+          :message_ids => MessageIdsMachine,
+          :envelope_from => EnvelopeFromMachine,
+          :mime_version => MimeVersionMachine,
+          :content_type => ContentTypeMachine,
+          :content_disposition => ContentDispositionMachine,
+          :content_transfer_encoding => ContentTransferEncodingMachine,
+          :content_location => ContentLocationMachine
+        }
+
+        def self.parse(machine, string)
+          MACHINE_LIST[machine].parse(string)
+        end
+      end
+    end
+  end
+end

data/lib/mail/parsers/ragel.rb

@@ -0,0 +1,17 @@
+module Mail
+  module Parsers
+    module Ragel
+      require 'mail/parsers/ragel/parser_info'
+      require "mail/parsers/ragel/ruby"
+
+      def self.parse(machine, string)
+        @machine_module ||= Ruby
+        @machine_module.parse(machine, string)
+      end
+
+      def self.machine_module=(m)
+        @machine_module = m
+      end
+    end
+  end
+end

data/lib/mail/parsers/received_parser.rb

@@ -0,0 +1,47 @@
+module Mail::Parsers
+  class ReceivedParser
+
+    def parse(s)
+      actions, error = Ragel.parse(:received, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::ReceivedElement, s, error)
+      end
+
+      received = ReceivedStruct.new
+
+      received_tokens_s = date_s = time_s = nil
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Received Tokens:
+        when :received_tokens_s then received_tokens_s = p
+        when :received_tokens_e
+          received.info = s[received_tokens_s..(p-1)]
+
+        # Date
+        when :date_s then date_s = p
+        when :date_e
+          received.date = s[date_s..(p-1)].strip
+
+        # Time
+        when :time_s then time_s = p
+        when :time_e
+          received.time = s[time_s..(p-1)]
+
+        when :angle_addr_s, :comment_e, :comment_s,
+             :domain_e, :domain_s, :local_dot_atom_e,
+             :local_dot_atom_pre_comment_e,
+             :local_dot_atom_pre_comment_s,
+             :local_dot_atom_s, :qstr_e, :qstr_s,
+             :local_quoted_string_s, :local_quoted_string_e
+          # ignored actions
+
+        else
+          raise Mail::Field::ParseError.new(Mail::ReceivedElement, s, "Failed to process unknown action: #{action}")
+        end
+      end
+      received
+    end
+  end
+end

data/lib/mail/parsers.rb

@@ -0,0 +1,26 @@
+module Mail
+  module Parsers
+
+    # Low-level ragel based parsers
+    require 'mail/parsers/ragel'
+
+    AddressListStruct = Struct.new(:addresses, :group_names, :error)
+    AddressStruct = Struct.new(:raw, :domain, :comments, :local,
+                             :obs_domain_list, :display_name, :group, :error)
+    ContentDispositionStruct = Struct.new(:disposition_type, :parameters, :error)
+    ContentLocationStruct = Struct.new(:location, :error)
+    ContentTransferEncodingStruct = Struct.new(:encoding, :error)
+    ContentTypeStruct = Struct.new(:main_type, :sub_type, :parameters, :error)
+    DateTimeStruct = Struct.new(:date_string, :time_string, :error)
+    EnvelopeFromStruct = Struct.new(:address, :ctime_date, :error)
+    MessageIdsStruct = Struct.new(:message_ids, :error)
+    MimeVersionStruct = Struct.new(:major, :minor, :error)
+    PhraseListsStruct = Struct.new(:phrases, :error)
+    ReceivedStruct = Struct.new(:date, :time, :info, :error)
+
+    require 'mail/parsers/ragel/parser_info'
+    Ragel::FIELD_PARSERS.each do |field_parser|
+      require "mail/parsers/#{field_parser}_parser"
+    end
+  end
+end

data/lib/mail/parts_list.rb

@@ -31,11 +31,13 @@ module Mail
     end
 
     def sort!(order)
-      sorted = self.sort do |a, b|
+      # stable sort should be used to maintain the relative order as the parts are added
+      i = 0;
+      sorted = self.sort_by do |a|
         # OK, 10000 is arbitrary... if anyone actually wants to explicitly sort 10000 parts of a
         # single email message... please show me a use case and I'll put more work into this method,
         # in the meantime, it works :)
-        get_order_value(a, order) <=> get_order_value(b, order)
+        [get_order_value(a, order), i += 1]
       end
       self.clear
       sorted.each { |p| self << p }
@@ -44,7 +46,7 @@ module Mail
   private
 
     def get_order_value(part, order)
-      if part.respond_to?(:content_type)
+      if part.respond_to?(:content_type) && !part[:content_type].nil?
         order.index(part[:content_type].string.downcase) || 10000
       else
         10000

data/lib/mail/patterns.rb

@@ -20,10 +20,12 @@ module Mail
     FWS           = /#{CRLF}#{WSP}*/
     TEXT          = /[#{text}]/ # + obs-text
     FIELD_NAME    = /[#{field_name}]+/
-    FIELD_BODY    = /.+/
+    FIELD_PREFIX  = /\A(#{FIELD_NAME})/
+    FIELD_BODY    = /.+/m
     FIELD_LINE    = /^[#{field_name}]+:\s*.+$/
     FIELD_SPLIT   = /^(#{FIELD_NAME})\s*:\s*(#{FIELD_BODY})?$/
     HEADER_LINE   = /^([#{field_name}]+:\s*.+)$/
+    HEADER_SPLIT  = /#{CRLF}(?!#{WSP})/
 
     QP_UNSAFE     = /[^#{qp_safe}]/
     QP_SAFE       = /[#{qp_safe}]/

data/lib/mail/utilities.rb

@@ -21,7 +21,9 @@ module Mail
         original_encoding = str.encoding
         str.force_encoding('ASCII-8BIT')
         if (PHRASE_UNSAFE === str)
-          dquote(str).force_encoding(original_encoding)
+          quoted_str = dquote(str).force_encoding(original_encoding)
+          str.force_encoding(original_encoding)
+          quoted_str
         else
           str.force_encoding(original_encoding)
         end

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     
     version = {}
-    File.read(File.join(File.dirname(__FILE__), '../', 'VERSION')).each_line do |line|
+    File.read(File.join(File.dirname(__FILE__), '../', '../', 'VERSION')).each_line do |line|
       type, value = line.chomp.split(":")
       next if type =~ /^\s+$/  || value =~ /^\s+$/
       version[type] = value

data/lib/mail/version_specific/ruby_1_8.rb

@@ -105,7 +105,7 @@ module Mail
 
     def Ruby18.fix_encoding(encoding)
       case encoding.upcase
-      when 'UTF8'
+      when 'UTF8', 'UTF_8'
         'UTF-8'
       when 'UTF16', 'UTF-16'
         'UTF-16BE'

data/lib/mail/version_specific/ruby_1_9.rb

@@ -73,6 +73,9 @@ module Mail
         string = string.sub(/\=$/, '')
         str = Encodings::QuotedPrintable.decode(string)
         str.force_encoding(pick_encoding(charset))
+        # We assume that binary strings hold utf-8 directly to work around
+        # jruby/jruby#829 which subtly changes String#encode semantics.
+        str.force_encoding('utf-8') if str.encoding == Encoding::ASCII_8BIT
       end
       decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
       decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
@@ -105,6 +108,10 @@ module Mail
     def Ruby19.pick_encoding(charset)
       case charset
 
+      # ISO-8859-8-I etc. http://en.wikipedia.org/wiki/ISO-8859-8-I
+      when /^iso-?8859-(\d+)(-i)?$/i
+        "ISO-8859-#{$1}"
+
       # ISO-8859-15, ISO-2022-JP and alike
       when /iso-?(\d{4})-?(\w{1,2})/i
         "ISO-#{$1}-#{$2}"
@@ -114,7 +121,7 @@ module Mail
         "ISO-#{$1}-#{$2}-#{$3}"
 
       # UTF-8, UTF-32BE and alike
-      when /utf-?(\d{1,2})?(\w{1,2})/i
+      when /utf[\-_]?(\d{1,2})?(\w{1,2})/i
         "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
 
       # Windows-1252 and alike
@@ -124,6 +131,14 @@ module Mail
       when /^8bit$/
         Encoding::ASCII_8BIT
 
+      # alternatives/misspellings of us-ascii seen in the wild
+      when /^iso-?646(-us)?$/i, /us=ascii/i
+        Encoding::ASCII
+
+      # Microsoft-specific alias for MACROMAN
+      when /^macintosh$/i
+        Encoding::MACROMAN
+
       # Microsoft-specific alias for CP949 (Korean)
       when 'ks_c_5601-1987'
         Encoding::CP949

data/lib/mail.rb

@@ -76,7 +76,7 @@ module Mail # :doc:
 
   require 'mail/envelope'
 
-  require 'load_parsers'
+  require 'mail/parsers'
 
   # Autoload header field elements and transfer encodings.
   require 'mail/elements'

metadata

@@ -1,110 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.5.4
-  prerelease: 
+  version: 2.6.0
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: treetop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A really Ruby Mail handler.
@@ -117,15 +96,16 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - TODO.rdoc
 files:
-- README.md
-- MIT-LICENSE
-- CONTRIBUTING.md
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - Dependencies.txt
 - Gemfile
+- MIT-LICENSE
+- README.md
 - Rakefile
 - TODO.rdoc
-- lib/load_parsers.rb
+- VERSION
+- lib/mail.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
 - lib/mail/check_delivery_params.rb
@@ -133,9 +113,10 @@ files:
 - lib/mail/core_extensions/nil.rb
 - lib/mail/core_extensions/object.rb
 - lib/mail/core_extensions/smtp.rb
+- lib/mail/core_extensions/string.rb
 - lib/mail/core_extensions/string/access.rb
 - lib/mail/core_extensions/string/multibyte.rb
-- lib/mail/core_extensions/string.rb
+- lib/mail/elements.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
 - lib/mail/elements/content_disposition_element.rb
@@ -148,17 +129,17 @@ files:
 - lib/mail/elements/mime_version_element.rb
 - lib/mail/elements/phrase_list.rb
 - lib/mail/elements/received_element.rb
-- lib/mail/elements.rb
+- lib/mail/encodings.rb
 - lib/mail/encodings/7bit.rb
 - lib/mail/encodings/8bit.rb
 - lib/mail/encodings/base64.rb
 - lib/mail/encodings/binary.rb
 - lib/mail/encodings/quoted_printable.rb
 - lib/mail/encodings/transfer_encoding.rb
-- lib/mail/encodings.rb
 - lib/mail/envelope.rb
 - lib/mail/field.rb
 - lib/mail/field_list.rb
+- lib/mail/fields.rb
 - lib/mail/fields/bcc_field.rb
 - lib/mail/fields/cc_field.rb
 - lib/mail/fields/comments_field.rb
@@ -197,17 +178,17 @@ files:
 - lib/mail/fields/subject_field.rb
 - lib/mail/fields/to_field.rb
 - lib/mail/fields/unstructured_field.rb
-- lib/mail/fields.rb
 - lib/mail/header.rb
 - lib/mail/indifferent_hash.rb
 - lib/mail/mail.rb
 - lib/mail/matchers/has_sent_mail.rb
 - lib/mail/message.rb
+- lib/mail/multibyte.rb
 - lib/mail/multibyte/chars.rb
 - lib/mail/multibyte/exceptions.rb
 - lib/mail/multibyte/unicode.rb
 - lib/mail/multibyte/utils.rb
-- lib/mail/multibyte.rb
+- lib/mail/network.rb
 - lib/mail/network/delivery_methods/exim.rb
 - lib/mail/network/delivery_methods/file_delivery.rb
 - lib/mail/network/delivery_methods/sendmail.rb
@@ -218,35 +199,47 @@ files:
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
 - lib/mail/network/retriever_methods/test_retriever.rb
-- lib/mail/network.rb
-- lib/mail/parsers/address_lists.rb
-- lib/mail/parsers/address_lists.treetop
-- lib/mail/parsers/content_disposition.rb
-- lib/mail/parsers/content_disposition.treetop
-- lib/mail/parsers/content_location.rb
-- lib/mail/parsers/content_location.treetop
-- lib/mail/parsers/content_transfer_encoding.rb
-- lib/mail/parsers/content_transfer_encoding.treetop
-- lib/mail/parsers/content_type.rb
-- lib/mail/parsers/content_type.treetop
-- lib/mail/parsers/date_time.rb
-- lib/mail/parsers/date_time.treetop
-- lib/mail/parsers/envelope_from.rb
-- lib/mail/parsers/envelope_from.treetop
-- lib/mail/parsers/message_ids.rb
-- lib/mail/parsers/message_ids.treetop
-- lib/mail/parsers/mime_version.rb
-- lib/mail/parsers/mime_version.treetop
-- lib/mail/parsers/phrase_lists.rb
-- lib/mail/parsers/phrase_lists.treetop
-- lib/mail/parsers/received.rb
-- lib/mail/parsers/received.treetop
-- lib/mail/parsers/rfc2045.rb
-- lib/mail/parsers/rfc2045.treetop
-- lib/mail/parsers/rfc2822.rb
-- lib/mail/parsers/rfc2822.treetop
-- lib/mail/parsers/rfc2822_obsolete.rb
-- lib/mail/parsers/rfc2822_obsolete.treetop
+- lib/mail/parsers.rb
+- lib/mail/parsers/address_lists_parser.rb
+- lib/mail/parsers/content_disposition_parser.rb
+- lib/mail/parsers/content_location_parser.rb
+- lib/mail/parsers/content_transfer_encoding_parser.rb
+- lib/mail/parsers/content_type_parser.rb
+- lib/mail/parsers/date_time_parser.rb
+- lib/mail/parsers/envelope_from_parser.rb
+- lib/mail/parsers/message_ids_parser.rb
+- lib/mail/parsers/mime_version_parser.rb
+- lib/mail/parsers/phrase_lists_parser.rb
+- lib/mail/parsers/ragel.rb
+- lib/mail/parsers/ragel/common.rl
+- lib/mail/parsers/ragel/date_time.rl
+- lib/mail/parsers/ragel/parser_info.rb
+- lib/mail/parsers/ragel/ruby.rb
+- lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/machines/rb_actions.rl
+- lib/mail/parsers/ragel/ruby/machines/received_machine.rb
+- lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl
+- lib/mail/parsers/ragel/ruby/parser.rb.rl.erb
+- lib/mail/parsers/received_parser.rb
 - lib/mail/part.rb
 - lib/mail/parts_list.rb
 - lib/mail/patterns.rb
@@ -255,33 +248,30 @@ files:
 - lib/mail/version.rb
 - lib/mail/version_specific/ruby_1_8.rb
 - lib/mail/version_specific/ruby_1_9.rb
-- lib/mail.rb
-- lib/tasks/corpus.rake
-- lib/tasks/treetop.rake
-- lib/VERSION
 homepage: http://github.com/mikel/mail
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "--exclude"
+- lib/mail/values/unicode_tables.dat
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.
 test_files: []

data/lib/VERSION

@@ -1,4 +0,0 @@
-major:2
-minor:5
-patch:4
-build: