sass-embedded 0.10.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c01d861dce5149bb56f25e6cb89e54d21a26bc4e50486298f860b2386198b7
-  data.tar.gz: 36f04488a3118b833f6210766e590a617fe7204dabb31b0908023b32a008ed21
+  metadata.gz: 6c8f92f0e6135b60c156ef3e8db7c7db99e5c2bc6eb3d0a8d557000851297c8e
+  data.tar.gz: 751defdb3ff0b131e31ce532bc879137df34ee59f949497fdad0bad03df4ee95
 SHA512:
-  metadata.gz: c7c15d96579e3dc1843c3dfc66709c9a3ae48bcbb7458f0defcc91c313cffb53dc43b01d114c35b13b8a7b8cfae516440037730283d52e5ea506fffa70a9bcac
-  data.tar.gz: ae089947ade94c0550e9a066860e89e1c774572ddc1ab7c5b42327f4a9f3fe6db41c4422ce96a9454d63b44ae8675091239278ebd8d6f524438c0f680a3e5e26
+  metadata.gz: 85b2081c739e06f454d3d47d15c2c8cf2321b38f9853ef7a18713761029c2adc0bbc40d38d43c9ebc44b4bec13b986ae1915c29e4fab5dd6f62eb68624f37246
+  data.tar.gz: 2efe026a515f212d6025635b9e12bacc8532102a1441582daee31931a59a9268aedb8430a35aefb1c94e102100c216b0151f10bcc74b501a458c7ff2606855aa

data/lib/sass/embedded/compile_context.rb

@@ -20,6 +20,7 @@ module Sass
                      url:,
 
                      source_map:,
+                     source_map_include_sources:,
                      style:,
 
                      functions:,
@@ -39,6 +40,7 @@ module Sass
         @url = url
 
         @source_map = source_map
+        @source_map_include_sources = source_map_include_sources
         @style = style
 
         @global_functions = functions.keys.map(&:to_s)
@@ -50,7 +52,11 @@ module Sass
 
         @alert_ascii = alert_ascii
         @alert_color = alert_color
-        @logger = logger
+
+        %i[debug warn].each do |sym|
+          instance_variable_set("@#{sym}".to_sym, get_method(logger, sym))
+        end
+
         @quiet_deps = quiet_deps
         @verbose = verbose
 
@@ -109,24 +115,26 @@ module Sass
       def log(event)
         case event.type
         when :DEBUG
-          if @logger.respond_to? :debug
-            @logger.debug(event.message, span: Logger::SourceSpan.from_proto(event.span))
-          else
+          if @debug.nil?
             Kernel.warn(event.formatted)
+          else
+            @debug.call(event.message, span: Logger::SourceSpan.from_proto(event.span))
           end
         when :DEPRECATION_WARNING
-          if @logger.respond_to? :warn
-            @logger.warn(event.message, deprecation: true, span: Logger::SourceSpan.from_proto(event.span),
-                                        stack: event.stack_trace)
-          else
+          if @warn.nil?
             Kernel.warn(event.formatted)
+          else
+            @warn.call(event.message, deprecation: true,
+                                      span: Logger::SourceSpan.from_proto(event.span),
+                                      stack: event.stack_trace)
           end
         when :WARNING
-          if @logger.respond_to? :warn
-            @logger.warn(event.message, deprecation: false, span: Logger::SourceSpan.from_proto(event.span),
-                                        stack: event.stack_trace)
-          else
+          if @warn.nil?
             Kernel.warn(event.formatted)
+          else
+            @warn.call(event.message, deprecation: false,
+                                      span: Logger::SourceSpan.from_proto(event.span),
+                                      stack: event.stack_trace)
           end
         end
       end
@@ -145,6 +153,7 @@ module Sass
           path: @path,
           style: to_proto_output_style(@style),
           source_map: @source_map,
+          source_map_include_sources: @source_map_include_sources,
           importers: to_proto_importers(@importers, @load_paths),
           global_functions: @global_functions,
           alert_ascii: @alert_ascii,
@@ -153,7 +162,9 @@ module Sass
       end
 
       def canonicalize_response(canonicalize_request)
-        url = importer_with_id(canonicalize_request.importer_id).canonicalize canonicalize_request.url
+        importer = importer_with_id(canonicalize_request.importer_id)
+        url = get_method(importer, :canonicalize).call canonicalize_request.url,
+                                                       from_import: canonicalize_request.from_import
 
         EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
           id: canonicalize_request.id,
@@ -167,14 +178,15 @@ module Sass
       end
 
       def import_response(import_request)
-        importer_result = importer_with_id(import_request.importer_id).load import_request.url
+        importer = importer_with_id(import_request.importer_id)
+        importer_result = get_method(importer, :load).call import_request.url
 
         EmbeddedProtocol::InboundMessage::ImportResponse.new(
           id: import_request.id,
           success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-            contents: importer_result.contents,
-            syntax: to_proto_syntax(importer_result.syntax),
-            source_map_url: importer_result.source_map_url
+            contents: get_attr(importer_result, :contents),
+            syntax: to_proto_syntax(get_attr(importer_result, :syntax)),
+            source_map_url: get_attr(importer_result, :source_map_url)
           )
         )
       rescue StandardError => e
@@ -186,8 +198,10 @@ module Sass
 
       def file_import_response(file_import_request)
         file_importer = importer_with_id(file_import_request.importer_id)
-        file_url = file_importer.find_file_url file_import_request.url,
-                                               from_import: file_import_request.from_import
+        file_url = get_method(file_importer, :find_file_url).call file_import_request.url,
+                                                                  from_import: file_import_request.from_import
+
+        raise "file_url must be a file: URL, was \"#{file_url}\"" if !file_url.nil? && !file_url.start_with?('file:')
 
         EmbeddedProtocol::InboundMessage::FileImportResponse.new(
           id: file_import_request.id,
@@ -235,16 +249,19 @@ module Sass
         when :compressed
           EmbeddedProtocol::OutputStyle::COMPRESSED
         else
-          raise ArgumentError, 'output_style must be one of :expanded, :compressed'
+          raise ArgumentError, 'style must be one of :expanded, :compressed'
         end
       end
 
       def to_proto_importer(importer, id)
-        if importer.respond_to?(:canonicalize) && importer.respond_to?(:load)
+        is_importer = get_method(importer, :canonicalize) && get_method(importer, :load)
+        is_file_importer = get_method(importer, :find_file_url)
+
+        if is_importer && !is_file_importer
           EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
             importer_id: id
           )
-        elsif importer.respond_to?(:find_file_url)
+        elsif is_file_importer && !is_importer
           EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
             file_importer_id: id
           )
@@ -274,6 +291,32 @@ module Sass
           @importers[id]
         end
       end
+
+      def get_method(obj, sym)
+        sym = sym.to_sym
+        if obj.respond_to? sym
+          obj.method(sym)
+        elsif obj.respond_to? :[]
+          if obj[sym].respond_to? :call
+            obj[sym]
+          elsif obj[sym.to_s].respond_to? :call
+            obj[sym.to_s]
+          end
+        end
+      end
+
+      def get_attr(obj, sym)
+        sym = sym.to_sym
+        if obj.respond_to? sym
+          obj.method(sym).call
+        elsif obj.respond_to? :[]
+          if obj[sym]
+            obj[sym]
+          elsif obj[sym.to_s]
+            obj[sym.to_s]
+          end
+        end
+      end
     end
   end
 end

data/lib/sass/embedded/compiler/requirements.rb

@@ -3,7 +3,7 @@
 module Sass
   class Embedded
     class Compiler
-      REQUIREMENTS = '~> 1.0.0-beta.16'
+      REQUIREMENTS = '~> 1.49.7'
     end
   end
 end

data/lib/sass/embedded/render.rb

@@ -66,6 +66,7 @@ module Sass
                                                 syntax: indented_syntax ? :indented : :scss,
                                                 url: (Url.path_to_file_url(File.absolute_path(file)) unless file.nil?),
                                                 source_map: source_map_option,
+                                                source_map_include_sources: source_map_contents,
                                                 style: output_style,
                                                 functions: functions,
                                                 importers: importer.map do |legacy_importer|
@@ -74,6 +75,7 @@ module Sass
                          else
                            compile(file, load_paths: load_paths,
                                          source_map: source_map_option,
+                                         source_map_include_sources: source_map_contents,
                                          style: output_style,
                                          functions: functions,
                                          importers: importer.map do |legacy_importer|
@@ -98,11 +100,9 @@ module Sass
       end
 
       map, source_map = post_process_map(map: compile_result.source_map,
-                                         data: data,
                                          file: file,
                                          out_file: out_file,
                                          source_map: source_map,
-                                         source_map_contents: source_map_contents,
                                          source_map_root: source_map_root)
 
       css = post_process_css(css: compile_result.css,
@@ -172,11 +172,9 @@ module Sass
 
     # @deprecated
     def post_process_map(map:,
-                         data:,
                          file:,
                          out_file:,
                          source_map:,
-                         source_map_contents:,
                          source_map_root:)
       return if map.nil? || map.empty?
 
@@ -201,26 +199,11 @@ module Sass
         map_data['file'] = 'stdin.css'
       end
 
-      map_data['sourcesContent'] = [] if source_map_contents
-
-      file = File.absolute_path(file) unless file.nil?
-
       map_data['sources'].map! do |source|
         if source.start_with? 'file://'
           path = Url.file_url_to_path(source)
-          content = if path == file && !data.nil?
-                      data
-                    else
-                      begin
-                        File.read(path)
-                      rescue StandardError
-                        nil
-                      end
-                    end
-          map_data['sourcesContent'].push(content) if source_map_contents
           relative_path(source_map_dir, path)
         else
-          map_data['sourcesContent'].push(nil) if source_map_contents
           source
         end
       end
@@ -317,8 +300,9 @@ module Sass
         @importer_results = {}
       end
 
-      def canonicalize(url)
-        canonical_url = Url.path_to_file_url(File.absolute_path(url, (@file.nil? ? 'stdin' : @file)))
+      def canonicalize(url, **_kwargs)
+        path = Url.file_url_to_path(url)
+        canonical_url = Url.path_to_file_url(File.absolute_path(path, (@file.nil? ? 'stdin' : @file)))
 
         result = @importer.call canonical_url, @file
 

data/lib/sass/embedded/url.rb

@@ -6,19 +6,29 @@ module Sass
   class Embedded
     # The {Url} module.
     module Url
-      # The {::URI::Parser} that is in consistent with Dart Uri.
+      # The {::URI::Parser} that is in consistent with RFC 2396 (URI Generic Syntax) and dart:core library.
       URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
-      private_constant :URI_PARSER
+      FILE_SCHEME = 'file://'
+
+      private_constant :URI_PARSER, :FILE_SCHEME
 
       module_function
 
       def path_to_file_url(path)
-        "file://#{Platform::OS == 'windows' ? File::SEPARATOR : ''}#{URI_PARSER.escape(path)}"
+        if File.absolute_path? path
+          URI_PARSER.escape "#{FILE_SCHEME}#{Platform::OS == 'windows' ? File::SEPARATOR : ''}#{path}"
+        else
+          URI_PARSER.escape path
+        end
       end
 
-      def file_url_to_path(file_uri)
-        URI_PARSER.unescape(file_uri[(Platform::OS == 'windows' ? 8 : 7)..])
+      def file_url_to_path(url)
+        if url.start_with? FILE_SCHEME
+          URI_PARSER.unescape url[(FILE_SCHEME.length + (Platform::OS == 'windows' ? 1 : 0))..]
+        else
+          URI_PARSER.unescape url
+        end
       end
     end
   end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.10.0'
+    VERSION = '0.13.1'
   end
 end

data/lib/sass/embedded.rb

@@ -34,6 +34,7 @@ module Sass
                 load_paths: [],
 
                 source_map: false,
+                source_map_include_sources: false,
                 style: :expanded,
 
                 functions: {},
@@ -55,6 +56,7 @@ module Sass
                                    syntax: nil,
                                    url: nil,
                                    source_map: source_map,
+                                   source_map_include_sources: source_map_include_sources,
                                    style: style,
                                    functions: functions,
                                    importers: importers,
@@ -81,6 +83,7 @@ module Sass
                        url: nil,
 
                        source_map: false,
+                       source_map_include_sources: false,
                        style: :expanded,
 
                        functions: {},
@@ -101,6 +104,7 @@ module Sass
                                    syntax: syntax,
                                    url: url,
                                    source_map: source_map,
+                                   source_map_include_sources: source_map_include_sources,
                                    style: style,
                                    functions: functions,
                                    importers: importers,

data/lib/sass/logger.rb

@@ -3,18 +3,22 @@
 module Sass
   # The {Logger} module.
   module Logger
-    # The instance of a slient {Logger}.
-    def self.slient
-      @slient ||= Slient.new
+    module_function
+
+    # The instance of a silent {Logger}.
+    def silent
+      Silent
     end
 
-    # The slient {Logger}.
-    class Slient
+    # The silent {Logger}.
+    module Silent
+      module_function
+
       def warn(message, deprecation: false, span: nil, stack: nil); end
 
       def debug(message, span: nil); end
     end
 
-    private_constant :Slient
+    private_constant :Silent
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.6
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -164,8 +192,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.10.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.10.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.13.1
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.13.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -175,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!