From bc50cb31d6b1064463b371cf428e7eb6fcbf2fd3 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 14 Jan 2012 18:11:38 -0200 Subject: Remove old compatibility methods not being used --- actionpack/lib/action_controller/metal/compatibility.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 43719d5808..a2d06bab95 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -28,10 +28,6 @@ module ActionController end end - # For old tests - def initialize_template_class(*) end - def assign_shortcuts(*) end - def _normalize_options(options) options[:text] = nil if options.delete(:nothing) == true options[:text] = " " if options.key?(:text) && options[:text].nil? -- cgit v1.2.3 From 6f8b1e3a8555405917e30ab8809124c247132b27 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 14 Jan 2012 18:18:29 -0200 Subject: Remove constant already defined in exceptions module --- actionpack/lib/action_controller/metal/compatibility.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index a2d06bab95..74e24c9321 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -2,9 +2,6 @@ module ActionController module Compatibility extend ActiveSupport::Concern - class ::ActionController::ActionControllerError < StandardError #:nodoc: - end - # Temporary hax included do ::ActionController::UnknownAction = ::AbstractController::ActionNotFound -- cgit v1.2.3 From 1ae9e60b8a369f004d001e885ca71cb0ade2be80 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 14 Jan 2012 18:25:11 -0200 Subject: Remove other old compatibility constants --- actionpack/lib/action_controller/metal/compatibility.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 74e24c9321..6e8b12d379 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -4,9 +4,6 @@ module ActionController # Temporary hax included do - ::ActionController::UnknownAction = ::AbstractController::ActionNotFound - ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError - # ROUTES TODO: This should be handled by a middleware and route generation # should be able to handle SCRIPT_NAME self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] -- cgit v1.2.3 From 71566c357308da8ab3fa86794ef57b853f99ce63 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 14 Jan 2012 18:28:09 -0200 Subject: Remove rescue_action from compatibility module and tests --- actionpack/lib/action_controller/metal/compatibility.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 6e8b12d379..45e9df6563 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -16,10 +16,6 @@ module ActionController :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout ] - - def rescue_action(env) - raise env["action_dispatch.rescue.exception"] - end end def _normalize_options(options) -- cgit v1.2.3 From 497004858de24e21dc67f8a9bd3a30b8ce951b92 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 15 Jan 2012 09:48:17 -0200 Subject: Remove relative url root setting from ENV var This is already being set by Rails configuration. --- actionpack/lib/action_controller/metal/compatibility.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 45e9df6563..1c205d7c02 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -4,10 +4,6 @@ module ActionController # Temporary hax included do - # ROUTES TODO: This should be handled by a middleware and route generation - # should be able to handle SCRIPT_NAME - self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] - class << self delegate :default_charset=, :to => "ActionDispatch::Response" end -- cgit v1.2.3 From bb33e88833575184b3bd2d0877ea92e170672cde Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 15 Jan 2012 13:45:31 -0200 Subject: Remove deprecated logic to render templates starting with / render :template => "/foo/bar" --- actionpack/lib/action_controller/metal/compatibility.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 1c205d7c02..a9e46f9343 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -21,7 +21,6 @@ module ActionController end def render_to_body(options) - options[:template].sub!(/^\//, '') if options.key?(:template) super || " " end -- cgit v1.2.3 From 6244d16eaf8eea9ce963f08dced60399b121a6dc Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 15 Jan 2012 15:34:50 -0200 Subject: Move render :nothing and :text => nil options to AC::Rendering --- actionpack/lib/action_controller/metal/compatibility.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index a9e46f9343..835d1f7e35 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -14,12 +14,6 @@ module ActionController ] end - def _normalize_options(options) - options[:text] = nil if options.delete(:nothing) == true - options[:text] = " " if options.key?(:text) && options[:text].nil? - super - end - def render_to_body(options) super || " " end @@ -31,9 +25,5 @@ module ActionController def method_for_action(action_name) super || (respond_to?(:method_missing) && "_handle_method_missing") end - - def performed? - response_body - end end end -- cgit v1.2.3 From a977b2588e46ab5b9b8a1cb2a8f7482988c64486 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 15 Jan 2012 15:47:45 -0200 Subject: Remove method missing handling when action is not found, use action missing instead Do not create a method_missing method to handle not found actions, use the action_missing method provided by Rails instead. --- actionpack/lib/action_controller/metal/compatibility.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 835d1f7e35..96707b6587 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -17,13 +17,5 @@ module ActionController def render_to_body(options) super || " " end - - def _handle_method_missing - method_missing(@_action_name.to_sym) - end - - def method_for_action(action_name) - super || (respond_to?(:method_missing) && "_handle_method_missing") - end end end -- cgit v1.2.3 From 67c96ab024f008ad1aee8345c1ae0fd7aa9bf072 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 15 Jan 2012 22:07:20 -0200 Subject: Move render_to_body logic to return a spaced string to AC::Rendering This seems to be required only when calling render :partial with an empty collection from a controller. This call happens to return no content, letting the response body empty, which means to Rails that it should go on and try to find a template to render based on the current action name, thus failing hard. Although tests keep all green, we need to check a better way to fix this. --- actionpack/lib/action_controller/metal/compatibility.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 96707b6587..813b6501d1 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -13,9 +13,5 @@ module ActionController :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout ] end - - def render_to_body(options) - super || " " - end end end -- cgit v1.2.3 From cb650a50bfc561dc00dfc844dac01beeab05bd00 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 17 Jan 2012 08:56:50 -0200 Subject: Remove deprecated default_charset= from AC::Base This should be set globally as a configuration, using `config.action_dispatch.default_charset` instead --- actionpack/lib/action_controller/metal/compatibility.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 813b6501d1..0f43bc8cce 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -4,10 +4,6 @@ module ActionController # Temporary hax included do - class << self - delegate :default_charset=, :to => "ActionDispatch::Response" - end - self.protected_instance_variables = [ :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout -- cgit v1.2.3 From 0b7548fab17c8f50d9bc6ed7e98ef475d73010cc Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 17 Jan 2012 08:59:42 -0200 Subject: Move protected instance variables definition, kill compatibility module --- actionpack/lib/action_controller/metal/compatibility.rb | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 actionpack/lib/action_controller/metal/compatibility.rb (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb deleted file mode 100644 index 0f43bc8cce..0000000000 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ /dev/null @@ -1,13 +0,0 @@ -module ActionController - module Compatibility - extend ActiveSupport::Concern - - # Temporary hax - included do - self.protected_instance_variables = [ - :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, - :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout - ] - end - end -end -- cgit v1.2.3