sassc-embedded 1.68.1 → 1.68.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1bae171b142e9c93398da7fd657e968c0804ce760bd7c05e04dc59a1d6c408
-  data.tar.gz: e45f9276e88a116aa2f83f592187b3705a6b2989b7837e90ca6917fbc418a51e
+  metadata.gz: ebda8193661d3e610338c37843843a7437ba861a3bc75e44a83b0f2fc6490248
+  data.tar.gz: fd67e61a4b5ddceb37c96f6c7793c9d2d6322612267f183fe09bd7fe71d278ab
 SHA512:
-  metadata.gz: 5f36c1fd78fbebbb9af4bf20126b0024aa0ca15a1900ed258390c449d1de36294c96160c0e9c76777d1a2ff053564b650b0b048038ceb03f7a2c64f3c9f8d88f
-  data.tar.gz: fc2bf82ab1c39773ea130bea388028c649dab02e71e35c9f31a2cbbb4f9a30be4718a535b628f5dbeef5fac1b43009e6c3776765c3d10b2399d0aba8019bd9ab
+  metadata.gz: 84d93ee23538b49add2e6ef11446cda4db188f974d742eb4982fb476daef8625471f679032c59195a4c894facc5394b4c04bcd16b7de82ea788516c71929ad9b
+  data.tar.gz: 8b776a2fd9357e6b4b0e9b515903c0fbde759574058ef8cb88c7a98e146520fbf5e784b2561bd9d90c382c3ff7dc07d3bb852e5931f100b02648610aea5e84a2

data/README.md

@@ -9,52 +9,13 @@ This library shims [`sassc`](https://github.com/sass/sassc-ruby) with the [`sass
 
 It has been tested with:
 
+- [`bootstrap`](https://github.com/twbs/bootstrap-rubygem)
 - [`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)
 
-## Uninstall `sassc`
-
-Execute:
-
-``` sh
-bundle remove sassc
-```
-
-Or uninstall it yourself as:
-
-``` sh
-gem uninstall sassc
-```
-
-**If your application has a transitive dependency on `sassc` that cannot be removed, you can use any of the following workarounds.**
-
-### Workaround One
-
-Add this line to your application's Gemfile:
-
-``` ruby
-gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
-```
-
-And then execute:
-
-``` sh
-bundle
-```
-
-The fork of `sassc` at https://github.com/sass/sassc-ruby/pull/233 will load the shim automatically when `require 'sassc'` is invoked, meaning no other code changes needed in your application.
-
-### Workaround Two
-
-Add this line to your application's code:
-
-``` ruby
-require 'sassc-embedded'
-```
-
-## Install `sassc-embedded`
+## Install
 
 Add this line to your application's Gemfile:
 
@@ -95,3 +56,45 @@ See [rubydoc.info/gems/sassc](https://rubydoc.info/gems/sassc) for full API docu
 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.
+
+## Troubleshooting
+
+### The original `sassc` gem is still being used instead of `sassc-embedded`
+
+When launching an application via `bundle exec`, it puts `sassc-embedded` at higher priority than `sassc` in `$LOAD_PATH`. You can verify the order of `$LOAD_PATH` with the following command:
+
+``` ruby
+bundle exec ruby -e 'puts $LOAD_PATH'
+```
+
+If you see `sassc` has higher priority than `sassc-embedded`, try remove `sassc`:
+
+```
+bundle remove sassc
+```
+
+If your application has a transitive dependency on `sassc` that cannot be removed, you can use one of the following workarounds.
+
+#### Workaround One
+
+Add this line to your application's Gemfile:
+
+``` ruby
+gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
+```
+
+And then execute:
+
+``` sh
+bundle
+```
+
+The fork of `sassc` at https://github.com/sass/sassc-ruby/pull/233 will load the shim whenever `require 'sassc'` is invoked, meaning no other code changes needed in your application.
+
+#### Workaround Two
+
+Add this line to your application's code:
+
+``` ruby
+require 'sassc-embedded'
+```

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.68.1'
+    VERSION = '1.68.3'
   end
 end

data/lib/sassc/embedded.rb

@@ -49,7 +49,7 @@ module SassC
         source_mapping_url = if source_map_embed?
                                "data:application/json;base64,#{[@source_map].pack('m0')}"
                              else
-                               URL.unescape(URL.parse(source_map_file_url).route_from(url).to_s)
+                               URL.file_urls_to_relative_url(source_map_file_url, url)
                              end
         css += "\n/*# sourceMappingURL=#{source_mapping_url} */"
       end
@@ -61,7 +61,7 @@ module SassC
       line += 1 unless line.nil?
       url = e.span&.url
       path = if url&.start_with?(Protocol::FILE)
-               URL.unescape(URL.parse(url).route_from(URL.path_to_file_url("#{Dir.pwd}/")).to_s)
+               URL.file_urls_to_relative_path(url, URL.path_to_file_url("#{Dir.pwd}/"))
              end
       raise SyntaxError.new(e.full_message, filename: path, line: line)
     end
@@ -69,9 +69,9 @@ module SassC
     def dependencies
       raise NotRenderedError unless @loaded_urls
 
-      Dependency.from_filenames(@loaded_urls
-        .filter { |url| url.start_with?(Protocol::FILE) && url != file_url }
-        .map { |url| URL.file_url_to_path(url) })
+      Dependency.from_filenames(@loaded_urls.filter_map do |url|
+        URL.file_url_to_path(url) if url.start_with?(Protocol::FILE) && url != file_url
+      end)
     end
 
     def source_map
@@ -79,10 +79,10 @@ module SassC
 
       url = URL.parse(source_map_file_url || file_url)
       data = JSON.parse(@source_map)
-      data['file'] = URL.unescape(URL.parse(output_url).route_from(url).to_s) if output_url
+      data['file'] = URL.file_urls_to_relative_url(output_url, url) if output_url
       data['sources'].map! do |source|
         if source.start_with?(Protocol::FILE)
-          URL.unescape(URL.parse(source).route_from(url).to_s)
+          URL.file_urls_to_relative_url(source, url)
         else
           source
         end
@@ -309,7 +309,7 @@ module SassC
           @parent_urls.push(canonical_url)
           canonical_url
         elsif url.start_with?(Protocol::FILE)
-          path = URL.unescape(URL.parse(url).route_from(@parent_urls.last).to_s)
+          path = URL.file_urls_to_relative_path(url, @parent_urls.last)
           parent_path = URL.file_url_to_path(@parent_urls.last)
 
           imports = @importer.imports(path, parent_path)
@@ -354,7 +354,7 @@ module SassC
       end
 
       def resolve_file_url(url, parent_url, from_import)
-        path = URL.unescape(URL.parse(url).route_from(parent_url).to_s)
+        path = URL.file_urls_to_relative_path(url, parent_url)
         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)
@@ -568,6 +568,14 @@ module SassC
       PARSER.unescape(str)
     end
 
+    def file_urls_to_relative_url(url, from_url)
+      parse(url).route_from(from_url).to_s
+    end
+
+    def file_urls_to_relative_path(url, from_url)
+      unescape(file_urls_to_relative_url(url, from_url))
+    end
+
     def file_url_to_path(url)
       return if url.nil?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.68.1
+  version: 1.68.3
 platform: ruby
 authors:
 - なつき
@@ -78,7 +78,7 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://rubydoc.info/gems/sassc
-  source_code_uri: https://github.com/ntkme/sassc-embedded-shim-ruby/tree/v1.68.1
+  source_code_uri: https://github.com/ntkme/sassc-embedded-shim-ruby/tree/v1.68.3
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []