Merge pull request #1271 from joshk/remove_am_deprecated_methods

Removed deprecated ActionMailer API and related tests

1 files changed, 0 insertions, 28 deletions

diff --git a/actionmailer/lib/action_mailer/adv_attr_accessor.rb b/actionmailer/lib/action_mailer/adv_attr_accessor.rb
deleted file mode 100644
index c1aa8021ce..0000000000
--- a/actionmailer/lib/action_mailer/adv_attr_accessor.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module ActionMailer
-  module AdvAttrAccessor #:nodoc:
-    def adv_attr_accessor(name, deprecation=nil)
-      ivar = "@#{name}"
-      deprecation ||= "Please pass :#{name} as hash key to mail() instead"
-
-      class_eval <<-ACCESSORS, __FILE__, __LINE__ + 1
-        def #{name}=(value)
-          ActiveSupport::Deprecation.warn "#{name}= is deprecated. #{deprecation}"
-          #{ivar} = value
-        end
-
-        def #{name}(*args)
-          raise ArgumentError, "expected 0 or 1 parameters" unless args.length <= 1
-          if args.empty?
-            ActiveSupport::Deprecation.warn "#{name}() is deprecated and will be removed in future versions."
-            #{ivar} if instance_variable_names.include?(#{ivar.inspect})
-          else
-            ActiveSupport::Deprecation.warn "#{name}(value) is deprecated. #{deprecation}"
-            #{ivar} = args.first
-          end
-        end
-      ACCESSORS
-
-      self.protected_instance_variables << ivar if self.respond_to?(:protected_instance_variables)
-    end
-  end
-end