sassc-embedded 1.4.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c93f068bcc4406780bad76da750f2b265943a971456d3b56a14b0bdb2f0be8a
-  data.tar.gz: c851519ef1b2f08fe4370f4669b9df263b7264844911df873de30273748b4675
+  metadata.gz: 34c4811b38299f8c49a35d9b8b87d23d610406fd94ce7f8075ac03313db70a23
+  data.tar.gz: 390d007373427c76c86c3bf4a9c7e8610dc99da6524bfc3546138b6f63b4fc83
 SHA512:
-  metadata.gz: 14f22ec99ba45f9fddf083a1bccab5b34b3c48e745cfd30c53078c504d90d3e870c27effc1c9ae20b32ead54602dffadfa48b59993a61fa82991c9cafa1cd856
-  data.tar.gz: 6a1d3fde2932a3c83932bb6601ad7e5ac0d945d69f69d0d5acf36c378401afdd3cbc7cb00dcb835b10be697fdbdb378bbcffd1e957e2995e686f3d10f546c6b7
+  metadata.gz: cc3c3f6ee78f82364b1ea56e44ae8e0006b9def7cf27492b7eb4a8e40fc47d7df99b2e10c125a285d19627964d7bb6f0f195049772351885df187725ed1fd14b
+  data.tar.gz: bbf300fce0ae4ea93219a10e321038fa22126f337303b02e2837dc808d2fc06a0ead8c733f2ee2591ee51c198037a9ef4d476772d1c723d58188f04e20b26f15

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.4.0'
+    VERSION = '1.5.2'
   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
@@ -297,7 +297,7 @@ module SassC
           return url if @importer_results.key?(url)
 
           path = URL.parse(url).route_from(@parent_urls.last).to_s
-          resolved = resolve_path(path, URL.file_url_to_path(@parent_urls.last.to_s), from_import)
+          resolved = resolve_path(path, URL.file_url_to_path(@parent_urls.last), from_import)
           return resolved.nil? ? nil : URL.path_to_file_url(resolved)
         end
 

metadata

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