From 9fffdc5cdb80b1824473a6d7ae1fedf9e74aa748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 18 Jan 2010 13:44:32 +0100 Subject: Generators load path now will be Ruby load path. If you want to use rspec:install generator, you need generators/rspec/install_generator in your load path. --- .../erb/controller/controller_generator.rb | 21 --------- .../erb/controller/templates/view.html.erb | 2 - .../generators/erb/mailer/mailer_generator.rb | 20 -------- .../rails/generators/erb/mailer/templates/view.erb | 3 -- .../generators/erb/scaffold/scaffold_generator.rb | 53 ---------------------- .../erb/scaffold/templates/_form.html.erb | 13 ------ .../erb/scaffold/templates/edit.html.erb | 6 --- .../erb/scaffold/templates/index.html.erb | 27 ----------- .../erb/scaffold/templates/layout.html.erb | 14 ------ .../generators/erb/scaffold/templates/new.html.erb | 5 -- .../erb/scaffold/templates/show.html.erb | 10 ---- 11 files changed, 174 deletions(-) delete mode 100644 railties/lib/rails/generators/erb/controller/controller_generator.rb delete mode 100644 railties/lib/rails/generators/erb/controller/templates/view.html.erb delete mode 100644 railties/lib/rails/generators/erb/mailer/mailer_generator.rb delete mode 100644 railties/lib/rails/generators/erb/mailer/templates/view.erb delete mode 100644 railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb delete mode 100644 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb delete mode 100644 railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb delete mode 100644 railties/lib/rails/generators/erb/scaffold/templates/index.html.erb delete mode 100644 railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb delete mode 100644 railties/lib/rails/generators/erb/scaffold/templates/new.html.erb delete mode 100644 railties/lib/rails/generators/erb/scaffold/templates/show.html.erb (limited to 'railties/lib/rails/generators/erb') diff --git a/railties/lib/rails/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb deleted file mode 100644 index f8780d9c33..0000000000 --- a/railties/lib/rails/generators/erb/controller/controller_generator.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'rails/generators/erb' - -module Erb - module Generators - class ControllerGenerator < Base - argument :actions, :type => :array, :default => [], :banner => "action action" - - def create_view_files - base_path = File.join("app/views", class_path, file_name) - empty_directory base_path - - actions.each do |action| - @action = action - @path = File.join(base_path, "#{action}.html.erb") - - template 'view.html.erb', @path - end - end - end - end -end diff --git a/railties/lib/rails/generators/erb/controller/templates/view.html.erb b/railties/lib/rails/generators/erb/controller/templates/view.html.erb deleted file mode 100644 index cd54d13d83..0000000000 --- a/railties/lib/rails/generators/erb/controller/templates/view.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

<%= class_name %>#<%= @action %>

-

Find me in <%= @path %>

diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb deleted file mode 100644 index 5266259e2f..0000000000 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'rails/generators/erb' - -module Erb - module Generators - class MailerGenerator < Base - argument :actions, :type => :array, :default => [], :banner => "method method" - - def create_view_folder - empty_directory File.join("app/views", file_path) - end - - def create_view_files - actions.each do |action| - @action, @path = action, File.join(file_path, action) - template "view.erb", File.join("app/views", "#{@path}.erb") - end - end - end - end -end diff --git a/railties/lib/rails/generators/erb/mailer/templates/view.erb b/railties/lib/rails/generators/erb/mailer/templates/view.erb deleted file mode 100644 index fcce7bd805..0000000000 --- a/railties/lib/rails/generators/erb/mailer/templates/view.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= class_name %>#<%= @action %> - -Find me in app/views/<%= @path %> diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb deleted file mode 100644 index de5b0e9c5d..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb +++ /dev/null @@ -1,53 +0,0 @@ -require 'rails/generators/erb' -require 'rails/generators/resource_helpers' - -module Erb - module Generators - class ScaffoldGenerator < Base - include Rails::Generators::ResourceHelpers - - argument :attributes, :type => :array, :default => [], :banner => "field:type field:type" - - class_option :layout, :type => :boolean - class_option :singleton, :type => :boolean, :desc => "Supply to skip index view" - - def create_root_folder - empty_directory File.join("app/views", controller_file_path) - end - - def copy_index_file - return if options[:singleton] - copy_view :index - end - - def copy_edit_file - copy_view :edit - end - - def copy_show_file - copy_view :show - end - - def copy_new_file - copy_view :new - end - - def copy_form_file - copy_view :_form - end - - def copy_layout_file - return unless options[:layout] - template "layout.html.erb", - File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.erb") - end - - protected - - def copy_view(view) - template "#{view}.html.erb", File.join("app/views", controller_file_path, "#{view}.html.erb") - end - - end - end -end diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb deleted file mode 100644 index 9c19a09616..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<%% form_for(@<%= singular_name %>) do |f| %> - <%%= f.error_messages %> - -<% for attribute in attributes -%> -
- <%%= f.label :<%= attribute.name %> %>
- <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> -
-<% end -%> -
- <%%= f.submit %> -
-<%% end %> diff --git a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb deleted file mode 100644 index 5bc507ffc8..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

Editing <%= singular_name %>

- -<%%= render 'form' %> - -<%%= link_to 'Show', @<%= singular_name %> %> | -<%%= link_to 'Back', <%= plural_name %>_path %> diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb deleted file mode 100644 index b5c7fd1e58..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

Listing <%= plural_name %>

- - - -<% for attribute in attributes -%> - -<% end -%> - - - - - -<%% @<%= plural_name %>.each do |<%= singular_name %>| %> - -<% for attribute in attributes -%> - -<% end -%> - - - - -<%% end %> -
<%= attribute.human_name %>
<%%= <%= singular_name %>.<%= attribute.name %> %><%%= link_to 'Show', <%= singular_name %> %><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %><%%= link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %>
- -
- -<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %> diff --git a/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb deleted file mode 100644 index 7aa049fe80..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - <%= controller_class_name %>: <%%= controller.action_name %> - <%%= stylesheet_link_tag 'scaffold' %> - - - -

<%%= notice %>

- -<%%= yield %> - - - diff --git a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb deleted file mode 100644 index 9a1c489331..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

New <%= singular_name %>

- -<%%= render 'form' %> - -<%%= link_to 'Back', <%= plural_name %>_path %> diff --git a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb deleted file mode 100644 index 24f13fc0f8..0000000000 --- a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% for attribute in attributes -%> -

- <%= attribute.human_name %>: - <%%= @<%= singular_name %>.<%= attribute.name %> %> -

- -<% end -%> - -<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> | -<%%= link_to 'Back', <%= plural_name %>_path %> -- cgit v1.2.3