sassc-rails 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4683003dd69fe77460dd8d33264b6ff33814fda
-  data.tar.gz: c43f5c7471f86937c7b3873d0719fe71ce27403a
+  metadata.gz: d64addcb28c15b04b17828fcb483f865e31f5807
+  data.tar.gz: 89b980dbf7276dc1ba6e3d5b547b74be35537a7b
 SHA512:
-  metadata.gz: 6d4032283c01a30192d737db805c14e0a3ff1b96de2ee9ac00d4c2f10de0bedd0e264fab7e938886eca9a9a5cc90d7f120839ac2f7e92c9ee6fa30a93b7117c3
-  data.tar.gz: 44fd699c654039520a2b84d9b552382c090ba318054a03ed28fab114cb2f76de2221769dca062d9763b3702c10882532bc5f3c041d5709e0b618f5e41bb119dd
+  metadata.gz: 680cfb7d2a6144a63e3fc94baf65d6ebc15eb6d3c0fa5f65ce995606016b69e685a371c255e7f22830127c3796abed7993f8cb52da1c27b62b0b1714df0aaaf9
+  data.tar.gz: 98e2152e6aef09bfb9b7291779f80f02a441f5f6c4835e71780d16d2c6b580731be8c423154ea6c3d4400329aee35bf2023a07b5775e2b654548494b86cd6ac4

data/.travis.yml

@@ -7,6 +7,7 @@ script: "bundle exec rake test"
 gemfile:
   - gemfiles/sprockets_2_12.gemfile
   - gemfiles/sprockets_3_0.gemfile
+  - gemfiles/sprockets_4_0.gemfile
   - gemfiles/sprockets-rails_3_0.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_4_1.gemfile

data/README.md

@@ -87,6 +87,9 @@ is maintained by [Ryan Boland](https://ryanboland.com) and [awesome contributors
 
 ## Changelog
 
+- **1.3.0**
+  - [Silence Sprockets deprecation warnings](https://github.com/sass/sassc-rails/pull/76)
+  - [Sprockets 4 compatibility](https://github.com/sass/sassc-rails/pull/65)
 - **1.2.1**
   - Bump SassC (and thus LibSass) version
 - **1.2.0**

data/Rakefile

@@ -4,6 +4,7 @@ task :test do
   $LOAD_PATH.unshift('lib', 'test')
   Dir.glob('./test/**/*_test.rb') { |f| require f }
 end
+task :default => [:test]
 
 namespace :tests do
   gemfiles = %w[

data/gemfiles/sprockets_3_0.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "sprockets", "~> 3.0.0"
+gem "sprockets", "~> 3.0.3"
 
 # Specify your gem's dependencies in sassc-rails.gemspec
 gemspec path: "../"

data/gemfiles/sprockets_4_0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "sprockets", "~> 4.0.x"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"

data/lib/sassc/rails/railtie.rb

@@ -50,8 +50,20 @@ module SassC::Rails
           self.sass_config = app.config.sass
         end
 
-        env.register_engine '.sass', SassC::Rails::SassTemplate
-        env.register_engine '.scss', SassC::Rails::ScssTemplate
+        if env.respond_to?(:register_transformer)
+          env.register_transformer 'text/sass', 'text/css', SassC::Rails::SassTemplate.new #->() { puts "yoyoyoy" }
+          env.register_transformer 'text/scss', 'text/css', SassC::Rails::ScssTemplate.new #->() { puts "yoyoyoy" }
+        end
+
+        if env.respond_to?(:register_engine)
+          [
+            ['.sass', SassC::Rails::SassTemplate],
+            ['.scss', SassC::Rails::ScssTemplate]
+          ].each do |engine|
+            engine << { silence_deprecation: true } if Sprockets::VERSION.start_with?("3")
+            env.register_engine(*engine)
+          end
+        end
       end
     end
 

data/lib/sassc/rails/template.rb

@@ -1,9 +1,16 @@
 require "sprockets/version"
-require "sprockets/sass_template"
+
+begin
+  require 'sprockets/sass_processor'
+rescue LoadError
+  require "sprockets/sass_template"
+end
+
 require "sprockets/utils"
 
 module SassC::Rails
-  class SassTemplate < Sprockets::SassTemplate
+
+  class SassTemplate < defined?(Sprockets::SassProcessor) ? Sprockets::SassProcessor : Sprockets::SassTemplate
     module Sprockets3
       def call(input)
         context = input[:environment].context_class.new(input)
@@ -19,7 +26,7 @@ module SassC::Rails
             environment: input[:environment],
             dependencies: context.metadata[:dependency_paths]
           }
-        }.merge(config_options)
+        }.merge(config_options) { |*args| safe_merge(*args) }
 
         engine = ::SassC::Engine.new(input[:data], options)
 
@@ -49,7 +56,7 @@ module SassC::Rails
             context: context,
             environment: context.environment
           }
-        }.merge(config_options)
+        }.merge(config_options, &method(:safe_merge))
 
         ::SassC::Engine.new(data, options).render
       end
@@ -62,7 +69,7 @@ module SassC::Rails
     end
 
     def config_options
-      opts = { style: sass_style }
+      opts = { style: sass_style, load_paths: load_paths }
 
 
       if Rails.application.config.sass.inline_source_maps
@@ -80,9 +87,23 @@ module SassC::Rails
       (Rails.application.config.sass.style || :expanded).to_sym
     end
 
+    def load_paths
+      Rails.application.config.sass.load_paths || []
+    end
+
     def line_comments?
       Rails.application.config.sass.line_comments
     end
+
+    def safe_merge(key, left, right)
+      if [left, right].all? { |v| v.is_a? Hash }
+        left.merge(right) { |*args| safe_merge *args }
+      elsif [left, right].all? { |v| v.is_a? Array }
+        (left + right).uniq
+      else
+        right
+      end
+    end
   end
 
   class ScssTemplate < SassTemplate

data/lib/sassc/rails/version.rb

@@ -1,5 +1,5 @@
 module SassC
   module Rails
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
   end
 end

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/dummy/app/assets/stylesheets/imports_test.scss

@@ -13,6 +13,7 @@
 @import "css_sass_handler";
 @import "css_scss_erb_handler";
 @import "css_sass_erb_handler";
+@import 'partial_in_load_paths';
 
 .main {
   color: yellow;

data/test/dummy/app/assets/stylesheets/in_load_paths/partial_in_load_paths.scss

@@ -0,0 +1,3 @@
+.partial_in_load_paths {
+  color: #BADA55
+}

data/test/sassc_rails_test.rb

@@ -54,7 +54,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
   def test_setup_works
     initialize_dev!
 
-    asset = render_asset("application.scss")
+    asset = render_asset("application.css")
 
     assert_equal <<-CSS, asset
 .hello {
@@ -67,7 +67,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
     initialize!
 
     assert_raises(SassC::SyntaxError) do
-      render_asset("syntax_error.scss")
+      render_asset("syntax_error.css")
     end
   end
 
@@ -76,7 +76,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
 
     initialize!
 
-    css_output = render_asset("helpers_test.scss")
+    css_output = render_asset("helpers_test.css")
 
     assert_match %r{asset-path:\s*"/assets/rails.png"},                           css_output, 'asset-path:\s*"/assets/rails.png"'
     assert_match %r{asset-url:\s*url\(/assets/rails.png\)},                       css_output, 'asset-url:\s*url\(/assets/rails.png\)'
@@ -87,7 +87,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
   def test_sass_asset_paths_work
     initialize!
 
-    css_output = render_asset("helpers_test.scss")
+    css_output = render_asset("helpers_test.css")
 
     assert_match %r{video-path:\s*"/videos/rails.mp4"},                           css_output, 'video-path:\s*"/videos/rails.mp4"'
     assert_match %r{video-url:\s*url\(/videos/rails.mp4\)},                       css_output, 'video-url:\s*url\(/videos/rails.mp4\)'
@@ -116,9 +116,10 @@ class SassRailsTest < MiniTest::Unit::TestCase
   end
 
   def test_sass_imports_work_correctly
+    app.config.sass.load_paths << Rails.root.join('app/assets/stylesheets/in_load_paths')
     initialize!
 
-    css_output = render_asset("imports_test.scss")
+    css_output = render_asset("imports_test.css")
     assert_match /main/,                     css_output
     assert_match /top-level/,                css_output
     assert_match /partial-sass/,             css_output
@@ -145,6 +146,8 @@ class SassRailsTest < MiniTest::Unit::TestCase
 
     assert_match /globbed/,                  css_output
     assert_match /nested-glob/,              css_output
+
+    assert_match /partial_in_load_paths/,    css_output
   end
 
   def test_style_config_item_is_defaulted_to_expanded_in_development_mode
@@ -162,7 +165,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
     @app.config.sass.line_comments = true
     initialize_dev!
 
-    css_output = render_asset("css_scss_handler.css.scss")
+    css_output = render_asset("css_scss_handler.css")
     assert_match %r{/* line 1}, css_output
     assert_match %r{.+/sassc-rails/test/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
   end
@@ -176,7 +179,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
 
   def test_special_characters_compile
     initialize!
-    css_output = render_asset("special_characters.scss")
+    css_output = render_asset("special_characters.css")
   end
 
   def test_css_compressor_config_item_is_honored_if_not_development_mode
@@ -204,7 +207,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
   def test_compression_works
     initialize_prod!
 
-    asset = render_asset("application.scss")
+    asset = render_asset("application.css")
     assert_equal <<-CSS, asset
 .hello{color:#FFF}
     CSS
@@ -213,7 +216,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
   def test_compression_works
     initialize_prod!
 
-    asset = render_asset("application.scss")
+    asset = render_asset("application.css")
     assert_equal <<-CSS, asset
 .hello{color:#FFF}
     CSS
@@ -226,14 +229,14 @@ class SassRailsTest < MiniTest::Unit::TestCase
 
     initialize_prod!
 
-    render_asset("application.scss")
+    render_asset("application.css")
   end
 
   def test_allows_for_inclusion_of_inline_source_maps
     @app.config.sass.inline_source_maps = true
     initialize_dev!
 
-    asset = render_asset("application.scss")
+    asset = render_asset("application.css")
     assert_match /.hello/, asset
     assert_match /sourceMappingURL/, asset
   end
@@ -278,14 +281,14 @@ class SassRailsTest < MiniTest::Unit::TestCase
         file.puts '.new-file-test { color: #000; }'
       end
 
-      css_output = render_asset("glob_test.scss")
+      css_output = render_asset("glob_test.css")
       assert_match /new-file-test/, css_output
 
       File.open(new_file, 'w') do |file|
         file.puts '.changed-file-test { color: #000; }'
       end
 
-      new_css_output = render_asset("glob_test.scss")
+      new_css_output = render_asset("glob_test.css")
       assert_match /changed-file-test/, new_css_output
       refute_equal css_output, new_css_output
     ensure
@@ -297,7 +300,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
     begin
       initialize!
 
-      css_output = render_asset("glob_test.scss")
+      css_output = render_asset("glob_test.css")
       refute_match /changed-file-test/, css_output
       new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
 
@@ -305,7 +308,7 @@ class SassRailsTest < MiniTest::Unit::TestCase
         file.puts '.changed-file-test { color: #000; }'
       end
 
-      new_css_output = render_asset("glob_test.scss")
+      new_css_output = render_asset("glob_test.css")
       assert_match /changed-file-test/, new_css_output
       refute_equal css_output, new_css_output
     ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -170,6 +170,7 @@ files:
 - gemfiles/sprockets-rails_3_0.gemfile
 - gemfiles/sprockets_2_12.gemfile
 - gemfiles/sprockets_3_0.gemfile
+- gemfiles/sprockets_4_0.gemfile
 - gemfiles/with_sass_rails.gemfile
 - lib/sassc-rails.rb
 - lib/sassc/rails.rb
@@ -180,6 +181,7 @@ files:
 - lib/sassc/rails/template.rb
 - lib/sassc/rails/version.rb
 - sassc-rails.gemspec
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/fonts/fake-font.ttf
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/images/1x1.png
@@ -198,6 +200,7 @@ files:
 - test/dummy/app/assets/stylesheets/globbed/nested/nested_glob.scss
 - test/dummy/app/assets/stylesheets/helpers_test.scss
 - test/dummy/app/assets/stylesheets/imports_test.scss
+- test/dummy/app/assets/stylesheets/in_load_paths/partial_in_load_paths.scss
 - test/dummy/app/assets/stylesheets/partials/_css_sass_import.sass
 - test/dummy/app/assets/stylesheets/partials/_explicit_extension_import.foo
 - test/dummy/app/assets/stylesheets/partials/_sass_import.sass
@@ -236,11 +239,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Integrate SassC-Ruby into Rails.
 test_files:
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/fonts/fake-font.ttf
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/images/1x1.png
@@ -259,6 +263,7 @@ test_files:
 - test/dummy/app/assets/stylesheets/globbed/nested/nested_glob.scss
 - test/dummy/app/assets/stylesheets/helpers_test.scss
 - test/dummy/app/assets/stylesheets/imports_test.scss
+- test/dummy/app/assets/stylesheets/in_load_paths/partial_in_load_paths.scss
 - test/dummy/app/assets/stylesheets/partials/_css_sass_import.sass
 - test/dummy/app/assets/stylesheets/partials/_explicit_extension_import.foo
 - test/dummy/app/assets/stylesheets/partials/_sass_import.sass