From 4f2a950ce2f29d4c6ce777d5a949440b6c2a440f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 16 May 2007 01:23:34 +0000 Subject: Make way for the new and improved scaffold git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6745 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../components/scaffold/templates/controller.rb | 58 ------------ .../components/scaffold/templates/form.html.erb | 3 - .../scaffold/templates/form_scaffolding.html.erb | 1 - .../scaffold/templates/functional_test.rb | 102 --------------------- .../components/scaffold/templates/helper.rb | 2 - .../components/scaffold/templates/layout.html.erb | 17 ---- .../components/scaffold/templates/style.css | 74 --------------- .../scaffold/templates/view_edit.html.erb | 9 -- .../scaffold/templates/view_list.html.erb | 27 ------ .../scaffold/templates/view_new.html.erb | 8 -- .../scaffold/templates/view_show.html.erb | 8 -- 11 files changed, 309 deletions(-) delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/helper.rb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/style.css delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb delete mode 100644 railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb (limited to 'railties/lib/rails_generator/generators/components/scaffold/templates') diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb deleted file mode 100644 index c059e74536..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb +++ /dev/null @@ -1,58 +0,0 @@ -class <%= controller_class_name %>Controller < ApplicationController -<% unless suffix -%> - def index - list - render :action => 'list' - end -<% end -%> - -<% for action in unscaffolded_actions -%> - def <%= action %><%= suffix %> - end - -<% end -%> - # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy<%= suffix %>, :create<%= suffix %>, :update<%= suffix %> ], - :redirect_to => { :action => :list<%= suffix %> } - - def list<%= suffix %> - @<%= singular_name %>_pages, @<%= plural_name %> = paginate :<%= plural_name %>, :per_page => 10 - end - - def show<%= suffix %> - @<%= singular_name %> = <%= model_name %>.find(params[:id]) - end - - def new<%= suffix %> - @<%= singular_name %> = <%= model_name %>.new - end - - def create<%= suffix %> - @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>]) - if @<%= singular_name %>.save - flash[:notice] = '<%= model_name %> was successfully created.' - redirect_to :action => 'list<%= suffix %>' - else - render :action => 'new<%= suffix %>' - end - end - - def edit<%= suffix %> - @<%= singular_name %> = <%= model_name %>.find(params[:id]) - end - - def update - @<%= singular_name %> = <%= model_name %>.find(params[:id]) - if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>]) - flash[:notice] = '<%= model_name %> was successfully updated.' - redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %> - else - render :action => 'edit<%= suffix %>' - end - end - - def destroy<%= suffix %> - <%= model_name %>.find(params[:id]).destroy - redirect_to :action => 'list<%= suffix %>' - end -end diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb deleted file mode 100644 index d15f0d4ec2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%%= error_messages_for '<%= singular_name %>' %> - -<%= template_for_inclusion %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb deleted file mode 100644 index c7a87553ac..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= all_input_tags(@model_instance, @singular_name, {}) %> \ No newline at end of file diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb deleted file mode 100644 index ed7136bb52..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb +++ /dev/null @@ -1,102 +0,0 @@ -require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper' -require '<%= controller_file_path %>_controller' - -# Re-raise errors caught by the controller. -class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end - -class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase - fixtures :<%= table_name %> - - def setup - @controller = <%= controller_class_name %>Controller.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - - @first_id = <%= plural_name %>(:first).id - end - -<% for action in unscaffolded_actions -%> - def test_<%= action %> - get :<%= action %> - assert_response :success - assert_template '<%= action %>' - end - -<% end -%> -<% unless suffix -%> - def test_index - get :index - assert_response :success - assert_template 'list' - end - -<% end -%> - def test_list<%= suffix %> - get :list<%= suffix %> - - assert_response :success - assert_template 'list<%= suffix %>' - - assert_not_nil assigns(:<%= plural_name %>) - end - - def test_show<%= suffix %> - get :show<%= suffix %>, :id => @first_id - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:<%= singular_name %>) - assert assigns(:<%= singular_name %>).valid? - end - - def test_new<%= suffix %> - get :new<%= suffix %> - - assert_response :success - assert_template 'new<%= suffix %>' - - assert_not_nil assigns(:<%= singular_name %>) - end - - def test_create - num_<%= plural_name %> = <%= model_name %>.count - - post :create<%= suffix %>, :<%= singular_name %> => {} - - assert_response :redirect - assert_redirected_to :action => 'list<%= suffix %>' - - assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count - end - - def test_edit<%= suffix %> - get :edit<%= suffix %>, :id => @first_id - - assert_response :success - assert_template 'edit<%= suffix %>' - - assert_not_nil assigns(:<%= singular_name %>) - assert assigns(:<%= singular_name %>).valid? - end - - def test_update<%= suffix %> - post :update<%= suffix %>, :id => @first_id - assert_response :redirect - assert_redirected_to :action => 'show<%= suffix %>', :id => @first_id - end - - def test_destroy<%= suffix %> - assert_nothing_raised { - <%= model_name %>.find(@first_id) - } - - post :destroy, :id => @first_id - assert_response :redirect - assert_redirected_to :action => 'list<%= suffix %>' - - assert_raise(ActiveRecord::RecordNotFound) { - <%= model_name %>.find(@first_id) - } - end -end diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/helper.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/helper.rb deleted file mode 100644 index 9bd821b1b2..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module <%= controller_class_name %>Helper -end diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb deleted file mode 100644 index 5c1f304232..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - <%= controller_class_name %>: <%%= controller.action_name %> - <%%= stylesheet_link_tag 'scaffold' %> - - - -

<%%= flash[:notice] %>

- -<%%= yield %> - - - diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/style.css b/railties/lib/rails_generator/generators/components/scaffold/templates/style.css deleted file mode 100644 index 8f239a3597..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/style.css +++ /dev/null @@ -1,74 +0,0 @@ -body { background-color: #fff; color: #333; } - -body, p, ol, ul, td { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; -} - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; -} - -a { color: #000; } -a:visited { color: #666; } -a:hover { color: #fff; background-color:#000; } - -.fieldWithErrors { - padding: 2px; - background-color: red; - display: table; -} - -#errorExplanation { - width: 400px; - border: 2px solid red; - padding: 7px; - padding-bottom: 12px; - margin-bottom: 20px; - background-color: #f0f0f0; -} - -#errorExplanation h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - background-color: #c00; - color: #fff; -} - -#errorExplanation p { - color: #333; - margin-bottom: 0; - padding: 5px; -} - -#errorExplanation ul li { - font-size: 12px; - list-style: square; -} - -div.uploadStatus { - margin: 5px; -} - -div.progressBar { - margin: 5px; -} - -div.progressBar div.border { - background-color: #fff; - border: 1px solid grey; - width: 100%; -} - -div.progressBar div.background { - background-color: #333; - height: 18px; - width: 0%; -} - diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb deleted file mode 100644 index a86aa0b0d5..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -

Editing <%= singular_name %>

- -<%% form_tag :action => 'update<%= @suffix %>', :id => @<%= singular_name %> do %> - <%%= render :partial => 'form' %> - <%%= submit_tag 'Edit' %> -<%% end %> - -<%%= link_to 'Show', :action => 'show<%= suffix %>', :id => @<%= singular_name %> %> | -<%%= link_to 'Back', :action => 'list<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb deleted file mode 100644 index 3e2a414485..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

Listing <%= plural_name %>

- - - - <%% for column in <%= model_name %>.content_columns %> - - <%% end %> - - -<%% for <%= singular_name %> in @<%= plural_name %> %> - - <%% for column in <%= model_name %>.content_columns %> - - <%% end %> - - - - -<%% end %> -
<%%= column.human_name %>
<%%=h <%= singular_name %>.send(column.name) %><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %> %><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %> %><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :confirm => 'Are you sure?', :method => :post %>
- -<%%= link_to 'Previous page', { :page => @<%= singular_name %>_pages.current.previous } if @<%= singular_name %>_pages.current.previous %> -<%%= link_to 'Next page', { :page => @<%= singular_name %>_pages.current.next } if @<%= singular_name %>_pages.current.next %> - -
- -<%%= link_to 'New <%= singular_name %>', :action => 'new<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb deleted file mode 100644 index 8222ea622f..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

New <%= singular_name %>

- -<%% form_tag :action => 'create<%= @suffix %>' do %> - <%%= render :partial => 'form' %> - <%%= submit_tag "Create" %> -<%% end %> - -<%%= link_to 'Back', :action => 'list<%= suffix %>' %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb deleted file mode 100644 index c9245cdfda..0000000000 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%% for column in <%= model_name %>.content_columns %> -

- <%%= column.human_name %>: <%%=h @<%= singular_name %>.send(column.name) %> -

-<%% end %> - -<%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => @<%= singular_name %> %> | -<%%= link_to 'Back', :action => 'list<%= suffix %>' %> -- cgit v1.2.3