sassc-embedded 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd5607c689b8388cf0c07abc26c3769ef50007ddd6b46432b277f7631bceb7f
-  data.tar.gz: 510835f24a3d66cf516bfd56acb0efd729d000cde730ef64908dfd5645f5aa12
+  metadata.gz: ae4ea5a6b743f50b8687316f4ff5492b91caa0e8672a7b85da21a7402e2e901d
+  data.tar.gz: c94a6a86fb24ee5d018feadfcc5d514fc60d3a77338fe0482f4d4451eafa4a54
 SHA512:
-  metadata.gz: 93bbe6c1e4ff6e2fc4209e9390fd4775f029f0efb60606ab64cf9ee71a6afbc64d658c7572fd9c0719a134e8e192c5e8200d8ac2530e691cb84ae3fc14a31686
-  data.tar.gz: 1eed6fff6d57ac4ac56965de504ee876bd6dbbebb93880edefef2de604eb99536660487ae5c1ebcd6991270904f4700b42a54790dd7c233e303a66755120f01d
+  metadata.gz: 42fa17dc23aa53fcfb091c5ad23d1d0e49c260dd914bab8c39ea3c15c9ae3a7e303c44e632f3088f5f4e42d1d6dd6881ec6451a3b5860adbb88e0adc12cc0d34
+  data.tar.gz: 35925d2e42085f78234223f56db9e406b95f6ff6541d98802ed5dc75056e4f1085a8f98efb1fe7233ce846b3c1ad8d45ec63255413a9a14191b4022b685ebeef

data/README.md

@@ -7,6 +7,12 @@ Use `sass-embedded` with SassC Ruby!
 
 This library polyfills [`sassc`](https://github.com/sass/sassc-ruby) with the [`sass-embedded`](https://github.com/ntkme/sass-embedded-host-ruby) implementation.
 
+It has been tested with:
+
+- [`sassc`](https://github.com/sass/sassc-ruby)
+- [`sassc-rails`](https://github.com/sass/sassc-rails)
+- [`sprockets`](https://github.com/rails/sprockets)
+- [`sprockets-rails`](https://github.com/rails/sprockets-rails)
 
 ## Install
 
@@ -43,12 +49,10 @@ See [rubydoc.info/gems/sassc](https://rubydoc.info/gems/sassc) for full API docu
 
 ## Behavioral Differences from SassC Ruby
 
-1. Option `:style => :nested` behaves as `:expanded`.
-
-2. Option `:style => :compact` behaves as `:compressed`.
+1. Option `:style => :nested` and `:style => :compact` behave as `:style => :expanded`.
 
-3. Option `:precision` is ignored.
+2. Option `:precision` is ignored.
 
-4. Option `:line_comments` is ignored.
+3. Option `:line_comments` is ignored.
 
 See [the dart-sass documentation](https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass) for other differences.

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.3.0'
+    VERSION = '1.5.0'
   end
 end

data/lib/sassc/embedded.rb

@@ -5,7 +5,6 @@ require 'sass-embedded'
 
 require 'base64'
 require 'json'
-require 'pathname'
 require 'uri'
 
 require_relative 'embedded/version'
@@ -46,8 +45,9 @@ module SassC
       line = e.span&.start&.line
       line += 1 unless line.nil?
       url = e.span&.url
-      path = url&.start_with?('file:') ? URL.file_url_to_path(url) : nil
-      path = relative_path(Dir.pwd, path) unless path.nil?
+      path = if url&.start_with?('file:')
+               URL.parse(url).route_from(URL.path_to_file_url("#{File.absolute_path('')}/"))
+             end
       raise SyntaxError.new(e.message, filename: path, line: line)
     end
 
@@ -64,6 +64,14 @@ module SassC
       )
     end
 
+    def output_url
+      @output_url ||= (URL.path_to_file_url(File.absolute_path(output_path)) if output_path)
+    end
+
+    def source_map_file_url
+      @source_map_file_url ||= (URL.path_to_file_url(File.absolute_path(source_map_file)) if source_map_file)
+    end
+
     def output_style
       @output_style ||= begin
         style = @options.fetch(:style, :sass_style_nested).to_s
@@ -72,10 +80,8 @@ module SassC
 
         style = style.delete_prefix('sass_style_').to_sym
         case style
-        when :nested
+        when :nested, :compact
           :expanded
-        when :compact
-          :compressed
         else
           style
         end
@@ -99,15 +105,12 @@ module SassC
     def post_process_source_map(source_map)
       return unless source_map
 
+      url = URL.parse(source_map_file_url || file_url)
       data = JSON.parse(source_map)
-
-      source_map_dir = File.dirname(source_map_file || '')
-
-      data['file'] = URL.escape(relative_path(source_map_dir, output_path)) if output_path
-
+      data['file'] = URL.parse(output_url).route_from(url).to_s if output_url
       data['sources'].map! do |source|
         if source.start_with?('file:')
-          relative_path(source_map_dir, URL.file_url_to_path(source))
+          URL.parse(source).route_from(url).to_s
         else
           source
         end
@@ -119,19 +122,16 @@ module SassC
     def post_process_css(css)
       css += "\n" unless css.empty?
       unless @source_map.nil? || omit_source_map_url?
-        url = if source_map_embed?
-                "data:application/json;base64,#{Base64.strict_encode64(@source_map)}"
-              else
-                URL.escape(relative_path(File.dirname(output_path || ''), source_map_file))
-              end
-        css += "\n/*# sourceMappingURL=#{url} */"
+        url = URL.parse(output_url || file_url)
+        source_mapping_url = if source_map_embed?
+                               "data:application/json;base64,#{Base64.strict_encode64(@source_map)}"
+                             else
+                               URL.parse(source_map_file_url).route_from(url).to_s
+                             end
+        css += "\n/*# sourceMappingURL=#{source_mapping_url} */"
       end
       css
     end
-
-    def relative_path(from, to)
-      Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
-    end
   end
 
   class FunctionsHandler
@@ -204,7 +204,7 @@ module SassC
       class << self
         def resolve_path(path, from_import)
           ext = File.extname(path)
-          if ['.sass', '.scss', '.css'].include?(ext)
+          unless ext.empty?
             if from_import
               result = exactly_one(try_path("#{without_ext(path)}.import#{ext}"))
               return result unless result.nil?
@@ -286,8 +286,7 @@ module SassC
       def initialize(importer)
         @importer = importer
         @importer_results = {}
-        @base_url = URL.parse(URL.path_to_file_url("#{File.absolute_path('')}/"))
-        @parent_urls = [URL.parse(URL.path_to_file_url(File.absolute_path(@importer.options[:filename] || 'stdin')))]
+        @parent_urls = [URL.path_to_file_url(File.absolute_path(@importer.options[:filename] || 'stdin'))]
       end
 
       def canonicalize(url, from_import:)
@@ -305,7 +304,7 @@ module SassC
         return unless url.start_with?(Protocol::FILE)
 
         path = URL.parse(url).route_from(@parent_urls.last).to_s
-        parent_path = @parent_urls.last.route_from(@base_url).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?
@@ -324,7 +323,7 @@ module SassC
         if canonical_url.start_with?(Protocol::IMPORT)
           @importer_results.delete(canonical_url)
         elsif canonical_url.start_with?(Protocol::FILE)
-          @parent_urls.push(URL.parse(canonical_url))
+          @parent_urls.push(canonical_url)
           if @importer_results.key?(canonical_url)
             @importer_results.delete(canonical_url)
           else
@@ -339,7 +338,7 @@ module SassC
           @parent_urls.pop
           {
             contents: '',
-            syntax: 'scss'
+            syntax: :scss
           }
         end
       end
@@ -374,11 +373,19 @@ module SassC
           contents: imports.flat_map do |import|
             file_url = URL.path_to_file_url(import.path)
             if import.source
-              @importer_results[file_url] = {
-                contents: import.source,
-                syntax: syntax(import.path),
-                source_map_url: file_url
-              }
+              @importer_results[file_url] = if import.source.is_a?(Hash)
+                                              {
+                                                contents: import.source[:contents],
+                                                syntax: import.source[:syntax],
+                                                source_map_url: file_url
+                                              }
+                                            else
+                                              {
+                                                contents: import.source,
+                                                syntax: syntax(import.path),
+                                                source_map_url: file_url
+                                              }
+                                            end
             end
             [
               "@import #{"#{Protocol::LOAD}#{file_url}".inspect};",
@@ -393,6 +400,15 @@ module SassC
     private_constant :Importer
   end
 
+  class Sass2Scss
+    def self.convert(sass)
+      {
+        contents: sass,
+        syntax: :indented
+      }
+    end
+  end
+
   module Script
     module ValueConversion
       def self.from_native(value, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-04-03 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.3.0
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.3.0
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.0
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []