From 6e6c0117b30226f031771acb9715318987067f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 25 Jun 2009 12:57:58 +0200 Subject: Added Mailer generaator template engine and test framework agnostic. --- .../lib/generators/rails/mailer/mailer_generator.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 railties/lib/generators/rails/mailer/mailer_generator.rb (limited to 'railties/lib/generators/rails/mailer/mailer_generator.rb') diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb new file mode 100644 index 0000000000..4c77df89ab --- /dev/null +++ b/railties/lib/generators/rails/mailer/mailer_generator.rb @@ -0,0 +1,18 @@ +module Rails + module Generators + class MailerGenerator < NamedBase + argument :actions, :type => :array, :default => [] + + def check_class_collision + class_collisions class_name + end + + def create_mailer_file + template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb") + end + + add_and_invoke_template_engine_option! + add_and_invoke_test_framework_option! + end + end +end -- cgit v1.2.3 From 0bb95968db3695467b63357aab66a9dddb62295c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 25 Jun 2009 15:45:15 +0200 Subject: More code refactoring. --- railties/lib/generators/rails/mailer/mailer_generator.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'railties/lib/generators/rails/mailer/mailer_generator.rb') diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb index 4c77df89ab..15140f2127 100644 --- a/railties/lib/generators/rails/mailer/mailer_generator.rb +++ b/railties/lib/generators/rails/mailer/mailer_generator.rb @@ -11,8 +11,7 @@ module Rails template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb") end - add_and_invoke_template_engine_option! - add_and_invoke_test_framework_option! + invoke_for :template_engine, :test_framework end end end -- cgit v1.2.3 From 0f1c325f3cd8bfbedc0a6e4925122016288e2817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 25 Jun 2009 17:34:09 +0200 Subject: Improving generators runner. --- railties/lib/generators/rails/mailer/mailer_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/generators/rails/mailer/mailer_generator.rb') diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb index 15140f2127..6e7e6e811e 100644 --- a/railties/lib/generators/rails/mailer/mailer_generator.rb +++ b/railties/lib/generators/rails/mailer/mailer_generator.rb @@ -1,7 +1,7 @@ module Rails module Generators class MailerGenerator < NamedBase - argument :actions, :type => :array, :default => [] + argument :actions, :type => :array, :default => [], :banner => "method method" def check_class_collision class_collisions class_name -- cgit v1.2.3 From 2f3681dfc24e51698b9b900a5d03950da4508d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 26 Jun 2009 10:40:02 +0200 Subject: Clean up class collisions check and a class method helper. --- railties/lib/generators/rails/mailer/mailer_generator.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'railties/lib/generators/rails/mailer/mailer_generator.rb') diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb index 6e7e6e811e..1753166af5 100644 --- a/railties/lib/generators/rails/mailer/mailer_generator.rb +++ b/railties/lib/generators/rails/mailer/mailer_generator.rb @@ -2,10 +2,7 @@ module Rails module Generators class MailerGenerator < NamedBase argument :actions, :type => :array, :default => [], :banner => "method method" - - def check_class_collision - class_collisions class_name - end + check_class_collision def create_mailer_file template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb") -- cgit v1.2.3 From 1a15dd4de577d77f37bc39a1ca59f871aa9a395b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 27 Jun 2009 14:27:26 +0200 Subject: Rename invoke_for to hook_for. --- railties/lib/generators/rails/mailer/mailer_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/generators/rails/mailer/mailer_generator.rb') diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb index 1753166af5..33f1665b83 100644 --- a/railties/lib/generators/rails/mailer/mailer_generator.rb +++ b/railties/lib/generators/rails/mailer/mailer_generator.rb @@ -8,7 +8,7 @@ module Rails template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb") end - invoke_for :template_engine, :test_framework + hook_for :template_engine, :test_framework end end end -- cgit v1.2.3