sprockets-sass 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af094799e7e501a8bd0e4d69f7a7fd79e2f3056
-  data.tar.gz: d889b5fba8d6296978821c0c12aa8b063f8a4324
+  metadata.gz: e93b8e4aef5fc9d0fcc2e1a59a42b2942f73de0b
+  data.tar.gz: 52d6ac715c3bf79e861b3a66977d3d6883e92495
 SHA512:
-  metadata.gz: 759bf41724fa6f5a2cafe99eb39ce7f0f15a820dce7cf1979589ecf13c93e245597a9c93cbb98602beba937da69463bed6441ef7eec20d0a70dce4e46ed0fd86
-  data.tar.gz: 63fa7d50c5350bfd57ce0e0c2fdba2cf902632a767ed950a541e71ee7c82249abee870d7fe7a94a0724bd11608cf7be4ea30f87ac5e38ec875bb9045c186cf64
+  metadata.gz: eebe585d42892338ca846c7d0ad6ed922459c6944a06447bb100034bdf07fd4cdd74c87a4c4bdee7b834dcdfe9f421f68d4b318d26baf50d48ebb6ef408ce71a
+  data.tar.gz: 21be3f03e533819ac78355160727abc4cb2c00f0c709791d6a0ca0b538cac7c0e268546fb1c166bdeea9d830cb7590ddccd45c9d0cae332c19f0ddfc62874a9b

data/.travis.yml

@@ -5,8 +5,6 @@ before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - gem install bundler
 rvm:
-- 2.0.0
-- 2.1.5
 - 2.2.2
 - 2.2.3
 - 2.3.1

data/lib/sprockets/sass/v2/importer.rb

@@ -171,12 +171,12 @@ module Sprockets
           []
         end
 
-        def get_engines_from_attributes(attributes)
+        def get_engines_from_attributes(context, attributes)
           attributes.engines
         end
 
         def get_all_processors_for_evaluate(context, content_type, attributes, path)
-          engines = get_engines_from_attributes(attributes)
+          engines = get_engines_from_attributes(context, attributes)
           preprocessors = get_context_preprocessors(context, content_type)
           additional_transformers = get_context_transformers(context, content_type, path)
           additional_transformers.reverse + preprocessors + engines.reverse

data/lib/sprockets/sass/v3/importer.rb

@@ -6,8 +6,8 @@ module Sprockets
       # class used for importing files from SCCS and SASS files
       class Importer < Sprockets::Sass::V2::Importer
         GLOB = /\*|\[.+\]/
-        
-      protected
+
+        protected
 
         def resolve_path_with_load_paths(context, path, root_path, file)
           context.resolve(file.to_s, load_paths: context.environment.paths, base_path: root_path, accept: syntax_mime_type(path))
@@ -43,10 +43,10 @@ module Sprockets
 
         def asset_requirable?(context, path)
           pathname = begin
-                       context.resolve(path)
-                     rescue
-                       nil
-                     end
+            context.resolve(path)
+          rescue
+            nil
+          end
           return false if pathname.nil?
           stat = stat_of_pathname(context, pathname, path)
           return false unless stat && stat.file?
@@ -118,6 +118,7 @@ module Sprockets
           metadata = (input[:metadata] || {}).dup
           metadata[:data] = input[:data]
           result = processor.call(input)
+          processors.delete(processor)
           handle_process_result(context, result, processors, metadata)
         end
 
@@ -137,14 +138,14 @@ module Sprockets
         def handle_process_result(context, result, processors, metadata)
           data = nil
           case result
-            when NilClass
-              data = metadata[:data]
-            when Hash
-              data = handle_complex_process_result(context, result, processors)
-            when String
-              data = result
-            else
-              raise Error, "invalid processor return type: #{result.class}"
+          when NilClass
+            data = metadata[:data]
+          when Hash
+            data = handle_complex_process_result(context, result, processors)
+          when String
+            data = result
+          else
+            raise Error, "invalid processor return type: #{result.class}"
           end
           data
         end
@@ -156,7 +157,6 @@ module Sprockets
           path = check_path_before_process(context, path)
           data = Sprockets::Sass::Utils.read_template_file(path.to_s)
           input = build_input_for_process(context, path, data)
-
           processors.each do |processor|
             data = call_processor_input(processor, context, input, processors)
           end
@@ -174,15 +174,27 @@ module Sprockets
           additional_transformers.is_a?(Array) ? additional_transformers : [additional_transformers]
         end
 
-        def get_engines_from_attributes(_attributes)
-          []
+        def get_engines_from_attributes(context, attributes)
+          engines = []
+          attributes[2].each do |extension|
+            ext = ::Sprockets::Utils.normalize_extension(extension)
+            ext_engines = context.environment.engines[ext]
+            ext_engines = ext_engines.is_a?(Array) ? ext_engines : [ext_engines]
+            engines.concat(ext_engines)
+          end
+          engines
         end
 
         def get_all_processors_for_evaluate(context, content_type, attributes, path)
-          engines = get_engines_from_attributes(attributes)
+          engines = get_engines_from_attributes(context, attributes)
           preprocessors = get_context_preprocessors(context, content_type)
           additional_transformers = get_context_transformers(context, content_type, path)
-          additional_transformers.reverse + preprocessors + engines.reverse
+          postprocessors = get_context_postprocessors(context, content_type)
+          engines.reverse + preprocessors + additional_transformers.reverse  + postprocessors
+        end
+
+        def get_context_postprocessors(context, content_type)
+          context.environment.postprocessors[content_type].map { |a| a.class == Class ? a : a.class  }
         end
 
         def filter_all_processors(processors)

data/lib/sprockets/sass/v4/importer.rb

@@ -85,6 +85,10 @@ module Sprockets
           end
         end
 
+        def get_engines_from_attributes(_context, _attributes)
+          []
+        end
+
         def call_processor_input(processor, context, input, processors)
           if processor.respond_to?(:processors)
             processor.processors = filter_all_processors(processor.processors)

data/lib/sprockets/sass/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Sprockets
   module Sass
-    VERSION = '2.0.0.beta1'
+    VERSION = '2.0.0.beta2'
   end
 end

data/spec/importer_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Sprockets::Sass do
+
+
+  before :each do
+    @root = create_construct
+    @assets = @root.directory 'assets'
+    @public_dir = @root.directory 'public'
+    @env = Sprockets::Environment.new @root.to_s
+    @env.append_path @assets.to_s
+    @env.register_postprocessor 'text/css', FailPostProcessor
+    @test_registration = Sprockets::Sass::TestRegistration.new(@env)
+    @test_registration.register_engines('.xyz' =>  Sprockets::Sass::FakeEngine)
+    @importer_class = Sprockets::Sass::Utils.get_class_by_version("Importer")
+  end
+
+  before(:each) do
+    @assets.file 'main.css.scss', %(@import "dep")
+    @dep_path = @assets.file 'dep.css.xyz', "$color: blue;\nbody { color: $color; }"
+  end
+
+  after :each do
+    @root.destroy!
+  end
+
+  if (3...4).include?(Sprockets::Sass::Utils.version_of_sprockets)
+    it 'allow calls the get engines from attributes with proper arguments' do
+      expect_any_instance_of(@importer_class).to receive(:get_engines_from_attributes).with(anything, [@dep_path.to_s.gsub('.css.xyz', ''), "text/css", [".xyz"], nil]).at_least(:once).and_call_original
+      asset = @env['main.css']
+    end
+
+    it 'calls the normalize extension from sprockets utils' do
+      expect(::Sprockets::Utils).to receive(:normalize_extension).with('.xyz').at_least(:once).and_call_original
+      asset = @env['main.css']
+    end
+
+    it 'retursn the engines registered on the file path' do
+      expect_any_instance_of(@importer_class).to receive(:filter_all_processors).with(array_including(Sprockets::Sass::FakeEngine)).at_least(:once).and_call_original
+      asset = @env['main.css']
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -7,6 +7,15 @@ require 'compass'
 require 'test_construct'
 
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec
+  
+  config.include RSpec::Matchers
   config.include TestConstruct::Helpers
 end
 

data/spec/sprockets-sass_spec.rb

@@ -396,7 +396,7 @@ describe Sprockets::Sass do
       expect(res).to  eql("div{color:red}\n")
     end
   end
-  
+
 
   describe Sprockets::Sass::SassTemplate do
 
@@ -410,15 +410,15 @@ describe Sprockets::Sass do
       it 'does add Sass functions if sprockets-helpers is not available' do
         Sprockets::Sass::SassTemplate.sass_functions_initialized = false
         Sprockets::Sass.add_sass_functions = true
-        Sprockets::Sass::SassTemplate.any_instance.should_receive(:require).with('sprockets/helpers').and_raise LoadError
-        Sprockets::Sass::SassTemplate.any_instance.should_not_receive(:require).with 'sprockets/sass/functions'
+        expect_any_instance_of(Sprockets::Sass::SassTemplate).to receive(:require).with('sprockets/helpers').and_raise LoadError
+        expect_any_instance_of(Sprockets::Sass::SassTemplate).to_not receive(:require).with 'sprockets/sass/functions'
         template
         expect(Sprockets::Sass::SassTemplate.engine_initialized?).to be_falsy
       end
 
       it 'does not add Sass functions if add_sass_functions is false' do
         Sprockets::Sass.add_sass_functions = false
-        template.should_not_receive(:require).with 'sprockets/sass/functions'
+        expect(template).to_not receive(:require).with 'sprockets/sass/functions'
         template.initialize_engine
         expect(Sprockets::Sass::SassTemplate.engine_initialized?).to be_falsy
         Sprockets::Sass.add_sass_functions = true

data/spec/support/be_fresh_matcher.rb

@@ -11,11 +11,11 @@ RSpec::Matchers.define :be_fresh do |env, old_asset|
     end
   end
 
-  failure_message_for_should do |env|
+  failure_message do |env|
     'expected asset to be fresh'
   end
 
-  failure_message_for_should_not do |env|
+  failure_message_when_negated do |env|
     'expected asset to be stale'
   end
 end

data/spec/support/fake_engine.rb

@@ -0,0 +1,50 @@
+module Sprockets
+  module Sass
+    class FakeEngine
+      VERSION = '1'
+
+      def self.default_mime_type
+        'text/xyx'
+      end
+
+      # Public: Return singleton instance with default options.
+      #
+      # Returns SassProcessor object.
+      def self.instance
+        @instance ||= new
+      end
+
+      def self.call(input)
+        instance.call(input)
+      end
+
+      attr_accessor :has_been_used
+      attr_reader :context
+
+      def initialize(*_args, &block)
+        @has_been_used = false
+      end
+
+      def call(input)
+        @context  = input[:environment].context_class.new(input)
+        run
+      end
+
+      def render(context, _empty_hash_wtf)
+        @context = context
+        run
+      end
+
+      def run
+        @has_been_used = true
+        result = ""
+        if context.respond_to?(:metadata)
+          context.metadata.merge(data: result, sass_dependencies:  Set.new([]))
+        else
+          result
+        end
+      end
+
+    end
+  end
+end

data/spec/support/test_registration.rb

@@ -0,0 +1,11 @@
+module Sprockets
+  module Sass
+    class TestRegistration < Sprockets::Sass::Registration
+
+      def register_engines(hash)
+        _register_engines(hash)
+      end
+
+    end
+  end
+end

data/sprockets-sass.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency             'sprockets',         '>= 2.0', '< 4.0'
 
-  s.add_development_dependency 'rspec',             '~> 2.13'
+  s.add_development_dependency 'rspec',             '~> 3.5'
   s.add_development_dependency 'test_construct',    '~> 2.0'
   s.add_development_dependency 'sprockets-helpers', '~> 1.0'
   s.add_development_dependency 'sass',              '~> 3.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-sass
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: test_construct
   requirement: !ruby/object:Gem::Requirement
@@ -212,12 +212,15 @@ files:
 - lib/sprockets/sass/version.rb
 - spec/custom_importer_spec.rb
 - spec/fixtures/image.jpg
+- spec/importer_spec.rb
 - spec/spec_helper.rb
 - spec/sprockets-sass_spec.rb
 - spec/support/be_fresh_matcher.rb
 - spec/support/dummy_importer.rb
 - spec/support/fail_postprocessor.rb
+- spec/support/fake_engine.rb
 - spec/support/sass_template.rb
+- spec/support/test_registration.rb
 - sprockets-sass.gemspec
 homepage: http://github.com/petebrowne/sprockets-sass
 licenses:
@@ -248,9 +251,12 @@ summary: Better Sass integration with Sprockets 2.0
 test_files:
 - spec/custom_importer_spec.rb
 - spec/fixtures/image.jpg
+- spec/importer_spec.rb
 - spec/spec_helper.rb
 - spec/sprockets-sass_spec.rb
 - spec/support/be_fresh_matcher.rb
 - spec/support/dummy_importer.rb
 - spec/support/fail_postprocessor.rb
+- spec/support/fake_engine.rb
 - spec/support/sass_template.rb
+- spec/support/test_registration.rb