sprockets-sass 0.2.1 → 0.2.2

data/lib/sprockets/sass.rb

@@ -6,8 +6,8 @@ require "sprockets/engines"
 module Sprockets
   module Sass
     autoload :Importer, "sprockets/sass/importer"
-    
-    ::Sprockets.register_engine ".sass", SassTemplate
-    ::Sprockets.register_engine ".scss", ScssTemplate
   end
+    
+  register_engine ".sass", Sass::SassTemplate
+  register_engine ".scss", Sass::ScssTemplate
 end

data/lib/sprockets/sass/importer.rb

@@ -53,7 +53,7 @@ module Sprockets
       # Create a Sass::Engine from the given path.
       def engine_from_path(path, options)
         pathname = resolve(path) or return nil
-        context.depend_on_asset pathname
+        context.depend_on pathname
         ::Sass::Engine.new evaluate(pathname), options.merge(
           :filename => pathname.to_s,
           :syntax   => syntax(pathname),
@@ -65,7 +65,7 @@ module Sprockets
       # a glob of files.
       def engine_from_glob(glob, base_path, options)
         imports = resolve_glob(glob, base_path).inject("") do |imports, path|
-          context.depend_on_asset path
+          context.depend_on path
           relative_path = path.relative_path_from Pathname.new(context.root_path)
           imports << %(@import "#{relative_path}";\n)
         end
@@ -93,13 +93,13 @@ module Sprockets
         path_with_glob = base_path.dirname.join(glob).to_s
         
         Pathname.glob(path_with_glob).sort.select do |path|
-          path != context.pathname && context.asset_requirable?(path)
+          path != context.pathname # && context.asset_requirable?(path)
         end
       end
       
       # Finds the asset using the context from Sprockets.
       def resolve_path(path)
-        context.resolve(path, :content_type => :self)
+        context.resolve path #, :content_type => :self
       rescue ::Sprockets::FileNotFound, ::Sprockets::ContentTypeMismatch
         nil
       end
@@ -115,7 +115,7 @@ module Sprockets
       def evaluate(path)
         processors = context.environment.attributes_for(path).processors.dup
         processors.delete_if { |processor| processor < Tilt::SassTemplate }
-        context.evaluate path, :processors => processors
+        context.evaluate(path, :processors => processors)
       end
     end
   end

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -15,35 +15,35 @@ describe Sprockets::Sass do
   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.scss"]
+    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.sass"]
+    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.scss"]
+    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.scss"]
+    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.css.sass", "$color: blue\nhtml\n  height: 100%"
-    asset = @env["main.css.scss"]
+    @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
   
@@ -51,28 +51,36 @@ describe Sprockets::Sass 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.scss"]
+    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.scss"]
+    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.scss"]
+    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.scss"]
+    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"]
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
@@ -82,7 +90,7 @@ describe Sprockets::Sass do
     
     @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
     vendor.file "dep.css.scss", "$color: blue;"
-    asset = @env["main.css.scss"]
+    asset = @env["main.css"]
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
@@ -92,7 +100,7 @@ describe Sprockets::Sass do
     
     @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
     vendor.file "dep.scss", "$color: blue;"
-    asset = @env["main.css.scss"]
+    asset = @env["main.css"]
     asset.to_s.should == "body {\n  color: blue; }\n"
   end
   
@@ -100,7 +108,7 @@ describe Sprockets::Sass 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.scss"]
+    asset = @env["main.css"]
     asset.to_s.should == "body {\n  color: blue;\n  background: red; }\n"
   end
 
@@ -108,7 +116,7 @@ describe Sprockets::Sass do
     @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
     dep = @assets.file "dep.css.scss", "$color: blue;"
     
-    asset = @env["main.css.scss"]
+    asset = @env["main.css"]
     asset.should be_fresh
     
     mtime = Time.now + 1
@@ -123,7 +131,7 @@ describe Sprockets::Sass do
     @assets.file "dep1.css.scss", %(@import "dep2";\n)
     dep = @assets.file "dep2.css.scss", "$color: blue;"
     
-    asset = @env["main.css.scss"]
+    asset = @env["main.css"]
     asset.should be_fresh
     
     mtime = Time.now + 1
@@ -135,10 +143,10 @@ describe Sprockets::Sass do
 
   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.css.scss", "$color: blue;"
-    dep = @assets.file "folder/dep2.css.scss", "$bg-color: red;"
+    @assets.file "folder/_dep1.scss", "$color: blue;"
+    dep = @assets.file "folder/_dep2.scss", "$bg-color: red;"
     
-    asset = @env["main.css.scss"]
+    asset = @env["main.css"]
     asset.should be_fresh
     
     mtime = Time.now + 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement