sprockets-sass 1.1.0 → 1.2.0

data/lib/sprockets/sass/importer.rb

@@ -60,7 +60,7 @@ module Sprockets
         context = options[:custom][:sprockets_context]
         imports = resolve_glob(context, glob, base_path).inject('') do |imports, path|
           context.depend_on path
-          relative_path = path.relative_path_from Pathname.new(context.root_path)
+          relative_path = path.relative_path_from Pathname.new(base_path).dirname
           imports << %(@import "#{relative_path}";\n)
         end
         return nil if imports.empty?
@@ -97,13 +97,18 @@ module Sprockets
       def possible_files(context, 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) ]
 
+        # Find base_path's root
+        env_root_paths = context.environment.paths.map {|p| Pathname.new(p) }
+        root_path = env_root_paths.detect do |env_root_path|
+          base_path.to_s.start_with?(env_root_path.to_s)
+        end
+        root_path ||= context.root_path
+
         # Add the relative path from the root, if necessary
         if path.relative? && base_path != root_path
           relative_path = base_path.relative_path_from(root_path).join path
-
           paths.unshift(relative_path, partialize_path(relative_path))
         end
 

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -145,6 +145,30 @@ describe Sprockets::Sass do
     expect(asset.to_s).to eql("body {\n  color: blue; }\n")
   end
 
+  it 'imports nested partials with relative path from the assets load path' do
+    vendor = @root.directory 'vendor'
+    @env.append_path vendor.to_s
+
+    @assets.file 'folder/main.css.scss', %(@import "dep";\nbody { color: $color; })
+    vendor.file 'dep.css.scss', '@import "folder1/dep1";'
+    vendor.file 'folder1/_dep1.scss', '@import "folder2/dep2";'
+    vendor.file 'folder1/folder2/_dep2.scss', '$color: blue;'
+    asset = @env['folder/main.css']
+    expect(asset.to_s).to eql("body {\n  color: blue; }\n")
+  end
+
+  it 'imports nested partials with relative path and glob from the assets load path' do
+    vendor = @root.directory 'vendor'
+    @env.append_path vendor.to_s
+
+    @assets.file 'folder/main.css.scss', %(@import "dep";\nbody { color: $color; })
+    vendor.file 'dep.css.scss', '@import "folder1/dep1";'
+    vendor.file 'folder1/_dep1.scss', '@import "folder2/*";'
+    vendor.file 'folder1/folder2/_dep2.scss', '$color: blue;'
+    asset = @env['folder/main.css']
+    expect(asset.to_s).to eql("body {\n  color: blue; }\n")
+  end
+
   it 'allows global Sass configuration' do
     Sprockets::Sass.options[:style] = :compact
     @assets.file 'main.css.scss', "body {\n  color: blue;\n}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-sass
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3623172445139916864
+      hash: -2591285633856815059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3623172445139916864
+      hash: -2591285633856815059
 requirements: []
 rubyforge_project: sprockets-sass
 rubygems_version: 1.8.23