Get rid of --old-style-hash

railties/lib/rails/generators/app_base.rb

@@ -60,9 +60,6 @@ def self.add_shared_options_for(name)
 
         class_option :help,               :type => :boolean, :aliases => "-h", :group => :rails,
                                           :desc => "Show this help message and quit"
-
-        class_option :old_style_hash,     :type => :boolean, :default => false,
-                                          :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
       end
 
       def initialize(*args)
@@ -255,14 +252,9 @@ def git_keep(destination)
         create_file("#{destination}/.gitkeep") unless options[:skip_git]
       end
 
-      # Returns Ruby 1.9 style key-value pair if current code is running on
-      # Ruby 1.9.x. Returns the old-style (with hash rocket) otherwise.
+      # Returns Ruby 1.9 style key-value pair.
       def key_value(key, value)
-        if options[:old_style_hash] || RUBY_VERSION < '1.9'
-          ":#{key} => #{value}"
-        else
-          "#{key}: #{value}"
-        end
+        "#{key}: #{value}"
       end
     end
   end

railties/lib/rails/generators/named_base.rb

@@ -9,9 +9,6 @@ class NamedBase < Base
       class_option :skip_namespace, :type => :boolean, :default => false,
                                     :desc => "Skip namespace (affects only isolated applications)"
 
-      class_option :old_style_hash, :type => :boolean, :default => false,
-                                    :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
-
       def initialize(args, *options) #:nodoc:
         @inside_template = nil
         # Unfreeze name in case it's given as a frozen string

railties/test/generators/app_generator_test.rb

@@ -337,18 +337,7 @@ def test_no_active_record_or_test_unit_if_skips_given
   def test_new_hash_style
     run_generator [destination_root]
     assert_file "config/initializers/session_store.rb" do |file|
-      if RUBY_VERSION < "1.9"
-        assert_match(/config.session_store :cookie_store, :key => '_.+_session'/, file)
-      else
-        assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
-      end
-    end
-  end
-
-  def test_force_old_style_hash
-    run_generator [destination_root, "--old-style-hash"]
-    assert_file "config/initializers/session_store.rb" do |file|
-      assert_match(/config.session_store :cookie_store, :key => '_.+_session'/, file)
+      assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
     end
   end
 

railties/test/generators/mailer_generator_test.rb

@@ -77,33 +77,14 @@ def test_actions_are_turned_into_methods
 
     assert_file "app/mailers/notifier.rb" do |mailer|
       assert_instance_method :foo, mailer do |foo|
-        if RUBY_VERSION < "1.9"
-          assert_match(/mail :to => "to@example.org"/, foo)
-        else
-          assert_match(/mail to: "to@example.org"/, foo)
-        end
+        assert_match(/mail to: "to@example.org"/, foo)
         assert_match(/@greeting = "Hi"/, foo)
       end
 
       assert_instance_method :bar, mailer do |bar|
-        if RUBY_VERSION < "1.9"
-          assert_match(/mail :to => "to@example.org"/, bar)
-        else
-          assert_match(/mail to: "to@example.org"/, bar)
-        end
+        assert_match(/mail to: "to@example.org"/, bar)
         assert_match(/@greeting = "Hi"/, bar)
       end
     end
   end
-
-  def test_force_old_style_hash
-    run_generator ["notifier", "foo", "--old-style-hash"]
-    assert_file "app/mailers/notifier.rb" do |mailer|
-      assert_match(/default :from => "from@example.com"/, mailer)
-
-      assert_instance_method :foo, mailer do |foo|
-        assert_match(/mail :to => "to@example.org"/, foo)
-      end
-    end
-  end
 end

railties/test/generators/scaffold_controller_generator_test.rb

@@ -126,18 +126,7 @@ def self.all(klass)
   def test_new_hash_style
     run_generator
     assert_file "app/controllers/users_controller.rb" do |content|
-      if RUBY_VERSION < "1.9"
-        assert_match(/\{ render :action => "new" \}/, content)
-      else
-        assert_match(/\{ render action: "new" \}/, content)
-      end
-    end
-  end
-
-  def test_force_old_style_hash
-    run_generator ["User", "--old-style-hash"]
-    assert_file "app/controllers/users_controller.rb" do |content|
-      assert_match(/\{ render :action => "new" \}/, content)
+      assert_match(/\{ render action: "new" \}/, content)
     end
   end
 end