nanoc-dart-sass 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5859b27799d61ea7f72bba2904aaa0978ad43797f90fd6ab6255dba9279ef3a
-  data.tar.gz: c8e681f15c0617a42fabbf1d571ad2cd82aa4458087070704c36598bf9909a9c
+  metadata.gz: 71ddac060520e3149a4caa4bdb0a605e1f123f281255d0e1691600b0eedfe440
+  data.tar.gz: 2429ebae5cfead56edd001349c4493cbe696fe9b3662c793aa3003ac49ca50dc
 SHA512:
-  metadata.gz: 906336b07db8e08f332f424d447f0d7a1954da7a5fbfef9d4d8a808936e5c8be92afee9786d1b22a812901d378c3a7454328a06bbb45ee0166b3bd02f8453023
-  data.tar.gz: c528b493cd63d3dc670a1307c2b78f41d30ca44e45420e5ef05e1f3ba6f42778e898b2f455db060c409bd2cea91c838f6667728a7e79608e397701cd07d839de
+  metadata.gz: 4ee86ca61d395df8599e4effbf19b5cec3876a8c07f6cd07f48be1b9e2ca3e229c36d9ed2c3428407eef0f080757c24e0c75383468f6496d958813c17977ca57
+  data.tar.gz: 8a9688ddf9f4faf94578d52eeedb18bcbb87d2efa3ce23433ace33b07ce37e70f528fc6561f5781f754827331de47882d5e9cfe145dd9491a273ed7ade8f0261

data/NEWS.md

@@ -1,5 +1,13 @@
 # nanoc-dart-sass news
 
+## 1.0.2 (2023-09-30)
+
+- Fix dart-sass compatibility (#1664)
+
+## 1.0.1 (2023-06-15)
+
+- Added support for importing relative paths (#1646, #1653)
+
 ## 1.0.0 (2022-12-17)
 
 Initial release.

data/lib/nanoc/dart_sass/filter.rb

@@ -18,35 +18,65 @@ module Nanoc
 
         result = Sass.compile_string(
           content,
-          importer: NanocImporter.new(@items),
+          importer: NanocImporter.new(@items, item),
           **params,
           syntax: syntax,
         )
         result.css
-      rescue StandardError => e
-        # TODO: use full_message for syntax errors
-        raise e
       end
 
       class NanocImporter
-        def initialize(items)
+        def initialize(items, source_item)
           @items = items
+          @source_item = source_item
         end
 
-        def canonicalize(url, **)
-          "nanoc:#{@items[url.sub(/\Ananoc:/, '')].identifier}"
+        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 = @items[url.sub(/\Ananoc:/, '')]
+          item = find_item_for_url(url)
+
           {
             contents: item.raw_content,
             syntax: Util.syntax_from_ext(item.identifier.ext),
           }
         end
-      end
 
-      private_constant :NanocImporter
+        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

data/lib/nanoc/dart_sass/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module DartSass
-    VERSION = '1.0.0'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-dart-sass
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-09-30 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.20
 signing_key:
 specification_version: 4
 summary: Dart Sass filter for Nanoc