actionmailer 2.0.5 → 2.1.0

data/test/mail_render_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 
 class RenderMailer < ActionMailer::Base
   def inline_template(recipient)

data/test/mail_service_test.rb

@@ -1,4 +1,5 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+# encoding: utf-8
+require 'abstract_unit'
 
 class FunkyPathMailer < ActionMailer::Base
   self.template_root = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
@@ -39,6 +40,15 @@ class TestMailer < ActionMailer::Base
     body       "Nothing to see here."
   end
 
+  def different_reply_to(recipient)
+    recipients recipient
+    subject    "testing reply_to"
+    from       "system@loudthinking.com"
+    sent_on    Time.local(2008, 5, 23)
+    reply_to   "atraver@gmail.com"
+    body       "Nothing to see here."
+  end
+
   def iso_charset(recipient)
     @recipients = recipient
     @subject    = "testing isø charsets"
@@ -444,6 +454,31 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end
 
+  def test_reply_to
+    expected = new_mail
+
+    expected.to       = @recipient
+    expected.subject  = "testing reply_to"
+    expected.body     = "Nothing to see here."
+    expected.from     = "system@loudthinking.com"
+    expected.reply_to = "atraver@gmail.com"
+    expected.date     = Time.local 2008, 5, 23
+
+    created = nil
+    assert_nothing_raised do
+      created = TestMailer.create_different_reply_to @recipient
+    end
+    assert_not_nil created
+    assert_equal expected.encoded, created.encoded
+
+    assert_nothing_raised do
+      TestMailer.deliver_different_reply_to @recipient
+    end
+
+    assert_not_nil ActionMailer::Base.deliveries.first
+    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+  end
+
   def test_iso_charset
     expected = new_mail( "iso-8859-1" )
     expected.to      = @recipient
@@ -767,23 +802,23 @@ EOF
 
   def test_implicitly_multipart_messages
     mail = TestMailer.create_implicitly_multipart_example(@recipient)
-    assert_equal 6, mail.parts.length
+    assert_equal 3, mail.parts.length
     assert_equal "1.0", mail.mime_version
     assert_equal "multipart/alternative", mail.content_type
     assert_equal "text/yaml", mail.parts[0].content_type
     assert_equal "utf-8", mail.parts[0].sub_header("content-type", "charset")
-    assert_equal "text/plain", mail.parts[2].content_type
+    assert_equal "text/plain", mail.parts[1].content_type
+    assert_equal "utf-8", mail.parts[1].sub_header("content-type", "charset")
+    assert_equal "text/html", mail.parts[2].content_type
     assert_equal "utf-8", mail.parts[2].sub_header("content-type", "charset")
-    assert_equal "text/html", mail.parts[4].content_type
-    assert_equal "utf-8", mail.parts[4].sub_header("content-type", "charset")
   end
 
   def test_implicitly_multipart_messages_with_custom_order
     mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["text/yaml", "text/plain"])
-    assert_equal 6, mail.parts.length
+    assert_equal 3, mail.parts.length
     assert_equal "text/html", mail.parts[0].content_type
-    assert_equal "text/plain", mail.parts[2].content_type
-    assert_equal "text/yaml", mail.parts[4].content_type
+    assert_equal "text/plain", mail.parts[1].content_type
+    assert_equal "text/yaml", mail.parts[2].content_type
   end
 
   def test_implicitly_multipart_messages_with_charset
@@ -839,7 +874,11 @@ EOF
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
     mail = TMail::Mail.parse(fixture)
     attachment = mail.attachments.last
-    assert_equal "01 Quien Te Dij\212at. Pitbull.mp3", attachment.original_filename
+
+    expected = "01 Quien Te Dij\212at. Pitbull.mp3"
+    expected.force_encoding(Encoding::ASCII_8BIT) if expected.respond_to?(:force_encoding)
+
+    assert_equal expected, attachment.original_filename
   end
 
   def test_wrong_mail_header

data/test/quoting_test.rb

@@ -1,12 +1,12 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+# encoding: utf-8
+require 'abstract_unit'
 require 'tmail'
 require 'tempfile'
 
 class QuotingTest < Test::Unit::TestCase
-  
   # Move some tests from TMAIL here
   def test_unquote_quoted_printable
-    a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
+    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
@@ -18,31 +18,34 @@ class QuotingTest < Test::Unit::TestCase
   end
 
   def test_unquote_without_charset
-    a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
+    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
+
   def test_unqoute_multiple
-    a ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?=" 
+    a ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?="
     b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
     assert_equal "Re: [12] #137: Inkonsistente verwendung von \"Hinzuf\303\274gen\"", b
   end
-  
+
   def test_unqoute_in_the_middle
-    a ="Re: Photos =?ISO-8859-1?Q?Brosch=FCre_Rand?=" 
+    a ="Re: Photos =?ISO-8859-1?Q?Brosch=FCre_Rand?="
     b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
     assert_equal "Re: Photos Brosch\303\274re Rand", b
   end
-  
+
   def test_unqoute_iso
-    a ="=?ISO-8859-1?Q?Brosch=FCre_Rand?=" 
+    a ="=?ISO-8859-1?Q?Brosch=FCre_Rand?="
     b = TMail::Unquoter.unquote_and_convert_to(a, 'iso-8859-1')
-    assert_equal "Brosch\374re Rand", b
+    expected = "Brosch\374re Rand"
+    expected.force_encoding 'iso-8859-1' if expected.respond_to?(:force_encoding)
+    assert_equal expected, b
   end
-    
+
   def test_quote_multibyte_chars
     original = "\303\246 \303\270 and \303\245"
+    original.force_encoding('ASCII-8BIT') if original.respond_to?(:force_encoding)
 
     result = execute_in_sandbox(<<-CODE)
       $:.unshift(File.dirname(__FILE__) + "/../lib/")
@@ -56,8 +59,8 @@ class QuotingTest < Test::Unit::TestCase
     unquoted = TMail::Unquoter.unquote_and_convert_to(result, nil)
     assert_equal unquoted, original
   end
-  
-  
+
+
   # test an email that has been created using \r\n newlines, instead of
   # \n newlines.
   def test_email_quoted_with_0d0a
@@ -69,19 +72,8 @@ class QuotingTest < Test::Unit::TestCase
     mail = TMail::Mail.parse(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_partially_quoted_subject"))
     assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject
   end
-  
-  def test_decode
-    encoded, decoded = expected_base64_strings
-    assert_equal decoded, TMail::Base64.decode(encoded)
-  end
-  
-  def test_encode
-    encoded, decoded = expected_base64_strings
-    assert_equal encoded.length, TMail::Base64.encode(decoded).length
-  end
-  
+
   private
-    
     # This whole thing *could* be much simpler, but I don't think Tempfile,
     # popen and others exist on all platforms (like Windows).
     def execute_in_sandbox(code)
@@ -103,9 +95,4 @@ class QuotingTest < Test::Unit::TestCase
       File.delete(test_name) rescue nil
       File.delete(res_name) rescue nil
     end
-    
-    def expected_base64_strings
-      [ File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_encoded_string"), File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_decoded_string") ]
-    end
 end
-

data/test/test_helper_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
 
 class TestHelperMailer < ActionMailer::Base
   def test
@@ -9,7 +9,6 @@ class TestHelperMailer < ActionMailer::Base
 end
 
 class TestHelperMailerTest < ActionMailer::TestCase
-
   def test_setup_sets_right_action_mailer_options
     assert_equal :test, ActionMailer::Base.delivery_method
     assert ActionMailer::Base.perform_deliveries
@@ -117,19 +116,14 @@ class TestHelperMailerTest < ActionMailer::TestCase
 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
+  def test_setup_shouldnt_conflict_with_mailer_setup
     assert @expected.is_a?(TMail::Mail)
-  end
-  
-  def test_should_run_overridden_setup_method
-    assert @test_var
+    assert_equal 'a value', @test_var
   end
 end

data/test/tmail_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 
 class TMailMailTest < Test::Unit::TestCase
   def test_body

data/test/url_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 
 class TestMailer < ActionMailer::Base
   
@@ -73,4 +73,4 @@ class ActionMailerUrlTest < Test::Unit::TestCase
     assert_not_nil ActionMailer::Base.deliveries.first
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,18 +9,17 @@ autorequire: action_mailer
 bindir: bin
 cert_chain: []
 
-date: 2008-10-19 00:00:00 +02:00
+date: 2008-05-31 00:00:00 -07: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.5
+        version: 2.1.0
     version: 
 description: Makes it trivial to test and deliver emails sent from a single service layer.
 email: david@loudthinking.com
@@ -51,37 +50,35 @@ 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.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/tmail-1.2.3
+- lib/action_mailer/vendor/tmail-1.2.3/tmail
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/compat.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/config.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/core_extensions.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/encode.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/interface.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/loader.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/mailbox.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/main.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/mbox.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/net.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/obsolete.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/port.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/quoting.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner_r.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/utils.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail/version.rb
+- lib/action_mailer/vendor/tmail-1.2.3/tmail.rb
 - lib/action_mailer/vendor.rb
 - lib/action_mailer/version.rb
 - lib/action_mailer.rb
@@ -91,25 +88,16 @@ files:
 - test/fixtures
 - test/fixtures/first_mailer
 - test/fixtures/first_mailer/share.erb
-- test/fixtures/first_mailer/share.rhtml
 - test/fixtures/helper_mailer
 - test/fixtures/helper_mailer/use_example_helper.erb
-- test/fixtures/helper_mailer/use_example_helper.rhtml
 - test/fixtures/helper_mailer/use_helper.erb
-- test/fixtures/helper_mailer/use_helper.rhtml
 - test/fixtures/helper_mailer/use_helper_method.erb
-- test/fixtures/helper_mailer/use_helper_method.rhtml
 - test/fixtures/helper_mailer/use_mail_helper.erb
-- test/fixtures/helper_mailer/use_mail_helper.rhtml
 - test/fixtures/helpers
 - test/fixtures/helpers/example_helper.rb
 - test/fixtures/path.with.dots
 - test/fixtures/path.with.dots/funky_path_mailer
 - test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb
-- test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml
-- test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml
-- test/fixtures/raw_base64_decoded_string
-- test/fixtures/raw_base64_encoded_string
 - test/fixtures/raw_email
 - test/fixtures/raw_email10
 - test/fixtures/raw_email12
@@ -128,30 +116,22 @@ files:
 - test/fixtures/raw_email_with_partially_quoted_subject
 - test/fixtures/second_mailer
 - test/fixtures/second_mailer/share.erb
-- test/fixtures/second_mailer/share.rhtml
 - test/fixtures/templates
 - test/fixtures/templates/signed_up.erb
-- test/fixtures/templates/signed_up.rhtml
 - test/fixtures/test_mailer
 - test/fixtures/test_mailer/_subtemplate.text.plain.erb
 - test/fixtures/test_mailer/custom_templating_extension.text.html.haml
 - test/fixtures/test_mailer/custom_templating_extension.text.plain.haml
 - test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb
-- test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml
 - test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak
 - test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb
-- test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml
 - test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb
-- test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml
 - test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb
-- test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml
 - test/fixtures/test_mailer/included_subtemplate.text.plain.erb
 - test/fixtures/test_mailer/rxml_template.builder
 - test/fixtures/test_mailer/rxml_template.rxml
 - test/fixtures/test_mailer/signed_up.erb
-- test/fixtures/test_mailer/signed_up.rhtml
 - test/fixtures/test_mailer/signed_up_with_url.erb
-- test/fixtures/test_mailer/signed_up_with_url.rhtml
 - test/mail_helper_test.rb
 - test/mail_render_test.rb
 - test/mail_service_test.rb
@@ -181,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: actionmailer
-rubygems_version: 1.2.0
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Service layer for easy email delivery and testing.

data/lib/action_mailer/vendor/tmail-1.2.1/tmail/Makefile

@@ -1,19 +0,0 @@
-#
-# lib/tmail/Makefile
-#
-
-debug:
-	rm -f parser.rb
-	make parser.rb DEBUG=true
-
-parser.rb: parser.y
-	if [ "$(DEBUG)" = true ]; then \
-	    racc -v -g -o$@ parser.y ;\
-	else \
-	    racc -E -o$@ parser.y ;\
-	fi
-
-clean:
-	rm -f parser.rb parser.output
-
-distclean: clean

data/lib/action_mailer/vendor/tmail-1.2.1/tmail/address.rb

@@ -1,245 +0,0 @@
-=begin rdoc
-
-= Address handling class
-
-=end
-#
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-require 'tmail/encode'
-require 'tmail/parser'
-
-
-module TMail
-
-  class Address
-
-    include TextUtils
-
-    def Address.parse( str )
-      Parser.parse :ADDRESS, str
-    end
-
-    def address_group?
-      false
-    end
-
-    def initialize( local, domain )
-      if domain
-        domain.each do |s|
-          raise SyntaxError, 'empty word in domain' if s.empty?
-        end
-      end
-
-      @local = local
-      @domain = domain
-      @name   = nil
-      @routes = []
-    end
-
-    attr_reader :name
-
-    def name=( str )
-      @name = str
-      @name = nil if str and str.empty?
-    end
-
-    alias phrase  name
-    alias phrase= name=
-
-    attr_reader :routes
-
-    def inspect
-      "#<#{self.class} #{address()}>"
-    end
-
-    def local
-      return nil unless @local
-      return '""' if @local.size == 1 and @local[0].empty?
-      @local.map {|i| quote_atom(i) }.join('.')
-    end
-
-    def domain
-      return nil unless @domain
-      join_domain(@domain)
-    end
-
-    def spec
-      s = self.local
-      d = self.domain
-      if s and d
-        s + '@' + d
-      else
-        s
-      end
-    end
-
-    alias address  spec
-
-    def ==( other )
-      other.respond_to? :spec and self.spec == other.spec
-    end
-
-    alias eql? ==
-
-    def hash
-      @local.hash ^ @domain.hash
-    end
-
-    def dup
-      obj = self.class.new(@local.dup, @domain.dup)
-      obj.name = @name.dup if @name
-      obj.routes.replace @routes
-      obj
-    end
-
-    include StrategyInterface
-
-    def accept( strategy, dummy1 = nil, dummy2 = nil )
-      unless @local
-        strategy.meta '<>'   # empty return-path
-        return
-      end
-
-      spec_p = (not @name and @routes.empty?)
-      if @name
-        strategy.phrase @name
-        strategy.space
-      end
-      tmp = spec_p ? '' : '<'
-      unless @routes.empty?
-        tmp << @routes.map {|i| '@' + i }.join(',') << ':'
-      end
-      tmp << self.spec
-      tmp << '>' unless spec_p
-      strategy.meta tmp
-      strategy.lwsp ''
-    end
-
-  end
-
-
-  class AddressGroup
-
-    include Enumerable
-
-    def address_group?
-      true
-    end
-
-    def initialize( name, addrs )
-      @name = name
-      @addresses = addrs
-    end
-
-    attr_reader :name
-    
-    def ==( other )
-      other.respond_to? :to_a and @addresses == other.to_a
-    end
-
-    alias eql? ==
-
-    def hash
-      map {|i| i.hash }.hash
-    end
-
-    def []( idx )
-      @addresses[idx]
-    end
-
-    def size
-      @addresses.size
-    end
-
-    def empty?
-      @addresses.empty?
-    end
-
-    def each( &block )
-      @addresses.each(&block)
-    end
-
-    def to_a
-      @addresses.dup
-    end
-
-    alias to_ary to_a
-
-    def include?( a )
-      @addresses.include? a
-    end
-
-    def flatten
-      set = []
-      @addresses.each do |a|
-        if a.respond_to? :flatten
-          set.concat a.flatten
-        else
-          set.push a
-        end
-      end
-      set
-    end
-
-    def each_address( &block )
-      flatten.each(&block)
-    end
-
-    def add( a )
-      @addresses.push a
-    end
-
-    alias push add
-    
-    def delete( a )
-      @addresses.delete a
-    end
-
-    include StrategyInterface
-
-    def accept( strategy, dummy1 = nil, dummy2 = nil )
-      strategy.phrase @name
-      strategy.meta ':'
-      strategy.space
-      first = true
-      each do |mbox|
-        if first
-          first = false
-        else
-          strategy.meta ','
-        end
-        strategy.space
-        mbox.accept strategy
-      end
-      strategy.meta ';'
-      strategy.lwsp ''
-    end
-
-  end
-
-end   # module TMail