hanami-assets 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3eca9645ece86fd7d459f856d4bd5927218a0bf2793800d79893f182802b3e8
-  data.tar.gz: ce397508bfee8960426520195c3a9916f782e816add006c936d53a36fccb6c56
+  metadata.gz: 72e4862475bc1ff37c766b05a9a08bb3ce9da8a2cf10aed7d01299cbe7178025
+  data.tar.gz: 99ee3de7d08606a05597e10ad263f22366190b428ff9901155d67493af8c3bcf
 SHA512:
-  metadata.gz: 8e0993d7081bdb900809b102654b2cd808a020e8e210c4e54b475b1d89f13c500f0ae636622972f737c342671715a0e4067f9c508f92e9fbf1e953b045d18852
-  data.tar.gz: ad68fce253795abe8b209d694205db4c239ede2cc9c6553126e2a214093ed0f76dd20dd480a114ebfdaa77a0fc4e76dbed445ee78bba748ff85a25875df7cbed
+  metadata.gz: 0b640e6812aa38cd807fddb0c2a0319d667acfd431cb60f15176a3c62cfbd96c1e1962a9f57032b11d663bd694f3e8bb71d4c3ca393ebaaf0f2ca3c81b83d44b
+  data.tar.gz: f83efc99e3720db13b6d7fc621022c38e719734fff57fd304dbcf93b950c3bc1920753bab902d18088974f5397ba7b03a5cca0c990981f2cc2d1b29ddd56c7f9

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Assets
 Assets management for Ruby web applications
 
+## v1.3.2 - 2019-08-02
+### Added
+- [Landon Grindheim & Sean Collins] Added support for `sassc` gem, because `sass` is no longer maintained
+
 ## v1.3.1 - 2019-01-18
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 2.6

data/README.md

@@ -15,7 +15,7 @@ Assets management for Ruby web projects
 
 * Home page: http://hanamirb.org
 * Community: http://hanamirb.org/community
-* Guides: http://hanamirb.org/guides
+* Guides: https://guides.hanamirb.org
 * Mailing List: http://hanamirb.org/mailing-list
 * API Doc: http://rdoc.info/gems/hanami-assets
 * Bugs/Issues: https://github.com/hanami/assets/issues
@@ -200,7 +200,7 @@ handling: `.css` for stylesheets.
 The second one is optional and it's for a preprocessor: `.scss` for Sass.
 
 ```ruby
-require 'sass'
+require 'sassc'
 require 'hanami/assets'
 
 Hanami::Assets.configure do
@@ -353,7 +353,7 @@ Hanami can use the following compressors (aka minifiers) for stylesheets.
 
   * `:builtin` - Ruby based compressor. It doesn't require any external gem. It's fast, but not an efficient compressor.
   * `:yui` - [YUI Compressor](http://yui.github.io/yuicompressor), it depends on [`yui-compressor`](https://rubygems.org/gems/yui-compressor) gem and it requires Java 1.4+
-  * `:sass` - [Sass](http://sass-lang.com/), it depends on [`sass`](https://rubygems.org/gems/sass) gem
+  * `:sass` - [Sass](http://sass-lang.com/), it depends on [`sassc`](https://rubygems.org/gems/sassc) gem
 
 ```ruby
 Hanami::Assets.configure do

data/hanami-assets.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yui-compressor',   '~> 0.12'
   spec.add_development_dependency 'uglifier',         '~> 2.7'
   spec.add_development_dependency 'closure-compiler', '~> 1.1'
-  spec.add_development_dependency 'sass',             '~> 3.4'
+  spec.add_development_dependency 'sassc',            '~> 2.0'
 
   spec.add_development_dependency 'coffee-script',    '~> 2.3'
   spec.add_development_dependency 'babel-transpiler', '~> 0.7'

data/lib/hanami/assets/bundler/compressor.rb

@@ -46,12 +46,12 @@ module Hanami
         # @api private
         def _compress(compressor)
           compressor.compress(@path)
-        rescue => e # rubocop:disable Style/RescueStandardError
+        rescue => exception # rubocop:disable Style/RescueStandardError
           warn(
             [
               "Skipping compression of: `#{@path}'",
-              "Reason: #{e}\n",
-              "\t#{e.backtrace.join("\n\t")}\n\n"
+              "Reason: #{exception}\n",
+              "\t#{exception.backtrace.join("\n\t")}\n\n"
             ].join("\n")
           )
         end

data/lib/hanami/assets/compilers/sass.rb

@@ -10,11 +10,6 @@ module Hanami
         # @api private
         EXTENSIONS = /\.(sass|scss)\z/.freeze
 
-        # @since 0.1.0
-        # @api private
-        CACHE_LOCATION = Pathname(Hanami.respond_to?(:root) ? # rubocop:disable Style/MultilineTernaryOperator
-                                  Hanami.root : Dir.pwd).join('tmp', 'sass-cache')
-
         # @since 0.3.0
         # @api private
         def self.eligible?(name)
@@ -26,19 +21,28 @@ module Hanami
         # @since 0.3.0
         # @api private
         def renderer
-          Tilt.new(source, nil, load_paths: load_paths, cache_location: CACHE_LOCATION)
+          @renderer ||=
+            ::SassC::Engine.new(
+              source.read,
+              syntax: target_syntax,
+              load_paths: load_paths
+            )
         end
 
         # @since 0.3.0
         # @api private
         def dependencies
-          engine.dependencies.map { |d| d.options[:filename] }
+          renderer.dependencies.map(&:filename)
         end
 
-        # @since 0.3.0
+        # @since 1.3.2
         # @api private
-        def engine
-          ::Sass::Engine.for_file(source.to_s, load_paths: load_paths, cache_location: CACHE_LOCATION)
+        def target_syntax
+          if source.extname =~ /sass\z/.freeze
+            :sass
+          else
+            :scss
+          end
         end
       end
     end

data/lib/hanami/assets/compressors/sass_stylesheet.rb

@@ -1,12 +1,12 @@
 require 'hanami/assets/compressors/stylesheet'
-require 'sass'
+require 'sassc'
 
 module Hanami
   module Assets
     module Compressors
       # Sass compressor for stylesheet
       #
-      # It depends on <tt>sass</tt> gem.
+      # It depends on <tt>sassc</tt> gem.
       #
       # @since 0.1.0
       # @api private
@@ -16,21 +16,19 @@ module Hanami
       class SassStylesheet < Stylesheet
         # @since 0.1.0
         # @api private
-        #
-        # FIXME This is the same logic that we have for Hanami::Assets::Compiler
-        SASS_CACHE_LOCATION = Pathname(Hanami.respond_to?(:root) ? # rubocop:disable Style/MultilineTernaryOperator
-                                       Hanami.root : Dir.pwd).join('tmp', 'sass-cache')
-        # @since 0.1.0
-        # @api private
         def initialize
-          @compressor = Sass::Engine
+          @compressor = SassC::Engine
         end
 
         # @since 0.1.0
         # @api private
         def compress(filename)
-          compressor.new(read(filename), filename: filename, syntax: :scss,
-                                         style: :compressed, cache_location: SASS_CACHE_LOCATION).render
+          compressor.new(
+            read(filename),
+            filename: filename,
+            syntax: :scss,
+            style: :compressed
+          ).render
         end
       end
     end

data/lib/hanami/assets/configuration.rb

@@ -233,7 +233,7 @@ module Hanami
       #
       #   * <tt>:builtin</tt> - Ruby based compressor. It doesn't require any external gem. It's fast, but not an efficient compressor.
       #   * <tt>:yui</tt> - YUI-Compressor, it depends on <tt>yui-compressor</tt> gem and requires Java 1.4+
-      #   * <tt>:sass</tt> - Sass, it depends on <tt>sass</tt> gem
+      #   * <tt>:sass</tt> - Sass, it depends on <tt>sassc</tt> gem
       #
       # @param value [Symbol,#compress] the compressor
       #
@@ -243,7 +243,7 @@ module Hanami
       # @see https://rubygems.org/gems/yui-compressor
       #
       # @see http://sass-lang.com
-      # @see https://rubygems.org/gems/sass
+      # @see https://rubygems.org/gems/sassc
       #
       # @example YUI Compressor
       #   require 'hanami/assets'

data/lib/hanami/assets/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-assets
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -149,19 +149,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Assets management