sprockets-sass 0.7.0 → 0.8.0

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 gemfiles/*.lock
 pkg/*
+.sass-cache

data/Appraisals

@@ -1,23 +1,27 @@
-appraise "sprockets-2.0" do
-  gem "sprockets", "~> 2.0.0"
+appraise 'sprockets-2.0' do
+  gem 'sprockets', '~> 2.0.0'
 end
 
-appraise "sprockets-2.1" do
-  gem "sprockets", "~> 2.1.0"
+appraise 'sprockets-2.1' do
+  gem 'sprockets', '~> 2.1.0'
 end
 
-appraise "sprockets-2.2" do
-  gem "sprockets", "~> 2.2.0"
+appraise 'sprockets-2.2' do
+  gem 'sprockets', '~> 2.2.0'
 end
 
-appraise "sprockets-2.3" do
-  gem "sprockets", "~> 2.3.0"
+appraise 'sprockets-2.3' do
+  gem 'sprockets', '~> 2.3.0'
 end
 
-appraise "compass-0.11" do
-  gem "compass", "~> 0.11.0"
+appraise 'sprockets-2.4' do
+  gem 'sprockets', '~> 2.4.0'
 end
 
-appraise "compass-0.12" do
-  gem "compass", ">= 0.12.alpha.1"
+appraise 'compass-0.11' do
+  gem 'compass', '~> 0.11.0'
+end
+
+appraise 'compass-0.12' do
+  gem 'compass', '~> 0.12.0'
 end

data/Rakefile

@@ -1,6 +1,6 @@
-require "appraisal"
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'appraisal'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 task :default => :spec

data/gemfiles/compass-0.12.gemfile

@@ -2,6 +2,6 @@
 
 source :rubygems
 
-gem "compass", ">= 0.12.alpha.1"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets-2.4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "sprockets", "~> 2.4.0"
+
+gemspec :path=>"../"

data/lib/sprockets-sass.rb

@@ -1 +1 @@
-require "sprockets/sass"
+require 'sprockets/sass'

data/lib/sprockets/sass.rb

@@ -1,12 +1,13 @@
-require "sprockets/sass/version"
-require "sprockets/sass/sass_template"
-require "sprockets/sass/scss_template"
-require "sprockets/engines"
+require 'sprockets/sass/version'
+require 'sprockets/sass/sass_template'
+require 'sprockets/sass/scss_template'
+require 'sprockets/engines'
 
 module Sprockets
   module Sass
-    autoload :CacheStore, "sprockets/sass/cache_store"
-    autoload :Importer,   "sprockets/sass/importer"
+    autoload :CacheStore, 'sprockets/sass/cache_store'
+    autoload :Compressor, 'sprockets/sass/compressor'
+    autoload :Importer,   'sprockets/sass/importer'
     
     class << self
       # Global configuration for `Sass::Engine` instances.
@@ -22,6 +23,6 @@ module Sprockets
     @add_sass_functions = true
   end
   
-  register_engine ".sass", Sass::SassTemplate
-  register_engine ".scss", Sass::ScssTemplate
+  register_engine '.sass', Sass::SassTemplate
+  register_engine '.scss', Sass::ScssTemplate
 end

data/lib/sprockets/sass/cache_store.rb

@@ -1,4 +1,4 @@
-require "sass"
+require 'sass'
 
 module Sprockets
   module Sass

data/lib/sprockets/sass/compressor.rb

@@ -0,0 +1,22 @@
+require 'sass'
+
+module Sprockets
+  module Sass
+    class Compressor
+      # Compresses the given CSS using Sass::Engine's
+      # :compressed output style.
+      def compress(css)
+        if css.count("\n") > 2
+          ::Sass::Engine.new(css,
+            :syntax     => :scss,
+            :cache      => false,
+            :read_cache => false,
+            :style      => :compressed
+          ).render
+        else
+          css
+        end
+      end
+    end
+  end
+end

data/lib/sprockets/sass/functions.rb

@@ -1,4 +1,4 @@
-require "sass"
+require 'sass'
 
 module Sprockets
   module Sass
@@ -19,10 +19,10 @@ module Sprockets
           options = {}
         end
         
-        if kind && context.respond_to?("#{kind}_path")
-          ::Sass::Script::String.new context.send("#{kind}_path", source.value), :string
+        if kind && sprockets_context.respond_to?("#{kind}_path")
+          ::Sass::Script::String.new sprockets_context.send("#{kind}_path", source.value), :string
         else
-          ::Sass::Script::String.new context.asset_path(source.value, map_options(options)), :string
+          ::Sass::Script::String.new sprockets_context.asset_path(source.value, map_options(options)).to_s, :string
         end
       end
       
@@ -49,7 +49,7 @@ module Sprockets
       #   background: url(image-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
       def image_path(source, options = {})
-        ::Sass::Script::String.new context.image_path(source.value, map_options(options)), :string
+        ::Sass::Script::String.new sprockets_context.image_path(source.value, map_options(options)).to_s, :string
       end
       
       # Using Sprockets::Helpers#image_path, return the url CSS
@@ -82,17 +82,17 @@ module Sprockets
       #   background: asset-data-uri("image.jpg"); // background: url(data:image/jpeg;base64,...);
       #
       def asset_data_uri(source)
-        ::Sass::Script::String.new "url(#{context.asset_data_uri(source.value)})"
+        ::Sass::Script::String.new "url(#{sprockets_context.asset_data_uri(source.value)})"
       end
       
       protected
       
       # Returns a reference to the Sprocket's context through
       # the importer.
-      def context # :nodoc:
+      def sprockets_context # :nodoc:
         options[:importer].context
       end
-      
+            
       # Returns an options hash where the keys are symbolized
       # and the values are unwrapped Sass literals.
       def map_options(options = {}) # :nodoc:

data/lib/sprockets/sass/importer.rb

@@ -1,5 +1,5 @@
-require "sass/importers/base"
-require "pathname"
+require 'sass/importers/base'
+require 'pathname'
 
 module Sprockets
   module Sass
@@ -19,13 +19,13 @@ module Sprockets
         if path =~ GLOB
           engine_from_glob(path, base_path, options)
         else
-          engine_from_path(path, options)
+          engine_from_path(path, base_path, options)
         end
       end
       
       # @see Sass::Importers::Base#find
       def find(path, options)
-        engine_from_path(path, options)
+        engine_from_path(path, nil, options)
       end
 
       # @see Sass::Importers::Base#mtime
@@ -51,8 +51,8 @@ module Sprockets
       protected
       
       # Create a Sass::Engine from the given path.
-      def engine_from_path(path, options)
-        pathname = resolve(path) or return nil
+      def engine_from_path(path, base_path, options)
+        pathname = resolve(path, base_path) or return nil
         context.depend_on pathname
         ::Sass::Engine.new evaluate(pathname), options.merge(
           :filename => pathname.to_s,
@@ -64,7 +64,7 @@ module Sprockets
       # Create a Sass::Engine that will handle importing
       # a glob of files.
       def engine_from_glob(glob, base_path, options)
-        imports = resolve_glob(glob, base_path).inject("") do |imports, path|
+        imports = resolve_glob(glob, base_path).inject('') do |imports, path|
           context.depend_on path
           relative_path = path.relative_path_from Pathname.new(context.root_path)
           imports << %(@import "#{relative_path}";\n)
@@ -80,18 +80,11 @@ module Sprockets
       # Finds an asset from the given path. This is where
       # we make Sprockets behave like Sass, and import partial
       # style paths.
-      def resolve(path)
-        path = Pathname.new(path) unless path.is_a?(Pathname)
-        
-        # First look for the normal path
-        context.resolve(path) { |found| return found if context.asset_requirable?(found) }
-        
-        # Then look for the partial-style version
-        unless path.basename.to_s =~ /^_/
-          partial = path.dirname.join "_#{path.basename}"
-          context.resolve(partial) { |found| return found if context.asset_requirable?(found) }
+      def resolve(path, base_path)
+        possible_files(path, base_path).each do |file|
+          context.resolve(file) { |found| return found if context.asset_requirable?(found) }
         end
-        
+
         nil
       end
       
@@ -105,9 +98,35 @@ module Sprockets
         end
       end
       
+      # Returns all of the possible paths (including partial variations)
+      # to attempt to resolve with the given path.
+      def possible_files(path, base_path)
+        path      = Pathname.new(path)
+        base_path = Pathname.new(base_path).dirname
+        root_path = Pathname.new(context.root_path)
+        paths     = [ path, partialize_path(path) ]
+
+        # Add the relative path from the root, if necessary
+        if path.relative? && base_path != root_path && path.to_s !~ /\A\.\//
+          relative_path = base_path.relative_path_from(root_path).join path
+          
+          paths.unshift(relative_path, partialize_path(relative_path))
+        end
+
+        paths.compact
+      end
+      
+      # Returns the partialized version of the given path.
+      # Returns nil if the path is already to a partial.
+      def partialize_path(path)
+        if path.basename.to_s !~ /\A_/
+          Pathname.new path.to_s.sub(/([^\/]+)\Z/, '_\1')
+        end
+      end
+      
       # Returns the Sass syntax of the given path.
       def syntax(path)
-        path.to_s.include?(".sass") ? :sass : :scss
+        path.to_s.include?('.sass') ? :sass : :scss
       end
       
       # Returns the string to be passed to the Sass engine. We use

data/lib/sprockets/sass/sass_template.rb

@@ -1,9 +1,9 @@
-require "tilt"
+require 'tilt'
 
 module Sprockets
   module Sass
     class SassTemplate < Tilt::SassTemplate
-      self.default_mime_type = "text/css"
+      self.default_mime_type = 'text/css'
       
       # A reference to the current Sprockets context
       attr_reader :context
@@ -18,7 +18,7 @@ module Sprockets
         super
         
         if Sass.add_sass_functions
-          require "sprockets/sass/functions"
+          require 'sprockets/sass/functions'
         end
       end
       
@@ -38,6 +38,10 @@ module Sprockets
         @output ||= begin
           @context = context
           ::Sass::Engine.new(data, sass_options).render
+        rescue ::Sass::SyntaxError => e
+          # Annotates exception message with parse line number
+          context.__LINE__ = e.sass_backtrace.first[:line]
+          raise e
         end
       end
 

data/lib/sprockets/sass/scss_template.rb

@@ -1,7 +1,7 @@
 module Sprockets
   module Sass
     class ScssTemplate < SassTemplate
-      self.default_mime_type = "text/css"
+      self.default_mime_type = 'text/css'
       
       # Define the expected syntax for the template
       def syntax

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.7.0"
+    VERSION = '0.8.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-require "sprockets"
-require "sprockets-sass"
-require "sprockets-helpers"
-require "compass"
-require "construct"
+require 'sprockets'
+require 'sprockets-sass'
+require 'sprockets-helpers'
+require 'compass'
+require 'construct'
 
 Compass.configuration do |compass|
   compass.line_comments = false

data/spec/sprockets-sass_spec.rb

@@ -1,9 +1,9 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Sprockets::Sass do
   before :each do
     @root   = create_construct
-    @assets = @root.directory "assets"
+    @assets = @root.directory 'assets'
     @env    = Sprockets::Environment.new @root.to_s
     @env.append_path @assets.to_s
   end
@@ -12,170 +12,202 @@ describe Sprockets::Sass do
     @root.destroy!
   end
   
-  it "processes scss files normally" do
-    @assets.file "main.css.scss", "//= require dep"
-    @assets.file "dep.css.scss", "body { color: blue; }"
-    asset = @env["main.css"]
+  it 'processes scss files normally' do
+    @assets.file 'main.css.scss', '//= require dep'
+    @assets.file 'dep.css.scss', 'body { color: blue; }'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "processes sass files normally" do
-    @assets.file "main.css.sass", "//= require dep"
-    @assets.file "dep.css.sass", "body\n  color: blue"
-    asset = @env["main.css"]
+  it 'processes sass files normally' do
+    @assets.file 'main.css.sass', '//= require dep'
+    @assets.file 'dep.css.sass', "body\n  color: blue"
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports standard files" do
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    @assets.file "dep.css.scss", "$color: blue;"
-    asset = @env["main.css"]
+  it 'imports standard files' do
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    @assets.file 'dep.css.scss', '$color: blue;'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports partial style files" do
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    @assets.file "_dep.css.scss", "$color: blue;"
-    asset = @env["main.css"]
+  it 'imports partials' do
+    @assets.file 'main.css.scss', %(@import "_dep";\nbody { color: $color; })
+    @assets.file '_dep.css.scss', '$color: blue;'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports other syntax" do
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    @assets.file "dep.sass", "$color: blue\nhtml\n  height: 100%"
-    asset = @env["main.css"]
+  it 'imports other syntax' do
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    @assets.file 'dep.sass', "$color: blue\nhtml\n  height: 100%"
+    asset = @env['main.css']
     asset.to_s.should == "html {\n  height: 100%; }\n\nbody {\n  color: blue; }\n"
   end
   
-  it "imports files with the correct content type" do
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    @assets.file "dep.js", "var app = {};"
-    @assets.file "_dep.css.scss", "$color: blue;"
-    asset = @env["main.css"]
+  it 'imports files with the correct content type' do
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    @assets.file 'dep.js', 'var app = {};'
+    @assets.file '_dep.css.scss', '$color: blue;'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports files with directives" do
-    @assets.file "main.css.scss", %(@import "dep";)
-    @assets.file "dep.css", "/*\n *= require subdep\n */"
-    @assets.file "subdep.css.scss", "$color: blue;\nbody { color: $color; }"
-    asset = @env["main.css"]
+  it 'imports files with directives' do
+    @assets.file 'main.css.scss', %(@import "dep";)
+    @assets.file 'dep.css', "/*\n *= require subdep\n */"
+    @assets.file 'subdep.css.scss', "$color: blue;\nbody { color: $color; }"
+    asset = @env['main.css']
     asset.to_s.should include("body {\n  color: blue; }\n")
   end
   
-  it "imports files with additional processors" do
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    @assets.file "dep.css.scss.erb", "$color: <%= 'blue' %>;"
-    asset = @env["main.css"]
+  it 'imports files with additional processors' do
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    @assets.file 'dep.css.scss.erb', "$color: <%= 'blue' %>;"
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports relative files" do
-    @assets.file "folder/main.css.scss", %(@import "./dep";\nbody { color: $color; })
-    @assets.file "folder/dep.css.scss", "$color: blue;"
-    asset = @env["folder/main.css"]
+  it 'imports relative files' do
+    @assets.file 'folder/main.css.scss', %(@import "./dep-1";\n@import "./subfolder/dep-2";\nbody { background-color: $background-color; color: $color; })
+    @assets.file 'folder/dep-1.css.scss', '$background-color: red;'
+    @assets.file 'folder/subfolder/dep-2.css.scss', '$color: blue;'
+    asset = @env['folder/main.css']
+    asset.to_s.should == "body {\n  background-color: red;\n  color: blue; }\n"
+  end
+  
+  it 'imports relative partials' do
+    @assets.file 'folder/main.css.scss', %(@import "./dep-1";\n@import "./subfolder/dep-2";\nbody { background-color: $background-color; color: $color; })
+    @assets.file 'folder/_dep-1.css.scss', '$background-color: red;'
+    @assets.file 'folder/subfolder/_dep-2.css.scss', '$color: blue;'
+    asset = @env['folder/main.css']
+    asset.to_s.should == "body {\n  background-color: red;\n  color: blue; }\n"
+  end
+  
+  it 'imports relative files without preceding ./' do
+    @assets.file 'folder/main.css.scss', %(@import "dep-1";\n@import "subfolder/dep-2";\nbody { background-color: $background-color; color: $color; })
+    @assets.file 'folder/dep-1.css.scss', '$background-color: red;'
+    @assets.file 'folder/subfolder/dep-2.css.scss', '$color: blue;'
+    asset = @env['folder/main.css']
+    asset.to_s.should == "body {\n  background-color: red;\n  color: blue; }\n"
+  end
+  
+  it 'imports relative partials without preceding ./' do
+    @assets.file 'folder/main.css.scss', %(@import "dep-1";\n@import "subfolder/dep-2";\nbody { background-color: $background-color; color: $color; })
+    @assets.file 'folder/_dep-1.css.scss', '$background-color: red;'
+    @assets.file 'folder/subfolder/_dep-2.css.scss', '$color: blue;'
+    asset = @env['folder/main.css']
+    asset.to_s.should == "body {\n  background-color: red;\n  color: blue; }\n"
+  end
+  
+  it 'imports files relative to root' do
+    @assets.file 'folder/main.css.scss', %(@import "dep";\nbody { color: $color; })
+    @assets.file 'dep.css.scss', '$color: blue;'
+    asset = @env['folder/main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports files relative to root" do
-    @assets.file "folder/main.css.scss", %(@import "dep";\nbody { color: $color; })
-    @assets.file "dep.css.scss", "$color: blue;"
-    asset = @env["folder/main.css"]
+  it 'imports partials relative to root' do
+    @assets.file 'folder/main.css.scss', %(@import "dep";\nbody { color: $color; })
+    @assets.file '_dep.css.scss', '$color: blue;'
+    asset = @env['folder/main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "shares Sass environment with other imports" do
-    @assets.file "main.css.scss", %(@import "dep1";\n@import "dep2";)
-    @assets.file "_dep1.scss", "$color: blue;"
-    @assets.file "_dep2.scss", "body { color: $color; }"
-    asset = @env["main.css"]
+  it 'shares Sass environment with other imports' do
+    @assets.file 'main.css.scss', %(@import "dep-1";\n@import "dep-2";)
+    @assets.file '_dep-1.scss', '$color: blue;'
+    @assets.file '_dep-2.scss', 'body { color: $color; }'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "imports files from the assets load path" do
-    vendor = @root.directory "vendor"
+  it 'imports files from the assets load path' do
+    vendor = @root.directory 'vendor'
     @env.append_path vendor.to_s
     
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    vendor.file "dep.css.scss", "$color: blue;"
-    asset = @env["main.css"]
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    vendor.file 'dep.css.scss', '$color: blue;'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
-  it "allows global Sass configuration" do
+  it 'allows global Sass configuration' do
     Sprockets::Sass.options[:style] = :compact
-    @assets.file "main.css.scss", "body {\n  color: blue;\n}"
+    @assets.file 'main.css.scss', "body {\n  color: blue;\n}"
     
-    asset = @env["main.css"]
+    asset = @env['main.css']
     asset.to_s.should == "body { color: blue; }\n"
     Sprockets::Sass.options.delete(:style)
   end
   
-  it "imports files from the Sass load path" do
-    vendor = @root.directory "vendor"
+  it 'imports files from the Sass load path' do
+    vendor = @root.directory 'vendor'
     Sprockets::Sass.options[:load_paths] = [ vendor.to_s ]
     
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    vendor.file "dep.scss", "$color: blue;"
-    asset = @env["main.css"]
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    vendor.file 'dep.scss', '$color: blue;'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue; }\n"
     Sprockets::Sass.options.delete(:load_paths)
   end
   
-  it "works with the Compass framework" do
-    @assets.file "main.css.scss", %(@import "compass/css3";\nbutton { @include border-radius(5px); })
+  it 'works with the Compass framework' do
+    @assets.file 'main.css.scss', %(@import "compass/css3";\nbutton { @include border-radius(5px); })
     
-    asset = @env["main.css"]
-    asset.to_s.should include("border-radius: 5px;")
+    asset = @env['main.css']
+    asset.to_s.should include('border-radius: 5px;')
   end
   
-  it "imports globbed files" do
-    @assets.file "main.css.scss", %(@import "folder/*";\nbody { color: $color; background: $bg-color; })
-    @assets.file "folder/dep1.css.scss", "$color: blue;"
-    @assets.file "folder/dep2.css.scss", "$bg-color: red;"
-    asset = @env["main.css"]
+  it 'imports globbed files' do
+    @assets.file 'main.css.scss', %(@import "folder/*";\nbody { color: $color; background: $bg-color; })
+    @assets.file 'folder/dep-1.css.scss', '$color: blue;'
+    @assets.file 'folder/dep-2.css.scss', '$bg-color: red;'
+    asset = @env['main.css']
     asset.to_s.should == "body {\n  color: blue;\n  background: red; }\n"
   end
 
-  it "adds dependencies when imported" do
-    @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
-    dep = @assets.file "dep.css.scss", "$color: blue;"
+  it 'adds dependencies when imported' do
+    @assets.file 'main.css.scss', %(@import "dep";\nbody { color: $color; })
+    dep = @assets.file 'dep.css.scss', '$color: blue;'
     
-    asset = @env["main.css"]
+    asset = @env['main.css']
     asset.should be_fresh(@env)
     
     mtime = Time.now + 1
-    dep.open("w") { |f| f.write "$color: red;" }
+    dep.open('w') { |f| f.write '$color: red;' }
     dep.utime mtime, mtime
     
     asset.should_not be_fresh(@env)
   end
 
-  it "adds dependencies from assets when imported" do
-    @assets.file "main.css.scss", %(@import "dep1";\nbody { color: $color; })
-    @assets.file "dep1.css.scss", %(@import "dep2";\n)
-    dep = @assets.file "dep2.css.scss", "$color: blue;"
+  it 'adds dependencies from assets when imported' do
+    @assets.file 'main.css.scss', %(@import "dep-1";\nbody { color: $color; })
+    @assets.file 'dep-1.css.scss', %(@import "dep-2";\n)
+    dep = @assets.file 'dep-2.css.scss', '$color: blue;'
     
-    asset = @env["main.css"]
+    asset = @env['main.css']
     asset.should be_fresh(@env)
     
     mtime = Time.now + 1
-    dep.open("w") { |f| f.write "$color: red;" }
+    dep.open('w') { |f| f.write '$color: red;' }
     dep.utime mtime, mtime
     
     asset.should_not be_fresh(@env)
   end
 
-  it "adds dependencies when imported from a glob" do
-    @assets.file "main.css.scss", %(@import "folder/*";\nbody { color: $color; background: $bg-color; })
-    @assets.file "folder/_dep1.scss", "$color: blue;"
-    dep = @assets.file "folder/_dep2.scss", "$bg-color: red;"
+  it 'adds dependencies when imported from a glob' do
+    @assets.file 'main.css.scss', %(@import "folder/*";\nbody { color: $color; background: $bg-color; })
+    @assets.file 'folder/_dep-1.scss', '$color: blue;'
+    dep = @assets.file 'folder/_dep-2.scss', '$bg-color: red;'
     
-    asset = @env["main.css"]
+    asset = @env['main.css']
     asset.should be_fresh(@env)
     
     mtime = Time.now + 1
-    dep.open("w") { |f| f.write "$bg-color: white;" }
+    dep.open('w') { |f| f.write "$bg-color: white;" }
     dep.utime mtime, mtime
     
     asset.should_not be_fresh(@env)
@@ -185,63 +217,73 @@ describe Sprockets::Sass do
     cache = {}
     @env.cache = cache
     
-    @assets.file "main.css.scss", %($color: blue;\nbody { color: $color; })
+    @assets.file 'main.css.scss', %($color: blue;\nbody { color: $color; })
     
     @env['main.css'].to_s
     sass_cache = cache.keys.detect { |key| key =~ /main\.css\.scss/ }
     sass_cache.should_not be_nil
   end
   
-  it "adds the #asset_path helper" do
-    @assets.file "asset_path.css.scss", %(body { background: url(asset-path("image.jpg")); })
-    @assets.file "asset_url.css.scss", %(body { background: asset-url("image.jpg"); })
-    @assets.file "asset_path_options.css.scss", %(body { background: url(asset-path("image.jpg", $digest: true, $prefix: "/themes")); })
-    @assets.file "asset_url_options.css.scss", %(body { background: asset-url("image.jpg", $digest: true, $prefix: "/themes"); })
-    @assets.file "image.jpg"
+  it 'adds the #asset_path helper' do
+    @assets.file 'asset_path.css.scss', %(body { background: url(asset-path("image.jpg")); })
+    @assets.file 'asset_url.css.scss', %(body { background: asset-url("image.jpg"); })
+    @assets.file 'asset_path_options.css.scss', %(body { background: url(asset-path("image.jpg", $digest: true, $prefix: "/themes")); })
+    @assets.file 'asset_url_options.css.scss', %(body { background: asset-url("image.jpg", $digest: true, $prefix: "/themes"); })
+    @assets.file 'image.jpg'
     
-    @env["asset_path.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["asset_url.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["asset_path_options.css"].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
-    @env["asset_url_options.css"].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
+    @env['asset_path.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['asset_url.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['asset_path_options.css'].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
+    @env['asset_url_options.css'].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
   end
   
-  it "adds the #image_path helper" do
-    @assets.file "image_path.css.scss", %(body { background: url(image-path("image.jpg")); })
-    @assets.file "image_url.css.scss", %(body { background: image-url("image.jpg"); })
-    @assets.file "image_path_options.css.scss", %(body { background: url(image-path("image.jpg", $digest: true, $prefix: "/themes")); })
-    @assets.file "image_url_options.css.scss", %(body { background: image-url("image.jpg", $digest: true, $prefix: "/themes"); })
-    @assets.file "image.jpg"
+  it 'adds the #image_path helper' do
+    @assets.file 'image_path.css.scss', %(body { background: url(image-path("image.jpg")); })
+    @assets.file 'image_url.css.scss', %(body { background: image-url("image.jpg"); })
+    @assets.file 'image_path_options.css.scss', %(body { background: url(image-path("image.jpg", $digest: true, $prefix: "/themes")); })
+    @assets.file 'image_url_options.css.scss', %(body { background: image-url("image.jpg", $digest: true, $prefix: "/themes"); })
+    @assets.file 'image.jpg'
     
-    @env["image_path.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["image_url.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["image_path_options.css"].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
-    @env["image_url_options.css"].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
+    @env['image_path.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['image_url.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['image_path_options.css'].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
+    @env['image_url_options.css'].to_s.should =~ %r(body \{\n  background: url\("/themes/image-[0-9a-f]+.jpg"\); \}\n)
   end
   
-  it "adds the #asset_data_uri helper" do
-    @assets.file "asset_data_uri.css.scss", %(body { background: asset-data-uri("image.jpg"); })
-    @assets.file "image.jpg", File.read("spec/fixtures/image.jpg")
+  it 'adds the #asset_data_uri helper' do
+    @assets.file 'asset_data_uri.css.scss', %(body { background: asset-data-uri("image.jpg"); })
+    @assets.file 'image.jpg', File.read('spec/fixtures/image.jpg')
     
-    @env["asset_data_uri.css"].to_s.should == %(body {\n  background: url(data:image/jpeg;base64,%2F9j%2F4AAQSkZJRgABAgAAZABkAAD%2F7AARRHVja3kAAQAEAAAAPAAA%2F%2B4ADkFkb2JlAGTAAAAAAf%2FbAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f%2F8AAEQgAAQABAwERAAIRAQMRAf%2FEAEoAAQAAAAAAAAAAAAAAAAAAAAgBAQAAAAAAAAAAAAAAAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAARAQAAAAAAAAAAAAAAAAAAAAD%2F2gAMAwEAAhEDEQA%2FACoD%2F9k%3D); }\n)
+    @env['asset_data_uri.css'].to_s.should == %(body {\n  background: url(data:image/jpeg;base64,%2F9j%2F4AAQSkZJRgABAgAAZABkAAD%2F7AARRHVja3kAAQAEAAAAPAAA%2F%2B4ADkFkb2JlAGTAAAAAAf%2FbAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f%2F8AAEQgAAQABAwERAAIRAQMRAf%2FEAEoAAQAAAAAAAAAAAAAAAAAAAAgBAQAAAAAAAAAAAAAAAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAARAQAAAAAAAAAAAAAAAAAAAAD%2F2gAMAwEAAhEDEQA%2FACoD%2F9k%3D); }\n)
   end
   
   it "mirrors Compass's #image_url helper" do
-    @assets.file "image_path.css.scss", %(body { background: url(image-url("image.jpg", true)); })
-    @assets.file "image_url.css.scss", %(body { background: image-url("image.jpg", false); })
-    @assets.file "cache_buster.css.scss", %(body { background: image-url("image.jpg", false, true); })
-    @assets.file "image.jpg"
+    @assets.file 'image_path.css.scss', %(body { background: url(image-url("image.jpg", true)); })
+    @assets.file 'image_url.css.scss', %(body { background: image-url("image.jpg", false); })
+    @assets.file 'cache_buster.css.scss', %(body { background: image-url("image.jpg", false, true); })
+    @assets.file 'image.jpg'
     
-    @env["image_path.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["image_url.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["cache_buster.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['image_path.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['image_url.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['cache_buster.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
   end
   
   it "mirrors Sass::Rails's #asset_path helpers" do
-    @assets.file "asset_path.css.scss", %(body { background: url(asset-path("image.jpg", image)); })
-    @assets.file "asset_url.css.scss", %(body { background: asset-url("icon.jpg", image); })
-    @assets.file "image.jpg"
+    @assets.file 'asset_path.css.scss', %(body { background: url(asset-path("image.jpg", image)); })
+    @assets.file 'asset_url.css.scss', %(body { background: asset-url("icon.jpg", image); })
+    @assets.file 'image.jpg'
     
-    @env["asset_path.css"].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
-    @env["asset_url.css"].to_s.should == %(body {\n  background: url("/images/icon.jpg"); }\n)
+    @env['asset_path.css'].to_s.should == %(body {\n  background: url("/assets/image.jpg"); }\n)
+    @env['asset_url.css'].to_s.should == %(body {\n  background: url("/images/icon.jpg"); }\n)
+  end
+
+  it "compresses css" do
+    css = <<-CSS
+      div {
+        color: red;
+      }
+    CSS
+
+    Sprockets::Sass::Compressor.new.compress(css).should == "div{color:red}\n"
   end
 end

data/spec/support/be_fresh_matcher.rb

@@ -8,10 +8,10 @@ RSpec::Matchers.define :be_fresh do |env|
   end
   
   failure_message_for_should do |env|
-    "expected asset to be fresh"
+    'expected asset to be fresh'
   end
   
   failure_message_for_should_not do |env|
-    "expected asset to be stale"
+    'expected asset to be stale'
   end
 end

data/sprockets-sass.gemspec

@@ -1,30 +1,30 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "sprockets/sass/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'sprockets/sass/version'
 
 Gem::Specification.new do |s|
-  s.name        = "sprockets-sass"
+  s.name        = 'sprockets-sass'
   s.version     = Sprockets::Sass::VERSION
-  s.authors     = ["Pete Browne"]
-  s.email       = ["me@petebrowne.com"]
-  s.homepage    = "http://github.com/petebrowne/sprockets-sass"
+  s.authors     = ['Pete Browne']
+  s.email       = ['me@petebrowne.com']
+  s.homepage    = 'http://github.com/petebrowne/sprockets-sass'
   s.summary     = %q{Better Sass integration with Sprockets 2.0}
   s.description = %q{When using Sprockets 2.0 with Sass you will eventually run into a pretty big issue. `//= require` directives will not allow Sass mixins, variables, etc. to be shared between files. So you'll try to use `@import`, and that'll also blow up in your face. `sprockets-sass` fixes all of this by creating a Sass::Importer that is Sprockets aware.}
 
-  s.rubyforge_project = "sprockets-sass"
+  s.rubyforge_project = 'sprockets-sass'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split('\n').map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
   
-  s.add_dependency "sprockets",                     "~> 2.0"
-  s.add_dependency "tilt",                          "~> 1.1"
-  s.add_development_dependency "appraisal",         "~> 0.4"
-  s.add_development_dependency "rspec",             "~> 2.6"
-  s.add_development_dependency "test-construct",    "~> 1.2"
-  s.add_development_dependency "sprockets-helpers", "~> 0.3"
-  s.add_development_dependency "sass",              "~> 3.1"
-  s.add_development_dependency "compass",           "~> 0.11"
-  s.add_development_dependency "rake"
+  s.add_dependency             'sprockets',         '~> 2.0'
+  s.add_dependency             'tilt',              '~> 1.1'
+  s.add_development_dependency 'appraisal',         '~> 0.4'
+  s.add_development_dependency 'rspec',             '~> 2.6'
+  s.add_development_dependency 'test-construct',    '~> 1.2'
+  s.add_development_dependency 'sprockets-helpers', '~> 0.3'
+  s.add_development_dependency 'sass',              '~> 3.1'
+  s.add_development_dependency 'compass',           '~> 0.11'
+  s.add_development_dependency 'rake'
 end

metadata

@@ -1,126 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sprockets-sass
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &-1072935398 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072935398
+- !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &-1072935738 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072935738
+- !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &-1072936198 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072936198
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &-1072936978 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072936978
+- !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &-1072937558 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072937558
+- !ruby/object:Gem::Dependency
   name: sprockets-helpers
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &-1072938048 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072938048
+- !ruby/object:Gem::Dependency
   name: sass
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &-1072938558 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072938558
+- !ruby/object:Gem::Dependency
   name: compass
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &-1072939588 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.11"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *-1072939588
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &-1072796628 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-description: When using Sprockets 2.0 with Sass you will eventually run into a pretty big issue. `//= require` directives will not allow Sass mixins, variables, etc. to be shared between files. So you'll try to use `@import`, and that'll also blow up in your face. `sprockets-sass` fixes all of this by creating a Sass::Importer that is Sprockets aware.
-email: 
+  version_requirements: *-1072796628
+description: When using Sprockets 2.0 with Sass you will eventually run into a pretty
+  big issue. `//= require` directives will not allow Sass mixins, variables, etc.
+  to be shared between files. So you'll try to use `@import`, and that'll also blow
+  up in your face. `sprockets-sass` fixes all of this by creating a Sass::Importer
+  that is Sprockets aware.
+email:
 - me@petebrowne.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Appraisals
 - Gemfile
@@ -133,9 +133,11 @@ files:
 - gemfiles/sprockets-2.1.gemfile
 - gemfiles/sprockets-2.2.gemfile
 - gemfiles/sprockets-2.3.gemfile
+- gemfiles/sprockets-2.4.gemfile
 - lib/sprockets-sass.rb
 - lib/sprockets/sass.rb
 - lib/sprockets/sass/cache_store.rb
+- lib/sprockets/sass/compressor.rb
 - lib/sprockets/sass/functions.rb
 - lib/sprockets/sass/importer.rb
 - lib/sprockets/sass/sass_template.rb
@@ -148,38 +150,35 @@ files:
 - sprockets-sass.gemspec
 homepage: http://github.com/petebrowne/sprockets-sass
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4611660647593714781
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 393589807
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4611660647593714781
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 393589807
 requirements: []
-
 rubyforge_project: sprockets-sass
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0
-test_files: 
+test_files:
 - spec/fixtures/image.jpg
 - spec/spec_helper.rb
 - spec/sprockets-sass_spec.rb