From e2ad603f52cd2414a104ab75b6d475d6cdd5ca7c Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 27 May 2007 18:44:33 +0000 Subject: Normalize whitespace. Closes #8385 [Time Pope] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6869 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../generators/components/model/templates/fixtures.yml | 2 +- .../generators/components/plugin/templates/MIT-LICENSE | 2 +- .../generators/components/plugin/templates/README | 2 +- .../generators/components/plugin/templates/USAGE | 2 +- .../generators/components/plugin/templates/init.rb | 2 +- .../generators/components/plugin/templates/plugin.rb | 2 +- .../generators/components/plugin/templates/tasks.rake | 2 +- .../generators/components/resource/templates/USAGE | 2 +- .../generators/components/resource/templates/controller.rb | 2 +- .../components/scaffold/templates/functional_test.rb | 10 +++++----- .../components/scaffold/templates/view_edit.html.erb | 2 +- .../components/scaffold/templates/view_index.html.erb | 4 ++-- .../generators/components/scaffold/templates/view_new.html.erb | 2 +- .../components/scaffold/templates/view_show.html.erb | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) (limited to 'railties/lib/rails_generator') diff --git a/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml b/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml index 9f5ae29a81..6be3c81bee 100644 --- a/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml +++ b/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml @@ -8,4 +8,4 @@ two: id: 2 <% for attribute in attributes -%> <%= attribute.name %>: <%= attribute.default %> -<% end -%> \ No newline at end of file +<% end -%> diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE b/railties/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE index 6600438d64..570ecf8706 100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE +++ b/railties/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE @@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/README b/railties/lib/rails_generator/generators/components/plugin/templates/README index c2e3fad36e..0a3378f1b9 100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/README +++ b/railties/lib/rails_generator/generators/components/plugin/templates/README @@ -10,4 +10,4 @@ Example Example goes here. -Copyright (c) 2007 [name of plugin creator], released under the MIT license \ No newline at end of file +Copyright (c) 2007 [name of plugin creator], released under the MIT license diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/USAGE b/railties/lib/rails_generator/generators/components/plugin/templates/USAGE index f927799428..ea9f4f12cc 100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/USAGE +++ b/railties/lib/rails_generator/generators/components/plugin/templates/USAGE @@ -5,4 +5,4 @@ Example: ./script/generate <%= file_name %> Thing This will create: - what/will/it/create \ No newline at end of file + what/will/it/create diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/init.rb b/railties/lib/rails_generator/generators/components/plugin/templates/init.rb index ada2eece96..3c19a743c9 100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/init.rb +++ b/railties/lib/rails_generator/generators/components/plugin/templates/init.rb @@ -1 +1 @@ -# Include hook code here \ No newline at end of file +# Include hook code here diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb b/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb index 1fa5b9028f..d8d908a959 100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb +++ b/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb @@ -1 +1 @@ -# <%= class_name %> \ No newline at end of file +# <%= class_name %> diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake b/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake index 5222b22c27..72920a9d3a 100644 --- a/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake +++ b/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake @@ -1,4 +1,4 @@ # desc "Explaining what the task does" # task :<%= file_name %> do # # Task goes here -# end \ No newline at end of file +# end diff --git a/railties/lib/rails_generator/generators/components/resource/templates/USAGE b/railties/lib/rails_generator/generators/components/resource/templates/USAGE index 39ad0db472..1c03d44bdb 100644 --- a/railties/lib/rails_generator/generators/components/resource/templates/USAGE +++ b/railties/lib/rails_generator/generators/components/resource/templates/USAGE @@ -15,4 +15,4 @@ Description: Examples: ./script/generate resource post ./script/generate resource post title:string created_on:date body:text published:boolean - ./script/generate resource purchase order_id:integer created_at:datetime amount:decimal \ No newline at end of file + ./script/generate resource purchase order_id:integer created_at:datetime amount:decimal diff --git a/railties/lib/rails_generator/generators/components/resource/templates/controller.rb b/railties/lib/rails_generator/generators/components/resource/templates/controller.rb index 153ee1edac..765a942694 100644 --- a/railties/lib/rails_generator/generators/components/resource/templates/controller.rb +++ b/railties/lib/rails_generator/generators/components/resource/templates/controller.rb @@ -1,2 +1,2 @@ class <%= controller_class_name %>Controller < ApplicationController -end \ No newline at end of file +end 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 index 7619b04dc3..15c61f1ddb 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb @@ -23,12 +23,12 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase get :new assert_response :success end - + def test_should_create_<%= file_name %> assert_difference('<%= class_name %>.count') do post :create, :<%= file_name %> => { } end - + assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>)) end @@ -41,17 +41,17 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase get :edit, :id => 1 assert_response :success end - + def test_should_update_<%= file_name %> put :update, :id => 1, :<%= file_name %> => { } assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>)) end - + def test_should_destroy_<%= file_name %> assert_difference('<%= class_name %>.count', -1) do delete :destroy, :id => 1 end - + assert_redirected_to <%= table_name %>_path end end 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 index a39916db96..8a65b50db1 100644 --- 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 @@ -16,4 +16,4 @@ <%% end %> <%%= link_to 'Show', @<%= singular_name %> %> | -<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file +<%%= link_to 'Back', <%= plural_name %>_path %> diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb index 32adca08ad..e89757e3e9 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb @@ -6,7 +6,7 @@ <%= attribute.column.human_name %> <% end -%> - + <%% for <%= singular_name %> in @<%= plural_name %> %> <% for attribute in attributes -%> @@ -21,4 +21,4 @@
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %> \ No newline at end of file +<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %> 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 index 3d92e1f516..96f59900b6 100644 --- 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 @@ -15,4 +15,4 @@

<%% end %> -<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file +<%%= link_to 'Back', <%= plural_name %>_path %> 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 index adecaf70c6..9b6b11b029 100644 --- 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 @@ -7,4 +7,4 @@ <% end -%> <%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> | -<%%= link_to 'Back', <%= plural_name %>_path %> \ No newline at end of file +<%%= link_to 'Back', <%= plural_name %>_path %> -- cgit v1.2.3