sass-embedded 1.76.0 → 1.77.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6976254a75e097194c2cb63ceef678379a5ef88a9db575b6383494ab23eac72
-  data.tar.gz: 0c62686ac5f3ea99d396e2b094aff05d6fb5466a589654d974962259967ca4ad
+  metadata.gz: 0bfff52de55e49e0fca1fc3e31b5872242a1bb7029df3f2559d4573572cfc7ea
+  data.tar.gz: 234f54677a6e1081be4b7c89f5e96941df79dfb96cd2e22a1820f983f1399d43
 SHA512:
-  metadata.gz: 20d212a1a7d0fcaa47aad73fed456681db64ea5fddde87bc5dc0a68f03cae403af3f4cbbbccd9a81fb57a895c196658bc7e0175e03d7a28fd8dcb199c0b77fab
-  data.tar.gz: 4395fb40b9b4f7f5d8a75e185420625ec0dacb30739aec8d15efc282a3f5a1b35f00cd9dc2a8f57d93e0e70825e843d8027cdc7135579c5b27f1e482a344e20e
+  metadata.gz: da2f6ff5eb532eb242490de2089775382901caa745c9115b66d53a326ebf58a03a53c24f9e67b16a2cf338a9671b318d12af29ecf72e84cf79032c04e710e70e
+  data.tar.gz: 91d0022d942e73e64436a34fab0f7cc14bdc02095937150d80559f18bb9a810e8a3ef9ee7e996be3086b6fbd9e104d2ddd76ab8ce30d6110c390ab60daf83451

data/exe/sass

@@ -5,7 +5,7 @@ require_relative '../ext/sass/cli'
 
 module Sass
   # The `sass` command line interface
-  class CLI
+  module CLI
     begin
       Kernel.exec(*COMMAND, *ARGV)
     rescue Errno::ENOENT

data/ext/sass/Rakefile

@@ -54,7 +54,7 @@ file 'cli.rb' => %w[dart-sass] do |t|
     # frozen_string_literal: true
 
     module Sass
-      class CLI
+      module CLI
         COMMAND = [#{command}].freeze
       end
 
@@ -174,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
@@ -190,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
 
@@ -312,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
 
@@ -350,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.76.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/connection.rb

@@ -10,7 +10,7 @@ module Sass
     #
     # It runs the `sass --embedded` command.
     class Connection
-      def initialize(dispatcher)
+      def initialize
         @mutex = Mutex.new
         @stdin, @stdout, @stderr, @wait_thread = begin
           Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
@@ -23,7 +23,9 @@ module Sass
         end
 
         @stdin.binmode
+      end
 
+      def listen(dispatcher)
         Thread.new do
           Thread.current.name = "sass-embedded-process-stdout-poller-#{@wait_thread.pid}"
 

data/lib/sass/compiler/dispatcher.rb

@@ -10,7 +10,8 @@ module Sass
         @id = 1
         @observers = {}.compare_by_identity
         @mutex = Mutex.new
-        @connection = Connection.new(self)
+        @connection = Connection.new
+        @connection.listen(self)
         ForkTracker.add(self)
       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/compiler/host.rb

@@ -36,7 +36,7 @@ module Sass
                           quiet_deps:,
                           silence_deprecations:,
                           verbose:)
-        alert_color = Exception.respond_to?(:to_tty?) && Exception.to_tty? if alert_color.nil?
+        alert_color = Exception.to_tty? if alert_color.nil?
 
         @function_registry = FunctionRegistry.new(functions, alert_color:)
         @importer_registry = ImporterRegistry.new(importers, load_paths, alert_color:)

data/lib/sass/embedded/version.rb

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

data/lib/sass/exception.rb

@@ -26,7 +26,7 @@ module Sass
     def full_message(highlight: nil, order: nil, **)
       return super if @full_message.nil?
 
-      highlight = Exception.respond_to?(:to_tty?) && Exception.to_tty? if highlight.nil?
+      highlight = Exception.to_tty? if highlight.nil?
       if highlight
         @full_message.dup
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.76.0
+  version: 1.77.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-30 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.76.0
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.76.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: 
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!