sprockets-sass 1.0.3 → 1.1.0

data/.gitignore

@@ -4,3 +4,5 @@ Gemfile.lock
 gemfiles/*.lock
 pkg/*
 .sass-cache
+.rspec
+.ruby-version

data/Appraisals

@@ -1,56 +1,75 @@
-appraise 'sprockets_2.0' do
-  gem 'sprockets', '~> 2.0.0'
+appraise 'sass_3.1' do
+  gem 'sass', '~> 3.1.0'
+  gem 'compass', '~> 0.12.0'
+end
+
+appraise 'compass_0.11' do
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.11.0'
 end
 
 appraise 'sprockets_2.1' do
   gem 'sprockets', '~> 2.1.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.2' do
   gem 'sprockets', '~> 2.2.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.3' do
   gem 'sprockets', '~> 2.3.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.4' do
   gem 'sprockets', '~> 2.4.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.5' do
   gem 'sprockets', '~> 2.5.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.6' do
   gem 'sprockets', '~> 2.6.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.7' do
   gem 'sprockets', '~> 2.7.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.8' do
   gem 'sprockets', '~> 2.8.0'
-  gem 'sass', '~> 3.1.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
 appraise 'sprockets_2.9' do
   gem 'sprockets', '~> 2.9.0'
-end
-
-appraise 'sass_3.1' do
-  gem 'sass', '~> 3.1.0'
-end
-
-appraise 'sass_3.2' do
   gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
-appraise 'compass_0.11' do
-  gem 'compass', '~> 0.11.0'
+appraise 'sprockets_2.10' do
+  gem 'sprockets', '~> 2.9.0'
+  gem 'sass', '~> 3.2.0'
+  gem 'compass', '~> 0.12.0'
 end
 
-appraise 'compass_0.12' do
+appraise 'sprockets_2.11' do
+  gem 'sprockets', '~> 2.9.0'
+  gem 'sass', '~> 3.2.0'
   gem 'compass', '~> 0.12.0'
 end

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/gemfiles/compass_0.11.gemfile

@@ -1,7 +1,8 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
+gem "sass", "~> 3.2.0"
 gem "compass", "~> 0.11.0"
 
 gemspec :path=>"../"

data/gemfiles/sass_3.1.gemfile

@@ -1,7 +1,8 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sass", "~> 3.1.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.1.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.1.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.10.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sprockets", "~> 2.9.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
+
+gemspec :path=>"../"

data/gemfiles/sprockets_2.11.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sprockets", "~> 2.9.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
+
+gemspec :path=>"../"

data/gemfiles/sprockets_2.2.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.2.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.3.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.3.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.4.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.4.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.5.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.5.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.6.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.6.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.7.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.7.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.8.gemfile

@@ -1,8 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.8.0"
-gem "sass", "~> 3.1.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/gemfiles/sprockets_2.9.gemfile

@@ -1,7 +1,9 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "sprockets", "~> 2.9.0"
+gem "sass", "~> 3.2.0"
+gem "compass", "~> 0.12.0"
 
 gemspec :path=>"../"

data/lib/sprockets/sass/importer.rb

@@ -6,14 +6,6 @@ module Sprockets
     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
@@ -52,9 +44,10 @@ module Sprockets
 
       # Create a Sass::Engine from the given path.
       def engine_from_path(path, base_path, options)
-        pathname = resolve(path, base_path) or return nil
+        context = options[:custom][:sprockets_context]
+        pathname = resolve(context, path, base_path) or return nil
         context.depend_on pathname
-        ::Sass::Engine.new evaluate(pathname), options.merge(
+        ::Sass::Engine.new evaluate(context, pathname), options.merge(
           :filename => pathname.to_s,
           :syntax   => syntax(pathname),
           :importer => self
@@ -64,7 +57,8 @@ 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|
+        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)
           imports << %(@import "#{relative_path}";\n)
@@ -80,8 +74,8 @@ 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, base_path)
-        possible_files(path, base_path).each do |file|
+      def resolve(context, path, base_path)
+        possible_files(context, path, base_path).each do |file|
           context.resolve(file) { |found| return found if context.asset_requirable?(found) }
         end
 
@@ -89,7 +83,7 @@ module Sprockets
       end
 
       # Finds all of the assets using the given glob.
-      def resolve_glob(glob, base_path)
+      def resolve_glob(context, glob, base_path)
         base_path      = Pathname.new(base_path)
         path_with_glob = base_path.dirname.join(glob).to_s
 
@@ -100,7 +94,7 @@ module Sprockets
 
       # Returns all of the possible paths (including partial variations)
       # to attempt to resolve with the given path.
-      def possible_files(path, base_path)
+      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)
@@ -132,7 +126,7 @@ module Sprockets
       # 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.
-      def evaluate(path)
+      def evaluate(context, path)
         attributes = context.environment.attributes_for(path)
         processors = context.environment.preprocessors(attributes.content_type) + attributes.engines.reverse
         processors.delete_if { |processor| processor < Tilt::SassTemplate }

data/lib/sprockets/sass/sass_template.rb

@@ -71,11 +71,6 @@ module Sprockets
         end
       end
 
-      # A reference to the custom Sass importer, `Sprockets::Sass::Importer`.
-      def importer
-        Importer.new context
-      end
-
       # Assemble the options for the `Sass::Engine`
       def sass_options
         merge_sass_options(default_sass_options, options).merge(
@@ -83,7 +78,7 @@ module Sprockets
           :line        => line,
           :syntax      => syntax,
           :cache_store => cache_store,
-          :importer    => importer,
+          :importer    => Importer.new,
           :custom      => { :sprockets_context => context }
         )
       end

data/lib/sprockets/sass/version.rb

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

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'sprockets'
 require 'sprockets-sass'
 require 'sprockets-helpers'
 require 'compass'
-require 'construct'
+require 'test_construct'
 
 Compass.configuration do |compass|
   compass.line_comments = false
@@ -14,5 +14,5 @@ end
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.include Construct::Helpers
+  config.include TestConstruct::Helpers
 end

data/spec/sprockets-sass_spec.rb

@@ -231,7 +231,11 @@ describe Sprockets::Sass do
     @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/ }
+    if Sass.version[:minor] > 2
+      sass_cache = cache.detect.detect { |key, value| value['pathname'] =~ /main\.css\.scss/ }
+    else
+      sass_cache = cache.keys.detect { |key| key =~ /main\.css\.scss/ }
+    end
     expect(sass_cache).to_not be_nil
   end
 

data/sprockets-sass.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.add_dependency             'tilt',              '~> 1.1'
   s.add_development_dependency 'appraisal',         '~> 0.5'
   s.add_development_dependency 'rspec',             '~> 2.13'
-  s.add_development_dependency 'test-construct',    '~> 1.2'
+  s.add_development_dependency 'test_construct',    '~> 2.0'
   s.add_development_dependency 'sprockets-helpers', '~> 1.0'
-  s.add_development_dependency 'sass',              '~> 3.2'
-  s.add_development_dependency 'compass',           '~> 0.12'
+  s.add_development_dependency 'sass',              '~> 3.3'
+  s.add_development_dependency 'compass',           '~> 1.0.0.alpha.19'
   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.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: test-construct
+  name: test_construct
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.0.0.alpha.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.0.0.alpha.19
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,8 @@ files:
 - gemfiles/sass_3.2.gemfile
 - gemfiles/sprockets_2.0.gemfile
 - gemfiles/sprockets_2.1.gemfile
+- gemfiles/sprockets_2.10.gemfile
+- gemfiles/sprockets_2.11.gemfile
 - gemfiles/sprockets_2.2.gemfile
 - gemfiles/sprockets_2.3.gemfile
 - gemfiles/sprockets_2.4.gemfile
@@ -230,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 899970428098053938
+      hash: 3623172445139916864
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 899970428098053938
+      hash: 3623172445139916864
 requirements: []
 rubyforge_project: sprockets-sass
 rubygems_version: 1.8.23