sass-embedded 1.77.0 → 1.77.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aed3c449332a23c0f25d1c5fdc76ae8f046bbb66500979ff5034a110e221bbe2
-  data.tar.gz: beb8b0f722c3e6ec28a7bbe40f454ddd1296eb7043ec8c228ef54f5dfdcc636e
+  metadata.gz: 0bfff52de55e49e0fca1fc3e31b5872242a1bb7029df3f2559d4573572cfc7ea
+  data.tar.gz: 234f54677a6e1081be4b7c89f5e96941df79dfb96cd2e22a1820f983f1399d43
 SHA512:
-  metadata.gz: fecd8f4170ebad67f4792bbf752dbd4049a3d180e6fdf7bd961ed91c67440f3ff88ddeddf258904ae47f5cb43cc55a2c1d8836912434f73693cad63c73cd2272
-  data.tar.gz: 5062c22580f6c62bbe481fbfe80b8b626b37e6575e5f2171c2e46bbb52d131f98e123ec938956ff7b8dc946709194fbb231348b7b17e94c8c6107ce5c4b93e8f
+  metadata.gz: da2f6ff5eb532eb242490de2089775382901caa745c9115b66d53a326ebf58a03a53c24f9e67b16a2cf338a9671b318d12af29ecf72e84cf79032c04e710e70e
+  data.tar.gz: 91d0022d942e73e64436a34fab0f7cc14bdc02095937150d80559f18bb9a810e8a3ef9ee7e996be3086b6fbd9e104d2ddd76ab8ce30d6110c390ab60daf83451

data/ext/sass/Rakefile

@@ -50,29 +50,9 @@ file 'cli.rb' => %w[dart-sass] do |t|
     "
             end
 
-  validate_gemspec = <<~'VALIDATE_GEMSPEC'
-
-    spec = Gem.loaded_specs['sass-embedded']
-    platform = spec&.platform
-    if platform.is_a?(Gem::Platform) && platform.os == 'linux' && platform.version.nil?
-      update = if Gem.disable_system_update_message
-                 'updating Ruby to version 3.2 or later'
-               else
-                 "running 'gem update --system' to update RubyGems"
-               end
-      install = if defined?(Bundler)
-                  "running 'rm -f Gemfile.lock && bundle install'"
-                else
-                  "running 'gem install sass-embedded'"
-                end
-      raise LoadError, "The gemspec for #{spec.name} at #{spec.loaded_from} was broken. " \
-                       "Try #{update}, and then try #{install} to reinstall."
-    end
-  VALIDATE_GEMSPEC
-
   File.write(t.name, <<~CLI_RB)
     # frozen_string_literal: true
-    #{validate_gemspec if SassConfig.gem_platform.os == 'linux'}
+
     module Sass
       module CLI
         COMMAND = [#{command}].freeze
@@ -194,6 +174,8 @@ module FileUtils
   end
 
   def gem_install(name, version, platform)
+    require 'rubygems/remote_fetcher'
+
     install_dir = File.absolute_path('ruby')
 
     if Rake::FileUtilsExt.verbose_flag
@@ -210,25 +192,26 @@ module FileUtils
 
     dependency = Gem::Dependency.new(name, version)
 
-    specs_and_sources, _errors = Gem::SpecFetcher.fetcher.spec_for_dependency(dependency, false)
+    dependency_request = Gem::Resolver::DependencyRequest.new(dependency, nil)
 
-    spec, source = specs_and_sources.find do |s, _|
+    resolver_spec = Gem::Resolver::BestSet.new.find_all(dependency_request).find do |s|
       s.platform == platform
     end
 
-    raise if spec.nil? || source.nil?
+    raise if resolver_spec.nil?
 
+    options = { force: true, install_dir: }
     if Rake::FileUtilsExt.nowrite_flag
-      installer = Gem::Installer.for_spec(spec, { force: true, install_dir: })
+      installer = Gem::Installer.for_spec(resolver_spec.spec, options)
     else
-      path = source.download(spec, install_dir)
-      installer = Gem::Installer.at(path, { force: true, install_dir: })
+      path = resolver_spec.download(options)
+      installer = Gem::Installer.at(path, options)
       installer.install
     end
 
     yield installer.dir
   ensure
-    rm_rf install_dir
+    rm_rf install_dir unless Rake::FileUtilsExt.nowrite_flag
   end
 end
 
@@ -332,7 +315,9 @@ module SassConfig
 
     repo = 'https://repo.maven.apache.org/maven2/com/google/protobuf/protoc'
 
-    spec = Gem::Dependency.new('google-protobuf').to_spec
+    dependency = Gem::Dependency.new('google-protobuf')
+
+    spec = dependency.to_spec
 
     version = spec.version
 
@@ -370,12 +355,14 @@ module SassConfig
 
     uri
   rescue Gem::RemoteFetcher::FetchError
-    tuples = Gem::SpecFetcher.fetcher.detect(:released) do |name_tuple|
-      name_tuple.name == spec.name && name_tuple.platform == 'ruby'
+    dependency_request = Gem::Resolver::DependencyRequest.new(dependency, nil)
+
+    versions = Gem::Resolver::BestSet.new.find_all(dependency_request).filter_map do |s|
+      s.version if s.platform == Gem::Platform::RUBY
     end
 
-    tuples.sort.reverse_each do |name_tuple, _source|
-      uri = "#{repo}/#{name_tuple.version}/protoc-#{name_tuple.version}-#{os}-#{cpu}.exe"
+    versions.sort.reverse_each do |v|
+      uri = "#{repo}/#{v}/protoc-#{v}-#{os}-#{cpu}.exe"
 
       Gem::RemoteFetcher.fetcher.fetch_https(Gem::Uri.new("#{uri}.sha1"))
 

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.77.0"
+    "sass": "1.77.1"
   }
 }

data/lib/sass/canonicalize_context.rb

@@ -7,13 +7,17 @@ module Sass
   # @see https://sass-lang.com/documentation/js-api/interfaces/canonicalizecontext/
   class CanonicalizeContext
     # @return [String, nil]
-    attr_reader :containing_url
+    def containing_url
+      @containing_url_unused = false
+      @containing_url
+    end
 
     # @return [Boolean]
     attr_reader :from_import
 
     # @!visibility private
     def initialize(canonicalize_request)
+      @containing_url_unused = true
       @containing_url = canonicalize_request.containing_url == '' ? nil : canonicalize_request.containing_url
       @from_import = canonicalize_request.from_import
     end

data/lib/sass/compiler/host/importer_registry.rb

@@ -68,12 +68,14 @@ module Sass
 
         def canonicalize(canonicalize_request)
           importer = @importers_by_id[canonicalize_request.importer_id]
+          canonicalize_context = CanonicalizeContext.new(canonicalize_request)
           url = importer.canonicalize(canonicalize_request.url,
-                                      CanonicalizeContext.new(canonicalize_request))&.to_s
+                                      canonicalize_context)&.to_s
 
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            url:
+            url:,
+            containing_url_unused: canonicalize_context.instance_eval { @containing_url_unused }
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
@@ -103,12 +105,14 @@ module Sass
 
         def file_import(file_import_request)
           importer = @importers_by_id[file_import_request.importer_id]
+          canonicalize_context = CanonicalizeContext.new(file_import_request)
           file_url = importer.find_file_url(file_import_request.url,
-                                            CanonicalizeContext.new(file_import_request))&.to_s
+                                            canonicalize_context)&.to_s
 
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            file_url:
+            file_url:,
+            containing_url_unused: canonicalize_context.instance_eval { @containing_url_unused }
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.77.0'
+    VERSION = '1.77.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.77.0
+  version: 1.77.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,8 +107,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.77.0
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.77.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.77.1
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.77.1
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: