Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

More deprecation fun

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4943 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 4bd444c1fe960e757819fb67dada0a5a0bf344e4 1 parent eb90b94
@dhh dhh authored
View
38 actionpack/lib/action_controller/base.rb
@@ -485,9 +485,19 @@ def process(request, response, method = :perform_action, *arguments) #:nodoc:
# would have slashed-off the path components after the changed action.
def url_for(options = {}, *parameters_for_method_reference) #:doc:
case options
- when String then options
- when Symbol then send(options, *parameters_for_method_reference)
- when Hash then @url.rewrite(rewrite_options(options))
+ when String
+ options
+
+ when Symbol
+ ActiveSupport::Deprecation.warn(
+ "WARNING: You called url_for(:#{options}), which is a deprecated API. Instead you should use the named " +
+ "route directly, like #{options}(). Using symbols and parameters with url_for will be removed from Rails 2.0."
+ )
+
+ send(options, *parameters_for_method_reference)
+
+ when Hash
+ @url.rewrite(rewrite_options(options))
end
end
@@ -661,12 +671,21 @@ def session_enabled?
def render(options = nil, deprecated_status = nil, &block) #:doc:
raise DoubleRenderError, "Can only render or redirect once per action" if performed?
- # Backwards compatibility
- unless options.is_a?(Hash)
- if options == :update
- options = {:update => true}
- else
- return render_file(options || default_template_name, deprecated_status, true)
+ if options.nil?
+ return render_file(default_template_name)
+ else
+ # Backwards compatibility
+ unless options.is_a?(Hash)
+ if options == :update
+ options = { :update => true }
+ else
+ ActiveSupport::Deprecation.warn(
+ "WARNING: You called render(#{options}), which is a deprecated API. Instead you use " +
+ "render :file => #{options}. Calling render with just a string will be removed from Rails 2.0."
+ )
+
+ return render_file(options || default_template_name, deprecated_status, true)
+ end
end
end
@@ -875,6 +894,7 @@ def redirect_to(options = {}, *parameters_for_method_reference) #:doc:
redirect_to(url_for(options))
response.redirected_to = options
else
+ # TOOD: Deprecate me!
redirect_to(url_for(options, *parameters_for_method_reference))
response.redirected_to, response.redirected_to_method_params = options, parameters_for_method_reference
end
View
32 actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../../abstract_unit'
+
+class DeprecatedBaseMethodsTest < Test::Unit::TestCase
+ class Target < ActionController::Base
+ def deprecated_symbol_parameter_to_url_for
+ redirect_to(url_for(:home_url, "superstars"))
+ end
+
+ def deprecated_render_parameters
+ # render ""
+ end
+
+ def home_url(greeting)
+ "http://example.com/#{greeting}"
+ end
+
+ def rescue_action(e) raise e end
+ end
+
+ def setup
+ @request = ActionController::TestRequest.new
+ @response = ActionController::TestResponse.new
+ @controller = Target.new
+ end
+
+ def test_deprecated_symbol_parameter_to_url_for
+ assert_deprecated("url_for(:home_url)") do
+ get :deprecated_symbol_parameter_to_url_for
+ end
+ assert_redirected_to "http://example.com/superstars"
+ end
+end
View
1  actionpack/test/controller/url_rewriter_test.rb
@@ -90,5 +90,4 @@ def test_named_route
ensure
ActionController::Routing::Routes.load!
end
-
end
View
5 activesupport/lib/active_support/deprecation.rb
@@ -38,9 +38,8 @@ def silence
private
def deprecation_message(callstack, message = nil)
file, line, method = extract_callstack(callstack)
- message ||= "WARNING: #{method} is deprecated and will be removed from Rails 2.0. " +
- "See http://www.rubyonrails.org/deprecation for details."
- "#{message} (#{method} at #{file}:#{line})"
+ message ||= "WARNING: #{method} is deprecated and will be removed from Rails 2.0."
+ "#{message}. See http://www.rubyonrails.org/deprecation for details. (#{method} at #{file}:#{line})"
end
def extract_callstack(callstack)
Please sign in to comment.
Something went wrong with that request. Please try again.