Skip to content
Browse files

Use anonymous? that works on both Ruby 1.8 and 1.9.

  • Loading branch information...
1 parent 1d71c93 commit 760dec17bea1cf10534d33d409e4d6e1ff62c6af @josevalim josevalim committed May 17, 2011
View
5 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
View
7 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)

0 comments on commit 760dec1

Please sign in to comment.
Something went wrong with that request. Please try again.