mail 2.5.5 → 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/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/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 }

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

@@ -108,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}"
@@ -117,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
@@ -127,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

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.6.0
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: treetop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +104,7 @@ files:
 - README.md
 - Rakefile
 - TODO.rdoc
-- lib/VERSION
-- lib/load_parsers.rb
+- VERSION
 - lib/mail.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
@@ -208,34 +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/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
@@ -244,14 +248,14 @@ files:
 - lib/mail/version.rb
 - lib/mail/version_specific/ruby_1_8.rb
 - lib/mail/version_specific/ruby_1_9.rb
-- lib/tasks/corpus.rake
-- lib/tasks/treetop.rake
 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
@@ -266,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.

data/lib/VERSION

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

data/lib/load_parsers.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-# This file loads up the parsers for mail to use.  It also will attempt to compile parsers
-# if they don't exist.
-#
-# It also only uses the compiler if we are running the SPEC suite
-module Mail # :doc:
-  require 'treetop/runtime'
-
-  def self.compile_parser(parser)
-    require 'treetop/compiler'
-    Treetop.load(File.join(File.dirname(__FILE__)) + "/mail/parsers/#{parser}")
-  end
-
-  parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
-                date_time received message_ids envelope_from rfc2045
-                mime_version content_type content_disposition
-                content_transfer_encoding content_location ]
-
-  if defined?(MAIL_SPEC_SUITE_RUNNING)
-    parsers.each do |parser|
-      compile_parser(parser)
-    end
-
-  else
-    parsers.each do |parser|
-      begin
-        require "mail/parsers/#{parser}"
-      rescue LoadError
-        compile_parser(parser)
-      end
-    end
-
-  end
-
-end

data/lib/mail/parsers/address_lists.rb

@@ -1,64 +0,0 @@
-# Autogenerated from a Treetop grammar. Edits may be lost.
-
-
-module Mail
-  module AddressLists
-    include Treetop::Runtime
-
-    def root
-      @root ||= :primary_address
-    end
-
-    include RFC2822
-
-    module PrimaryAddress0
-      def addresses
-        ([first_addr] + other_addr.elements.map { |o| o.addr_value }).reject { |e| e.empty? }
-      end
-    end
-
-    module PrimaryAddress1
-      def addresses
-        [first_addr] + other_addr.elements.map { |o| o.addr_value }
-      end
-    end
-
-    def _nt_primary_address
-      start_index = index
-      if node_cache[:primary_address].has_key?(index)
-        cached = node_cache[:primary_address][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      r1 = _nt_address_list
-      r1.extend(PrimaryAddress0)
-      if r1
-        r0 = r1
-      else
-        r2 = _nt_obs_addr_list
-        r2.extend(PrimaryAddress1)
-        if r2
-          r0 = r2
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-
-      node_cache[:primary_address][start_index] = r0
-
-      r0
-    end
-
-  end
-
-  class AddressListsParser < Treetop::Runtime::CompiledParser
-    include AddressLists
-  end
-
-end