sprockets-sass 0.1.0 → 0.2.0

data/README.md

@@ -10,18 +10,12 @@ _Note: This works in Rails 3.1, thanks to the [sass-rails gem](http://github.com
 ### Features
 
 * Imports Sass _partials_ (filenames prepended with "_").
-* Import paths work exactly like `require` directives*.
+* Import paths work exactly like `require` directives.
 * Imports either Sass syntax, or just regular CSS files.
 * Imported files are preprocessed by Sprockets, so `.css.scss.erb` files can be imported.
   Directives from within imported files also work as expected.
 * Standard Sass load paths are not touched, so Compass extensions will work as expected.
-
-_* Glob support coming in 0.2.0_
-
-### TODO
-
-* Glob support (as mentioned above)
-* Asset path helpers
+* Supports glob imports, like sass-rails.
 
 
 Installation

data/lib/sprockets/sass/importer.rb

@@ -4,6 +4,8 @@ require "pathname"
 module Sprockets
   module Sass
     class Importer < ::Sass::Importers::Base
+      GLOB = /\*|\[.+\]/
+      
       # Reference to the Sprockets context
       attr_reader :context
       
@@ -13,8 +15,12 @@ module Sprockets
       end
       
       # @see Sass::Importers::Base#find_relative
-      def find_relative(path, base, options)
-        engine_from_path(path, options)
+      def find_relative(path, base_path, options)
+        if path =~ GLOB
+          engine_from_glob(path, base_path, options)
+        else
+          engine_from_path(path, options)
+        end
       end
       
       # @see Sass::Importers::Base#find
@@ -45,7 +51,6 @@ module Sprockets
       protected
       
       # Create a Sass::Engine from the given path.
-      # This is where all the magic happens!
       def engine_from_path(path, options)
         pathname = resolve(path) or return nil
         context.depend_on pathname
@@ -56,6 +61,22 @@ module Sprockets
         )
       end
       
+      # 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|
+          context.depend_on path
+          relative_path = path.relative_path_from Pathname.new(context.root_path)
+          imports << %(@import "#{relative_path}";\n)
+        end
+        return nil if imports.empty?
+        ::Sass::Engine.new imports, options.merge(
+          :filename => base_path.to_s,
+          :syntax   => :scss,
+          :importer => self
+        )
+      end
+      
       # Finds an asset from the given path. This is where
       # we make Sprockets behave like Sass, and import partial
       # style paths.
@@ -63,11 +84,21 @@ module Sprockets
         path    = Pathname.new(path) unless path.is_a?(Pathname)
         partial = path.dirname.join("_#{path.basename}")
         
-        resolve_asset(path) || resolve_asset(partial)
+        resolve_path(path) || resolve_path(partial)
+      end
+      
+      # Finds all of the assets using the given glob.
+      def resolve_glob(glob, base_path)
+        base_path      = Pathname.new(base_path)
+        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)
+        end
       end
       
       # Finds the asset using the context from Sprockets.
-      def resolve_asset(path)
+      def resolve_path(path)
         context.resolve(path, :content_type => :self)
       rescue ::Sprockets::FileNotFound, ::Sprockets::ContentTypeMismatch
         nil

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -95,8 +95,16 @@ describe Sprockets::Sass do
     asset = @env["main.css.scss"]
     asset.to_s.should == "body {\n  color: blue; }\n"
   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.scss"]
+    asset.to_s.should == "body {\n  color: blue;\n  background: red; }\n"
+  end
 
-  it "adds dependency when imported" do
+  it "adds dependencies when imported" do
     @assets.file "main.css.scss", %(@import "dep";\nbody { color: $color; })
     dep = @assets.file "dep.css.scss", "$color: blue;"
     
@@ -109,4 +117,19 @@ describe Sprockets::Sass do
     
     asset.should be_stale
   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.css.scss", "$color: blue;"
+    dep = @assets.file "folder/dep2.css.scss", "$bg-color: red;"
+    
+    asset = @env["main.css.scss"]
+    asset.should be_fresh
+    
+    mtime = Time.now + 1
+    dep.open("w") { |f| f.write "$bg-color: white;" }
+    dep.utime mtime, mtime
+    
+    asset.should be_stale
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets-sass
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Pete Browne