From 760dec17bea1cf10534d33d409e4d6e1ff62c6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 17 May 2011 14:51:44 -0400 Subject: [PATCH] Use anonymous? that works on both Ruby 1.8 and 1.9. --- actionpack/lib/action_controller/metal/params_wrapper.rb | 5 +++-- actionpack/lib/action_controller/test_case.rb | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index b7c37ce1c1..93241fc056 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/hash/except' require 'active_support/core_ext/array/wrap' +require 'active_support/core_ext/module/anonymous' require 'action_dispatch/http/mime_types' module ActionController @@ -140,7 +141,7 @@ def inherited(klass) # This method also does namespace lookup. Foo::Bar::UsersController will # try to find Foo::Bar::User, Foo::User and finally User. def _default_wrap_model #:nodoc: - return nil if self.name.nil? + return nil if self.anonymous? model_name = self.name.sub(/Controller$/, '').singularize @@ -170,7 +171,7 @@ def _set_wrapper_defaults(options, model=nil) end end - unless options[:name] || self.name.nil? + unless options[:name] || self.anonymous? model ||= _default_wrap_model options[:name] = model ? model.to_s.demodulize.underscore : controller_name.singularize diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 5e4b48a531..89ff5ba174 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/class/attribute' +require 'active_support/core_ext/module/anonymous' module ActionController module TemplateAssertions @@ -413,9 +414,9 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method = @request.env['REQUEST_METHOD'] = http_method parameters ||= {} - controller_class_name = @controller.class.name ? - @controller.class.name.underscore.sub(/_controller$/, '') : - "anonymous_controller" + controller_class_name = @controller.class.anonymous? ? + "anonymous_controller" : + @controller.class.name.underscore.sub(/_controller$/, '') @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters) -- GitLab