nanoc-dart-sass 0.0.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40b93740b864b61bac9b890e3076e2f52ed675d85ec815296d22a29e3d3bb1cf
-  data.tar.gz: ccfc074b2ac62ed6172ead70e9f3c77311633885efaec81cf1b371bf45d68b51
+  metadata.gz: abb3353a67957a72db05a7eaec7a3dcd669b600a188b081bc41d9a8dd8b99a54
+  data.tar.gz: ce51516fc85577f8c265669f9a3e71be00417eedda5f419b9e3d0f11d48ffbe4
 SHA512:
-  metadata.gz: 665aabe49726e3ec886549f46331d343df41341568fadbc6cd1a4273601e32e41ae1b7d03a48a973ab08745a4ae2b8929b328ef2f4196827580ab92a04a9aecc
-  data.tar.gz: c0d0dcf3bf0ea5978886b544982e57bed7ff06649dd64e14367299f616d4915bdbd164b8a8f1b4f72bafffe5c5caebee9175656758fdfa4246998f8529a2bc69
+  metadata.gz: 7c7a5043abd21b916203fc476a4305b7da06ce44b21e856714a48b88c125be5508bef0a60e41f48db09dbcf92365effa9f158b87628a2c56ba4cb0b2851d5e70
+  data.tar.gz: a4e1f92ac5ec75283a1ef62d9b9801a773b05d7aaff4ca75b266d0130047d1343d95f85326c91528f9799273270cc5b3b46cb556b1455be436691303ed9ec060

data/NEWS.md

@@ -1,5 +1,17 @@
 # nanoc-dart-sass news
 
+## 1.0.1 (2023-06-15)
+
+- Added support for importing relative paths (#1646, #1653)
+
+## 1.0.0 (2022-12-17)
+
+Initial release.
+
+Fixes:
+
+- Apply Sass syntax detection logic to dependencies (#1630) [ntkme]
+
 ## 0.0.1 (2022-11-20)
 
 Initial pre-release.

data/README.md

@@ -2,6 +2,8 @@
 
 This provides a filter that allows [Nanoc](https://nanoc.app) to process content via [Dart Sass](https://sass-lang.com/dart-sass).
 
+This filter offers similar functionality to Nanoc’s built-in `:sass` filter. The built-in `:sass` filter, however, uses the [Ruby Sass](https://sass-lang.com/ruby-sass) implementation, which has reached end of life.
+
 ## Installation
 
 Add `nanoc-dart-sass` to the `nanoc` group of your Gemfile:

data/lib/nanoc/dart_sass/filter.rb

@@ -14,47 +14,91 @@ module Nanoc
       def run(content, params = {})
         # Read syntax
         syntax = params[:syntax]
-        syntax ||=
-          case item.identifier.ext
-          when 'sass'
-            :indented
-          when 'scss'
-            :scss
-          when 'css'
-            :css
-          else
-            nil
-          end
+        syntax ||= Util.syntax_from_ext(item.identifier.ext)
 
         result = Sass.compile_string(
           content,
-          importer: make_dart_sass_importer(@items),
+          importer: NanocImporter.new(@items, item),
           **params,
           syntax: syntax,
         )
         result.css
-      rescue StandardError => e
+      rescue StandardError => e # rubocop:disable Lint/UselessRescue
         # TODO: use full_message for syntax errors
         raise e
       end
 
-      private
-
-      def make_dart_sass_importer(items)
-        {
-          canonicalize: lambda do |param, **|
-            "nanoc:#{items[param.sub(/\Ananoc:/, '')].identifier}"
-          end,
-          load: lambda { |url|
-            param = url.sub(/\Ananoc:/, '')
-            item = items[param]
-            return {
-              contents: item.raw_content,
-              syntax: item.identifier.ext,
-            }
-          },
-        }
+      class NanocImporter
+        def initialize(items, source_item)
+          @items = items
+          @source_item = source_item
+        end
+
+        def canonicalize(url, **)
+          # Construct proper URL with `nanoc:` prefix if needed
+          if url.start_with?('nanoc:')
+            url
+          else
+            "nanoc:#{url}"
+          end
+        end
+
+        def load(url)
+          item = find_item_for_url(url)
+
+          {
+            contents: item.raw_content,
+            syntax: Util.syntax_from_ext(item.identifier.ext),
+          }
+        end
+
+        private
+
+        def find_item_for_url(url)
+          pat = url.sub(/\Ananoc:/, '')
+
+          # If URL has no extension, add `.*` at the end
+          if pat.match?(%r{(/|^)[^.]+$})
+            pat += '.*'
+          end
+
+          # Convert to absolute pattern
+          pat =
+            if pat.start_with?('/')
+              pat
+            else
+              dirname = File.dirname(@source_item.identifier.to_s)
+              File.expand_path(pat, dirname)
+            end
+
+          item = @items[pat]
+
+          unless item
+            raise "Could not find an item matching pattern `#{pat}`"
+          end
+
+          item
+        end
+      end
+
+      module Util
+        module_function
+
+        def syntax_from_ext(ext)
+          case ext
+          when 'sass'
+            :indented
+          when 'scss'
+            :scss
+          when 'css'
+            :css
+          else
+            nil
+          end
+        end
       end
+
+      private_constant :Util
     end
   end
 end

data/lib/nanoc/dart_sass/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module DartSass
-    VERSION = '0.0.1'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-dart-sass
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc-core
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Dart Sass filter for Nanoc