sassc-embedded 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 464d4f9326ea315b791701d5ff9ca9a06201b9bbdccc920aba591ea5764f9cba
-  data.tar.gz: c149398af2d50cad3659f680d1f10a053e7290457340e02758fa4235a2f7ba34
+  metadata.gz: 59a845230e544276ea6eb32db4a12a9612d2e14b6f25bd4e0031806ceb6f5eb4
+  data.tar.gz: 1716cb7bdb3d8bf99564bff6802f995802399bb22ee347ae2028c8d0729c5218
 SHA512:
-  metadata.gz: 7b9e55b5db011df6ee7befabb77a6e74934ed7addf4bedcc8ebcf831ca38a7cdeff2b2d2f34ce7326f83cd97f52d8f19f79f1229882f8a436dd533243ad207db
-  data.tar.gz: 506cf7f45c08fc2e7f82e1d6675fb2d9cf9b36a66d098ae5fc43e6ea0c997b2fe4f442caa4cbdb1b442132768c32c35e83e2457da40ff2a8baff29cb9e05a60c
+  metadata.gz: 2bb616946d32c4a71a939d1e723dc11dcb7c7b02fb1ebc1236865e7badc53ad8dc9fc320706b7b3119e0d2d0e1bccad55665e95dd3ede0b6ce715226d0d31dfb
+  data.tar.gz: 5fefa20e790fbbc14368e1ae5111d2f1621e9f58c58d5a206f9799ecd2a046c15039082c25aabadcdb539fb51a7b9525305221db8b96d9b25d0f79ba881d2a03

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.5.6'
+    VERSION = '1.6.0'
   end
 end

data/lib/sassc/embedded.rb

@@ -26,7 +26,7 @@ module SassC
         style: output_style,
 
         functions: functions_handler.setup(nil, functions: @functions),
-        importers: [],
+        importers: @options.fetch(:importers, []),
 
         alert_ascii: @options.fetch(:alert_ascii, false),
         alert_color: @options.fetch(:alert_color, nil),
@@ -293,55 +293,45 @@ module SassC
       end
 
       def canonicalize(url, from_import:)
-        return url if url.start_with?(Protocol::LOADED)
-
         if url.start_with?(Protocol::IMPORT)
-          url = @canonical_urls.delete(url.delete_prefix(Protocol::IMPORT))
-          return url if @importer_results.key?(url)
-
+          canonical_url = @canonical_urls.delete(url.delete_prefix(Protocol::IMPORT))
+          unless @importer_results.key?(canonical_url)
+            canonical_url = resolve_file_url(canonical_url, @parent_urls.last, from_import)
+          end
+          @parent_urls.push(canonical_url)
+          canonical_url
+        elsif url.start_with?(Protocol::FILE)
           path = URL.parse(url).route_from(@parent_urls.last).to_s
-          resolved = resolve_path(path, URL.file_url_to_path(@parent_urls.last), from_import)
-          return URL.path_to_file_url(resolved) unless resolved.nil?
+          parent_path = URL.file_url_to_path(@parent_urls.last)
 
-          return
-        end
-
-        return unless url.start_with?(Protocol::FILE)
-
-        path = URL.parse(url).route_from(@parent_urls.last).to_s
-        parent_path = URL.file_url_to_path(@parent_urls.last)
+          imports = @importer.imports(path, parent_path)
+          imports = [SassC::Importer::Import.new(path)] if imports.nil?
+          imports = [imports] unless imports.is_a?(Array)
+          imports.each do |import|
+            import.path = File.absolute_path(import.path, File.dirname(parent_path))
+          end
 
-        imports = @importer.imports(path, parent_path)
-        imports = [SassC::Importer::Import.new(path)] if imports.nil?
-        imports = [imports] unless imports.is_a?(Array)
-        imports.each do |import|
-          import.path = File.absolute_path(import.path, File.dirname(parent_path))
+          canonical_url = "#{Protocol::IMPORT}#{next_id}"
+          @importer_results[canonical_url] = imports_to_native(imports)
+          canonical_url
+        elsif url.start_with?(Protocol::LOADED)
+          canonical_url = Protocol::LOADED
+          @parent_urls.pop
+          canonical_url
         end
-
-        id = next_id
-        canonical_url = "#{Protocol::IMPORT}#{id}"
-        @canonical_urls[id] = canonical_url
-        @importer_results[canonical_url] = imports_to_native(imports)
-        canonical_url
       end
 
       def load(canonical_url)
-        if canonical_url.start_with?(Protocol::IMPORT)
+        if @importer_results.key?(canonical_url)
           @importer_results.delete(canonical_url)
         elsif canonical_url.start_with?(Protocol::FILE)
-          @parent_urls.push(canonical_url)
-          if @importer_results.key?(canonical_url)
-            @importer_results.delete(canonical_url)
-          else
-            path = URL.file_url_to_path(canonical_url)
-            {
-              contents: File.read(path),
-              syntax: syntax(path),
-              source_map_url: canonical_url
-            }
-          end
+          path = URL.file_url_to_path(canonical_url)
+          {
+            contents: File.read(path),
+            syntax: syntax(path),
+            source_map_url: canonical_url
+          }
         elsif canonical_url.start_with?(Protocol::LOADED)
-          @parent_urls.pop
           {
             contents: '',
             syntax: :scss
@@ -355,10 +345,12 @@ module SassC
         @load_paths ||= (@importer.options[:load_paths] || []) + SassC.load_paths
       end
 
-      def resolve_path(path, parent_path, from_import)
+      def resolve_file_url(url, parent_url, from_import)
+        path = URL.parse(url).route_from(parent_url).to_s
+        parent_path = URL.file_url_to_path(parent_url)
         [File.dirname(parent_path)].concat(load_paths).each do |load_path|
           resolved = FileImporter.resolve_path(File.absolute_path(path, load_path), from_import)
-          return resolved unless resolved.nil?
+          return URL.path_to_file_url(resolved) unless resolved.nil?
         end
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.6
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.6
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.6.0
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.6.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []