sprockets-sass 1.2.0 → 1.3.0

data/.gitignore

@@ -6,3 +6,7 @@ pkg/*
 .sass-cache
 .rspec
 .ruby-version
+
+# Ignore IntelliJ IDEA project files.
+*.iml
+/.idea/

data/lib/sprockets/sass/sass_template.rb

@@ -73,12 +73,21 @@ module Sprockets
 
       # Assemble the options for the `Sass::Engine`
       def sass_options
+        # Allow the use of custom SASS importers, making sure the
+        # custom importer is a `Sprockets::Sass::Importer`
+        if default_sass_options.has_key?(:importer) &&
+           default_sass_options[:importer].is_a?(Importer)
+          importer = default_sass_options[:importer]
+        else
+          importer = Importer.new
+        end
+
         merge_sass_options(default_sass_options, options).merge(
           :filename    => eval_file,
           :line        => line,
           :syntax      => syntax,
           :cache_store => cache_store,
-          :importer    => Importer.new,
+          :importer    => importer,
           :custom      => { :sprockets_context => context }
         )
       end

data/lib/sprockets/sass/version.rb

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

data/spec/custom_importer_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Sprockets::Sass::SassTemplate do
+
+  before :each do
+    # Create the custom importer.
+    @custom_importer =  Sprockets::Sass::DummyImporter.new
+    Sprockets::Sass.options[:importer] = @custom_importer
+
+    # Initialize the environment.
+    @root = create_construct
+    @assets = @root.directory 'assets'
+    @env = Sprockets::Environment.new @root.to_s
+    @env.append_path @assets.to_s
+    @env.register_postprocessor 'text/css', :fail_postprocessor do |_, data|
+      data.gsub /@import/, 'fail engine'
+    end
+  end
+
+  after :each do
+    @root.destroy!
+  end
+
+  it 'allow specifying custom sass importer' do
+    @assets.file 'main.css.scss', %(@import "dep";)
+    @assets.file 'dep.css.scss', "$color: blue;\nbody { color: $color; }"
+    @env['main.css']
+
+    expect(@custom_importer.has_been_used).to be_truthy
+  end
+
+end

data/spec/sprockets-sass_spec.rb

@@ -372,7 +372,7 @@ describe Sprockets::Sass do
         template.should_receive(:require).with('sprockets/helpers').and_raise LoadError
         template.should_not_receive(:require).with 'sprockets/sass/functions'
         template.initialize_engine
-        expect(Sprockets::Sass::SassTemplate.engine_initialized?).to be_true
+        expect(Sprockets::Sass::SassTemplate.engine_initialized?).to be_truthy
       end
 
       it 'does not add Sass functions if add_sass_functions is false' do
@@ -380,7 +380,7 @@ describe Sprockets::Sass do
         template = Sprockets::Sass::SassTemplate.new {}
         template.should_not_receive(:require).with 'sprockets/sass/functions'
         template.initialize_engine
-        expect(Sprockets::Sass::SassTemplate.engine_initialized?).to be_true
+        expect(Sprockets::Sass::SassTemplate.engine_initialized?).to be_truthy
         Sprockets::Sass.add_sass_functions = true
       end
     end

data/spec/support/dummy_importer.rb

@@ -0,0 +1,25 @@
+module Sprockets
+  module Sass
+
+    class DummyImporter < Importer
+      attr_accessor :has_been_used
+
+      def initialize
+        super()
+        @has_been_used = false
+      end
+
+      def find(path, options)
+        @has_been_used = true
+        super(path, options)
+      end
+
+      def find_relative(uri, base, options, *args)
+        @has_been_used = true
+        super(uri, base, options, *args)
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-sass
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -213,10 +213,12 @@ files:
 - lib/sprockets/sass/sass_template.rb
 - lib/sprockets/sass/scss_template.rb
 - lib/sprockets/sass/version.rb
+- spec/custom_importer_spec.rb
 - spec/fixtures/image.jpg
 - spec/spec_helper.rb
 - spec/sprockets-sass_spec.rb
 - spec/support/be_fresh_matcher.rb
+- spec/support/dummy_importer.rb
 - sprockets-sass.gemspec
 homepage: http://github.com/petebrowne/sprockets-sass
 licenses: []
@@ -232,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2591285633856815059
+      hash: 3139794298757869131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -241,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2591285633856815059
+      hash: 3139794298757869131
 requirements: []
 rubyforge_project: sprockets-sass
 rubygems_version: 1.8.23
@@ -249,7 +251,9 @@ signing_key:
 specification_version: 3
 summary: Better Sass integration with Sprockets 2.0
 test_files:
+- spec/custom_importer_spec.rb
 - spec/fixtures/image.jpg
 - spec/spec_helper.rb
 - spec/sprockets-sass_spec.rb
 - spec/support/be_fresh_matcher.rb
+- spec/support/dummy_importer.rb