sass-embedded 0.17.0 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c35a262d552f107bf4a13ed024c5c3bfb46da786ff08f4dd116a73211bc9bba
-  data.tar.gz: a0eb5eb4389b4212a66d265eb762511e616d2c5f51c393d2dc7191853501839f
+  metadata.gz: cc4a508736aaa5f9027fdef79ee94818b654039c1f2d50466ef2143abb405028
+  data.tar.gz: 16f20ce568c5db54cf8612c7e7fcd238005f488b050fcf0a6f48b2fe93112be9
 SHA512:
-  metadata.gz: 2a2b5b0aaa9065d64cf12947c96e129cff83d07e628c61e362f0aa4cf7bbdf02ca479508a3f717eaaac4d1466c45a15efffa18882144e5b951ec0242f286d71f
-  data.tar.gz: b4b2b8991b1640f7c5661aede8b13688cea6feb66d2016b96f9ba19d2bc59fdbd13404d317fa0e86819233c58a2ee22c70a25a60d6982be877b787c8cd27baec
+  metadata.gz: 1354199d1d4816557ddb4f64a8c266fea74a4712dc36d8004e1ce26d249b8c2e46a74d83edce9c4fb4ad01c143d47d95326502366cfff8284d6e9d76515d439d
+  data.tar.gz: 6ff13850fabab22c14e40520e7f8bfd95bcb7d68cfe02b5b901bfa4c566a2b3ba4bcf6a3aa2bb28733684fec1c6731cd7e2d8ea3c3c194d975b5023313844f74

data/ext/sass/extconf.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'json'
 require 'mkmf'
 require 'open-uri'
-require_relative '../../lib/sass/embedded/compiler/path'
+require_relative '../../lib/sass/embedded/compiler'
 
 module Sass
   class Embedded

data/lib/sass/compile_error.rb

@@ -3,13 +3,21 @@
 module Sass
   # An exception thrown because a Sass compilation failed.
   class CompileError < StandardError
-    attr_accessor :sass_message, :sass_stack, :span
+    attr_accessor :sass_stack, :span
 
-    def initialize(message, sass_message, sass_stack, span)
+    def initialize(message, full_message, sass_stack, span)
       super(message)
-      @sass_message = sass_message
+      @full_message = full_message
       @sass_stack = sass_stack
       @span = span
     end
+
+    def full_message(*)
+      if @full_message.nil?
+        super
+      else
+        @full_message
+      end
+    end
   end
 end

data/lib/sass/embedded/compile_context/function_registry.rb

@@ -7,7 +7,7 @@ module Sass
       class FunctionRegistry
         attr_reader :global_functions
 
-        def initialize(functions)
+        def initialize(functions, highlight:)
           functions = functions.transform_keys(&:to_s)
 
           @global_functions = functions.keys
@@ -20,9 +20,12 @@ module Sass
               signature
             end
           end
+
+          @id = 0
           @functions_by_id = {}
           @ids_by_function = {}
-          @id = 0
+
+          @highlight = highlight
         end
 
         def register(function)
@@ -59,7 +62,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
             id: function_call_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
 

data/lib/sass/embedded/compile_context/importer_registry.rb

@@ -7,7 +7,7 @@ module Sass
       class ImporterRegistry
         attr_reader :importers
 
-        def initialize(importers, load_paths)
+        def initialize(importers, load_paths, highlight:)
           @id = 0
           @importers_by_id = {}
           @importers = importers
@@ -17,6 +17,8 @@ module Sass
                                    path: File.absolute_path(load_path)
                                  )
                                end)
+
+          @highlight = highlight
         end
 
         def register(importer)
@@ -52,7 +54,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
 
@@ -71,7 +73,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
 
@@ -88,7 +90,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
       end

data/lib/sass/embedded/compile_context/value_protofier.rb

@@ -112,7 +112,7 @@ module Sass
         end
 
         def from_proto(proto)
-          obj = proto.method(proto.value).call
+          obj = proto.send(proto.value)
           case proto.value
           when :string
             Sass::Value::String.new(
@@ -122,8 +122,8 @@ module Sass
           when :number
             Sass::Value::Number.new(
               obj.value,
-              obj.numerators,
-              obj.denominators
+              obj.numerators.to_a,
+              obj.denominators.to_a
             )
           when :rgb_color
             Sass::Value::Color.new(

data/lib/sass/embedded/compile_context.rb

@@ -27,8 +27,8 @@ module Sass
                      logger:,
                      quiet_deps:,
                      verbose:)
-        @function_registery = FunctionRegistry.new(functions)
-        @importer_registery = ImporterRegistry.new(importers, load_paths)
+        @function_registery = FunctionRegistry.new(functions, highlight: alert_color)
+        @importer_registery = ImporterRegistry.new(importers, load_paths, highlight: alert_color)
         @logger_registery = LoggerRegistry.new(logger)
 
         super(channel)

data/lib/sass/embedded/compiler.rb

@@ -11,6 +11,10 @@ module Sass
     class Compiler
       include Observable
 
+      PATH = File.absolute_path(
+        "../../../ext/sass/sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__
+      )
+
       PROTOCOL_ERROR_ID = 4_294_967_295
 
       def initialize
@@ -29,11 +33,11 @@ module Sass
         end
       end
 
-      def add_observer(*args)
+      def add_observer(*)
         @observerable_mutex.synchronize do
           raise ProtocolError, 'half-closed compiler' if half_closed?
 
-          super(*args)
+          super
 
           id = @id
           @id = @id.next
@@ -41,9 +45,9 @@ module Sass
         end
       end
 
-      def delete_observer(*args)
+      def delete_observer(*)
         @observerable_mutex.synchronize do
-          super(*args)
+          super
 
           close if half_closed? && count_observers.zero?
         end
@@ -81,9 +85,7 @@ module Sass
         Thread.new do
           loop do
             yield
-          rescue StandardError => e
-            notify_observers(e, nil)
-            close
+          rescue StandardError
             break
           end
         end
@@ -99,7 +101,8 @@ module Sass
       def receive_message(message)
         case message
         when EmbeddedProtocol::ProtocolError
-          raise ProtocolError, message.message
+          notify_observers(ProtocolError.new(message.message), nil)
+          close
         else
           notify_observers(nil, message)
         end
@@ -108,6 +111,10 @@ module Sass
       def read
         length = Varint.read(@stdout)
         @stdout.read(length)
+      rescue IOError => e
+        notify_observers(e, nil)
+        close
+        raise e
       end
 
       def write(payload)

data/lib/sass/embedded/legacy.rb

@@ -125,8 +125,8 @@ module Sass
                          end
       rescue CompileError => e
         raise RenderError.new(
-          e.sass_message,
           e.message,
+          e.full_message,
           if e.span.nil?
             nil
           elsif e.span.url.nil?

data/lib/sass/embedded/protofier.rb

@@ -18,8 +18,8 @@ module Sass
       def from_proto_compile_response(compile_response)
         if compile_response.result == :failure
           raise CompileError.new(
-            compile_response.failure.formatted || compile_response.failure.message,
             compile_response.failure.message,
+            compile_response.failure.formatted,
             compile_response.failure.stack_trace,
             from_proto_source_span(compile_response.failure.span)
           )
@@ -52,7 +52,7 @@ module Sass
 
       def from_proto_message(proto)
         message = EmbeddedProtocol::OutboundMessage.decode(proto)
-        message.method(message.message).call
+        message.send(message.message)
       end
 
       def to_proto_message(message)

data/lib/sass/embedded/structifier.rb

@@ -13,7 +13,11 @@ module Sass
         obj.each do |key, value|
           if value.respond_to? :call
             struct.define_singleton_method key.to_sym do |*args, **kwargs|
-              value.call(*args, **kwargs)
+              if kwargs.empty?
+                value.call(*args)
+              else
+                value.call(*args, **kwargs)
+              end
             end
           else
             struct.define_singleton_method key.to_sym do

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.17.0'
+    VERSION = '0.18.3'
   end
 end

data/lib/sass.rb

@@ -11,7 +11,6 @@ require_relative 'sass/embedded/compile_context/importer_registry'
 require_relative 'sass/embedded/compile_context/logger_registry'
 require_relative 'sass/embedded/compile_context/value_protofier'
 require_relative 'sass/embedded/compiler'
-require_relative 'sass/embedded/compiler/path'
 require_relative 'sass/embedded_protocol'
 require_relative 'sass/embedded/legacy'
 require_relative 'sass/embedded/protocol_error'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.3
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -135,7 +135,6 @@ files:
 - lib/sass/embedded/compile_context/logger_registry.rb
 - lib/sass/embedded/compile_context/value_protofier.rb
 - lib/sass/embedded/compiler.rb
-- lib/sass/embedded/compiler/path.rb
 - lib/sass/embedded/legacy.rb
 - lib/sass/embedded/observer.rb
 - lib/sass/embedded/protocol_error.rb
@@ -165,8 +164,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.17.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.17.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.18.3
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.18.3
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -176,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class Compiler
-      PATH = File.absolute_path(
-        "../../../../ext/sass/sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__
-      )
-    end
-  end
-end