mail 2.5.5 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483ee321c6ec26a7fb20deb57c50254f916c5055
-  data.tar.gz: 49bbe456db7b901b8f9a17cc404ed6cdd4ac84f2
+  metadata.gz: ecb5e9115e61802f251480eef90c6698ac665d0b
+  data.tar.gz: a1105d5defc2c7b374598a392e5f5dc4d1452a21
 SHA512:
-  metadata.gz: bc79fcc391b2358f8aecd403453c934399a561bd2cf0c3cb32bf850815a6c99086c47104e0680a7d77a62585453bef8ca27d885f0345d102e0191a1f5354973d
-  data.tar.gz: cd1ea707e1b61aa29bb452d3b2eaa7a245721b28d17448061cef63beff93c794f3a05d0c104afa79a9cb7026f0b20376f422b76747170d35fe72a59ed64e40e6
+  metadata.gz: 103d2126c02d1aeb5ffd4982f261407af16652fd181f6e0fc63bf12702e5aa1ea3c7f863a3c39f822ba3b8e8cf704782d1beb7c4e2e28cba5f4fc2931151cf0e
+  data.tar.gz: 6f25c0decaf77a0314b42d0fbf6c61edfc7f2fe9b4bbeef004e34a7127882093b660108cd7728a108f26b1b3dcf2664beac4e5e6d0d0d3e68565f78fdd273d4e

data/CHANGELOG.rdoc

@@ -1,15 +1,10 @@
-== Version 2.5.5 - 2017-06-09 Jeremy Daer <jeremydaer@gmail.com>
+== HEAD
 
-Security:
-* #1097 – SMTP security: prevent command injection via To/From addresses. (jeremy)
-
-Bugs:
-* #633 – Cope with message parts that have an empty Content-Type (ThomasKoppensteiner, zeepeeare)
-* #689 - Fix Exim delivery method broken by #477 in 2.5.4. (jethrogb)
-
-== Version 2.5.4 - Tue May 14 14:45:00 +1100 2013 Mikel Lindsaar <mikel@lindsaar.net>
+== Version 2.6.0 - Mon Jun 2 22:49 +1100 2014 Mikel Lindsaar <mikel@reinteractive.net>
 
 Features:
+* Allow interceptors and observers to be unregistered (zuhao)
+* Added feature to find the mail in uid (taketin)
 * Save settings passed to TestMailer#new (svanderbleek)
 * Allow the setting of envelope from directly (jeremy)
 * Accept other IETF/IANA-registered Content-Types and Content-Transfer-Encodings (jeremy)
@@ -25,9 +20,13 @@ Features:
 * Close pull request 389 - Don't add superfluous message headers to MIME parts (djmaze, jeremy)
 
 Performance:
+* Migrate to RAGEL based parser, awesome work by (bpot)
+* Performance improvements for people parsing email headers (ConradIrwin)
 * Close pull request 488 - Speed up field construction & comparison (bpot)
 
 Bugs:
+* Fix for when content looks like field name (kjg)
+* Don't change original when you change a copy (TylerRick)
 * Don't include separating semicolon in paramter value when sanitizing (bpot)
 * Fix fencepost encoding problem with binhex strings and only one token (drasch)
 * Fix sendmail delivery to addresses with a leading hyphen (lifo, jeremy)

data/CONTRIBUTING.md

@@ -43,3 +43,16 @@ Syntax:
 * Follow the conventions you see used in the source already.
 
 And in case we didn't emphasize it enough: we love specs!
+
+### Testing against mime-types versions:
+
+Use [appraisal](https://github.com/thoughtbot/appraisal) to run against all supported versions of mime-types.
+
+1. Run `(bundle check || bundle) && appraisal` so that all the 'appraised' gemfiles are bundled.
+2. Run either `appraisal rake` or `rake appraisal` to run all the tests.
+
+To run only one 'appraised' gemfile, run. e.g. `BUNDLE_GEMFILE=gemfiles/mime_types_edge.gemfile (bundle check || bundle) && rake`
+
+To change the appraisals, modify the `Appraisals` file, run `appraisal`, commit the generated gemfiles, and modify the .travis.yml matrix.
+
+To run on all rubies / gemfiles, just like TravisCI, see [WWTD](https://github.com/grosser/wwtd).

data/Dependencies.txt

@@ -1,3 +1,2 @@
-treetop: we need to include this in the gem spec
 tlsmail: if ruby < 1.8.6... we could make it optional, or embed it in Mail
 mime/types: I think we embed a simplified version, or help maintain it, it is old (2006)

data/Gemfile

@@ -1,32 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-if RUBY_VERSION < '1.9.3'
-  gem 'activesupport', '< 4'
-elsif RUBY_VERSION < '2.2.2'
-  gem 'activesupport', '< 5'
-end
-gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'
-gem "tlsmail" if RUBY_VERSION <= '1.8.6'
-gem "mime-types", "~> 1.16"
-gem "treetop", "~> 1.4.10"
+gem "tlsmail", "~> 0.0.1" if RUBY_VERSION <= "1.8.6"
+gem "jruby-openssl", :platforms => :jruby
 
-gem 'jruby-openssl', :platform => :jruby
+group :development, :test do
+  gem "appraisal", "~> 1.0"
+end
 
 # For gems not required to run tests
 group :local_development, :test do
-  gem 'rake', '> 0.8.7', '< 11.0.1'
-  gem 'rdoc', '< 4.3' if RUBY_VERSION < '1.9.3'
-  gem "rspec",      "~> 2.8.0"
-  case
-  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-    # Skip it
-  when RUBY_PLATFORM == 'java'
-    # Skip it
-  when RUBY_VERSION < '1.9'
-    gem "ruby-debug"
-  else
-    # Skip it
-  end
+  gem "ruby-debug", :platforms => :mri_18
 end

data/README.md

@@ -42,15 +42,25 @@ me a nice email :)
 Compatibility
 -------------
 
-Mail supports Ruby 1.8.7+, including JRuby and Rubinius.
+Every Mail commit is tested by Travis on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
 
-Every Mail commit is tested by Travis on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.travis.yml).
+* ruby-1.8.7-p374 [ i686 ]
+* ruby-1.9.2-p320 [ x86_64 ]
+* ruby-1.9.3-p327 [ x86_64 ]
+* ruby-2.0.0-p451 [ x86_64 ]
+* ruby-2.1.2 [ x86_64 ]
+* ruby-head [ x86_64 ]
+* jruby [ x86_64 ]
+* jruby-head [ x86_64 ]
+* rbx-2 [ x86_64 ]
+
+Testing a specific mime type (needed for 1.8.7 for example) can be done manually with:
+
+  $ BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle check
+  $ BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle
+  $ BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile rake
 
-Testing a specific version of mime-types (needed for Ruby 1.8.7, for example) can be done manually with:
 
-```sh
-BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle && rake
-```
 
 Discussion
 ----------
@@ -185,6 +195,8 @@ mail['from'] = 'mikel@test.lindsaar.net'
 mail[:to]    = 'you@test.lindsaar.net'
 mail.subject = 'This is a test email'
 
+mail.header['X-Custom-Header'] = 'custom value'
+
 mail.to_s #=> "From: mikel@test.lindsaar.net\r\nTo: you@...
 ```
 
@@ -227,10 +239,10 @@ easy as:
 
 ```ruby
 Mail.deliver do
-   from    'me@test.lindsaar.net'
-   to      'you@test.lindsaar.net'
-   subject 'Here is the image you wanted'
-   body    File.read('body.txt')
+  from     'me@test.lindsaar.net'
+  to       'you@test.lindsaar.net'
+  subject  'Here is the image you wanted'
+  body     File.read('body.txt')
   add_file '/full/path/to/somefile.png'
 end
 ```
@@ -265,6 +277,15 @@ mail.delivery_method :sendmail
 mail.deliver
 ```
 
+Sending via smtp (for example to [mailcatcher](https://github.com/sj26/mailcatcher))
+```ruby
+
+Mail.defaults do
+  delivery_method :smtp, address: "localhost", port: 1025
+end
+```
+
+
 Exim requires its own delivery manager, and can be used like so:
 
 ```ruby
@@ -318,7 +339,7 @@ emails.length #=> LOTS!
 ```ruby
 mail = Mail.read('/path/to/message.eml')
 
-mail.envelope.from   #=> 'mikel@test.lindsaar.net'
+mail.envelope_from   #=> 'mikel@test.lindsaar.net'
 mail.from.addresses  #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 mail.sender.address  #=> 'mikel@test.lindsaar.net'
 mail.to              #=> 'bob@test.lindsaar.net'
@@ -349,7 +370,7 @@ mail.parts[1].content_type_parameters  #=> {'name' => 'my.pdf'}
 Mail generates a tree of parts.  Each message has many or no parts.  Each part
 is another message which can have many or no parts.
 
-A message will only have parts if it is a multipart/mixed or related/mixed
+A message will only have parts if it is a multipart/mixed or multipart/related
 content type and has a boundary defined.
 
 ### Testing and extracting attachments
@@ -362,7 +383,7 @@ mail.attachments.each do | attachment |
     filename = attachment.filename
     begin
       File.open(images_dir + filename, "w+b", 0644) {|f| f.write attachment.body.decoded}
-    rescue Exception => e
+    rescue => e
       puts "Unable to save data for #{filename} because #{e.message}"
     end
   end
@@ -545,7 +566,7 @@ Using Mail with Testing or Spec'ing Libraries
 If mail is part of your system, you'll need a way to test it without actually
 sending emails, the TestMailer can do this for you.
 
-```
+```ruby
 require 'mail'
 => true
 Mail.defaults do
@@ -571,7 +592,7 @@ Mail::TestMailer.deliveries.clear
 
 There is also a set of RSpec matchers stolen fr^H^H^H^H^H^H^H^H inspired by Shoulda's ActionMailer matchers (you'll want to set <code>delivery_method</code> as above too):
 
-```
+```ruby
 Mail.defaults do
   delivery_method :test # in practice you'd do this in spec_helper.rb
 end

data/Rakefile

@@ -1,4 +1,6 @@
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __FILE__)
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __FILE__)
+end
 require 'rubygems'
 require 'bundler/setup'
 
@@ -17,5 +19,11 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w(--backtrace --color)
 end
 
+begin
+  require "appraisal"
+rescue LoadError
+  warn "Appraisal is only available in test/development"
+end
+
 # load custom rake tasks
-Dir["#{File.dirname(__FILE__)}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].sort.each { |ext| load ext }

data/VERSION

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

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'

data/lib/mail/body.rb

@@ -127,9 +127,9 @@ module Mail
     def sort_parts!
       @parts.each do |p|
         p.body.set_sort_order(@part_sort_order)
-        @parts.sort!(@part_sort_order)
         p.body.sort_parts!
       end
+      @parts.sort!(@part_sort_order)
     end
     
     # Returns the raw source that the body was initialized with, without
@@ -257,7 +257,7 @@ module Mail
     
     def split!(boundary)
       self.boundary = boundary
-      parts = raw_source.split(/(?:\A|\r\n)--#{Regexp.escape(boundary)}(?=(?:--)?\s*$)/)
+      parts = raw_source.split(/(?:\A|\r\n)--#{Regexp.escape(boundary || "")}(?=(?:--)?\s*$)/)
       # Make the preamble equal to the preamble (if any)
       self.preamble = parts[0].to_s.strip
       # Make the epilogue equal to the epilogue (if any)

data/lib/mail/check_delivery_params.rb

@@ -1,57 +1,20 @@
 module Mail
-  module CheckDeliveryParams #:nodoc:
-    class << self
-      def check(mail)
-        [ check_from(mail.smtp_envelope_from),
-          check_to(mail.smtp_envelope_to),
-          check_message(mail) ]
+  module CheckDeliveryParams
+    def check_delivery_params(mail)
+      if mail.smtp_envelope_from.blank?
+        raise ArgumentError.new('An SMTP From address is required to send a message. Set the message smtp_envelope_from, return_path, sender, or from address.')
       end
 
-      def check_from(addr)
-        if addr.blank?
-          raise ArgumentError, "SMTP From address may not be blank: #{addr.inspect}"
-        end
-
-        check_addr 'From', addr
-      end
-
-      def check_to(addrs)
-        if addrs.blank?
-          raise ArgumentError, "SMTP To address may not be blank: #{addrs.inspect}"
-        end
-
-        Array(addrs).map do |addr|
-          check_addr 'To', addr
-        end
+      if mail.smtp_envelope_to.blank?
+        raise ArgumentError.new('An SMTP To address is required to send a message. Set the message smtp_envelope_to, to, cc, or bcc address.')
       end
 
-      def check_addr(addr_name, addr)
-        validate_smtp_addr addr do |error_message|
-          raise ArgumentError, "SMTP #{addr_name} address #{error_message}: #{addr.inspect}"
-        end
+      message = mail.encoded if mail.respond_to?(:encoded)
+      if message.blank?
+        raise ArgumentError.new('An encoded message is required to send an email')
       end
 
-      def validate_smtp_addr(addr)
-        if addr.bytesize > 2048
-          yield 'may not exceed 2kB'
-        end
-
-        if /[\r\n]/ =~ addr
-          yield 'may not contain CR or LF line breaks'
-        end
-
-        addr
-      end
-
-      def check_message(message)
-        message = message.encoded if message.respond_to?(:encoded)
-
-        if message.blank?
-          raise ArgumentError, 'An encoded message is required to send an email'
-        end
-
-        message
-      end
+      [mail.smtp_envelope_from, mail.smtp_envelope_to, message]
     end
   end
 end

data/lib/mail/core_extensions/string.rb

@@ -1,11 +1,21 @@
 # encoding: utf-8
 class String #:nodoc:
+
+  if RUBY_VERSION >= '1.9'
+    # This 1.9 only regex can save a reasonable amount of time (~20%)
+    # by not matching "\r\n" so the string is returned unchanged in
+    # the common case.
+    CRLF_REGEX = Regexp.new("(?<!\r)\n|\r(?!\n)")
+  else
+    CRLF_REGEX = /\n|\r\n|\r/
+  end
+
   def to_crlf
-    to_str.gsub(/\n|\r\n|\r/) { "\r\n" }
+    to_str.gsub(CRLF_REGEX, "\r\n")
   end
 
   def to_lf
-    to_str.gsub(/\n|\r\n|\r/) { "\n" }
+    to_str.gsub(/\r\n|\r/, "\n")
   end
 
   unless String.instance_methods(false).map {|m| m.to_sym}.include?(:blank?)

data/lib/mail/elements/address.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mail
   class Address
-    
+
     include Mail::Utilities
     
     # Mail::Address handles all email addresses in Mail.  It takes an email address string
@@ -22,21 +22,19 @@ module Mail
     #  a.to_s         #=> 'Mikel Lindsaar <mikel@test.lindsaar.net> (My email address)'
     def initialize(value = nil)
       @output_type = :decode
-      @tree = nil
-      @raw_text = value
-      case
-      when value.nil?
+      if value.nil?
         @parsed = false
+        @data = nil
         return
       else
         parse(value)
       end
     end
     
-    # Returns the raw imput of the passed in string, this is before it is passed
+    # Returns the raw input of the passed in string, this is before it is passed
     # by the parser.
     def raw
-      @raw_text
+      @data.raw
     end
 
     # Returns a correctly formatted address for the email going out.  If given
@@ -48,15 +46,14 @@ module Mail
     #  a.format #=> 'Mikel Lindsaar <mikel@test.lindsaar.net> (My email address)'
     def format
       parse unless @parsed
-      case
-      when tree.nil?
+      if @data.nil?
         ''
-      when display_name
+      elsif display_name
         [quote_phrase(display_name), "<#{address}>", format_comments].compact.join(" ")
-      when address
+      elsif address
         [address, format_comments].compact.join(" ")
       else
-        tree.text_value
+        raw
       end
     end
 
@@ -106,7 +103,7 @@ module Mail
     #  a.local #=> 'mikel'
     def local
       parse unless @parsed
-      "#{obs_domain_list}#{get_local.strip}" if get_local
+      "#{@data.obs_domain_list}#{get_local.strip}" if get_local
     end
 
     # Returns the domain part (the right hand side of the @ sign in the email address) of
@@ -174,29 +171,24 @@ module Mail
     
     def parse(value = nil)
       @parsed = true
-      case
-      when value.nil?
+
+      case value
+      when NilClass
+        @data = nil
         nil
-      when value.class == String
-        self.tree = Mail::AddressList.new(value).address_nodes.first
-      else
-        self.tree = value
+      when Mail::Parsers::AddressStruct
+        @data = value
+      when String
+        @raw_text = value
+        if value.blank?
+          @data = nil
+        else
+          address_list = Mail::Parsers::AddressListsParser.new.parse(value)
+          @data = address_list.addresses.first
+        end
       end
     end
     
-    
-    def get_domain
-      if tree.respond_to?(:angle_addr) && tree.angle_addr.respond_to?(:addr_spec) && tree.angle_addr.addr_spec.respond_to?(:domain)
-        @domain_text ||= tree.angle_addr.addr_spec.domain.text_value.strip
-      elsif tree.respond_to?(:domain)
-        @domain_text ||= tree.domain.text_value.strip
-      elsif tree.respond_to?(:addr_spec) && tree.addr_spec.respond_to?(:domain)
-        tree.addr_spec.domain.text_value.strip
-      else
-        nil
-      end
-    end
-
     def strip_all_comments(string)
       unless comments.blank?
         comments.each do |comment|
@@ -209,7 +201,7 @@ module Mail
     def strip_domain_comments(value)
       unless comments.blank?
         comments.each do |comment|
-          if get_domain && get_domain.include?("(#{comment})")
+          if @data.domain && @data.domain.include?("(#{comment})")
             value = value.gsub("(#{comment})", '')
           end
         end
@@ -217,20 +209,11 @@ module Mail
       value.to_s.strip
     end
     
-    def get_comments
-      if tree.respond_to?(:comments)
-        @comments = tree.comments.map { |c| unparen(c.text_value.to_str) } 
-      else
-        @comments = []
-      end
-    end
-    
     def get_display_name
-      if tree.respond_to?(:display_name)
-        name = unquote(tree.display_name.text_value.strip)
-        str = strip_all_comments(name.to_s)
-      elsif comments
-        if domain
+      if @data.display_name
+        str = strip_all_comments(@data.display_name.to_s)
+      elsif @data.comments
+        if @data.domain
           str = strip_domain_comments(format_comments)
         else
           str = nil
@@ -263,15 +246,6 @@ module Mail
       end
     end
     
-    # Provides access to the Treetop parse tree for this address
-    def tree
-      @tree
-    end
-    
-    def tree=(value)
-      @tree = value
-    end
-    
     def format_comments
       if comments
         comment_text = comments.map {|c| escape_paren(c) }.join(' ').squeeze(" ")
@@ -280,35 +254,17 @@ module Mail
         nil
       end
     end
-   
-    def obs_domain_list
-      if tree.respond_to?(:angle_addr)
-        obs = tree.angle_addr.elements.select { |e| e.respond_to?(:obs_domain_list) }
-        !obs.empty? ? obs.first.text_value : nil
-      else
-        nil
-      end
-    end
-    
+
     def get_local
-      case
-      when tree.respond_to?(:local_dot_atom_text)
-        tree.local_dot_atom_text.text_value
-      when tree.respond_to?(:angle_addr) && tree.angle_addr.respond_to?(:addr_spec) && tree.angle_addr.addr_spec.respond_to?(:local_part)
-        tree.angle_addr.addr_spec.local_part.text_value
-      when tree.respond_to?(:addr_spec) && tree.addr_spec.respond_to?(:local_part)
-        tree.addr_spec.local_part.text_value
-      when tree.respond_to?(:angle_addr) && tree.angle_addr.respond_to?(:addr_spec) && tree.angle_addr.addr_spec.respond_to?(:local_dot_atom_text)
-        # Ignore local dot atom text when in angle brackets
-        nil
-      when tree.respond_to?(:addr_spec) && tree.addr_spec.respond_to?(:local_dot_atom_text)
-        # Ignore local dot atom text when in angle brackets
-        nil
-      else
-        tree && tree.respond_to?(:local_part) ? tree.local_part.text_value : nil
-      end
+      @data && @data.local
+    end
+
+    def get_domain
+      @data && @data.domain
     end
     
- 
+    def get_comments
+      @data && @data.comments
+    end
   end
 end