sprockets-sass 1.0.1 → 1.0.2

data/lib/sprockets/sass/importer.rb

@@ -5,15 +5,15 @@ module Sprockets
   module Sass
     class Importer < ::Sass::Importers::Base
       GLOB = /\*|\[.+\]/
-      
+
       # Reference to the Sprockets context
       attr_reader :context
-      
-      # 
+
+      #
       def initialize(context)
         @context = context
       end
-      
+
       # @see Sass::Importers::Base#find_relative
       def find_relative(path, base_path, options)
         if path =~ GLOB
@@ -22,7 +22,7 @@ module Sprockets
           engine_from_path(path, base_path, options)
         end
       end
-      
+
       # @see Sass::Importers::Base#find
       def find(path, options)
         engine_from_path(path, nil, options)
@@ -47,9 +47,9 @@ module Sprockets
       def to_s
         "#{self.class.name}:#{context.pathname}"
       end
-      
+
       protected
-      
+
       # Create a Sass::Engine from the given path.
       def engine_from_path(path, base_path, options)
         pathname = resolve(path, base_path) or return nil
@@ -60,7 +60,7 @@ module Sprockets
           :importer => self
         )
       end
-      
+
       # Create a Sass::Engine that will handle importing
       # a glob of files.
       def engine_from_glob(glob, base_path, options)
@@ -76,7 +76,7 @@ module Sprockets
           :importer => self
         )
       end
-      
+
       # Finds an asset from the given path. This is where
       # we make Sprockets behave like Sass, and import partial
       # style paths.
@@ -87,17 +87,17 @@ module Sprockets
 
         nil
       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
-      
+
       # Returns all of the possible paths (including partial variations)
       # to attempt to resolve with the given path.
       def possible_files(path, base_path)
@@ -107,15 +107,15 @@ module Sprockets
         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\.\//
+        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
 
         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)
@@ -123,12 +123,12 @@ module Sprockets
           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
       end
-      
+
       # Returns the string to be passed to the Sass engine. We use
       # Sprockets to process the file, but we remove any Sass processors
       # because we need to let the Sass::Engine handle that.

data/lib/sprockets/sass/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Sass
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/sprockets-sass_spec.rb

@@ -86,6 +86,14 @@ describe Sprockets::Sass do
     expect(asset.to_s).to eql("body {\n  background-color: red;\n  color: blue; }\n")
   end
 
+  it 'imports deeply nested relative partials' do
+    @assets.file 'package-prime/stylesheets/main.scss', %(@import "package-dep/src/stylesheets/variables";\nbody { background-color: $background-color; color: $color; })
+    @assets.file 'package-dep/src/stylesheets/_variables.scss', %(@import "./colors";\n$background-color: red;)
+    @assets.file 'package-dep/src/stylesheets/_colors.scss', '$color: blue;'
+    asset = @env['package-prime/stylesheets/main.scss']
+    expect(asset.to_s).to eql("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;'

data/sprockets-sass.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass',              '~> 3.2'
   s.add_development_dependency 'compass',           '~> 0.12'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-sass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747215420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70190747215420
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747213020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  version_requirements: *70190747213020
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747230780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
+  version_requirements: *70190747230780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747249820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+  version_requirements: *70190747249820
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747245740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *70190747245740
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747258420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70190747258420
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747256440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70190747256440
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747254100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: '0.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.12'
+  version_requirements: *70190747254100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70190747286900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,12 +109,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70190747286900
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70190747284400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70190747284400
 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
@@ -212,15 +178,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -41476719199559965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -41476719199559965
 requirements: []
 rubyforge_project: sprockets-sass
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0