sassc-embedded 1.3.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ff232a1e9ffcdb66044bbf2bf16cb7f30e103391a59c8d77198a2c273fb23ee
-  data.tar.gz: b9f778ee93529d8ea8fd78e117938dbefd85effbade12914b4766f6b462516cb
+  metadata.gz: 506575e793d5ee699691de8907a88ceebfd7beb59bdab24dbb2cf635c2ffb404
+  data.tar.gz: af6c43358f10c090d012aa78e0e5137f556b372f10bcfe44588e23cc2a831bc2
 SHA512:
-  metadata.gz: afe628bdf03866ce81814e6063075c7fde3b5dcd577a5f2f914feb65d71f343992f34d96b943669c10cb0ccc5c6655f9816092a347c5173d3a83abd4e2ddb3eb
-  data.tar.gz: df0aac452aca91d9df03785bfd61c09ac75b6fcc0506316bc5ddf800634cde576e1f0b526735a7d5ed5f61506d81db9e01b41f23dd5a938070b546f17131a16c
+  metadata.gz: 7519d7e819f13d826b28f432010ab427bb5edeb1a3a047731f82363b982265ea2533ded7fb7598d5f9d6232ec20c07b143331ef1ae54a7c7f2e51f3134888216
+  data.tar.gz: 7118fc14334409be70766a79be3e9adb3f3a41ef451b3779762d90ee8409d795277e4a04ac3e71ed27464e870c3d52216d981e84bbba936f680eaaa3ca5a8618

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.1'
+    VERSION = '1.5.1'
   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
@@ -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 = URL.file_url_to_path(@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?
@@ -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.1
+  version: 1.5.1
 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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -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.1
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.3.1
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.1
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []