nanoc-dart-sass 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb3353a67957a72db05a7eaec7a3dcd669b600a188b081bc41d9a8dd8b99a54
-  data.tar.gz: ce51516fc85577f8c265669f9a3e71be00417eedda5f419b9e3d0f11d48ffbe4
+  metadata.gz: 3b3ec8688e0eacf5312456127b9f9137d7ee17fdc3b2788c8eb44d2a18a48d39
+  data.tar.gz: dfc61b8856486c27210a20b79fa70da2852a88f4eeb5a5e804b2b3411e8d7653
 SHA512:
-  metadata.gz: 7c7a5043abd21b916203fc476a4305b7da06ce44b21e856714a48b88c125be5508bef0a60e41f48db09dbcf92365effa9f158b87628a2c56ba4cb0b2851d5e70
-  data.tar.gz: a4e1f92ac5ec75283a1ef62d9b9801a773b05d7aaff4ca75b266d0130047d1343d95f85326c91528f9799273270cc5b3b46cb556b1455be436691303ed9ec060
+  metadata.gz: 054bdb5a6ba1c907c2c8fc06f56efde60a173df8b0aa328b3654df7b7a8e42017b0cc123bcf09317aa6e93ef1754ef65a83e659122ea1794950f8d63c87ef9f8
+  data.tar.gz: ba2afccd8953791279521d4444053df10e94ad69e9b16f787519b621e69fdf9e5f9b71bb72a861cb57165ccb9b8e4bf918724bef1805362fd3be2c1c6c2c32dc

data/NEWS.md

@@ -1,5 +1,15 @@
 # nanoc-dart-sass news
 
+## 1.0.3 (2024-04-19)
+
+Enhancements:
+
+- Added support for importing partials and directories (#1690, #1699)
+
+## 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)

data/lib/nanoc/dart_sass/filter.rb

@@ -23,9 +23,6 @@ module Nanoc
           syntax: syntax,
         )
         result.css
-      rescue StandardError => e # rubocop:disable Lint/UselessRescue
-        # TODO: use full_message for syntax errors
-        raise e
       end
 
       class NanocImporter
@@ -34,7 +31,7 @@ module Nanoc
           @source_item = source_item
         end
 
-        def canonicalize(url, **)
+        def canonicalize(url, *, **)
           # Construct proper URL with `nanoc:` prefix if needed
           if url.start_with?('nanoc:')
             url
@@ -57,10 +54,7 @@ module Nanoc
         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
+          is_extension_given = !pat.match?(%r{(/|^)[^.]+$})
 
           # Convert to absolute pattern
           pat =
@@ -71,13 +65,48 @@ module Nanoc
               File.expand_path(pat, dirname)
             end
 
-          item = @items[pat]
+          items = collect_items(pat, is_extension_given)
 
-          unless item
+          # Get the single matching item, or error if there isn’t exactly one
+          items = items.compact
+          case items.size
+          when 0
             raise "Could not find an item matching pattern `#{pat}`"
+          when 1
+            items.first
+          else
+            raise "It is not clear which item to import. Multiple items match `#{pat}`: #{items.map { _1.identifier.to_s }.sort.join(', ')}"
+          end
+        end
+
+        # Given a pattern, return a collection of items that match this pattern.
+        # This goes beyond what Nanoc patterns typically support by e.g.
+        # supporting partials and index imports.
+        def collect_items(pat, is_extension_given)
+          items = []
+
+          # Try as a regular path
+          items.concat(try_pat(pat, is_extension_given))
+
+          # Try as a partial
+          partial_pat = File.join(File.dirname(pat), "_#{File.basename(pat)}")
+          items.concat(try_pat(partial_pat, is_extension_given))
+
+          # Try as index
+          unless is_extension_given
+            items.concat(@items.find_all(File.join(pat, '/index.*')))
+            items.concat(@items.find_all(File.join(pat, '/_index.*')))
           end
 
-          item
+          items
+        end
+
+        def try_pat(pat, is_extension_given)
+          if is_extension_given
+            @items.find_all(pat)
+          else
+            @items.find_all("#{pat}.*")
+          end
         end
       end
 

data/lib/nanoc/dart_sass/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-dart-sass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc-core
@@ -51,11 +51,12 @@ files:
 - lib/nanoc/dart_sass.rb
 - lib/nanoc/dart_sass/filter.rb
 - lib/nanoc/dart_sass/version.rb
-homepage: https://nanoc.ws/
+homepage: https://nanoc.app/
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-dart-sass-v1.0.3/nanoc-dart-sass
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Dart Sass filter for Nanoc