From 37ba0047a98279ad818744c5ab3b4bb5f3f3eef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 4 Jul 2009 10:17:10 +0200 Subject: Removed invoke_if and allow hook_for to accept boolean options. --- railties/lib/generators/rails/controller/controller_generator.rb | 3 +-- .../rails/scaffold_controller/scaffold_controller_generator.rb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'railties/lib/generators/rails') diff --git a/railties/lib/generators/rails/controller/controller_generator.rb b/railties/lib/generators/rails/controller/controller_generator.rb index 3fed058c00..91470be833 100644 --- a/railties/lib/generators/rails/controller/controller_generator.rb +++ b/railties/lib/generators/rails/controller/controller_generator.rb @@ -8,8 +8,7 @@ module Rails template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb") end - hook_for :template_engine, :test_framework - invoke_if :helper + hook_for :template_engine, :test_framework, :helper end end end diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb index c7c777014e..972be5a33b 100644 --- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb +++ b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb @@ -18,8 +18,7 @@ module Rails hook_for :template_engine, :test_framework, :as => :scaffold # Invoke the helper using the controller (pluralized) name. - # - invoke_if :helper do |base, invoked| + hook_for :helper, :as => :scaffold do |base, invoked| base.invoke invoked, [ base.controller_name ] end end -- cgit v1.2.3