sass-embedded 1.99.0 → 1.101.0

data/lib/sass/embedded_protocol.rb

@@ -3,7 +3,7 @@
 module Sass
   # @see https://github.com/sass/sass/blob/HEAD/spec/embedded-protocol.md
   module EmbeddedProtocol
-    require_relative 'embedded_sass_pb'
+    require 'sass/embedded_sass_pb'
   end
 
   private_constant :EmbeddedProtocol

data/lib/sass/exception.rb

@@ -12,25 +12,77 @@ module Sass
     # @return [Array<String>]
     attr_reader :loaded_urls
 
-    # @!visibility private
-    def initialize(message, full_message, sass_stack, span, loaded_urls)
-      super(message)
+    if Exception.public_method_defined?(:detailed_message, false)
+      # @!visibility private
+      def initialize(message, detailed_message, sass_stack, span, loaded_urls)
+        super(message)
 
-      @full_message = full_message
-      @sass_stack = sass_stack
-      @span = span
-      @loaded_urls = loaded_urls
-    end
+        @detailed_message = detailed_message
+        @sass_stack = sass_stack
+        @span = span
+        @loaded_urls = loaded_urls
+      end
 
-    # @return [String]
-    def full_message(highlight: nil, order: nil, **)
-      return super if @full_message.nil?
-
-      highlight = Exception.to_tty? if highlight.nil?
-      if highlight
-        @full_message.dup
-      else
-        @full_message.gsub(/\e\[[0-9;]*m/, '')
+      # @!visibility private
+      def detailed_message(highlight: nil, **)
+        return super if @detailed_message.nil?
+
+        highlight = Exception.to_tty? if highlight.nil?
+
+        detailed_message = @detailed_message.sub(message, super)
+        detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+        detailed_message
+      end
+    else # TODO: remove once ruby 3.1 support is dropped
+      # @!visibility private
+      def initialize(message, detailed_message, sass_stack, span, loaded_urls)
+        super(detailed_message.nil? ? message : detailed_message)
+
+        @message = message
+        @detailed_message = detailed_message
+        @sass_stack = sass_stack
+        @span = span
+        @loaded_urls = loaded_urls
+      end
+
+      # @!visibility private
+      def message
+        return @message if @detailed_message.nil? || @full_message.nil?
+
+        @detailed_message
+      end
+
+      # @!visibility private
+      def detailed_message(highlight: nil, **)
+        highlight = Exception.to_tty? if highlight.nil?
+
+        super_ = if highlight
+                   lines = message.split("\n")
+                   lines[0] += " (\e[1;4m#{self.class.name}\e[m\e[1m)" unless lines.empty?
+                   lines.map { |line| "\e[1m#{line}\e[m" }.join("\n")
+                 else
+                   lines = message.split("\n", 2)
+                   lines[0] += " (#{self.class.name})" unless lines.empty?
+                   lines.join("\n")
+                 end
+
+        return super_ if @detailed_message.nil?
+
+        detailed_message = @detailed_message.sub(message, super_)
+        detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+        detailed_message
+      end
+
+      # @!visibility private
+      def full_message(highlight: nil, order: :top, **)
+        highlight = Exception.to_tty? if highlight.nil?
+
+        @full_message = true
+        full_message = super.force_encoding(message.encoding)
+        full_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+        full_message
+      ensure
+        @full_message = nil
       end
     end
 

data/lib/sass/gem_package_importer.rb

@@ -2,16 +2,25 @@
 
 module Sass
   # The built-in RubyGems package importer. This loads pkg: URLs from gems.
+  #
+  # @example
+  #   require 'bundler/inline'
+  #
+  #   gemfile do
+  #     source 'https://rubygems.org'
+  #     gem 'bootstrap', require: false
+  #     gem 'sass-embedded'
+  #   end
+  #
+  #   puts Sass.compile_string('@use "pkg:bootstrap/assets/stylesheets/bootstrap";', importers: [Sass::GemPackageImporter.new]).css
   class GemPackageImporter
     # @!visibility private
     def find_file_url(url, _canonicalize_context)
       return unless url.start_with?('pkg:')
 
-      library, _, path = url[4..].partition(/[#?]/).first.partition('/')
-      gem_dir = Gem::Dependency.new(library).to_spec.gem_dir
-      gem_dir = "/#{gem_dir}" unless gem_dir.start_with?('/')
-
-      "file://#{gem_dir.gsub(/[#%?\\]/, { '#' => '%23', '%' => '%25', '?' => '%3F', '\\' => '%5C' })}/#{path}"
+      library, _, path = url[4..].partition('/')
+      gem_dir = Gem::Dependency.new(Uri.decode_uri_component(library)).to_spec.gem_dir
+      "#{Uri.path_to_file_uri(gem_dir)}/#{path}"
     rescue Gem::MissingSpecError
       nil
     end

data/lib/sass/uri.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module Sass
+  # The {Uri} class.
+  #
+  # It follows RFC3986 to match the behavior of Uri class from Dart.
+  #
+  # @see https://www.rfc-editor.org/info/rfc3986/
+  module Uri
+    module_function
+
+    def decode_uri_component(str)
+      str.b.gsub(/%\h\h/, ::URI::TBLDECWWWCOMP_).force_encoding(str.encoding)
+    end
+
+    def encode_uri_component(str)
+      str.b.gsub(/[^0-9A-Za-z\-._~]/n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
+
+    def encode_uri_path_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/]}n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
+
+    def encode_uri_query_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/?]}n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
+
+    def file_uri_to_path(uri)
+      path = decode_uri_component(::URI::RFC3986_PARSER.parse(uri).path)
+      if path.start_with?('/')
+        windows_path = path[1..]
+        path = windows_path if File.absolute_path?(windows_path)
+      end
+      path
+    end
+
+    def path_to_file_uri(path)
+      path = "/#{path}" unless path.start_with?('/')
+      "file://#{encode_uri_path_component(path)}"
+    end
+
+    def pwd
+      pwd = Dir.pwd
+      pwd += '/' unless pwd.end_with?('/')
+      path_to_file_uri(pwd)
+    end
+
+    def relative(to, from)
+      ::URI::RFC3986_PARSER.parse(to).route_from(from).to_s
+    end
+  end
+
+  private_constant :Uri
+end

data/lib/sass/value/color/space/utils.rb

@@ -33,7 +33,7 @@ module Sass
 
           # The algorithm for converting a single `srgb` or `display-p3` channel to
           # linear-light form.
-          # @param [Numeric]
+          # @param channel [Numeric]
           # @return [Numeric]
           def srgb_and_display_p3_to_linear(channel)
             abs = channel.abs
@@ -42,7 +42,7 @@ module Sass
 
           # The algorithm for converting a single `srgb` or `display-p3` channel to
           # gamma-corrected form.
-          # @param [Numeric]
+          # @param channel [Numeric]
           # @return [Numeric]
           def srgb_and_display_p3_from_linear(channel)
             abs = channel.abs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 1.101.0
 platform: ruby
 authors:
 - なつき
@@ -51,8 +51,12 @@ files:
 - README.md
 - exe/sass
 - ext/sass/Rakefile
+- ext/sass/file_utils.rb
 - ext/sass/package.json
-- ext/sass/sass-1.99.0.tgz
+- ext/sass/platform.rb
+- ext/sass/sass-1.101.0.tgz
+- ext/sass/sass_config.rb
+- ext/sass/utils.rb
 - lib/sass-embedded.rb
 - lib/sass/calculation_value.rb
 - lib/sass/calculation_value/calculation_operation.rb
@@ -62,12 +66,14 @@ files:
 - lib/sass/compiler/channel.rb
 - lib/sass/compiler/connection.rb
 - lib/sass/compiler/dispatcher.rb
-- lib/sass/compiler/host.rb
-- lib/sass/compiler/host/function_registry.rb
-- lib/sass/compiler/host/importer_registry.rb
-- lib/sass/compiler/host/logger_registry.rb
-- lib/sass/compiler/host/protofier.rb
-- lib/sass/compiler/host/struct.rb
+- lib/sass/compiler/session.rb
+- lib/sass/compiler/session/function_registry.rb
+- lib/sass/compiler/session/importer_registry.rb
+- lib/sass/compiler/session/logger_registry.rb
+- lib/sass/compiler/session/path.rb
+- lib/sass/compiler/session/protofier.rb
+- lib/sass/compiler/session/stack_trace.rb
+- lib/sass/compiler/session/struct.rb
 - lib/sass/compiler/varint.rb
 - lib/sass/elf.rb
 - lib/sass/embedded.rb
@@ -82,6 +88,7 @@ files:
 - lib/sass/logger/source_span.rb
 - lib/sass/node_package_importer.rb
 - lib/sass/serializer.rb
+- lib/sass/uri.rb
 - lib/sass/value.rb
 - lib/sass/value/argument_list.rb
 - lib/sass/value/boolean.rb
@@ -126,8 +133,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.99.0
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.99.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.101.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.101.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -144,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.9
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []