Use Ruby 1.9 Hash syntax in railties

62 files changed, 232 insertions, 232 deletions

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index d7e22cc839..dd51a6fb01 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -106,7 +106,7 @@ module Rails
     # * The environment variable RAILS_GROUPS;
     # * The optional envs given as argument and the hash with group dependencies;
     #
-    #   groups :assets => [:development, :test]
+    #   groups assets: [:development, :test]
     #
     #   # Returns
     #   # => [:default, :development, :assets] for Rails.env == "development"
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 0a717c76b3..eff5bbbdd6 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -71,7 +71,7 @@ module Rails
     attr_reader :reloaders
     attr_writer :queue
 
-    delegate :default_url_options, :default_url_options=, :to => :routes
+    delegate :default_url_options, :default_url_options=, to: :routes
 
     def initialize
       super
@@ -106,7 +106,7 @@ module Rails
     def key_generator
       # number of iterations selected based on consultation with the google security
       # team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220
-      @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, :iterations=>1000)
+      @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, iterations: 1000)
     end
 
     # Stores some of the Rails initial environment parameters which
@@ -296,9 +296,9 @@ module Rails
 
           if rack_cache == true
             rack_cache = {
-              :metastore => "rails:/",
-              :entitystore => "rails:/",
-              :verbose => false
+              metastore: "rails:/",
+              entitystore: "rails:/",
+              verbose: false
             }
           end
 
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index a1bc95550b..62d57c0cc6 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -7,13 +7,13 @@ module Rails
     module Bootstrap
       include Initializable
 
-      initializer :load_environment_hook, :group => :all do end
+      initializer :load_environment_hook, group: :all do end
 
-      initializer :load_active_support, :group => :all do
+      initializer :load_active_support, group: :all do
         require "active_support/all" unless config.active_support.bare
       end
 
-      initializer :set_eager_load, :group => :all do
+      initializer :set_eager_load, group: :all do
         if config.eager_load.nil?
           warn <<-INFO
 config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly:
@@ -28,7 +28,7 @@ INFO
       end
 
       # Initialize the logger early in the stack in case we need to log some deprecation.
-      initializer :initialize_logger, :group => :all do
+      initializer :initialize_logger, group: :all do
         Rails.logger ||= config.logger || begin
           path = config.paths["log"].first
           unless File.exist? File.dirname path
@@ -56,7 +56,7 @@ INFO
       end
 
       # Initialize cache early in the stack so railties can make use of it.
-      initializer :initialize_cache, :group => :all do
+      initializer :initialize_cache, group: :all do
         unless Rails.cache
           Rails.cache = ActiveSupport::Cache.lookup_store(config.cache_store)
 
@@ -67,11 +67,11 @@ INFO
       end
 
       # Sets the dependency loading mechanism.
-      initializer :initialize_dependency_mechanism, :group => :all do
+      initializer :initialize_dependency_mechanism, group: :all do
         ActiveSupport::Dependencies.mechanism = config.cache_classes ? :require : :load
       end
 
-      initializer :bootstrap_hook, :group => :all do |app|
+      initializer :bootstrap_hook, group: :all do |app|
         ActiveSupport.run_load_hooks(:before_initialize, app)
       end
     end
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9b89d7094c..c3e75a643b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -79,10 +79,10 @@ module Rails
       def paths
         @paths ||= begin
           paths = super
-          paths.add "config/database",    :with => "config/database.yml"
-          paths.add "config/environment", :with => "config/environment.rb"
+          paths.add "config/database",    with: "config/database.yml"
+          paths.add "config/environment", with: "config/environment.rb"
           paths.add "lib/templates"
-          paths.add "log",                :with => "log/#{Rails.env}.log"
+          paths.add "log",                with: "log/#{Rails.env}.log"
           paths.add "public"
           paths.add "public/javascripts"
           paths.add "public/stylesheets"
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 4a15a36ba9..c520f7af9d 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -72,7 +72,7 @@ module Rails
 
       # Set app reload just after the finisher hook to ensure
       # paths added in the hook are still loaded.
-      initializer :set_clear_dependencies_hook, :group => :all do
+      initializer :set_clear_dependencies_hook, group: :all do
         callback = lambda do
           ActiveSupport::DescendantsTracker.clear
           ActiveSupport::Dependencies.clear
@@ -83,7 +83,7 @@ module Rails
           self.reloaders << reloader
           # We need to set a to_prepare callback regardless of the reloader result, i.e.
           # models should be reloaded if any of the reloaders (i18n, routes) were updated.
-          ActionDispatch::Reloader.to_prepare(:prepend => true){ reloader.execute }
+          ActionDispatch::Reloader.to_prepare(prepend: true){ reloader.execute }
         else
           ActionDispatch::Reloader.to_cleanup(&callback)
         end
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index 6f9a200aa9..737977adf9 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -4,7 +4,7 @@ module Rails
   class Application
     class RoutesReloader
       attr_reader :route_sets, :paths
-      delegate :execute_if_updated, :execute, :updated?, :to => :updater
+      delegate :execute_if_updated, :execute, :updated?, to: :updater
 
       def initialize
         @paths      = []
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 9023c61bf2..5479da86a0 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -6,4 +6,4 @@ if [nil, "-h", "--help"].include?(ARGV.first)
 end
 
 name = ARGV.shift
-Rails::Generators.invoke name, ARGV, :behavior => :revoke, :destination_root => Rails.root
+Rails::Generators.invoke name, ARGV, behavior: :revoke, destination_root: Rails.root
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index 9f13cb0513..351c59c645 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -8,4 +8,4 @@ end
 name = ARGV.shift
 
 root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
-Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => root
+Rails::Generators.invoke name, ARGV, behavior: :invoke, destination_root: root
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index a672258aa6..0cc672e01c 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -1,7 +1,7 @@
 require 'optparse'
 require 'rbconfig'
 
-options = { :environment => (ENV['RAILS_ENV'] || "development").dup }
+options = { environment: (ENV['RAILS_ENV'] || "development").dup }
 code_or_file = nil
 
 if ARGV.first.nil?
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index a684129353..80fdc06cd2 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -105,13 +105,13 @@ module Rails
 
     def default_options
       super.merge({
-        :Port        => 3000,
-        :DoNotReverseLookup => true,
-        :environment => (ENV['RAILS_ENV'] || "development").dup,
-        :daemonize   => false,
-        :debugger    => false,
-        :pid         => File.expand_path("tmp/pids/server.pid"),
-        :config      => File.expand_path("config.ru")
+        Port:         3000,
+        DoNotReverseLookup:  true,
+        environment:  (ENV['RAILS_ENV'] || "development").dup,
+        daemonize:    false,
+        debugger:     false,
+        pid:          File.expand_path("tmp/pids/server.pid"),
+        config:       File.expand_path("config.ru")
       })
     end
   end
diff --git a/railties/lib/rails/commands/update.rb b/railties/lib/rails/commands/update.rb
index 85a81cddf0..59fae5c337 100644
--- a/railties/lib/rails/commands/update.rb
+++ b/railties/lib/rails/commands/update.rb
@@ -6,4 +6,4 @@ if ARGV.size == 0
 end
 
 name = ARGV.shift
-Rails::Generators.invoke name, ARGV, :behavior => :skip
+Rails::Generators.invoke name, ARGV, behavior: :skip
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 7afb599910..2c2bb1c714 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -251,7 +251,7 @@ module Rails
   #
   #   # config/routes.rb
   #   MyApplication::Application.routes.draw do
-  #     mount MyEngine::Engine => "/my_engine", :as => "my_engine"
+  #     mount MyEngine::Engine => "/my_engine", as: "my_engine"
   #     get "/foo" => "foo#index"
   #   end
   #
@@ -368,7 +368,7 @@ module Rails
       def isolate_namespace(mod)
         engine_name(generate_railtie_name(mod))
 
-        self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
+        self.routes.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
         unless mod.respond_to?(:railtie_namespace)
@@ -407,8 +407,8 @@ module Rails
       end
     end
 
-    delegate :middleware, :root, :paths, :to => :config
-    delegate :engine_name, :isolated?, :to => "self.class"
+    delegate :middleware, :root, :paths, to: :config
+    delegate :engine_name, :isolated?, to: "self.class"
 
     def initialize
       @_all_autoload_paths = nil
@@ -536,7 +536,7 @@ module Rails
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
-    initializer :set_load_path, :before => :bootstrap_hook do
+    initializer :set_load_path, before: :bootstrap_hook do
       _all_load_paths.reverse_each do |path|
         $LOAD_PATH.unshift(path) if File.directory?(path)
       end
@@ -548,7 +548,7 @@ module Rails
     #
     # This needs to be an initializer, since it needs to run once
     # per engine and get the engine as a block parameter
-    initializer :set_autoload_paths, :before => :bootstrap_hook do |app|
+    initializer :set_autoload_paths, before: :bootstrap_hook do |app|
       ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
       ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
 
@@ -581,13 +581,13 @@ module Rails
       end
     end
 
-    initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
+    initializer :load_environment_config, before: :load_environment_hook, group: :all do
       paths["config/environments"].existent.each do |environment|
         require environment
       end
     end
 
-    initializer :append_assets_path, :group => :all do |app|
+    initializer :append_assets_path, group: :all do |app|
       app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index 6b18b1e249..22e885a3a6 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -20,7 +20,7 @@ module Rails
       # Holds generators configuration:
       #
       #   config.generators do |g|
-      #     g.orm             :data_mapper, :migration => true
+      #     g.orm             :data_mapper, migration: true
       #     g.template_engine :haml
       #     g.test_framework  :rspec
       #   end
@@ -38,26 +38,26 @@ module Rails
       def paths
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
-          paths.add "app",                 :eager_load => true, :glob => "*"
-          paths.add "app/assets",          :glob => "*"
-          paths.add "app/controllers",     :eager_load => true
-          paths.add "app/helpers",         :eager_load => true
-          paths.add "app/models",          :eager_load => true
-          paths.add "app/mailers",         :eager_load => true
+          paths.add "app",                 eager_load: true, glob: "*"
+          paths.add "app/assets",          glob: "*"
+          paths.add "app/controllers",     eager_load: true
+          paths.add "app/helpers",         eager_load: true
+          paths.add "app/models",          eager_load: true
+          paths.add "app/mailers",         eager_load: true
           paths.add "app/views"
-          paths.add "lib",                 :load_path => true
-          paths.add "lib/assets",          :glob => "*"
-          paths.add "lib/tasks",           :glob => "**/*.rake"
+          paths.add "lib",                 load_path: true
+          paths.add "lib/assets",          glob: "*"
+          paths.add "lib/tasks",           glob: "**/*.rake"
           paths.add "config"
-          paths.add "config/environments", :glob => "#{Rails.env}.rb"
-          paths.add "config/initializers", :glob => "**/*.rb"
-          paths.add "config/locales",      :glob => "*.{rb,yml}"
+          paths.add "config/environments", glob: "#{Rails.env}.rb"
+          paths.add "config/initializers", glob: "**/*.rb"
+          paths.add "config/locales",      glob: "*.{rb,yml}"
           paths.add "config/routes.rb"
           paths.add "db"
           paths.add "db/migrate"
           paths.add "db/seeds.rb"
-          paths.add "vendor",              :load_path => true
-          paths.add "vendor/assets",       :glob => "*"
+          paths.add "vendor",              load_path: true
+          paths.add "vendor/assets",       glob: "*"
           paths
         end
       end
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index a8c0626a41..367f9288b8 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -23,41 +23,41 @@ module Rails
     mattr_accessor :namespace
 
     DEFAULT_ALIASES = {
-      :rails => {
-        :actions => '-a',
-        :orm => '-o',
-        :javascripts => '-j',
-        :javascript_engine => '-je',
-        :resource_controller => '-c',
-        :scaffold_controller => '-c',
-        :stylesheets => '-y',
-        :stylesheet_engine => '-se',
-        :template_engine => '-e',
-        :test_framework => '-t'
+      rails: {
+        actions: '-a',
+        orm: '-o',
+        javascripts: '-j',
+        javascript_engine: '-je',
+        resource_controller: '-c',
+        scaffold_controller: '-c',
+        stylesheets: '-y',
+        stylesheet_engine: '-se',
+        template_engine: '-e',
+        test_framework: '-t'
       },
 
-      :test_unit => {
-        :fixture_replacement => '-r',
+      test_unit: {
+        fixture_replacement: '-r',
       }
     }
 
     DEFAULT_OPTIONS = {
-      :rails => {
-        :assets => true,
-        :force_plural => false,
-        :helper => true,
-        :integration_tool => nil,
-        :javascripts => true,
-        :javascript_engine => :js,
-        :orm => false,
-        :performance_tool => nil,
-        :resource_controller => :controller,
-        :resource_route => true,
-        :scaffold_controller => :scaffold_controller,
-        :stylesheets => true,
-        :stylesheet_engine => :css,
-        :test_framework => false,
-        :template_engine => :erb
+      rails: {
+        assets: true,
+        force_plural: false,
+        helper: true,
+        integration_tool: nil,
+        javascripts: true,
+        javascript_engine: :js,
+        orm: false,
+        performance_tool: nil,
+        resource_controller: :controller,
+        resource_route: true,
+        scaffold_controller: :scaffold_controller,
+        stylesheets: true,
+        stylesheet_engine: :css,
+        test_framework: false,
+        template_engine: :erb
       }
     }
 
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index c41acc7841..5c4e81431c 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -7,9 +7,9 @@ module Rails
 
       # Adds an entry into Gemfile for the supplied gem.
       #
-      #   gem "rspec", :group => :test
-      #   gem "technoweenie-restful-authentication", :lib => "restful-authentication", :source => "http://gems.github.com/"
-      #   gem "rails", "3.0", :git => "git://github.com/rails/rails"
+      #   gem "rspec", group: :test
+      #   gem "technoweenie-restful-authentication", lib: "restful-authentication", source: "http://gems.github.com/"
+      #   gem "rails", "3.0", git: "git://github.com/rails/rails"
       def gem(*args)
         options = args.extract_options!
         name, version = args
@@ -33,7 +33,7 @@ module Rails
           str = "gem #{parts.join(", ")}"
           str = "  " + str if @in_group
           str = "\n" + str
-          append_file "Gemfile", str, :verbose => false
+          append_file "Gemfile", str, verbose: false
         end
       end
 
@@ -47,13 +47,13 @@ module Rails
         log :gemfile, "group #{name}"
 
         in_root do
-          append_file "Gemfile", "\ngroup #{name} do", :force => true
+          append_file "Gemfile", "\ngroup #{name} do", force: true
 
           @in_group = true
           instance_eval(&block)
           @in_group = false
 
-          append_file "Gemfile", "\nend\n", :force => true
+          append_file "Gemfile", "\nend\n", force: true
         end
       end
 
@@ -64,7 +64,7 @@ module Rails
         log :source, source
 
         in_root do
-          prepend_file "Gemfile", "source #{source.inspect}\n", :verbose => false
+          prepend_file "Gemfile", "source #{source.inspect}\n", verbose: false
         end
       end
 
@@ -77,7 +77,7 @@ module Rails
       #     "config.autoload_paths += %W(#{config.root}/extras)"
       #   end
       #
-      #   environment(nil, :env => "development") do
+      #   environment(nil, env: "development") do
       #     "config.active_record.observers = :cacher"
       #   end
       def environment(data=nil, options={}, &block)
@@ -87,10 +87,10 @@ module Rails
 
         in_root do
           if options[:env].nil?
-            inject_into_file 'config/application.rb', "\n    #{data}", :after => sentinel, :verbose => false
+            inject_into_file 'config/application.rb', "\n    #{data}", after: sentinel, verbose: false
           else
             Array(options[:env]).each do |env|
-              inject_into_file "config/environments/#{env}.rb", "\n  #{data}", :after => env_file_sentinel, :verbose => false
+              inject_into_file "config/environments/#{env}.rb", "\n  #{data}", after: env_file_sentinel, verbose: false
             end
           end
         end
@@ -100,8 +100,8 @@ module Rails
       # Run a command in git.
       #
       #   git :init
-      #   git :add => "this.file that.rb"
-      #   git :add => "onefile.rb", :rm => "badfile.cxx"
+      #   git add: "this.file that.rb"
+      #   git add: "onefile.rb", rm: "badfile.cxx"
       def git(commands={})
         if commands.is_a?(Symbol)
           run "git #{commands}"
@@ -123,7 +123,7 @@ module Rails
       #   vendor("foreign.rb", "# Foreign code is fun")
       def vendor(filename, data=nil, &block)
         log :vendor, filename
-        create_file("vendor/#{filename}", data, :verbose => false, &block)
+        create_file("vendor/#{filename}", data, verbose: false, &block)
       end
 
       # Create a new file in the lib/ directory. Code can be specified
@@ -136,7 +136,7 @@ module Rails
       #   lib("foreign.rb", "# Foreign code is fun")
       def lib(filename, data=nil, &block)
         log :lib, filename
-        create_file("lib/#{filename}", data, :verbose => false, &block)
+        create_file("lib/#{filename}", data, verbose: false, &block)
       end
 
       # Create a new Rakefile with the provided code (either in a block or a string).
@@ -156,7 +156,7 @@ module Rails
       #   rakefile('seed.rake', 'puts "Planting seeds"')
       def rakefile(filename, data=nil, &block)
         log :rakefile, filename
-        create_file("lib/tasks/#{filename}", data, :verbose => false, &block)
+        create_file("lib/tasks/#{filename}", data, verbose: false, &block)
       end
 
       # Create a new initializer with the provided code (either in a block or a string).
@@ -174,7 +174,7 @@ module Rails
       #   initializer("api.rb", "API_KEY = '123456'")
       def initializer(filename, data=nil, &block)
         log :initializer, filename
-        create_file("config/initializers/#{filename}", data, :verbose => false, &block)
+        create_file("config/initializers/#{filename}", data, verbose: false, &block)
       end
 
       # Generate something using a generator from Rails or a plugin.
@@ -186,19 +186,19 @@ module Rails
         log :generate, what
         argument = args.map {|arg| arg.to_s }.flatten.join(" ")
 
-        in_root { run_ruby_script("script/rails generate #{what} #{argument}", :verbose => false) }
+        in_root { run_ruby_script("script/rails generate #{what} #{argument}", verbose: false) }
       end
 
       # Runs the supplied rake task
       #
       #   rake("db:migrate")
-      #   rake("db:migrate", :env => "production")
-      #   rake("gems:install", :sudo => true)
+      #   rake("db:migrate", env: "production")
+      #   rake("gems:install", sudo: true)
       def rake(command, options={})
         log :rake, command
         env  = options[:env] || ENV["RAILS_ENV"] || 'development'
         sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
-        in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
+        in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", verbose: false) }
       end
 
       # Just run the capify command in root
@@ -206,7 +206,7 @@ module Rails
       #   capify!
       def capify!
         log :capify, ""
-        in_root { run("#{extify(:capify)} .", :verbose => false) }
+        in_root { run("#{extify(:capify)} .", verbose: false) }
       end
 
       # Make an entry in Rails routing file config/routes.rb
@@ -217,7 +217,7 @@ module Rails
         sentinel = /\.routes\.draw do\s*$/
 
         in_root do
-          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { :after => sentinel, :verbose => false }
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", { after: sentinel, verbose: false }
         end
       end
 
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 5ca1bfc20f..7e938fab47 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -61,7 +61,7 @@ module Rails
       #
       #   module Rails::Generators
       #     class ControllerGenerator < Base
-      #       hook_for :test_framework, :aliases => "-t"
+      #       hook_for :test_framework, aliases: "-t"
       #     end
       #   end
       #
@@ -102,7 +102,7 @@ module Rails
       # :as option:
       #
       #   class AwesomeGenerator < Rails::Generators::Base
-      #     hook_for :test_framework, :as => :controller
+      #     hook_for :test_framework, as: :controller
       #   end
       #
       # And now it will lookup at:
@@ -113,7 +113,7 @@ module Rails
       # need to provide the :base value:
       #
       #   class AwesomeGenerator < Rails::Generators::Base
-      #     hook_for :test_framework, :in => :rails, :as => :controller
+      #     hook_for :test_framework, in: :rails, as: :controller
       #   end
       #
       # And the lookup is exactly the same as previously:
@@ -137,7 +137,7 @@ module Rails
       # developers might want to have webrat available on controller generator.
       # This can be achieved as:
       #
-      #   Rails::Generators::ControllerGenerator.hook_for :webrat, :type => :boolean
+      #   Rails::Generators::ControllerGenerator.hook_for :webrat, type: :boolean
       #
       # Then, if you want webrat to be invoked, just supply:
       #
@@ -171,9 +171,9 @@ module Rails
           defaults = if options[:type] == :boolean
             { }
           elsif [true, false].include?(default_value_for_option(name, options))
-            { :banner => "" }
+            { banner: "" }
           else
-            { :desc => "#{name.to_s.humanize} to be invoked", :banner => "NAME" }
+            { desc: "#{name.to_s.humanize} to be invoked", banner: "NAME" }
           end
 
           unless class_options.key?(name)
@@ -343,8 +343,8 @@ module Rails
         # Small macro to add ruby as an option to the generator with proper
         # default value plus an instance helper method called shebang.
         def self.add_shebang_option!
-          class_option :ruby, :type => :string, :aliases => "-r", :default => Thor::Util.ruby_command,
-                              :desc => "Path to the Ruby binary of your choice", :banner => "PATH"
+          class_option :ruby, type: :string, aliases: "-r", default: Thor::Util.ruby_command,
+                              desc: "Path to the Ruby binary of your choice", banner: "PATH"
 
           no_tasks {
             define_method :shebang do
diff --git a/railties/lib/rails/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb
index 89e6361f93..5f06734ab8 100644
--- a/railties/lib/rails/generators/erb/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/erb'
 module Erb # :nodoc:
   module Generators # :nodoc:
     class ControllerGenerator < Base # :nodoc:
-      argument :actions, :type => :array, :default => [], :banner => "action action"
+      argument :actions, type: :array, default: [], banner: "action action"
 
       def copy_view_files
         base_path = File.join("app/views", class_path, file_name)
diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
index 54ed648df4..bacbc2d280 100644
--- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
@@ -6,7 +6,7 @@ module Erb # :nodoc:
     class ScaffoldGenerator < Base # :nodoc:
       include Rails::Generators::ResourceHelpers
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_root_folder
         empty_directory File.join("app/views", controller_file_path)
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 231813f774..d8a4f15b4b 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -23,7 +23,7 @@ module Rails
           type = type.to_sym if type
 
           if type && reference?(type)
-            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { :unique => true } : true
+            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { unique: true } : true
             attr_options[:index] = references_index
           end
 
@@ -41,11 +41,11 @@ module Rails
         def parse_type_and_options(type)
           case type
           when /(string|text|binary|integer)\{(\d+)\}/
-            return $1, :limit => $2.to_i
+            return $1, limit: $2.to_i
           when /decimal\{(\d+)[,.-](\d+)\}/
-            return :decimal, :precision => $1.to_i, :scale => $2.to_i
+            return :decimal, precision: $1.to_i, scale: $2.to_i
           when /(references|belongs_to)\{polymorphic\}/
-            return $1, :polymorphic => true
+            return $1, polymorphic: true
           else
             return type, {}
           end
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index b61a5fc69d..84f8f76838 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -5,9 +5,9 @@ require 'rails/generators/generated_attribute'
 module Rails
   module Generators
     class NamedBase < Base
-      argument :name, :type => :string
-      class_option :skip_namespace, :type => :boolean, :default => false,
-                                    :desc => "Skip namespace (affects only isolated applications)"
+      argument :name, type: :string
+      class_option :skip_namespace, type: :boolean, default: false,
+                                    desc: "Skip namespace (affects only isolated applications)"
 
       def initialize(args, *options) #:nodoc:
         @inside_template = nil
@@ -169,7 +169,7 @@ module Rails
         #
         # ==== Examples
         #
-        #   check_class_collision :suffix => "Observer"
+        #   check_class_collision suffix: "Observer"
         #
         # If the generator is invoked with class name Admin, it will check for
         # the presence of "AdminObserver".
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 67e7c4d54f..18637451ac 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -96,7 +96,7 @@ module Rails
     end
 
     def public_directory
-      directory "public", "public", :recursive => false
+      directory "public", "public", recursive: false
       if options[:skip_index_html]
         remove_file "public/index.html"
         remove_file 'app/assets/images/rails.png'
@@ -108,7 +108,7 @@ module Rails
       directory "script" do |content|
         "#{shebang}\n" + content
       end
-      chmod "script", 0755, :verbose => false
+      chmod "script", 0755, verbose: false
     end
 
     def test
@@ -152,8 +152,8 @@ module Rails
       add_shared_options_for "application"
 
       # Add bin/rails options
-      class_option :version, :type => :boolean, :aliases => "-v", :group => :rails,
-                             :desc => "Show Rails version number and quit"
+      class_option :version, type: :boolean, aliases: "-v", group: :rails,
+                             desc: "Show Rails version number and quit"
 
       def initialize(*args)
         raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
diff --git a/railties/lib/rails/generators/rails/assets/assets_generator.rb b/railties/lib/rails/generators/rails/assets/assets_generator.rb
index e4f07bba2e..6f4b86e708 100644
--- a/railties/lib/rails/generators/rails/assets/assets_generator.rb
+++ b/railties/lib/rails/generators/rails/assets/assets_generator.rb
@@ -1,11 +1,11 @@
 module Rails
   module Generators
     class AssetsGenerator < NamedBase # :nodoc:
-      class_option :javascripts, :type => :boolean, :desc => "Generate JavaScripts"
-      class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
+      class_option :javascripts, type: :boolean, desc: "Generate JavaScripts"
+      class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
 
-      class_option :javascript_engine, :desc => "Engine for JavaScripts"
-      class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
+      class_option :javascript_engine, desc: "Engine for JavaScripts"
+      class_option :stylesheet_engine, desc: "Engine for Stylesheets"
 
       protected
 
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 1482fc28d4..bae54623c6 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -1,8 +1,8 @@
 module Rails
   module Generators
     class ControllerGenerator < NamedBase # :nodoc:
-      argument :actions, :type => :array, :default => [], :banner => "action action"
-      check_class_collision :suffix => "Controller"
+      argument :actions, type: :array, default: [], banner: "action action"
+      check_class_collision suffix: "Controller"
 
       def create_controller_files
         template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")
diff --git a/railties/lib/rails/generators/rails/generator/generator_generator.rb b/railties/lib/rails/generators/rails/generator/generator_generator.rb
index 8a0fdbf2fb..9a7a516b5b 100644
--- a/railties/lib/rails/generators/rails/generator/generator_generator.rb
+++ b/railties/lib/rails/generators/rails/generator/generator_generator.rb
@@ -1,10 +1,10 @@
 module Rails
   module Generators
     class GeneratorGenerator < NamedBase # :nodoc:
-      check_class_collision :suffix => "Generator"
+      check_class_collision suffix: "Generator"
 
-      class_option :namespace, :type => :boolean, :default => true,
-                               :desc => "Namespace generator under lib/generators/name"
+      class_option :namespace, type: :boolean, default: true,
+                               desc: "Namespace generator under lib/generators/name"
 
       def create_generator_files
         directory '.', generator_dir
diff --git a/railties/lib/rails/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb
index a1f83ac3e4..5ff38e4111 100644
--- a/railties/lib/rails/generators/rails/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class HelperGenerator < NamedBase # :nodoc:
-      check_class_collision :suffix => "Helper"
+      check_class_collision suffix: "Helper"
 
       def create_helper_files
         template 'helper.rb', File.join('app/helpers', class_path, "#{file_name}_helper.rb")
diff --git a/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb b/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb
index 9258ae1ee8..70770ddcb8 100644
--- a/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb
+++ b/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class IntegrationTestGenerator < NamedBase # :nodoc:
-      hook_for :integration_tool, :as => :integration
+      hook_for :integration_tool, as: :integration
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/migration/migration_generator.rb b/railties/lib/rails/generators/rails/migration/migration_generator.rb
index 2e1b6a27d8..965c42db36 100644
--- a/railties/lib/rails/generators/rails/migration/migration_generator.rb
+++ b/railties/lib/rails/generators/rails/migration/migration_generator.rb
@@ -1,8 +1,8 @@
 module Rails
   module Generators
     class MigrationGenerator < NamedBase # :nodoc:
-      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
-      hook_for :orm, :required => true
+      argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+      hook_for :orm, required: true
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/model/model_generator.rb b/railties/lib/rails/generators/rails/model/model_generator.rb
index af1617fadf..ea3d69d7c9 100644
--- a/railties/lib/rails/generators/rails/model/model_generator.rb
+++ b/railties/lib/rails/generators/rails/model/model_generator.rb
@@ -1,8 +1,8 @@
 module Rails
   module Generators
     class ModelGenerator < NamedBase # :nodoc:
-      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
-      hook_for :orm, :required => true
+      argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+      hook_for :orm, required: true
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/observer/observer_generator.rb b/railties/lib/rails/generators/rails/observer/observer_generator.rb
index a11085eb0f..7a4d701ac6 100644
--- a/railties/lib/rails/generators/rails/observer/observer_generator.rb
+++ b/railties/lib/rails/generators/rails/observer/observer_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class ObserverGenerator < NamedBase # :nodoc:
-      hook_for :orm, :required => true
+      hook_for :orm, required: true
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb
index 83771c3dd7..56cd562f3d 100644
--- a/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb
+++ b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class PerformanceTestGenerator < NamedBase # :nodoc:
-      hook_for :performance_tool, :as => :performance
+      hook_for :performance_tool, as: :performance
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 42e0246f76..4a0bcc35a4 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -68,7 +68,7 @@ module Rails
       append_file "Rakefile", <<-EOF
 #{rakefile_test_tasks}
 
-task :default => :test
+task default: :test
       EOF
       if full?
         template "test/integration/navigation_test.rb"
@@ -89,10 +89,10 @@ task :default => :test
     end
 
     def test_dummy_config
-      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
-      template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
+      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
+      template "rails/application.rb", "#{dummy_path}/config/application.rb", force: true
       if mountable?
-        template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
+        template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       end
     end
 
@@ -135,10 +135,10 @@ task :default => :test
     def script(force = false)
       return unless full?
 
-      directory "script", :force => force do |content|
+      directory "script", force: force do |content|
         "#{shebang}\n" + content
       end
-      chmod "script", 0755, :verbose => false
+      chmod "script", 0755, verbose: false
     end
 
     def gemfile_entry
@@ -158,20 +158,20 @@ task :default => :test
 
       alias_method :plugin_path, :app_path
 
-      class_option :dummy_path,   :type => :string, :default => "test/dummy",
-                                  :desc => "Create dummy application at given path"
+      class_option :dummy_path,   type: :string, default: "test/dummy",
+                                  desc: "Create dummy application at given path"
 
-      class_option :full,         :type => :boolean, :default => false,
-                                  :desc => "Generate a rails engine with bundled Rails application for testing"
+      class_option :full,         type: :boolean, default: false,
+                                  desc: "Generate a rails engine with bundled Rails application for testing"
 
-      class_option :mountable,    :type => :boolean, :default => false,
-                                  :desc => "Generate mountable isolated application"
+      class_option :mountable,    type: :boolean, default: false,
+                                  desc: "Generate mountable isolated application"
 
-      class_option :skip_gemspec, :type => :boolean, :default => false,
-                                  :desc => "Skip gemspec file"
+      class_option :skip_gemspec, type: :boolean, default: false,
+                                  desc: "Skip gemspec file"
 
-      class_option :skip_gemfile_entry, :type => :boolean, :default => false,
-                                        :desc => "If creating plugin in application's directory " +
+      class_option :skip_gemfile_entry, type: :boolean, default: false,
+                                        desc: "If creating plugin in application's directory " +
                                                  "skip adding entry to Gemfile"
 
       def initialize(*args)
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
index bd983fb90f..1d380420b4 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application", :media => "all" %>
+  <%%= stylesheet_link_tag    "<%= name %>/application", media: "all" %>
   <%%= javascript_include_tag "<%= name %>/application" %>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index d3ba597dbd..8014feb75f 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -7,14 +7,14 @@ module Rails
     class ResourceGenerator < ModelGenerator # :nodoc:
       include ResourceHelpers
 
-      hook_for :resource_controller, :required => true do |controller|
+      hook_for :resource_controller, required: true do |controller|
         invoke controller, [ controller_name, options[:actions] ]
       end
 
-      class_option :actions, :type => :array, :banner => "ACTION ACTION", :default => [],
-                             :desc => "Actions for the resource controller"
+      class_option :actions, type: :array, banner: "ACTION ACTION", default: [],
+                             desc: "Actions for the resource controller"
 
-      hook_for :resource_route, :required => true
+      hook_for :resource_route, required: true
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index c33c99e989..b4f466fbd8 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -6,10 +6,10 @@ module Rails
       remove_hook_for :resource_controller
       remove_class_option :actions
 
-      class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
-      class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
+      class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
+      class_option :stylesheet_engine, desc: "Engine for Stylesheets"
 
-      hook_for :scaffold_controller, :required => true
+      hook_for :scaffold_controller, required: true
 
       hook_for :assets do |assets|
         invoke assets, [controller_name]
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index df069ca937..4f36b612ae 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -5,21 +5,21 @@ module Rails
     class ScaffoldControllerGenerator < NamedBase # :nodoc:
       include ResourceHelpers
 
-      check_class_collision :suffix => "Controller"
+      check_class_collision suffix: "Controller"
 
-      class_option :orm, :banner => "NAME", :type => :string, :required => true,
-                         :desc => "ORM to generate the controller for"
+      class_option :orm, banner: "NAME", type: :string, required: true,
+                         desc: "ORM to generate the controller for"
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_controller_files
         template "controller.rb", File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
       end
 
-      hook_for :template_engine, :test_framework, :as => :scaffold
+      hook_for :template_engine, :test_framework, as: :scaffold
 
       # Invoke the helper using the controller name (pluralized)
-      hook_for :helper, :as => :scaffold do |invoked|
+      hook_for :helper, as: :scaffold do |invoked|
         invoke invoked, [ controller_name ]
       end
     end
diff --git a/railties/lib/rails/generators/rails/task/task_generator.rb b/railties/lib/rails/generators/rails/task/task_generator.rb
index cf3d1182ea..754824ca0c 100644
--- a/railties/lib/rails/generators/rails/task/task_generator.rb
+++ b/railties/lib/rails/generators/rails/task/task_generator.rb
@@ -1,7 +1,7 @@
 module Rails
   module Generators
     class TaskGenerator < NamedBase # :nodoc:
-      argument :actions, :type => :array, :default => [], :banner => "action action"
+      argument :actions, type: :array, default: [], banner: "action action"
 
       def create_task_files
         template 'task.rb', File.join('lib/tasks', "#{file_name}.rake")
diff --git a/railties/lib/rails/generators/rails/task/templates/task.rb b/railties/lib/rails/generators/rails/task/templates/task.rb
index b7407bd6dc..1e3ed5f158 100644
--- a/railties/lib/rails/generators/rails/task/templates/task.rb
+++ b/railties/lib/rails/generators/rails/task/templates/task.rb
@@ -1,7 +1,7 @@
 namespace :<%= file_name %> do
 <% actions.each do |action| -%>
   desc "TODO"
-  task :<%= action %> => :environment do
+  task <%= action %>: :environment do
   end
 
 <% end -%>
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 3df25219ab..7fd5c00768 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -8,7 +8,7 @@ module Rails
       mattr_accessor :skip_warn
 
       def self.included(base) #:nodoc:
-        base.class_option :force_plural, :type => :boolean, :desc => "Forces the use of a plural ModelName"
+        base.class_option :force_plural, type: :boolean, desc: "Forces the use of a plural ModelName"
       end
 
       # Set controller variables on initialization.
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index 30ae805348..24308dcf6c 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -200,12 +200,12 @@ module Rails
       # You can provide a configuration hash as second argument. This method returns the output
       # printed by the generator.
       def run_generator(args=self.default_arguments, config={})
-        capture(:stdout) { self.generator_class.start(args, config.reverse_merge(:destination_root => destination_root)) }
+        capture(:stdout) { self.generator_class.start(args, config.reverse_merge(destination_root: destination_root)) }
       end
 
       # Instantiate the generator.
       def generator(args=self.default_arguments, options={}, config={})
-        @generator ||= self.generator_class.new(args, options, config.reverse_merge(:destination_root => destination_root))
+        @generator ||= self.generator_class.new(args, options, config.reverse_merge(destination_root: destination_root))
       end
 
       # Create a Rails::Generators::GeneratedAttribute by supplying the
diff --git a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
index c53930f994..b5aa581769 100644
--- a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
@@ -3,8 +3,8 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class ControllerGenerator < Base # :nodoc:
-      argument :actions, :type => :array, :default => [], :banner => "action action"
-      check_class_collision :suffix => "ControllerTest"
+      argument :actions, type: :array, default: [], banner: "action action"
+      check_class_collision suffix: "ControllerTest"
 
       def create_test_files
         template 'functional_test.rb',
diff --git a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
index bcd370098e..0db76f9eaf 100644
--- a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class HelperGenerator < Base # :nodoc:
-      check_class_collision :suffix => "HelperTest"
+      check_class_collision suffix: "HelperTest"
 
       def create_helper_files
         template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb")
diff --git a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
index 427d128275..e004835bd5 100644
--- a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
+++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class IntegrationGenerator < Base # :nodoc:
-      check_class_collision :suffix => "Test"
+      check_class_collision suffix: "Test"
 
       def create_test_files
         template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
index 570a733227..3334b189bf 100644
--- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
@@ -3,8 +3,8 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class MailerGenerator < Base # :nodoc:
-      argument :actions, :type => :array, :default => [], :banner => "method method"
-      check_class_collision :suffix => "Test"
+      argument :actions, type: :array, default: [], banner: "method method"
+      check_class_collision suffix: "Test"
 
       def create_test_files
         template "functional_test.rb", File.join('test/mailers', class_path, "#{file_name}_test.rb")
diff --git a/railties/lib/rails/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb
index 9b73f3561f..2801749ffe 100644
--- a/railties/lib/rails/generators/test_unit/model/model_generator.rb
+++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb
@@ -3,10 +3,10 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class ModelGenerator < Base # :nodoc:
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :fixture, :type => :boolean
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+      class_option :fixture, type: :boolean
 
-      check_class_collision :suffix => "Test"
+      check_class_collision suffix: "Test"
 
       def create_test_file
         template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
diff --git a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
index 8bfb749743..64fe694a8b 100644
--- a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class ObserverGenerator < Base # :nodoc:
-      check_class_collision :suffix => "ObserverTest"
+      check_class_collision suffix: "ObserverTest"
 
       def create_test_files
         template 'unit_test.rb',  File.join('test/models', class_path, "#{file_name}_observer_test.rb")
diff --git a/railties/lib/rails/generators/test_unit/performance/performance_generator.rb b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
index 9a80d1ea54..5552edeee4 100644
--- a/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
+++ b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class PerformanceGenerator < Base # :nodoc:
-      check_class_collision :suffix => "Test"
+      check_class_collision suffix: "Test"
 
       def create_test_files
         template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")
diff --git a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
index 2f25dcf832..2bcb482d68 100644
--- a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
+++ b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
@@ -3,8 +3,8 @@ require 'rails/performance_test_help'
 
 class <%= class_name %>Test < ActionDispatch::PerformanceTest
   # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory],
-  #                          :output => 'tmp/performance', :formats => [:flat] }
+  # self.profile_options = { runs: 5, metrics: [:wall_time, :memory],
+  #                          output: 'tmp/performance', formats: [:flat] }
 
   test "homepage" do
     get '/'
diff --git a/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb b/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb
index 41e8873783..b5d4f38444 100644
--- a/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/test_unit'
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class PluginGenerator < Base # :nodoc:
-      check_class_collision :suffix => "Test"
+      check_class_collision suffix: "Test"
 
       def create_test_files
         directory '.', 'test'
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index 0462c15224..3b4fec2e83 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -6,9 +6,9 @@ module TestUnit # :nodoc:
     class ScaffoldGenerator < Base # :nodoc:
       include Rails::Generators::ResourceHelpers
 
-      check_class_collision :suffix => "ControllerTest"
+      check_class_collision suffix: "ControllerTest"
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_test_files
         template "functional_test.rb",
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index 512803aeac..e94c6a2030 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -23,7 +23,7 @@ class Rails::InfoController < ActionController::Base
 
   def require_local!
     unless local_request?
-      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
+      render text: '<p>For security purposes, this information is only available to local requests.</p>', status: :forbidden
     end
   end
 
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 9826aecb54..8af4130e87 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -5,7 +5,7 @@ module Rails
     # paths by a Hash like API. It requires you to give a physical path on initialization.
     #
     #   root = Root.new "/rails"
-    #   root.add "app/controllers", :eager_load => true
+    #   root.add "app/controllers", eager_load: true
     #
     # The command above creates a new root object and add "app/controllers" as a path.
     # This means we can get a <tt>Rails::Paths::Path</tt> object back like below:
@@ -26,7 +26,7 @@ module Rails
     # contains the path with the same path value given to +add+. In some situations,
     # you may not want this behavior, so you can give :with as option.
     #
-    #   root.add "config/routes", :with => "config/routes.rb"
+    #   root.add "config/routes", with: "config/routes.rb"
     #   root["config/routes"].inspect # => ["config/routes.rb"]
     #
     # The +add+ method accepts the following options as arguments:
@@ -52,7 +52,7 @@ module Rails
 
       def []=(path, value)
         glob = self[path] ? self[path].glob : nil
-        add(path, :with => value, :glob => glob)
+        add(path, with: value, glob: glob)
       end
 
       def add(path, options={})
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index fba685c769..5b454e7f20 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -172,7 +172,7 @@ module Rails
         end
     end
 
-    delegate :railtie_name, :to => "self.class"
+    delegate :railtie_name, to: "self.class"
 
     def config
       @config ||= Railtie::Configuration.new
diff --git a/railties/lib/rails/railtie/configurable.rb b/railties/lib/rails/railtie/configurable.rb
index 53796c74cf..1572af0b2a 100644
--- a/railties/lib/rails/railtie/configurable.rb
+++ b/railties/lib/rails/railtie/configurable.rb
@@ -6,7 +6,7 @@ module Rails
       extend ActiveSupport::Concern
 
       module ClassMethods
-        delegate :config, :to => :instance
+        delegate :config, to: :instance
 
         def inherited(base)
           raise "You cannot inherit from a #{self.superclass.name} child"
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index 9dc8843887..0cbbf04da2 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -50,23 +50,23 @@ module Rails
 
       # First configurable block to run. Called before any initializers are run.
       def before_configuration(&block)
-        ActiveSupport.on_load(:before_configuration, :yield => true, &block)
+        ActiveSupport.on_load(:before_configuration, yield: true, &block)
       end
 
       # Third configurable block to run. Does not run if +config.cache_classes+
       # set to false.
       def before_eager_load(&block)
-        ActiveSupport.on_load(:before_eager_load, :yield => true, &block)
+        ActiveSupport.on_load(:before_eager_load, yield: true, &block)
       end
 
       # Second configurable block to run. Called before frameworks initialize.
       def before_initialize(&block)
-        ActiveSupport.on_load(:before_initialize, :yield => true, &block)
+        ActiveSupport.on_load(:before_initialize, yield: true, &block)
       end
 
       # Last configurable block to run. Called after frameworks initialize.
       def after_initialize(&block)
-        ActiveSupport.on_load(:after_initialize, :yield => true, &block)
+        ActiveSupport.on_load(:after_initialize, yield: true, &block)
       end
 
       # Array of callbacks defined by #to_prepare.
diff --git a/railties/lib/rails/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake
index 9067b03d00..386ecf44be 100644
--- a/railties/lib/rails/tasks/annotations.rake
+++ b/railties/lib/rails/tasks/annotations.rake
@@ -2,7 +2,7 @@ require 'rails/source_annotation_extractor'
 
 desc "Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)"
 task :notes do
-  SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", :tag => true
+  SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", tag: true
 end
 
 namespace :notes do
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index f9cff5b627..50499304cb 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -1,6 +1,6 @@
 namespace :rails do
   desc "Update configs and some other initially generated files (or use just update:configs, update:scripts, or update:application_controller)"
-  task :update => [ "update:configs", "update:scripts", "update:application_controller" ]
+  task update: [ "update:configs", "update:scripts", "update:application_controller" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
   task :template do
@@ -9,8 +9,8 @@ namespace :rails do
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
     require 'rails/generators'
     require 'rails/generators/rails/app/app_generator'
-    generator = Rails::Generators::AppGenerator.new [Rails.root], {}, :destination_root => Rails.root
-    generator.apply template, :verbose => false
+    generator = Rails::Generators::AppGenerator.new [Rails.root], {}, destination_root: Rails.root
+    generator.apply template, verbose: false
   end
 
   namespace :templates do
@@ -44,8 +44,8 @@ namespace :rails do
       @app_generator ||= begin
         require 'rails/generators'
         require 'rails/generators/rails/app/app_generator'
-        gen = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
-                                                             :destination_root => Rails.root
+        gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
+                                                             destination_root: Rails.root
         File.exists?(Rails.root.join("config", "application.rb")) ?
           gen.send(:app_const) : gen.send(:valid_app_const?)
         gen
diff --git a/railties/lib/rails/tasks/middleware.rake b/railties/lib/rails/tasks/middleware.rake
index cd35ffb19a..31e961b483 100644
--- a/railties/lib/rails/tasks/middleware.rake
+++ b/railties/lib/rails/tasks/middleware.rake
@@ -1,5 +1,5 @@
 desc 'Prints out your Rack middleware stack'
-task :middleware => :environment do
+task middleware: :environment do
   Rails.configuration.middleware.each do |middleware|
     puts "use #{middleware.inspect}"
   end
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 0a9b9ff4ff..4195106961 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -5,7 +5,7 @@ task :secret do
 end
 
 desc 'List versions of all Rails frameworks and the environment'
-task :about => :environment do
+task about: :environment do
   puts Rails::Info
 end
 
@@ -26,7 +26,7 @@ namespace :time do
       require 'active_support'
       require 'active_support/time'
       jan_offset = Time.now.beginning_of_year.utc_offset
-      jul_offset = Time.now.beginning_of_year.change(:month => 7).utc_offset
+      jul_offset = Time.now.beginning_of_year.change(month: 7).utc_offset
       offset = jan_offset < jul_offset ? jan_offset : jul_offset
       build_time_zone_list(:all, offset)
     end
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 95f47566ef..676b475640 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -1,5 +1,5 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
-task :routes => :environment do
+task routes: :environment do
   all_routes = Rails.application.routes.routes
   require 'action_dispatch/routing/inspector'
   inspector = ActionDispatch::Routing::RoutesInspector.new
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 0bb64ced95..116988665f 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -1,6 +1,6 @@
 namespace :tmp do
   desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
-  task :clear => [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+  task clear: [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
 
   tmp_dirs = [ 'tmp/sessions',
                'tmp/cache',
@@ -13,7 +13,7 @@ namespace :tmp do
   tmp_dirs.each { |d| directory d }
 
   desc "Creates tmp directories for sessions, cache, sockets, and pids"
-  task :create => tmp_dirs
+  task create: tmp_dirs
 
   namespace :sessions do
     # desc "Clears all files in tmp/sessions"
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index 2b6170ebfb..ed89ce4128 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -1,8 +1,8 @@
 module Rails
   class TestUnitRailtie < Rails::Railtie
     config.app_generators do |c|
-      c.test_framework :test_unit, :fixture => true,
-                                   :fixture_replacement => nil
+      c.test_framework :test_unit, fixture: true,
+                                   fixture_replacement: nil
 
       c.integration_tool :test_unit
       c.performance_tool :test_unit
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 63cb955d44..cd59fbe599 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -43,7 +43,7 @@ module Kernel
   end
 end
 
-task :default => :test
+task default: :test
 
 desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile)'
 task :test do
@@ -61,7 +61,7 @@ namespace :test do
         Rake::Task[task].invoke
         nil
       rescue => e
-        { :task => task, :exception => e }
+        { task: task, exception: e }
       end
     end.compact
 
@@ -71,7 +71,7 @@ namespace :test do
     end
   end
 
-  Rake::TestTask.new(:recent => "test:prepare") do |t|
+  Rake::TestTask.new(recent: "test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
       recent_tests('app/models/**/*.rb', 'test/models', since) +
@@ -84,7 +84,7 @@ namespace :test do
   end
   Rake::Task['test:recent'].comment = "Test recent changes"
 
-  Rake::TestTask.new(:uncommitted => "test:prepare") do |t|
+  Rake::TestTask.new(uncommitted: "test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
@@ -108,52 +108,52 @@ namespace :test do
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-  Rake::TestTask.new(:single => "test:prepare") do |t|
+  Rake::TestTask.new(single: "test:prepare") do |t|
     t.libs << "test"
   end
 
-  Rails::SubTestTask.new(:models => "test:prepare") do |t|
+  Rails::SubTestTask.new(models: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/models/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:helpers => "test:prepare") do |t|
+  Rails::SubTestTask.new(helpers: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/helpers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:units => "test:prepare") do |t|
+  Rails::SubTestTask.new(units: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:controllers => "test:prepare") do |t|
+  Rails::SubTestTask.new(controllers: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/controllers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:mailers => "test:prepare") do |t|
+  Rails::SubTestTask.new(mailers: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/mailers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:functionals => "test:prepare") do |t|
+  Rails::SubTestTask.new(functionals: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:integration => "test:prepare") do |t|
+  Rails::SubTestTask.new(integration: "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t|
+  Rails::SubTestTask.new(benchmark: 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
     t.options = '-- --benchmark'
   end
 
-  Rails::SubTestTask.new(:profile => 'test:prepare') do |t|
+  Rails::SubTestTask.new(profile: 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
   end