actionmailer 2.0.2 → 2.0.4

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/mail.rb

@@ -28,6 +28,23 @@
 # Note: Originally licensed under LGPL v2+. Using MIT license for Rails
 # with permission of Minero Aoki.
 #++
+# == TMail::Mail
+# === Class Methods
+#  
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+ 
 
 require 'tmail/interface'
 require 'tmail/encode'
@@ -162,6 +179,14 @@ module TMail
       @header.dup
     end
 
+    # Returns a TMail::AddressHeader object of the field you are querying.
+    # Examples:
+    #  @mail['from']  #=> #<TMail::AddressHeader "mikel@test.com.au">
+    #  @mail['to']    #=> #<TMail::AddressHeader "mikel@test.com.au">
+    #
+    # You can get the string value of this by passing "to_s" to the query:
+    # Example:
+    #  @mail['to'].to_s #=> "mikel@test.com.au"
     def []( key )
       @header[key.downcase]
     end
@@ -172,6 +197,19 @@ module TMail
 
     alias fetch []
 
+    # Allows you to set or delete TMail header objects at will.
+    # Eamples:
+    #  @mail = TMail::Mail.new
+    #  @mail['to'].to_s       # => 'mikel@test.com.au'
+    #  @mail['to'] = 'mikel@elsewhere.org'
+    #  @mail['to'].to_s       # => 'mikel@elsewhere.org'
+    #  @mail.encoded          # => "To: mikel@elsewhere.org\r\n\r\n"
+    #  @mail['to'] = nil
+    #  @mail['to'].to_s       # => nil
+    #  @mail.encoded          # => "\r\n"
+    # 
+    # Note: setting mail[] = nil actualy deletes the header field in question from the object,
+    # it does not just set the value of the hash to nil
     def []=( key, val )
       dkey = key.downcase
 
@@ -203,7 +241,14 @@ module TMail
     end
 
     alias store []=
-
+    
+    # Allows you to loop through each header in the TMail::Mail object in a block
+    # Example:
+    #   @mail['to'] = 'mikel@elsewhere.org'
+    #   @mail['from'] = 'me@me.com'
+    #   @mail.each_header { |k,v| puts "#{k} = #{v}" }
+    #   # => from = me@me.com
+    #   # => to = mikel@elsewhere.org
     def each_header
       @header.each do |key, val|
         [val].flatten.each {|v| yield key, v }

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/mailbox.rb

@@ -213,13 +213,13 @@ module TMail
               fromaddr(), TextUtils.time2str(File.mtime(port.filename))
     end
 
-    def UNIXMbox.fromaddr
+    def UNIXMbox.fromaddr(port)
       h = HeaderField.new_from_port(port, 'Return-Path') ||
-          HeaderField.new_from_port(port, 'From') or return 'nobody'
+      HeaderField.new_from_port(port, 'From') ||
+      HeaderField.new_from_port(port, 'EnvelopeSender') or return 'nobody'
       a = h.addrs[0] or return 'nobody'
       a.spec
     end
-    private_class_method :fromaddr
 
     def close
       return if @closed

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/net.rb

@@ -128,41 +128,6 @@ module TMail
               'using C.T.Encoding with multipart mail is not permitted'
       end
     end
-
-    def create_empty_mail
-      self.class.new(StringPort.new(''), @config)
-    end
-
-    def create_reply
-      setup_reply create_empty_mail()
-    end
-
-    def setup_reply( m )
-      if tmp = reply_addresses(nil)
-        m.to_addrs = tmp
-      end
-
-      mid = message_id(nil)
-      tmp = references(nil) || []
-      tmp.push mid if mid
-      m.in_reply_to = [mid] if mid
-      m.references = tmp unless tmp.empty?
-      m.subject = 'Re: ' + subject('').sub(/\A(?:\s*re:)+/i, '')
-
-      m
-    end
-
-    def create_forward
-      setup_forward create_empty_mail()
-    end
-
-    def setup_forward( mail )
-      m = Mail.new(StringPort.new(''))
-      m.body = decoded
-      m.set_content_type 'message', 'rfc822'
-      m.encoding = encoding('7bit')
-      mail.parts.push m
-    end
   
   end
 

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/quoting.rb

@@ -13,12 +13,12 @@ module TMail
       from_charset = sub_header("content-type", "charset")
       case (content_transfer_encoding || "7bit").downcase
         when "quoted-printable"
-          # the default charset is set to iso-8859-1 instead of 'us-ascii'. 
+          # the default charset is set to iso-8859-1 instead of 'us-ascii'.
           # This is needed as many mailer do not set the charset but send in ISO. This is only used if no charset is set.
           if !from_charset.blank? && from_charset.downcase == 'us-ascii'
             from_charset = 'iso-8859-1'
           end
-          
+
           Unquoter.unquote_quoted_printable_and_convert_to(quoted_body,
             to_charset, from_charset, true)
         when "base64"
@@ -35,9 +35,9 @@ module TMail
 
     def body(to_charset = 'utf-8', &block)
       attachment_presenter = block || Proc.new { |file_name| "Attachment: #{file_name}\n" }
-    
+
       if multipart?
-        parts.collect { |part| 
+        parts.collect { |part|
           header = part["content-type"]
 
           if part.multipart?
@@ -81,13 +81,13 @@ module TMail
             end
         end
       end
- 
+
       def unquote_quoted_printable_and_convert_to(text, to, from, preserve_underscores=false)
         text = text.gsub(/_/, " ") unless preserve_underscores
         text = text.gsub(/\r\n|\r/, "\n") # normalize newlines
         convert_to(text.unpack("M*").first, to, from)
       end
- 
+
       def unquote_base64_and_convert_to(text, to, from)
         convert_to(Base64.decode(text), to, from)
       end
@@ -116,27 +116,3 @@ module TMail
     end
   end
 end
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class TC_Unquoter < Test::Unit::TestCase
-    def test_unquote_quoted_printable
-      a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
-      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
-    end
-
-    def test_unquote_base64
-      a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
-      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
-    end
-
-    def test_unquote_without_charset
-      a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
-      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-      assert_equal "[166417]_Bekr=E6ftelse_fra_Rejsefeber", b
-    end
-  end
-end

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/scanner.rb

@@ -30,14 +30,18 @@
 #++
 
 require 'tmail/utils'
+require 'tmail/config'
 
 module TMail
-  require 'tmail/scanner_r.rb'
+  # NOTE: It woiuld be nice if these two libs could boith be called "tmailscanner", and
+  # the native extension would have precedence. However RubyGems boffs that up b/c
+  # it does not gaurantee load_path order.
   begin
-    raise LoadError, 'Turn off Ruby extention by user choice' if ENV['NORUBYEXT']
-    require 'tmail/scanner_c.so'
-    Scanner = Scanner_C
+    raise LoadError, 'Turned off native extentions by user choice' if ENV['NORUBYEXT']
+    require('tmail/tmailscanner') # c extension
+    Scanner = TMailScanner
   rescue LoadError
-    Scanner = Scanner_R
+    require 'tmail/scanner_r'
+    Scanner = TMailScanner
   end
 end

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/scanner_r.rb

@@ -29,12 +29,11 @@
 
 require 'tmail/config'
 
-
 module TMail
 
-  class Scanner_R
+  class TMailScanner
 
-    Version = '0.10.7'
+    Version = '0.11.0'
     Version.freeze
 
     MIME_HEADERS = {
@@ -46,7 +45,6 @@ module TMail
     alnum      = 'a-zA-Z0-9'
     atomsyms   = %q[  _#!$%&`'*+-{|}~^/=?  ].strip
     tokensyms  = %q[  _#!$%&`'*+-{|}~^@.    ].strip
-
     atomchars  = alnum + Regexp.quote(atomsyms)
     tokenchars = alnum + Regexp.quote(tokensyms)
     iso2022str = '\e(?!\(B)..(?:[^\e]+|\e(?!\(B)..)*\e\(B'

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/utils.rb

@@ -56,7 +56,7 @@ module TMail
 
   module TextUtils
     # Defines characters per RFC that are OK for TOKENs, ATOMs, PHRASEs and CONTROL characters.
-    
+
     aspecial     = '()<>[]:;.\\,"'
     tspecial     = '()<>[];:\\,"/?='
     lwsp         = " \t\r\n"
@@ -248,8 +248,7 @@ module TMail
     def decode_RFC2231( str )
       m = RFC2231_ENCODED.match(str) or return str
       begin
-        NKF.nkf(NKF_FLAGS[$KCODE],
-        m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
+        to_kcode(m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
       rescue
         m.post_match.gsub(/%[\da-f]{2}/in, "")
       end
@@ -263,7 +262,7 @@ module TMail
         preamble = $1
         remainder = $2
         if remainder =~ /;/
-          remainder =~ /^(.*)(;.*)$/m
+          remainder =~ /^(.*?)(;.*)$/m
           boundary_text = $1
           post = $2.chomp
         else

data/lib/action_mailer/vendor/{tmail-1.1.0 → tmail-1.2.1}/tmail/version.rb

@@ -30,8 +30,8 @@
 module TMail #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/action_mailer/version.rb

@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 2
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/mail_service_test.rb

@@ -534,7 +534,8 @@ class ActionMailerTest < Test::Unit::TestCase
   def test_delivery_logs_sent_mail
     mail = TestMailer.create_signed_up(@recipient)
     logger = mock()
-    logger.expects(:info).with("Sent mail:\n #{mail.encoded}")
+    logger.expects(:info).with("Sent mail to #{@recipient}")
+    logger.expects(:debug).with("\n#{mail.encoded}")
     TestMailer.logger = logger
     TestMailer.deliver_signed_up(@recipient)
   end
@@ -838,7 +839,7 @@ EOF
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
     mail = TMail::Mail.parse(fixture)
     attachment = mail.attachments.last
-    assert_equal "01QuienTeDijat.Pitbull.mp3", attachment.original_filename
+    assert_equal "01 Quien Te Dij\212at. Pitbull.mp3", attachment.original_filename
   end
 
   def test_wrong_mail_header

data/test/test_helper_test.rb

@@ -115,3 +115,21 @@ class TestHelperMailerTest < ActionMailer::TestCase
     assert_match /0 .* but 1/, error.message
   end
 end
+
+class AnotherTestHelperMailerTest < ActionMailer::TestCase
+
+  tests TestHelperMailer
+
+  def setup
+    # Should not override ActionMailer setup methods
+    @test_var = "a value"
+  end
+
+  def test_should_still_setup_mailer
+    assert @expected.is_a?(TMail::Mail)
+  end
+  
+  def test_should_run_overridden_setup_method
+    assert @test_var
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,17 +9,18 @@ autorequire: action_mailer
 bindir: bin
 cert_chain: []
 
-date: 2007-12-16 00:00:00 -06:00
+date: 2008-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     version: 
 description: Makes it trivial to test and deliver emails sent from a single service layer.
 email: david@loudthinking.com
@@ -50,37 +51,37 @@ files:
 - lib/action_mailer/vendor/text-format-0.6.3
 - lib/action_mailer/vendor/text-format-0.6.3/text
 - lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
-- lib/action_mailer/vendor/tmail-1.1.0
-- lib/action_mailer/vendor/tmail-1.1.0/tmail
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
-- lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
+- lib/action_mailer/vendor/tmail-1.2.1
+- lib/action_mailer/vendor/tmail-1.2.1/tmail
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/address.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/attachments.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/base64.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/compat.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/config.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/core_extensions.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/encode.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/facade.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/header.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/info.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/interface.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/loader.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/mail.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/mailbox.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/Makefile
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/mbox.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/net.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/obsolete.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/parser.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/parser.y
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/port.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/quoting.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/scanner.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/scanner_r.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/stringio.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/tmail.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/utils.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail/version.rb
+- lib/action_mailer/vendor/tmail-1.2.1/tmail.rb
 - lib/action_mailer/vendor.rb
 - lib/action_mailer/version.rb
 - lib/action_mailer.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: actionmailer
-rubygems_version: 0.9.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Service layer for easy email delivery and testing.