mail 2.3.3 → 2.4.0

data/Rakefile

@@ -21,9 +21,8 @@ end
 
 require File.expand_path('../spec/environment', __FILE__)
 
-require 'rake/rdoctask'
 require 'rake/testtask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc "Build a gem file"
 task :build do
@@ -32,34 +31,9 @@ end
 
 task :default => :spec
 
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_files = FileList['test/**/tc_*.rb', 'spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = t.rcov_opts << ['--exclude', '/Library,/opt,/System,/usr']
-end
-
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.warning = true
-  t.spec_files = FileList["#{File.dirname(__FILE__)}/spec/**/*_spec.rb"]
-  t.spec_opts = %w(--backtrace --diff --color)
-  t.libs << "#{File.dirname(__FILE__)}/spec"
-  t.libs << "#{File.dirname(__FILE__)}/spec/mail"
-end
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Mail - A Ruby Mail Library'
-
-  rdoc.options << '-c' << 'utf-8'
-  rdoc.options << '--line-numbers'
-  rdoc.options << '--inline-source'
-  rdoc.options << '-m' << 'README.rdoc'
-
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('lib/network/**/*.rb')
-  rdoc.rdoc_files.exclude('lib/parsers/*')
-
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.ruby_opts = '-w'
+  t.rspec_opts = %w(--backtrace --color)
 end
 
 # load custom rake tasks

data/lib/VERSION

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

data/lib/mail.rb

@@ -29,7 +29,7 @@ module Mail # :doc:
   require 'mail/core_extensions/nil'
   require 'mail/core_extensions/object'
   require 'mail/core_extensions/string'
-  require 'mail/core_extensions/shell_escape'
+  require 'mail/core_extensions/shellwords' unless String.new.respond_to?(:shellescape)
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
   require 'mail/indifferent_hash'
 
@@ -84,6 +84,8 @@ module Mail # :doc:
   require 'mail/encodings/base64'
   require 'mail/encodings/quoted_printable'
 
+  require 'mail/matchers/has_sent_mail'
+
   # Finally... require all the Mail.methods
   require 'mail/mail'
 end

data/lib/mail/attachments_list.rb

@@ -94,10 +94,9 @@ module Mail
     def set_mime_type(filename)
       # Have to do this because MIME::Types is not Ruby 1.9 safe yet
       if RUBY_VERSION >= '1.9'
-        new_file = String.new(filename).force_encoding(Encoding::BINARY)
-        ext = new_file.split('.'.force_encoding(Encoding::BINARY)).last
-        filename = "file.#{ext}".force_encoding('US-ASCII')
+         filename   = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
       end
+
       @mime_type = MIME::Types.type_for(filename).first
     end
 

data/lib/mail/body.rb

@@ -267,8 +267,7 @@ module Mail
     end
     
     def only_us_ascii?
-      raw_source.each_byte {|b| return false if (b == 0 || b > 127)}
-      true
+      !(raw_source =~ /[^\x01-\x7f]/)
     end
     
     def empty?

data/lib/mail/configuration.rb

@@ -5,10 +5,10 @@
 require 'singleton'
 
 module Mail
-  
+
   # The Configuration class is a Singleton used to hold the default
   # configuration for all Mail objects.
-  # 
+  #
   # Each new mail object gets a copy of these values at initialization
   # which can be overwritten on a per mail object basis.
   class Configuration
@@ -50,7 +50,7 @@ module Mail
       return @retriever_method if @retriever_method && method.nil?
       @retriever_method = lookup_retriever_method(method).new(settings)
     end
-    
+
     def lookup_retriever_method(method)
       case method
       when nil

data/lib/mail/core_extensions/nil.rb

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

data/lib/mail/core_extensions/shellwords.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+# The following is imported from ruby 1.9.2 shellwords.rb
+#
+module Shellwords
+  # Escapes a string so that it can be safely used in a Bourne shell
+  # command line.
+  #
+  # Note that a resulted string should be used unquoted and is not
+  # intended for use in double quotes nor in single quotes.
+  #
+  #   open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
+  #     # ...
+  #   }
+  #
+  # +String#shellescape+ is a shorthand for this function.
+  #
+  #   open("| grep #{pattern.shellescape} file") { |pipe|
+  #     # ...
+  #   }
+  #
+  def shellescape(str)
+    # An empty argument will be skipped, so return empty quotes.
+    return "''" if str.empty?
+
+    str = str.dup
+
+    # Process as a single byte sequence because not all shell
+    # implementations are multibyte aware.
+    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+
+    # A LF cannot be escaped with a backslash because a backslash + LF
+    # combo is regarded as line continuation and simply ignored.
+    str.gsub!(/\n/, "'\n'")
+
+    return str
+  end
+
+  module_function :shellescape
+
+  class << self
+    alias escape shellescape
+  end
+
+end
+
+class String
+  # call-seq:
+  #   str.shellescape => string
+  #
+  # Escapes +str+ so that it can be safely used in a Bourne shell
+  # command line.  See +Shellwords::shellescape+ for details.
+  #
+  def shellescape
+    Shellwords.escape(self)
+  end
+end

data/lib/mail/core_extensions/string.rb

@@ -1,15 +1,17 @@
 # encoding: utf-8
 class String #:nodoc:
   def to_crlf
-    gsub(/\n|\r\n|\r/) { "\r\n" }
+    to_str.gsub(/\n|\r\n|\r/) { "\r\n" }
   end
 
   def to_lf
-    gsub(/\n|\r\n|\r/) { "\n" }
+    to_str.gsub(/\n|\r\n|\r/) { "\n" }
   end
 
-  def blank?
-    self !~ /\S/
+  unless String.instance_methods(false).map {|m| m.to_sym}.include?(:blank?)
+    def blank?
+      self !~ /\S/
+    end
   end
 
   unless method_defined?(:ascii_only?)

data/lib/mail/core_extensions/string/access.rb

@@ -101,4 +101,45 @@ class String
       end
     end
   end
+
+  if Module.method(:const_get).arity == 1
+    # Tries to find a constant with the name specified in the argument string:
+    #
+    #   "Module".constantize     # => Module
+    #   "Test::Unit".constantize # => Test::Unit
+    #
+    # The name is assumed to be the one of a top-level constant, no matter whether
+    # it starts with "::" or not. No lexical context is taken into account:
+    #
+    #   C = 'outside'
+    #   module M
+    #     C = 'inside'
+    #     C               # => 'inside'
+    #     "C".constantize # => 'outside', same as ::C
+    #   end
+    #
+    # NameError is raised when the name is not in CamelCase or the constant is
+    # unknown.
+    def constantize
+      names = self.split('::')
+      names.shift if names.empty? || names.first.empty?
+
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+      end
+      constant
+    end
+  else
+    def constantize #:nodoc:
+      names = self.split('::')
+      names.shift if names.empty? || names.first.empty?
+
+      constant = Object
+      names.each do |name|
+        constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
+      end
+      constant
+    end
+  end
 end

data/lib/mail/encodings.rb

@@ -181,7 +181,7 @@ module Mail
       return address if address.ascii_only? or charset.nil?
       us_ascii = %Q{\x00-\x7f}
       # Encode any non usascii strings embedded inside of quotes
-      address.gsub!(/(".*?[^#{us_ascii}].+?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
+      address.gsub!(/(".*?[^#{us_ascii}].*?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
       # Then loop through all remaining items and encode as needed
       tokens = address.split(/\s/)
       map_with_index(tokens) do |word, i|
@@ -204,9 +204,9 @@ module Mail
     #
     #  Encodings.b_value_encode('This is あ string', 'UTF-8')
     #  #=> "=?UTF-8?B?VGhpcyBpcyDjgYIgc3RyaW5n?="
-    def Encodings.b_value_encode(str, encoding = nil)
-      return str if str.to_s.ascii_only?
-      string, encoding = RubyVer.b_value_encode(str, encoding)
+    def Encodings.b_value_encode(encoded_str, encoding = nil)
+      return encoded_str if encoded_str.to_s.ascii_only?
+      string, encoding = RubyVer.b_value_encode(encoded_str, encoding)
       map_lines(string) do |str|
         "=?#{encoding}?B?#{str.chomp}?="
       end.join(" ")
@@ -219,9 +219,9 @@ module Mail
     #
     #  Encodings.q_value_encode('This is あ string', 'UTF-8')
     #  #=> "=?UTF-8?Q?This_is_=E3=81=82_string?="
-    def Encodings.q_value_encode(str, encoding = nil)
-      return str if str.to_s.ascii_only?
-      string, encoding = RubyVer.q_value_encode(str, encoding)
+    def Encodings.q_value_encode(encoded_str, encoding = nil)
+      return encoded_str if encoded_str.to_s.ascii_only?
+      string, encoding = RubyVer.q_value_encode(encoded_str, encoding)
       string.gsub!("=\r\n", '') # We already have limited the string to the length we want
       map_lines(string) do |str|
         "=?#{encoding}?Q?#{str.chomp.gsub(/ /, '_')}?="
@@ -247,7 +247,7 @@ module Mail
     #  Encodings.q_value_decode("=?UTF-8?Q?This_is_=E3=81=82_string?=")
     #  #=> 'This is あ string'
     def Encodings.q_value_decode(str)
-      RubyVer.q_value_decode(str).gsub(/_/, ' ')
+      RubyVer.q_value_decode(str)
     end
 
     def Encodings.split_encoding_from_string( str )

data/lib/mail/field.rb

@@ -113,6 +113,8 @@ module Mail
       match_to_s(other.name, field.name)
     end
     
+    alias_method :==, :same
+    
     def <=>( other )
       self_order = FIELD_ORDER.rindex(self.name.to_s.downcase) || 100
       other_order = FIELD_ORDER.rindex(other.name.to_s.downcase) || 100

data/lib/mail/fields/common/parameter_hash.rb

@@ -29,7 +29,7 @@ module Mail
         super(exact || key_name)
       else # Dealing with a multiple value pair or a single encoded value pair
         string = pairs.sort { |a,b| a.first.to_s <=> b.first.to_s }.map { |v| v.last }.join('')
-        if mt = string.match(/([\w\d\-]+)'(\w\w)'(.*)/)
+        if mt = string.match(/([\w\-]+)'(\w\w)'(.*)/)
           string = mt[3]
           encoding = mt[1]
         else

data/lib/mail/fields/unstructured_field.rb

@@ -166,7 +166,7 @@ module Mail
     end
         
     def encode(value)
-      value.encode!(charset) if defined?(Encoding) && charset
+      value.encode!(charset) if charset && value.respond_to?(:encode!)
       (value.not_ascii_only? ? [value].pack("M").gsub("=\n", '') : value).gsub("\r", "=0D").gsub("\n", "=0A")
     end
     

data/lib/mail/matchers/has_sent_mail.rb

@@ -0,0 +1,124 @@
+module Mail
+  module Matchers
+    def have_sent_email
+      HasSentEmailMatcher.new(self)
+    end
+
+    class HasSentEmailMatcher
+      def initialize(_context)
+      end
+
+      def matches?(subject)
+        matching_deliveries = filter_matched_deliveries(Mail::TestMailer.deliveries)
+        !(matching_deliveries.empty?)
+      end
+
+      def from(sender)
+        @sender = sender
+        self
+      end
+
+      def to(recipient_or_list)
+        @recipients ||= []
+
+        if recipient_or_list.kind_of?(Array)
+          @recipients += recipient_or_list
+        else
+          @recipients << recipient_or_list
+        end
+        self
+      end
+
+      def with_subject(subject)
+        @subject = subject
+        self
+      end
+
+      def matching_subject(subject_matcher)
+        @subject_matcher = subject_matcher
+        self
+      end
+
+      def with_body(body)
+        @body = body
+        self
+      end
+
+      def matching_body(body_matcher)
+        @body_matcher = body_matcher
+        self
+      end
+
+      def description
+        result = "send a matching email"
+        result
+      end
+
+      def failure_message
+        result = "Expected email to be sent "
+        result += explain_expectations
+        result += dump_deliveries
+        result
+      end
+
+      def negative_failure_message
+        result = "Expected no email to be sent "
+        result += explain_expectations
+        result += dump_deliveries
+        result
+      end
+
+      protected
+      
+      def filter_matched_deliveries(deliveries)
+        candidate_deliveries = deliveries
+
+        %w(sender recipients subject subject_matcher body body_matcher).each do |modifier_name|
+          next unless instance_variable_defined?("@#{modifier_name}")
+          candidate_deliveries = candidate_deliveries.select{|matching_delivery| self.send("matches_on_#{modifier_name}?", matching_delivery)}
+        end
+
+        candidate_deliveries
+      end
+
+      def matches_on_sender?(delivery)
+        delivery.from.include?(@sender)
+      end
+
+      def matches_on_recipients?(delivery)
+        @recipients.all? {|recipient| delivery.to.include?(recipient) }
+      end
+
+      def matches_on_subject?(delivery)
+        delivery.subject == @subject
+      end
+
+      def matches_on_subject_matcher?(delivery)
+        @subject_matcher.match delivery.subject
+      end
+
+      def matches_on_body?(delivery)
+        delivery.body == @body
+      end
+
+      def matches_on_body_matcher?(delivery)
+        @body_matcher.match delivery.body.raw_source
+      end
+
+      def explain_expectations
+        result = ''
+        result += "from #{@sender} " if instance_variable_defined?('@sender')
+        result += "to #{@recipients.inspect} " if instance_variable_defined?('@recipients')
+        result += "with subject \"#{@subject}\" " if instance_variable_defined?('@subject')
+        result += "with subject matching \"#{@subject_matcher}\" " if instance_variable_defined?('@subject_matcher')
+        result += "with body \"#{@body}\" " if instance_variable_defined?('@body')
+        result += "with body matching \"#{@body_matcher}\" " if instance_variable_defined?('@body_matcher')
+        result
+      end
+
+      def dump_deliveries
+        "(actual deliveries: " + Mail::TestMailer.deliveries.inspect + ")"
+      end
+    end
+  end
+end