Remove the deprecated API from ActionMailer.

5 files changed, 1 insertions, 262 deletions

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 6e2d288082..05ba12197a 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -43,7 +43,6 @@ module ActionMailer
   autoload :Collector
   autoload :Base
   autoload :DeliveryMethods
-  autoload :DeprecatedApi
   autoload :MailHelper
   autoload :OldApi
   autoload :TestCase
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 8fe5868d52..efa50d0839 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -344,7 +344,6 @@ module ActionMailer #:nodoc:
     helper  ActionMailer::MailHelper
 
     include ActionMailer::OldApi
-    include ActionMailer::DeprecatedApi
 
     delegate :register_observer, :to => Mail
     delegate :register_interceptor, :to => Mail
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb
deleted file mode 100644
index 7d57feba04..0000000000
--- a/actionmailer/lib/action_mailer/deprecated_api.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-require 'active_support/core_ext/object/try'
-
-module ActionMailer
-  # This is the API which is deprecated and is going to be removed on Rails 3.1 release.
-  # Part of the old API will be deprecated after 3.1, for a smoother deprecation process.
-  # Check those in OldApi instead.
-  module DeprecatedApi #:nodoc:
-    extend ActiveSupport::Concern
-
-    included do
-      [:charset, :content_type, :mime_version, :implicit_parts_order].each do |method|
-        class_eval <<-FILE, __FILE__, __LINE__ + 1
-          def self.default_#{method}
-            @@default_#{method}
-          end
-
-          def self.default_#{method}=(value)
-            ActiveSupport::Deprecation.warn "ActionMailer::Base.default_#{method}=value is deprecated, " <<
-              "use default :#{method} => value instead"
-            @@default_#{method} = value
-          end
-
-          @@default_#{method} = nil
-        FILE
-      end
-    end
-
-    module ClassMethods
-      # Deliver the given mail object directly. This can be used to deliver
-      # a preconstructed mail object, like:
-      #
-      #   email = MyMailer.create_some_mail(parameters)
-      #   email.set_some_obscure_header "frobnicate"
-      #   MyMailer.deliver(email)
-      def deliver(mail, show_warning=true)
-        if show_warning
-          ActiveSupport::Deprecation.warn "#{self}.deliver is deprecated, call " <<
-            "deliver in the mailer instance instead", caller[0,2]
-        end
-
-        raise "no mail object available for delivery!" unless mail
-        wrap_delivery_behavior(mail)
-        mail.deliver
-        mail
-      end
-
-      def template_root
-        self.view_paths && self.view_paths.first
-      end
-
-      def template_root=(root)
-        ActiveSupport::Deprecation.warn "template_root= is deprecated, use prepend_view_path instead", caller[0,2]
-        self.view_paths = ActionView::Base.process_view_paths(root)
-      end
-
-      def respond_to?(method_symbol, include_private = false)
-        matches_dynamic_method?(method_symbol) || super
-      end
-
-      def method_missing(method_symbol, *parameters)
-        if match = matches_dynamic_method?(method_symbol)
-          case match[1]
-            when 'create'
-              ActiveSupport::Deprecation.warn "#{self}.create_#{match[2]} is deprecated, " <<
-                "use #{self}.#{match[2]} instead", caller[0,2]
-              new(match[2], *parameters).message
-            when 'deliver'
-              ActiveSupport::Deprecation.warn "#{self}.deliver_#{match[2]} is deprecated, " <<
-                "use #{self}.#{match[2]}.deliver instead", caller[0,2]
-              new(match[2], *parameters).message.deliver
-            else super
-          end
-        else
-          super
-        end
-      end
-
-    private
-
-      def matches_dynamic_method?(method_name)
-        method_name = method_name.to_s
-        /^(create|deliver)_([_a-z]\w*)/.match(method_name) || /^(new)$/.match(method_name)
-      end
-    end
-
-    # Delivers a Mail object. By default, it delivers the cached mail
-    # object (from the <tt>create!</tt> method). If no cached mail object exists, and
-    # no alternate has been given as the parameter, this will fail.
-    def deliver!(mail = @_message)
-      ActiveSupport::Deprecation.warn "Calling deliver in the AM::Base object is deprecated, " <<
-        "please call deliver in the Mail instance", caller[0,2]
-      self.class.deliver(mail, false)
-    end
-    alias :deliver :deliver!
-
-    def render(*args)
-      options = args.last.is_a?(Hash) ? args.last : {}
-
-      if options[:body].is_a?(Hash)
-        ActiveSupport::Deprecation.warn(':body in render deprecated. Please use instance ' <<
-                                        'variables as assigns instead', caller[0,1])
-
-        options[:body].each { |k,v| instance_variable_set(:"@#{k}", v) }
-      end
-      super
-    end
-
-    # Render a message but does not set it as mail body. Useful for rendering
-    # data for part and attachments.
-    #
-    # Examples:
-    #
-    #   render_message "special_message"
-    #   render_message :template => "special_message"
-    #   render_message :inline => "<%= 'Hi!' %>"
-    #
-    def render_message(*args)
-      ActiveSupport::Deprecation.warn "render_message is deprecated, use render instead", caller[0,2]
-      render(*args)
-    end
-
-  private
-
-    def initialize_defaults(*)
-      @charset              ||= self.class.default_charset.try(:dup)
-      @content_type         ||= self.class.default_content_type.try(:dup)
-      @implicit_parts_order ||= self.class.default_implicit_parts_order.try(:dup)
-      @mime_version         ||= self.class.default_mime_version.try(:dup)
-      super
-    end
-
-    def create_parts
-      if @body.is_a?(Hash) && !@body.empty?
-        ActiveSupport::Deprecation.warn "Giving a hash to body is deprecated, please use instance variables instead", caller[0,2]
-        @body.each { |k, v| instance_variable_set(:"@#{k}", v) }
-      end
-      super
-    end
-
-  end
-end
diff --git a/actionmailer/test/old_base/mail_render_test.rb b/actionmailer/test/old_base/mail_render_test.rb
index bf489e77d4..9b1455da33 100644
--- a/actionmailer/test/old_base/mail_render_test.rb
+++ b/actionmailer/test/old_base/mail_render_test.rb
@@ -129,16 +129,6 @@ class RenderHelperTest < Test::Unit::TestCase
     mail = RenderMailer.no_instance_variable.deliver
     assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
   end
-
-  def test_legacy_multipart_alternative
-    mail = RenderMailer.multipart_alternative.deliver
-    assert_equal(2, mail.parts.size)
-    assert_equal("multipart/alternative", mail.mime_type)
-    assert_equal("text/plain", mail.parts[0].mime_type)
-    assert_equal("foo: bar", mail.parts[0].body.encoded)
-    assert_equal("text/html", mail.parts[1].mime_type)
-    assert_equal("<strong>foo</strong> bar", mail.parts[1].body.encoded)
-  end
 end
 
 class FirstSecondHelperTest < Test::Unit::TestCase
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index a216b94a55..49647c9612 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -1095,112 +1095,4 @@ EOF
   ensure
     TestMailer.smtp_settings.merge!(:enable_starttls_auto => true)
   end
-end
-
-class InheritableTemplateRootTest < ActiveSupport::TestCase
-  def test_attr
-    expected = File.expand_path("#{File.dirname(__FILE__)}/../fixtures/path.with.dots")
-    assert_equal expected, FunkyPathMailer.template_root.to_s
-
-    sub = Class.new(FunkyPathMailer)
-    assert_deprecated do
-      sub.template_root = 'test/path'
-    end
-
-    assert_equal File.expand_path('test/path'), sub.template_root.to_s
-    assert_equal expected, FunkyPathMailer.template_root.to_s
-  end
-end
-
-class MethodNamingTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
-  class TestMailer < ActionMailer::Base
-    def send
-      body       'foo'
-    end
-  end
-
-  def setup
-    set_delivery_method :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries.clear
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_send_method
-    assert_nothing_raised do
-      assert_emails 1 do
-        assert_deprecated do
-          TestMailer.deliver_send
-        end
-      end
-    end
-  end
-end
-class RespondToTest < Test::Unit::TestCase
-  class RespondToMailer < ActionMailer::Base; end
-
-  def setup
-    set_delivery_method :test
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_should_respond_to_new
-    assert_respond_to RespondToMailer, :new
-  end
-
-  def test_should_respond_to_create_with_template_suffix
-    assert_respond_to RespondToMailer, :create_any_old_template
-  end
-
-  def test_should_respond_to_deliver_with_template_suffix
-    assert_respond_to RespondToMailer, :deliver_any_old_template
-  end
-
-  def test_should_not_respond_to_new_with_template_suffix
-    assert !RespondToMailer.respond_to?(:new_any_old_template)
-  end
-
-  def test_should_not_respond_to_create_with_template_suffix_unless_it_is_separated_by_an_underscore
-    assert !RespondToMailer.respond_to?(:createany_old_template)
-  end
-
-  def test_should_not_respond_to_deliver_with_template_suffix_unless_it_is_separated_by_an_underscore
-    assert !RespondToMailer.respond_to?(:deliverany_old_template)
-  end
-
-  def test_should_not_respond_to_create_with_template_suffix_if_it_begins_with_a_uppercase_letter
-    assert !RespondToMailer.respond_to?(:create_Any_old_template)
-  end
-
-  def test_should_not_respond_to_deliver_with_template_suffix_if_it_begins_with_a_uppercase_letter
-    assert !RespondToMailer.respond_to?(:deliver_Any_old_template)
-  end
-
-  def test_should_not_respond_to_create_with_template_suffix_if_it_begins_with_a_digit
-    assert !RespondToMailer.respond_to?(:create_1_template)
-  end
-
-  def test_should_not_respond_to_deliver_with_template_suffix_if_it_begins_with_a_digit
-    assert !RespondToMailer.respond_to?(:deliver_1_template)
-  end
-
-  def test_should_not_respond_to_method_where_deliver_is_not_a_suffix
-    assert !RespondToMailer.respond_to?(:foo_deliver_template)
-  end
-
-  def test_should_still_raise_exception_with_expected_message_when_calling_an_undefined_method
-    error = assert_raise NoMethodError do
-      RespondToMailer.not_a_method
-    end
-
-    assert_match(/method.*not_a_method/, error.message)
-  end
-end
+end
\ No newline at end of file