actionpack/test/template/deprecate_ivars_test.rb @@ -157,6 +157,8 @@ module ActionView #:nodoc: attr_reader :logger, :response, :headers attr_internal :cookies, :flash, :headers, :params, :request, :response, :session + delegate :logger, :action_name, :to => :controller + attr_writer :template_format # Specify trim mode for the ERB compiler. Defaults to '-'. @@ -524,10 +526,18 @@ If you are rendering a subtemplate, you must now use controller-like partial syn def template_handler_is_compilable?(handler) handler.new(self).respond_to?(:compile) end - + # Assigns instance variables from the controller to the view. def assign_variables_from_controller - @assigns.each { |key, value| instance_variable_set("@#{key}", value) } + @assigns.each do |key, value| + if ['logger'].include?(key) + instance_variable_set("@#{key}", ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, key.to_sym)) + elsif ['action_name'].include?(key) + instance_variable_set("@#{key}", ActiveSupport::Deprecation::DeprecatedInstanceVariable.new(value, key)) + else + instance_variable_set("@#{key}", value) + end + end end actionpack/lib/action_view/base.rb @@ -1,4 +1,5 @@ require 'yaml' +require 'delegate' module ActiveSupport module Deprecation #:nodoc: @@ -175,6 +176,20 @@ module ActiveSupport ActiveSupport::Deprecation.warn("#{@var} is deprecated! Call #{@method}.#{called} instead of #{@var}.#{called}. Args: #{args.inspect}", callstack) end end + + class DeprecatedInstanceVariable < Delegator + def initialize(value, method) + super(value) + @method = method + @value = value + end + + def __getobj__ + ActiveSupport::Deprecation.warn("Instance variable @#{@method} is deprecated! Call instance method #{@method} instead.") + @value + end + end + end end activesupport/lib/active_support/deprecation.rb @@ -1,6 +1,7 @@ require File.dirname(__FILE__) + '/abstract_unit' class Deprecatee + def initialize @request = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :request) @_request = 'there we go' @@ -148,4 +149,15 @@ class DeprecationTest < Test::Unit::TestCase assert_not_deprecated { error.message } assert_nil @last_message end + +end + +class DeprecatedIvarTest < Test::Unit::TestCase + + def test_deprecated_ivar + @action = ActiveSupport::Deprecation::DeprecatedInstanceVariable.new("fubar", :foobar) + + assert_deprecated(/Instance variable @foobar is deprecated! Call instance method foobar instead/) { assert_equal "fubar", @action } + end + end activesupport/test/deprecation_test.rb 2c96f509a8e630bcd0a79916ae7aadfe919b49a5 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/63edc022f12713b1ac170331a1b619fbcc064d5a 63edc022f12713b1ac170331a1b619fbcc064d5a 2008-05-06T03:43:33-07:00 2008-05-06T03:35:35-07:00 Deprecate ivars in view. Deprecate use of @logger and @action_name instance variables inside views. Please use instance methods logger and action_name instead. 5e00b9960ba048d4864bb795756d62e322702c55 Pratik Naik pratiknaik@gmail.com