mail 1.2.8 → 1.2.9

data/Rakefile

@@ -1,3 +1,8 @@
+environment = File.expand_path('../../vendor/gems/environment')
+if File.exist?("#{environment}.rb")
+  require environment
+end
+
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/testtask'
@@ -7,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "1.2.8"
+  s.version     = "1.2.9"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"
@@ -44,7 +49,11 @@ Spec::Rake::SpecTask.new(:rcov) do |t|
 end
 
 Spec::Rake::SpecTask.new(:spec) do |t|
+  t.warning = true
   t.spec_files = FileList['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::TestTask.new(:test) do |t|

data/lib/mail.rb

@@ -2,17 +2,15 @@
 module Mail # :doc:
 
   require 'date'
-  
+
   require 'treetop'
   require 'active_support'
-  require 'active_support'
-  
+
   # Have to handle ActiveSupport 2.3 and 3.0
   # Following two lines make sure that HashWithIndifferentAccess is available
   # regardless of having activesupport 3 or 2.3 loaded
   require 'active_support/core_ext/hash/indifferent_access'
-  HashWithIndifferentAccess 
-  
+
   require 'uri'
   require 'net/smtp'
   require 'mime/types'
@@ -29,7 +27,14 @@ module Mail # :doc:
   end
 
   require File.join(dir_name, 'version')
-  require File.join(dir_name, 'core_extensions')
+  begin
+    require 'active_support/core_ext/object/blank'
+  rescue LoadError
+    # Unneeded for Active Support <= 3.0.pre
+  end
+  require File.join(dir_name, 'core_extensions/nil')
+  require File.join(dir_name, 'core_extensions/string')
+
   require File.join(dir_name, 'patterns')
   require File.join(dir_name, 'utilities')
   require File.join(dir_name, 'configuration')

data/lib/mail/body.rb

@@ -32,9 +32,32 @@ module Mail
       else
         @raw_source = string
       end
+      @encoding = nil
       set_charset
     end
     
+    # Matches this body with another body.  Also matches the decoded value of this
+    # body with a string.
+    # 
+    # Examples:
+    # 
+    #   body = Mail::Body.new('The body')
+    #   body == body #=> true
+    #   
+    #   body = Mail::Body.new('The body')
+    #   body == 'The body' #=> true
+    #   
+    #   body = Mail::Body.new("VGhlIGJvZHk=\n")
+    #   body.encoding = 'base64'
+    #   body == "The body" #=> true
+    def ==(other)
+      if other.class == String
+        self.decoded == other
+      else
+        self.eql?(other)
+      end
+    end
+    
     # Returns the raw source that the body was initialized with, without
     # any tampering
     def raw_source
@@ -155,4 +178,4 @@ module Mail
       raw_source.ascii_only? ? @charset = 'US-ASCII' : @charset = nil
     end
   end
-end
+end

data/lib/mail/core_extensions/nil.rb

@@ -1,14 +1,10 @@
 # encoding: utf-8
 
 class NilClass #:nodoc:
-  def blank?
-    true
-  end
-  
   def to_crlf
     ''
   end
-  
+
   def to_lf
     ''
   end

data/lib/mail/core_extensions/string.rb

@@ -1,23 +1,19 @@
 # encoding: utf-8
 class String #:nodoc:
-  
   def to_crlf
-    self.gsub(/\n|\r\n|\r/) { "\r\n" }
+    gsub(/\n|\r\n|\r/) { "\r\n" }
   end
 
   def to_lf
-    self.gsub(/\n|\r\n|\r/) { "\n" }
+    gsub(/\n|\r\n|\r/) { "\n" }
   end
 
-  if RUBY_VERSION <= "1.9"
-
+  unless method_defined?(:ascii_only?)
     # Provides all strings with the Ruby 1.9 method of .ascii_only? and
     # returns true or false
     US_ASCII_REGEXP = %Q{\x00-\x7f}
     def ascii_only?
       !(self =~ /[^#{US_ASCII_REGEXP}]/)
     end
-    
   end
-  
-end
+end

data/lib/mail/encodings/encodings.rb

@@ -116,6 +116,7 @@ module Mail
         output
       elsif original_encoding && to_encoding
         begin
+          require 'iconv'
           Iconv.iconv(to_encoding, original_encoding, output).first
         rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL
           # the 'from' parameter specifies a charset other than what the text
@@ -193,4 +194,4 @@ module Mail
     end
     
   end
-end
+end

data/lib/mail/message.rb

@@ -49,6 +49,7 @@ module Mail
     
     # Creates a new Mail::Message object through .new
     def initialize(*args, &block)
+      @body = nil
 
       if args.flatten.first.respond_to?(:each_pair)
         init_with_hash(args.flatten.first)

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 +11:00
+date: 2009-11-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.3"
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -69,10 +69,8 @@ files:
 - lib/mail/attachment.rb
 - lib/mail/body.rb
 - lib/mail/configuration.rb
-- lib/mail/core_extensions/blank.rb
 - lib/mail/core_extensions/nil.rb
 - lib/mail/core_extensions/string.rb
-- lib/mail/core_extensions.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
 - lib/mail/elements/content_disposition_element.rb

data/lib/mail/core_extensions.rb

@@ -1,6 +0,0 @@
-# encoding: utf-8
-module Mail
-  require File.join(File.dirname(__FILE__), 'core_extensions/blank')
-  require File.join(File.dirname(__FILE__), 'core_extensions/nil')
-  require File.join(File.dirname(__FILE__), 'core_extensions/string')
-end

data/lib/mail/core_extensions/blank.rb

@@ -1,41 +0,0 @@
-# encoding: utf-8
-#:nodoc:
-# From the nice guys at rubyonrails.org -> ActiveSupport
-class ::Object
-  # An object is blank if it's nil, empty, or a whitespace string.
-  # For example, "", "   ", nil, [], and {} are blank.
-  #
-  # This simplifies
-  #   if !address.nil? && !address.empty?
-  # to
-  #   if !address.blank?
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end
-
-class FalseClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class TrueClass #:nodoc:
-  def blank?
-    false
-  end
-end
-
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end