Normalize whitespace. Closes #8385 [Time Pope]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6869 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

28 files changed, 41 insertions, 41 deletions

diff --git a/railties/bin/about b/railties/bin/about
index 7b07d46a30..cd38a32abf 100644
--- a/railties/bin/about
+++ b/railties/bin/about
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/about'
\ No newline at end of file
+require 'commands/about'
diff --git a/railties/bin/console b/railties/bin/console
index 42f28f7d6d..498077ab33 100644
--- a/railties/bin/console
+++ b/railties/bin/console
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/console'
\ No newline at end of file
+require 'commands/console'
diff --git a/railties/bin/destroy b/railties/bin/destroy
index fa0e6fcd0b..a4df765a39 100644
--- a/railties/bin/destroy
+++ b/railties/bin/destroy
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/destroy'
\ No newline at end of file
+require 'commands/destroy'
diff --git a/railties/bin/generate b/railties/bin/generate
index ef976e09f3..173a9f147d 100644
--- a/railties/bin/generate
+++ b/railties/bin/generate
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/generate'
\ No newline at end of file
+require 'commands/generate'
diff --git a/railties/bin/plugin b/railties/bin/plugin
index 26ca64c06b..87cd2070fe 100644
--- a/railties/bin/plugin
+++ b/railties/bin/plugin
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/plugin'
\ No newline at end of file
+require 'commands/plugin'
diff --git a/railties/bin/runner b/railties/bin/runner
index ccc30f9d24..a4a7cb25ba 100644
--- a/railties/bin/runner
+++ b/railties/bin/runner
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/runner'
\ No newline at end of file
+require 'commands/runner'
diff --git a/railties/bin/server b/railties/bin/server
index dfabcb8812..3c67f39b69 100644
--- a/railties/bin/server
+++ b/railties/bin/server
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/server'
\ No newline at end of file
+require 'commands/server'
diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf
index d3c9983451..d9d211c058 100755
--- a/railties/configs/apache.conf
+++ b/railties/configs/apache.conf
@@ -37,4 +37,4 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
 # Example:
 #   ErrorDocument 500 /500.html
 
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
\ No newline at end of file
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml
index b7e01dac78..b3525663bf 100644
--- a/railties/configs/databases/mysql.yml
+++ b/railties/configs/databases/mysql.yml
@@ -45,4 +45,4 @@ production:
   socket: <%= socket %>
 <% else -%>
   host: localhost
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/railties/configs/initializers/inflections.rb b/railties/configs/initializers/inflections.rb
index a372f170b5..3bf26a7f55 100644
--- a/railties/configs/initializers/inflections.rb
+++ b/railties/configs/initializers/inflections.rb
@@ -5,4 +5,4 @@
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
-# end
\ No newline at end of file
+# end
diff --git a/railties/configs/initializers/mime_types.rb b/railties/configs/initializers/mime_types.rb
index 43fde08ce5..af12e9d449 100644
--- a/railties/configs/initializers/mime_types.rb
+++ b/railties/configs/initializers/mime_types.rb
@@ -1,3 +1,3 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register "application/x-mobile", :mobile
\ No newline at end of file
+# Mime::Type.register "application/x-mobile", :mobile
diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb
index ee6ff5d3dd..ef0c8e8d2a 100644
--- a/railties/configs/routes.rb
+++ b/railties/configs/routes.rb
@@ -1,6 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   # The priority is based upon order of creation: first created -> highest priority.
-  
+
   # Sample of regular route:
   # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
@@ -8,7 +8,7 @@ ActionController::Routing::Routes.draw do |map|
   # Sample of named route:
   # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
   # This route can be invoked with purchase_url(:id => product.id)
-  
+
   # Sample resource route (maps HTTP verbs to controller actions automatically):
   # map.resources :products
 
@@ -16,7 +16,7 @@ ActionController::Routing::Routes.draw do |map|
   # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
 
   # Sample resource route with sub-resources:
-  # map.resources :products, :has_many => [ :comments, :sales ], :has_ony => :seller
+  # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
 
   # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
   # map.root :controller => "welcome"
@@ -24,4 +24,4 @@ ActionController::Routing::Routes.draw do |map|
   # Install the default routes as the lowest priority.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
-end
\ No newline at end of file
+end
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 2e485a5738..73ebf20d3f 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -1,6 +1,6 @@
 # Be sure to restart your web server when you modify this file.
 
-# Uncomment below to force Rails into production mode when 
+# Uncomment below to force Rails into production mode when
 # you don't control web/app server and can't set it the proper way
 # ENV['RAILS_ENV'] ||= 'production'
 
@@ -12,7 +12,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here
-  
+
   # Skip frameworks you're not going to use (only works if using vendor/rails)
   # config.frameworks -= [ :active_resource, :action_mailer ]
 
@@ -22,7 +22,7 @@ Rails::Initializer.run do |config|
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
-  # Force all environments to use the same logger level 
+  # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 
@@ -38,7 +38,7 @@ Rails::Initializer.run do |config|
   # config.action_controller.session_store = :active_record_store
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper, 
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
@@ -49,7 +49,7 @@ Rails::Initializer.run do |config|
   # config.active_record.default_timezone = :utc
 
   # See Rails::Configuration for more options
-  
+
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory is automatically loaded
-end
\ No newline at end of file
+end
diff --git a/railties/environments/test.rb b/railties/environments/test.rb
index f0689b924b..bbca20a31b 100644
--- a/railties/environments/test.rb
+++ b/railties/environments/test.rb
@@ -16,4 +16,4 @@ config.action_controller.perform_caching             = false
 # Tell ActionMailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
\ No newline at end of file
+config.action_mailer.delivery_method = :test
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 @@
     <th><%= attribute.column.human_name %></th>
 <% end -%>
   </tr>
-  
+
 <%% for <%= singular_name %> in @<%= plural_name %> %>
   <tr>
 <% for attribute in attributes -%>
@@ -21,4 +21,4 @@
 
 <br />
 
-<%%= 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 @@
   </p>
 <%% 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 %>