mail 2.6.3 → 2.6.4.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3af499471587d4cb917ab992eb4bb45f19b9579e
-  data.tar.gz: f05e6aaf887b9a79b9252e7edc2dd74b81f7cb6c
+  metadata.gz: 9294e13f17b710d1817da0765d4f366904f79b0a
+  data.tar.gz: 7c7e6bb27d50e7d0a77aeff4b0024a575950fa6e
 SHA512:
-  metadata.gz: 75bb13148f71ffbbef303ca23f01b0c6c8a14aeea255bd528ba3ac0545c056b75ff3a420dc0578c7f15efd894a3367072496121c8479aa8ddc78e376c115168f
-  data.tar.gz: 0f26c569a7c210d3ee57d95cf5011f8ff4941f5c1cd054ef804f018aa829bec44db3fdde7ab2fe1a89056cf81a5e6d618735caaaf9ccf4e8810e4295256f012e
+  metadata.gz: 21c9ad8d24e777f6eb598f91f26502d9a22e8ee7477d222b58a5d08d33cb395e0fbe7423ef4d55b28b41a0829a081f2f489e9b5ab60b3a5aa6f5a3dcb6d91460
+  data.tar.gz: ee66d0c7ad442f39ecc5a383098d156309faf9ee231197e9a7cac7899f7b286d234d2de83a170c4069699650c75d21f74c0eff4cd369473d2b0dba5ceb426c38

data/CHANGELOG.rdoc

@@ -1,5 +1,27 @@
 == HEAD
 
+Features:
+* #772 - Normalize encoding matchers (grosser)
+* #775 - Avoid failed encodings / stop bad charsets early (grosser)
+* #782 – Make the gem compatible with Rubinius (robin850)
+* #865 - Allow a body with an invalid encoding to be round tripped (kjg)
+* #866 - Support decoding message bodies with non-Ruby-standard charsets (jeremy)
+* #868 - Use the Ruby19.charset_encoder when decoding message bodies (kjg)
+* #872 - Low-level option to include BCC field in the encoded message (grossadamm)
+* #901 - Allow mail.text_part = '…' and mail.html_part = '<p>…</p>' (taavo)
+* #924 - Matcher for having attachments (schepedw)
+
+Bugs:
+* #719 - Fix to not extract header content that looks like its field name (kjg)
+* #789 - Fix encoding collapsing not dealing with multiple encodings in 1 line (grosser)
+* #808 - Mail::Field correctly responds_to? the methods of its instantiated field (thegcat)
+* #849 - Handle calling Part#inline? when the Content-Disposition field couldn't be parsed (kjg)
+* #874 – Stay under 1000-char SMTP line length limits (pushrax)
+* #877 - Make Mail::Field == other take the field value into account (kjg)
+* #907 - Mail::ContentDispositionField should work with nil value (kjg)
+* #910 - Mail::Address should handle b_value_encoded local and domain parts (kjg)
+* #918 - Account for possibility of absent delivery-status headers (kjg)
+
 == Version 2.6.3 - Mon Nov 3 23:53 +1100 2014 Mikel Lindsaar <mikel@reinteractive.net>
 
 * #796 support uu encoding (grosser)

data/Gemfile

@@ -5,11 +5,8 @@ gemspec
 gem "tlsmail", "~> 0.0.1" if RUBY_VERSION <= "1.8.6"
 gem "jruby-openssl", :platforms => :jruby
 
-group :development, :test do
-  gem "appraisal", "~> 1.0"
-end
-
 # For gems not required to run tests
 group :local_development, :test do
+  gem "appraisal", "~> 1.0" unless RUBY_VERSION <= "1.8.7"
   gem "ruby-debug", :platforms => :mri_18
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2013 Mikel Lindsaar
+Copyright (c) 2009-2015 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -110,6 +110,8 @@ the gem gets released.
 
 It also means you can be sure Mail will behave correctly.
 
+Note: If you care about core extensions (aka "monkey-patching"), please read the Core Extensions section near the end of this README.
+
 API Policy
 ----------
 
@@ -588,7 +590,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):
+There is also a set of RSpec matchers stolen/inspired by Shoulda's ActionMailer matchers (you'll want to set <code>delivery_method</code> as above too):
 
 ```ruby
 Mail.defaults do
@@ -634,9 +636,43 @@ describe "sending an email" do
   # Note that apart from recipients, repeating a modifier overwrites old value.
 
   it { should have_sent_email.from('you@you.com').to('mike1@me.com').matching_body(/hell/)
+
+  # test for attachments
+
+  # ... by specific attachment
+  it { should_have_sent_email.with_attachments(my_attachment) }
+
+  # ... or any attachment
+  it { should_have_sent_email.with_attachments(any_attachment) }
+
+  # ... by array of attachments
+  it { should_have_sent_email.with_attachments([my_attachment1, my_attachment2]) } #note that order is important
+
+  #... by presence
+  it { should_have_sent_email.with_any_attachments }
+
+  #... or by absence
+  it { should_have_sent_email.with_no_attachments }
+
 end
 ```
 
+Core Extensions
+---------------
+
+The mail gem adds several constants and methods to Ruby's core objects (similar to the activesupport gem from the Rails project).  For example:
+
+    NilClass::blank?
+    NilClass::to_crlf
+    NilClass::to_lf
+    Object::blank?
+    String::to_crlf
+    String::to_lf
+    String::blank?
+    ...etc...
+
+For all the details, check out lib/mail/core_extensions/.
+
 Excerpts from TREC Spam Corpus 2005
 -----------------------------------
 
@@ -661,7 +697,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2013 Mikel Lindsaar
+Copyright (c) 2009-2015 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -21,8 +21,8 @@ end
 
 begin
   require "appraisal"
-rescue LoadError
-  warn "Appraisal is only available in test/development"
+rescue LoadError, SyntaxError
+  warn "Appraisal is only available in test/development on Ruby 1.9+"
 end
 
 # load custom rake tasks

data/lib/mail.rb

@@ -6,7 +6,13 @@ module Mail # :doc:
 
   require 'uri'
   require 'net/smtp'
-  require 'mime/types'
+
+  begin
+    # Use mime/types/columnar if available, for reduced memory usage
+    require 'mime/types/columnar'
+  rescue LoadError
+    require 'mime/types'
+  end
 
   if RUBY_VERSION <= '1.8.6'
     begin
@@ -27,7 +33,6 @@ module Mail # :doc:
   require 'mail/version'
 
   require 'mail/core_extensions/nil'
-  require 'mail/core_extensions/object'
   require 'mail/core_extensions/string'
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
   require 'mail/indifferent_hash'
@@ -86,6 +91,7 @@ module Mail # :doc:
   require 'mail/encodings/unix_to_unix'
 
   require 'mail/matchers/has_sent_mail'
+  require 'mail/matchers/attachment_matchers.rb'
 
   # Finally... require all the Mail.methods
   require 'mail/mail'

data/lib/mail/body.rb

@@ -33,7 +33,7 @@ module Mail
       @charset  = nil
       @part_sort_order = [ "text/plain", "text/enriched", "text/html" ]
       @parts = Mail::PartsList.new
-      if string.blank?
+      if Utilities.blank?(string)
         @raw_source = ''
       else
         # Do join first incase we have been given an Array in Ruby 1.9
@@ -156,7 +156,7 @@ module Mail
         be = get_best_encoding(transfer_encoding)
         dec = Mail::Encodings::get_encoding(encoding)
         enc = Mail::Encodings::get_encoding(be)
-        if transfer_encoding == encoding and dec.nil?
+        if dec.nil?
             # Cannot decode, so skip normalization
             raw_source
         else
@@ -201,7 +201,7 @@ module Mail
     end
     
     def encoding=( val )
-      @encoding = if val == "text" || val.blank?
+      @encoding = if val == "text" || Utilities.blank?(val)
           (only_us_ascii? ? '7bit' : '8bit')
       else
           val
@@ -291,7 +291,7 @@ module Mail
         (?=\s*$)                              # lookahead matching zero or more spaces followed by line-ending
       /x
       parts = raw_source.split(parts_regex).each_slice(2).to_a
-      parts.each_with_index { |(part, _), index| parts.delete_at(index) if index > 0 && part.blank? }
+      parts.each_with_index { |(part, _), index| parts.delete_at(index) if index > 0 && Utilities.blank?(part) }
 
       if parts.size > 1
         final_separator = parts[-2][1]

data/lib/mail/check_delivery_params.rb

@@ -1,16 +1,16 @@
 module Mail
   module CheckDeliveryParams
     def check_delivery_params(mail)
-      if mail.smtp_envelope_from.blank?
+      if Utilities.blank?(mail.smtp_envelope_from)
         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
 
-      if mail.smtp_envelope_to.blank?
+      if Utilities.blank?(mail.smtp_envelope_to)
         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
 
       message = mail.encoded if mail.respond_to?(:encoded)
-      if message.blank?
+      if Utilities.blank?(message)
         raise ArgumentError.new('An encoded message is required to send an email')
       end
 

data/lib/mail/constants.rb

@@ -33,7 +33,8 @@ module Mail
     ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{sp}]/n
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
     TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{sp}]/n
-    ENCODED_VALUE = /\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi
+    ENCODED_VALUE = /\=\?([^?]+)\?([QB])\?[^?]*?\?\=/mi
+    FULL_ENCODED_VALUE = /(\=\?[^?]+\?[QB]\?[^?]*?\?\=)/mi
 
     EMPTY          = ''
     SPACE          = ' '

data/lib/mail/core_extensions/nil.rb

@@ -3,12 +3,6 @@
 # This is not loaded if ActiveSupport is already loaded
 
 class NilClass #:nodoc:
-  unless nil.respond_to? :blank?
-    def blank?
-      true
-    end
-  end
-
   def to_crlf
     ''
   end

data/lib/mail/core_extensions/string.rb

@@ -21,12 +21,6 @@ class String #:nodoc:
     to_str.gsub(/\r\n|\r/, LF)
   end
 
-  unless String.instance_methods(false).map {|m| m.to_sym}.include?(:blank?)
-    def blank?
-      self !~ /\S/
-    end
-  end
-
   unless method_defined?(:ascii_only?)
     # Backport from Ruby 1.9 checks for non-us-ascii characters.
     def ascii_only?

data/lib/mail/elements/address.rb

@@ -102,7 +102,7 @@ module Mail
     #  a.local #=> 'mikel'
     def local
       parse unless @parsed
-      "#{@data.obs_domain_list}#{get_local.strip}" if get_local
+      Encodings.decode_encode("#{@data.obs_domain_list}#{get_local.strip}", @output_type) if get_local
     end
 
     # Returns the domain part (the right hand side of the @ sign in the email address) of
@@ -112,7 +112,7 @@ module Mail
     #  a.domain #=> 'test.lindsaar.net'
     def domain
       parse unless @parsed
-      strip_all_comments(get_domain) if get_domain
+      Encodings.decode_encode(strip_all_comments(get_domain), @output_type) if get_domain
     end
 
     # Returns an array of comments that are in the email, or an empty array if there
@@ -176,7 +176,7 @@ module Mail
       when Mail::Parsers::AddressStruct
         @data = value
       when String
-        unless value.blank?
+        unless Utilities.blank?(value)
           address_list = Mail::Parsers::AddressListsParser.new.parse(value)
           @data = address_list.addresses.first
         end
@@ -184,7 +184,7 @@ module Mail
     end
 
     def strip_all_comments(string)
-      unless comments.blank?
+      unless Utilities.blank?(comments)
         comments.each do |comment|
           string = string.gsub("(#{comment})", EMPTY)
         end
@@ -193,7 +193,7 @@ module Mail
     end
 
     def strip_domain_comments(value)
-      unless comments.blank?
+      unless Utilities.blank?(comments)
         comments.each do |comment|
           if @data.domain && @data.domain.include?("(#{comment})")
             value = value.gsub("(#{comment})", EMPTY)
@@ -210,7 +210,7 @@ module Mail
         str = strip_domain_comments(format_comments)
       end
 
-      str unless str.blank?
+      str unless Utilities.blank?(str)
     end
 
     def get_name
@@ -220,7 +220,7 @@ module Mail
         str = "(#{comments.join(SPACE).squeeze(SPACE)})"
       end
 
-      unparen(str) unless str.blank?
+      unparen(str) unless Utilities.blank?(str)
     end
 
     def format_comments

data/lib/mail/encodings.rb

@@ -47,7 +47,15 @@ module Mail
     end
 
     def Encodings.get_name(enc)
-      enc = underscoreize(enc).downcase
+      underscoreize(enc).downcase
+    end
+
+    def Encodings.transcode_charset(str, from_charset, to_charset = 'UTF-8')
+      if from_charset
+        RubyVer.transcode_charset str, from_charset, to_charset
+      else
+        str
+      end
     end
 
     # Encodes a parameter value using URI Escaping, note the language field 'en' can
@@ -121,7 +129,7 @@ module Mail
       # Split on white-space boundaries with capture, so we capture the white-space as well
       lines.each do |line|
         line.gsub!(ENCODED_VALUE) do |string|
-          case $1
+          case $2
           when *B_VALUES then b_value_decode(string)
           when *Q_VALUES then q_value_decode(string)
           end
@@ -240,27 +248,13 @@ module Mail
       RubyVer.q_value_decode(str)
     end
 
-    def Encodings.split_encoding_from_string( str )
-      match = str.match(/\=\?([^?]+)?\?[QB]\?(.*)\?\=/mi)
-      if match
-        match[1]
-      else
-        nil
-      end
-    end
-
     def Encodings.find_encoding(str)
       RUBY_VERSION >= '1.9' ? str.encoding : $KCODE
     end
 
     # Gets the encoding type (Q or B) from the string.
-    def Encodings.split_value_encoding_from_string(str)
-      match = str.match(/\=\?[^?]+?\?([QB])\?(.*)\?\=/mi)
-      if match
-        match[1]
-      else
-        nil
-      end
+    def Encodings.value_encoding_from_string(str)
+      str[ENCODED_VALUE, 1]
     end
 
     # When the encoded string consists of multiple lines, lines with the same
@@ -268,19 +262,22 @@ module Mail
     #
     # String has to be of the format =?<encoding>?[QB]?<string>?=
     def Encodings.collapse_adjacent_encodings(str)
-      lines = str.split(/(\?=)\s*(=\?)/).each_slice(2).map(&:join)
       results = []
       previous_encoding = nil
-
-      lines.each do |line|
-        encoding = split_value_encoding_from_string(line)
-
-        if encoding == previous_encoding
-          line = results.pop + line
+      lines = str.split(FULL_ENCODED_VALUE)
+      lines.each_slice(2) do |unencoded, encoded|
+        if encoded
+          encoding = value_encoding_from_string(encoded)
+          if encoding == previous_encoding && Utilities.blank?(unencoded)
+            results.last << encoded
+          else
+            results << unencoded unless unencoded == EMPTY
+            results << encoded
+          end
+          previous_encoding = encoding
+        else
+          results << unencoded
         end
-
-        previous_encoding = encoding
-        results << line
       end
 
       results

data/lib/mail/encodings/8bit.rb

@@ -25,6 +25,11 @@ module Mail
         1.0
       end
 
+      # Per RFC 2821 4.5.3.1, SMTP lines may not be longer than 1000 octets including the <CRLF>.
+      def self.compatible_input?(str)
+        !str.lines.find { |line| line.length > 998 }
+      end
+
       Encodings.register(NAME, self) 
     end
   end

data/lib/mail/encodings/base64.rb

@@ -27,6 +27,11 @@ module Mail
         4.0/3
       end
 
+      # Base64 inserts newlines automatically and cannot violate the SMTP spec.
+      def self.compatible_input?(str)
+        true
+      end
+
       Encodings.register(NAME, self)      
     end
   end

data/lib/mail/encodings/quoted_printable.rb

@@ -30,7 +30,12 @@ module Mail
         total = (str.bytesize - c)*3 + c
         total.to_f/str.bytesize
       end
-        
+
+      # QP inserts newlines automatically and cannot violate the SMTP spec.
+      def self.compatible_input?(str)
+        true
+      end
+
       private
 
       Encodings.register(NAME, self)