Merge pull request #271 from rails/skip-css-ext

.css.css -> .scss

Author: josh

lib/rails/generators/sass/assets/assets_generator.rb

@@ -6,7 +6,7 @@ class AssetsGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_sass
-        template "stylesheet.css.sass", File.join('app/assets/stylesheets', class_path, "#{file_name}.css.sass")
+        template "stylesheet.sass", File.join('app/assets/stylesheets', class_path, "#{file_name}.sass")
       end
     end
   end

lib/rails/generators/sass/assets/templates/stylesheet.css.sass renamed to lib/rails/generators/sass/assets/templates/stylesheet.sass

@@ -8,9 +8,8 @@ def copy_stylesheet
         dir = ::Rails::Generators::ScaffoldGenerator.source_root
         file = File.join(dir, "scaffold.css")
         converted_contents = ::Sass::CSS.new(File.read(file)).render(syntax)
-        create_file "app/assets/stylesheets/scaffolds.css.#{syntax}", converted_contents
+        create_file "app/assets/stylesheets/scaffolds.#{syntax}", converted_contents
       end
     end
   end
 end
-

lib/rails/generators/sass_scaffold.rb

@@ -6,7 +6,7 @@ class AssetsGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_scss
-        template "stylesheet.css.scss", File.join('app/assets/stylesheets', class_path, "#{file_name}.css.scss")
+        template "stylesheet.scss", File.join('app/assets/stylesheets', class_path, "#{file_name}.scss")
       end
     end
   end

lib/rails/generators/scss/assets/assets_generator.rb

@@ -14,13 +14,9 @@ def initialize(context, *args)
       def extensions
         {
           'css'          => :scss,
-          'css.scss'     => :scss,
-          'css.sass'     => :sass,
           'css.erb'      => :scss,
           'scss.erb'     => :scss,
-          'sass.erb'     => :sass,
-          'css.scss.erb' => :scss,
-          'css.sass.erb' => :sass
+          'sass.erb'     => :sass
         }.merge!(super)
       end