nanoc 4.10.0 → 4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046c9869b2f916776a4f0fe741916842cbbc68b584e11b606abac58b854a9f44
-  data.tar.gz: aeb902ad7fca66c89b63d46e2e9e8508c08e1cc3cdeb8dcbf0c45698d8c6a905
+  metadata.gz: 780927fbc58c76e3906df40019201441f6675433afbd34222ae79e7daeb0f4f0
+  data.tar.gz: 0c62c92d07ef676a555a8cf7c680226048788ae6cab56bcdd82ab2227d091794
 SHA512:
-  metadata.gz: 93124b5f9eab590c046853ef39aa1c58516a365f2f721e7f1de73a34c0c4916ea1c3331a6c5db5e218e5921b0ef77abb5b50f5caf832d832eb0cc328133d58a8
-  data.tar.gz: f3c544d01d70da7ac4379311208fd57932ba26ca157b039fdda05d4c96f8c7f6fbe93a45376ad4bf4e2cf3c10e5c2e9a6157a8b729dd58006a675b9ffc3a48ce
+  metadata.gz: 11011bf293454e1c66b644ed12864e1a8c6ab72a18548e2f770048097918cc08c5f48410968cec0bcaff85cd14f052ff4c78fc2040f19fe75232e283f949fc6d
+  data.tar.gz: d6fbdaca866cf1b79b4bac978a1c09c3dbd36ad2b6a1d4d90e832f04b3e5133e7496e1e247bcafaff1b53baca9cf0cfd354eee69504757163115ed05c7910fd5

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.10.1 (2018-10-16)
+
+Fixes:
+
+* Made Nanoc no longer crash when the Sass gem is not available (#1371)
+
 ## 4.10.0 (2018-10-14)
 
 Features:

data/lib/nanoc/filters/sass.rb

@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
 module Nanoc::Filters
-  Nanoc::Filter.define(:sass) do |content, params = {}|
-    include Sass
-    css(self, @item_rep, content, params)
-  end
-
-  Nanoc::Filter.define(:sass_sourcemap) do |content, params = {}|
-    include Sass
-    sourcemap(self, @item_rep, content, params)
-  end
+  module SassCommon
+    REQUIRES = %w[sass nanoc/filters/sass/importer nanoc/filters/sass/functions].freeze
 
-  require 'sass'
-
-  module Sass
     def css(filter, rep, content, params)
       css, = render(filter, rep, content, params)
       css
@@ -27,7 +17,7 @@ module Nanoc::Filters
     private
 
     def render(filter, rep, content, params = {})
-      importer = NanocSassImporter.new(filter)
+      importer = Nanoc::Filters::SassCommon::Importer.new(filter)
 
       options = params.merge(
         load_paths: [importer, *params[:load_paths]&.reject { |p| p.is_a?(String) && %r{^content/} =~ p }],
@@ -41,113 +31,27 @@ module Nanoc::Filters
       css, sourcemap = sourcemap_path ? engine.render_with_sourcemap(sourcemap_path) : engine.render
       [css, sourcemap&.to_json(css_uri: rep.path, type: rep.path.nil? ? :inline : :auto)]
     end
+  end
 
-    # @api private
-    class NanocSassImporter < ::Sass::Importers::Filesystem
-      attr_reader :filter
-
-      def initialize(filter)
-        @filter = filter
-        super('.')
-      end
-
-      def find_relative(name, base_identifier, options)
-        base_raw_filename = filter.items[base_identifier].raw_filename
-
-        # we can't resolve a relative filename from an in-memory item
-        return unless base_raw_filename
-
-        raw_filename, syntax = ::Sass::Util.destructure(find_real_file(File.dirname(base_raw_filename), name, options))
-        return unless raw_filename
-
-        item = raw_filename_to_item(raw_filename)
-        # it doesn't make sense to import a file, from Nanoc's content if the corresponding item has been deleted
-        raise "unable to map #{raw_filename} to any item" if item.nil?
-
-        filter.depend_on([item])
-
-        options[:syntax] = syntax
-        options[:filename] = item.identifier.to_s
-        options[:importer] = self
-        ::Sass::Engine.new(item.raw_content, options)
-      end
-
-      def find(identifier, options)
-        items = filter.items.find_all(identifier)
-        return if items.empty?
-
-        content = if items.size == 1
-                    items.first.compiled_content
-                  else
-                    items.map { |item| %(@import "#{item.identifier}";) }.join("\n")
-                  end
-
-        options[:syntax] = :scss
-        options[:filename] = identifier.to_s
-        options[:importer] = self
-        ::Sass::Engine.new(content, options)
-      end
-
-      def key(identifier, _options)
-        [self.class.name + ':' + root, identifier.to_s]
-      end
-
-      def public_url(identifier, _sourcemap_directory)
-        path = filter.items[identifier].path
-        return path unless path.nil?
-
-        raw_filename = filter.items[identifier].raw_filename
-        return if raw_filename.nil?
-
-        ::Sass::Util.file_uri_from_path(raw_filename)
-      end
-
-      def to_s
-        'Nanoc Sass Importer'
-      end
-
-      def self.raw_filename_to_item_map_for_config(config, items)
-        @raw_filename_to_item_map ||= {}
-        @raw_filename_to_item_map[config.object_id] ||=
-          {}.tap do |map|
-            items.each do |item|
-              if item.raw_filename
-                path = Pathname.new(item.raw_filename).realpath.to_s
-                map[path] = item
-              end
-            end
-          end
-      end
+  class SassFilter < Nanoc::Filter
+    identifier :sass
 
-      def raw_filename_to_item(filename)
-        realpath = Pathname.new(filename).realpath.to_s
+    include SassCommon
+    requires(*SassCommon::REQUIRES)
 
-        map = self.class.raw_filename_to_item_map_for_config(filter.config, filter.items)
-        map[realpath]
-      end
+    def run(content, params = {})
+      css(self, @item_rep, content, params)
     end
   end
 
-  module ::Sass::Script::Functions
-    def nanoc(string, params)
-      assert_type string, :String
-      assert_type params, :Hash
-      result = options[:importer].filter.instance_eval(string.value)
-      case result
-      when TrueClass, FalseClass
-        bool(result)
-      when Array
-        list(result, :comma)
-      when Hash
-        map(result)
-      when nil
-        null
-      when Numeric
-        number(result)
-      else
-        params['unquote'] ? unquoted_string(result) : quoted_string(result)
-      end
+  class SassSourcemapFilter < Nanoc::Filter
+    identifier :sass_sourcemap
+
+    include SassCommon
+    requires(*SassCommon::REQUIRES)
+
+    def run(content, params = {})
+      sourcemap(self, @item_rep, content, params)
     end
-    declare :nanoc, [:string], var_kwargs: true
   end
 end

data/lib/nanoc/filters/sass/functions.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ::Sass::Script::Functions
+  def nanoc(string, params)
+    assert_type string, :String
+    assert_type params, :Hash
+    result = options[:importer].filter.instance_eval(string.value)
+    case result
+    when TrueClass, FalseClass
+      bool(result)
+    when Array
+      list(result, :comma)
+    when Hash
+      map(result)
+    when nil
+      null
+    when Numeric
+      number(result)
+    else
+      params['unquote'] ? unquoted_string(result) : quoted_string(result)
+    end
+  end
+  declare :nanoc, [:string], var_kwargs: true
+end

data/lib/nanoc/filters/sass/importer.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Nanoc::Filters::SassCommon
+  # @api private
+  class Importer < ::Sass::Importers::Filesystem
+    attr_reader :filter
+
+    def initialize(filter)
+      @filter = filter
+      super('.')
+    end
+
+    def find_relative(name, base_identifier, options)
+      base_raw_filename = filter.items[base_identifier].raw_filename
+
+      # we can't resolve a relative filename from an in-memory item
+      return unless base_raw_filename
+
+      raw_filename, syntax = ::Sass::Util.destructure(find_real_file(File.dirname(base_raw_filename), name, options))
+      return unless raw_filename
+
+      item = raw_filename_to_item(raw_filename)
+      # it doesn't make sense to import a file, from Nanoc's content if the corresponding item has been deleted
+      raise "unable to map #{raw_filename} to any item" if item.nil?
+
+      filter.depend_on([item])
+
+      options[:syntax] = syntax
+      options[:filename] = item.identifier.to_s
+      options[:importer] = self
+      ::Sass::Engine.new(item.raw_content, options)
+    end
+
+    def find(identifier, options)
+      items = filter.items.find_all(identifier)
+      return if items.empty?
+
+      content = if items.size == 1
+                  items.first.compiled_content
+                else
+                  items.map { |item| %(@import "#{item.identifier}";) }.join("\n")
+                end
+
+      options[:syntax] = :scss
+      options[:filename] = identifier.to_s
+      options[:importer] = self
+      ::Sass::Engine.new(content, options)
+    end
+
+    def key(identifier, _options)
+      [self.class.name + ':' + root, identifier.to_s]
+    end
+
+    def public_url(identifier, _sourcemap_directory)
+      path = filter.items[identifier].path
+      return path unless path.nil?
+
+      raw_filename = filter.items[identifier].raw_filename
+      return if raw_filename.nil?
+
+      ::Sass::Util.file_uri_from_path(raw_filename)
+    end
+
+    def to_s
+      'Nanoc Sass Importer'
+    end
+
+    def self.raw_filename_to_item_map_for_config(config, items)
+      @raw_filename_to_item_map ||= {}
+      @raw_filename_to_item_map[config.object_id] ||=
+        {}.tap do |map|
+          items.each do |item|
+            if item.raw_filename
+              path = Pathname.new(item.raw_filename).realpath.to_s
+              map[path] = item
+            end
+          end
+        end
+    end
+
+    def raw_filename_to_item(filename)
+      realpath = Pathname.new(filename).realpath.to_s
+
+      map = self.class.raw_filename_to_item_map_for_config(filter.config, filter.items)
+      map[realpath]
+    end
+  end
+end

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.10.0'
+  VERSION = '4.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.10.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-14 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -401,6 +401,8 @@ files:
 - lib/nanoc/filters/relativize_paths.rb
 - lib/nanoc/filters/rubypants.rb
 - lib/nanoc/filters/sass.rb
+- lib/nanoc/filters/sass/functions.rb
+- lib/nanoc/filters/sass/importer.rb
 - lib/nanoc/filters/slim.rb
 - lib/nanoc/filters/typogruby.rb
 - lib/nanoc/filters/uglify_js.rb