improving tests, using proper sass output styles, support sass style

bolandrm · bolandrm · commit bd3b0cf079cd · 2015-04-26T15:31:50.000-04:00
diff --git a/lib/sassc/rails.rb b/lib/sassc/rails.rb
@@ -1,4 +1,6 @@
 require_relative "rails/version"
+
+require "sassc"
 require_relative "rails/functions"
 require_relative "rails/importer"
 require_relative "rails/template"
diff --git a/lib/sassc/rails/functions.rb b/lib/sassc/rails/functions.rb
@@ -1,5 +1,4 @@
 require "sprockets/sass_template"
-require "sassc"
 
 module Sprockets
   class SassTemplate
diff --git a/lib/sassc/rails/importer.rb b/lib/sassc/rails/importer.rb
@@ -26,11 +26,16 @@ def import_for(original_path, parent_path, full_path, options)
         end
       end
 
-      class ERBExtension < Extension
-        def initialize(postfix)
-          super
+      class SassERBExtension < Extension
+        def import_for(original_path, parent_path, full_path, options)
+          template = Tilt::ERBTemplate.new(full_path)
+          parsed_erb = template.render(options[:sprockets][:context], {})
+          parsed_scss = SassC::Sass2Scss.convert(parsed_erb)
+          SassC::Importer::Import.new(full_path, source: parsed_scss)
         end
+      end
 
+      class ERBExtension < Extension
         def import_for(original_path, parent_path, full_path, options)
           template = Tilt::ERBTemplate.new(full_path)
           parsed_erb = template.render(options[:sprockets][:context], {})
@@ -43,42 +48,13 @@ def import_for(original_path, parent_path, full_path, options)
         Extension.new(".sass"),
         CSSExtension.new,
         ERBExtension.new(".scss.erb"),
-        ERBExtension.new(".sass.erb"),
+        SassERBExtension.new(".sass.erb"),
         ERBExtension.new(".css.erb"),
       ]
 
       PREFIXS = [ "", "_" ]
 
       def imports(path, parent_path)
-        # should return an Import, or array of Imports.
-        # Import.new(path)
-
-        # Imports can usually be passed with only a path.  However,
-        # when parsing ERB we need to return the import like this:
-        # Import.new(path, source: parsed_erb)
-        # in this case, the path is just for reference, i don't believe it
-        # gets used.
-
-        # the parent path is basically the file that's calling the
-        # @import function.  This necessary when we need to do an import
-        # relative to the folder that the import function is being called from.
-
-        # for the filename, it looks like libsass can properly resolve
-        # filenames without extensions provided that the actual file has
-        # a .sass or .scss filename.
-
-        # it CANNOT resolve a .css file unless you explicitly pass the
-        # filename with the .css extension.
-
-        # lets ignore globbing for now.
-
-        # for ERB parsing, check out the sass-rails importer below, it looks pretty
-        # simple
-
-        # check out
-        # https://github.com/sass/sass/blob/stable/lib/sass/importers/filesystem.rb
-        # for reference
-
         parent_dir, _ = File.split(parent_path)
         specified_dir, specified_file = File.split(path)
 
@@ -123,151 +99,3 @@ def load_paths
     end
   end
 end
-
-#require 'active_support/deprecation/reporting'
-#require 'sass'
-#require 'sprockets/sass_importer'
-#require 'tilt'
-
-#  module Sass
-#    module Rails
-#      class SassImporter < Sass::Importers::Filesystem
-#        module Globbing
-#          GLOB = /(\A|\/)(\*|\*\*\/\*)\z/
-#  
-#          def find_relative(name, base, options)
-#            if options[:sprockets] && m = name.match(GLOB)
-#              path = name.sub(m[0], "")
-#              base = File.expand_path(path, File.dirname(base))
-#              glob_imports(base, m[2], options)
-#            else
-#              super
-#            end
-#          end
-#  
-#          def find(name, options)
-#            # globs must be relative
-#            return if name =~ GLOB
-#            super
-#          end
-#  
-#          private
-#            def glob_imports(base, glob, options)
-#              contents = ""
-#              context = options[:sprockets][:context]
-#              each_globbed_file(base, glob, context) do |filename|
-#                next if filename == options[:filename]
-#                contents << "@import #{filename.inspect};\n"
-#              end
-#              return nil if contents == ""
-#              Sass::Engine.new(contents, options.merge(
-#                :filename => base,
-#                :importer => self,
-#                :syntax => :scss
-#              ))
-#            end
-#  
-#            def each_globbed_file(base, glob, context)
-#              raise ArgumentError unless glob == "*" || glob == "**/*"
-#  
-#              exts = extensions.keys.map { |ext| Regexp.escape(".#{ext}") }.join("|")
-#              sass_re = Regexp.compile("(#{exts})$")
-#  
-#              context.depend_on(base)
-#  
-#              Dir["#{base}/#{glob}"].sort.each do |path|
-#                if File.directory?(path)
-#                  context.depend_on(path)
-#                elsif sass_re =~ path
-#                  yield path
-#                end
-#              end
-#            end
-#        end
-#  
-#        module ERB
-#          def extensions
-#            {
-#              'css.erb'  => :scss_erb,
-#              'scss.erb' => :scss_erb,
-#              'sass.erb' => :sass_erb
-#            }.merge(super)
-#          end
-#  
-#          def erb_extensions
-#            {
-#              :scss_erb => :scss,
-#              :sass_erb => :sass
-#            }
-#          end
-#  
-#          def find_relative(*args)
-#            process_erb_engine(super)
-#          end
-#  
-#          def find(*args)
-#            process_erb_engine(super)
-#          end
-#  
-#          private
-#            def process_erb_engine(engine)
-#              if engine && engine.options[:sprockets] && syntax = erb_extensions[engine.options[:syntax]]
-#                template = Tilt::ERBTemplate.new(engine.options[:filename])
-#                contents = template.render(engine.options[:sprockets][:context], {})
-#  
-#                Sass::Engine.new(contents, engine.options.merge(:syntax => syntax))
-#              else
-#                engine
-#              end
-#            end
-#        end
-#  
-#        module Deprecated
-#          def extensions
-#            {
-#              'css.scss'     => :scss,
-#              'css.sass'     => :sass,
-#              'css.scss.erb' => :scss_erb,
-#              'css.sass.erb' => :sass_erb
-#            }.merge(super)
-#          end
-#  
-#          def find_relative(*args)
-#            deprecate_extra_css_extension(super)
-#          end
-#  
-#          def find(*args)
-#            deprecate_extra_css_extension(super)
-#          end
-#  
-#          private
-#            def deprecate_extra_css_extension(engine)
-#              if engine && filename = engine.options[:filename]
-#                if filename.end_with?('.css.scss')
-#                  msg = "Extra .css in SCSS file is unnecessary. Rename #{filename} to #{filename.sub('.css.scss', '.scss')}."
-#                elsif filename.end_with?('.css.sass')
-#                  msg = "Extra .css in SASS file is unnecessary. Rename #{filename} to #{filename.sub('.css.sass', '.sass')}."
-#                elsif filename.end_with?('.css.scss.erb')
-#                  msg = "Extra .css in SCSS/ERB file is unnecessary. Rename #{filename} to #{filename.sub('.css.scss.erb', '.scss.erb')}."
-#                elsif filename.end_with?('.css.sass.erb')
-#                  msg = "Extra .css in SASS/ERB file is unnecessary. Rename #{filename} to #{filename.sub('.css.sass.erb', '.sass.erb')}."
-#                end
-#  
-#                ActiveSupport::Deprecation.warn(msg) if msg
-#              end
-#  
-#              engine
-#            end
-#        end
-#  
-#        include Deprecated
-#        include ERB
-#        include Globbing
-#  
-#        # Allow .css files to be @import'd
-#        def extensions
-#          { 'css' => :scss }.merge(super)
-#        end
-#      end
-#    end
-#  end
diff --git a/lib/sassc/rails/railtie.rb b/lib/sassc/rails/railtie.rb
@@ -53,8 +53,10 @@ class Railtie < ::Rails::Railtie
     end
 
     initializer :setup_compression, group: :all do |app|
+      app.config.assets.css_compressor = nil
+
       if !Rails.env.development?
-        app.config.assets.css_compressor ||= :sass
+        app.config.sass.style = :compressed
       else
         # Use expanded output instead of the sass default of :nested unless specified
         app.config.sass.style ||= :expanded
diff --git a/sassc-rails.gemspec b/sassc-rails.gemspec
@@ -23,14 +23,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5.1"
   spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'mocha'
 
   # unfortunately we require sass for now, so that we can
   # reuse portions of the sprockets template
   spec.add_dependency 'sass'
 
   spec.add_dependency 'tilt' # For ERB
 
-  spec.add_dependency "sassc", "0.0.10"
+  spec.add_dependency "sassc", "1.0.0"
   spec.add_dependency 'railties'
   spec.add_dependency 'sprockets', '3.0.0.beta.6'
 end
diff --git a/test/dummy/app/assets/stylesheets/imports_test.scss b/test/dummy/app/assets/stylesheets/imports_test.scss
@@ -7,13 +7,13 @@
 @import "partials/without_css_ext";
 @import "css_erb_handler";
 @import "scss_erb_handler";
-// @import "sass_erb_handler";
+@import "sass_erb_handler";
 @import "css_scss_erb_handler";
-// @import "css_sass_erb_handler";
+@import "css_sass_erb_handler";
 
 .main {
   color: yellow;
-  // @include background-from-partial(red);
+  @include background-from-partial(red);
 }
 
 @include without-css-ext;
diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`require "sprockets/sass_template"`
`2`		`-require "sassc"`
`3`	`2`
`4`	`3`	`module Sprockets`
`5`	`4`	`class SassTemplate`