sass-rails 5.0.3 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dca2ad9e3a47299754e3c7533fbf3925799abdf
-  data.tar.gz: f3f726e222a54bd4a4328b5c7ce8f8d9ad4a7902
+  metadata.gz: dc20cc8a698a7c1e645a39e3f938c007aa50acdf
+  data.tar.gz: 58038028760c974e11a7fdff1cfbd1b2e7eeb9d4
 SHA512:
-  metadata.gz: 44ca6e2500b867ce8fb3cec783b1492928c2ab31395c90fee8d10e721399a3fef655da362da7b1bd65828cfcb3476cf9bde5fea89626f0e0b4f98460721268ac
-  data.tar.gz: 57fc653a7f09e242d9663cbe8740e11468c0fcb1c0bcba67307584a2ea23e6c4431276ddca678298b1c72085ae0e65c39e084ec3684e065d141fb0a2174cc2bb
+  metadata.gz: a78ea099aa7b2bee1a24e922aa70899216093b720c97fbc4906c96b55e2d15eba0c9e10e867459ef95f5c992207577a401468389ef8424acfe43bb1a4379391a
+  data.tar.gz: b000b620f75fab1098032f95fa4a4baafe5a541c3c47c1e96bcacd989d04f3d09da7b6c7b13c6d839bbb3297f4520ff527c864ef7de9f633097a41b43d65b7ed

data/README.md

@@ -68,24 +68,24 @@ in Sass):
 #### `asset-path($relative-asset-path)`
 Returns a string to the asset.
 
-* `asset-path("rails.png")` becomes `"/assets/rails.png"`
+* `asset-path("rails.png")` returns `"/assets/rails.png"`
 
 #### `asset-url($relative-asset-path)`
 Returns a url reference to the asset.
 
-* `asset-url("rails.png")` becomes `url(/assets/rails.png)`
+* `asset-url("rails.png")` returns `url(/assets/rails.png)`
 
 As a convenience, for each of the following asset classes there are
 corresponding `-path` and `-url` helpers:
 image, font, video, audio, javascript, stylesheet.
 
-* `image-path("rails.png")` becomes `"/assets/rails.png"`
-* `image-url("rails.png")` becomes `url(/assets/rails.png)`
+* `image-path("rails.png")` returns `"/assets/rails.png"`
+* `image-url("rails.png")` returns `url(/assets/rails.png)`
 
 #### `asset-data-url($relative-asset-path)`
 Returns a url reference to the Base64-encoded asset at the specified path.
 
-* `asset-data-url("rails.png")` becomes `url(data:image/png;base64,iVBORw0K...)`
+* `asset-data-url("rails.png")` returns `url(data:image/png;base64,iVBORw0K...)`
 
 ## Running Tests
 

data/lib/sass/rails/helpers.rb

@@ -3,6 +3,7 @@ require 'sprockets/sass_functions'
 
 module Sprockets
   module SassFunctions
+    remove_method :asset_data_url if method_defined?(:asset_data_url)
     def asset_data_url(path)
       Sass::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
     end

data/lib/sass/rails/railtie.rb

@@ -54,8 +54,22 @@ module Sass::Rails
       end
 
       config.assets.configure do |env|
-        env.register_engine '.sass', Sass::Rails::SassTemplate
-        env.register_engine '.scss', Sass::Rails::ScssTemplate
+        if env.respond_to?(:register_engine)
+          args = ['.sass', Sass::Rails::SassTemplate]
+          args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
+          env.register_engine(*args)
+
+          args = ['.scss', Sass::Rails::ScssTemplate]
+          args << { silence_deprecation: true } if env.method(:register_engine).arity.abs > 2
+          env.register_engine(*args)
+        end
+
+        if env.respond_to?(:register_transformer)
+          env.register_transformer 'text/sass', 'text/css',
+            Sprockets::SassProcessor.new(importer: SassImporter, sass_config: app.config.sass)
+          env.register_transformer 'text/scss', 'text/css',
+            Sprockets::ScssProcessor.new(importer: SassImporter, sass_config: app.config.sass)
+        end
 
         env.context_class.class_eval do
           class_attribute :sass_config
@@ -67,11 +81,13 @@ module Sass::Rails
     end
 
     initializer :setup_compression, group: :all do |app|
-      unless Rails.env.development?
-        app.config.assets.css_compressor ||= :sass
-      else
+      if Rails.env.development?
         # Use expanded output instead of the sass default of :nested unless specified
         app.config.sass.style ||= :expanded
+      else
+        # config.assets.css_compressor may be set to nil in non-dev environments.
+        # otherwise, the default is sass compression.
+        app.config.assets.css_compressor = :sass unless app.config.assets.has_key?(:css_compressor)
       end
     end
   end

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "5.0.3"
+    VERSION = "5.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.7
 platform: ruby
 authors:
 - wycats
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -20,7 +20,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -89,16 +89,22 @@ dependencies:
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Sass adapter for the Rails asset pipeline.