sass-embedded 0.16.2 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4a584b02baef5fc270ec2ce84d7843c01f3656e64aa0c30e303a1d4c123313
-  data.tar.gz: d2230700daf1964f727ca1e5d5c695244cdb1d304700ad15997526ccb62ad31c
+  metadata.gz: b9eeafb6dcad576b707936df8fe78e0de78712c7a1fb51c0adc372a83721d371
+  data.tar.gz: 5f1a354a8c9b08f37f6215c9d9a53582b0eef7e48f62c84d910671ae960b2677
 SHA512:
-  metadata.gz: 9fc031920618a3bc5b40a5c146b7ef8fc56b9d048b5c481b214425f3e17b72d05651ef1645b29ac08a15c5504d0c48b4f6605e6e5c13224560a9b26d212b13e9
-  data.tar.gz: e2a1e112ab8241f2a5393d01b237d1a9d41dcca7f386fdaa42a287c5a9cd82d4a6ec909775598a4235a373573ff76381df302f07f16861399ecad35734ea9913
+  metadata.gz: 50ac1de6a47ac9becebe4f229ffd6befbc25a0a481a4551e88fc600ff8934f554ab1ecc35bee8e68847d5d2315058d9a21a4952cd4ee86b3ccf011c21ec62ed9
+  data.tar.gz: daa53389ab4d49e5d8a6189eaf4391a978a640444b79279b401beac6070086db4903786b4df9d6ee9a0216a4391e3f4cb32a9be2c1c25c4ec9eae3a145f065c1

data/ext/sass/extconf.rb

@@ -5,8 +5,7 @@ require 'fileutils'
 require 'json'
 require 'mkmf'
 require 'open-uri'
-require_relative '../../lib/sass/embedded/compiler/path'
-require_relative '../../lib/sass/embedded/compiler/requirements'
+require_relative '../../lib/sass/embedded/compiler'
 
 module Sass
   class Embedded
@@ -123,56 +122,12 @@ module Sass
         raise
       end
 
-      def resolve_tag_name(repo, *requirements, gh_release: true)
-        requirements = Gem::Requirement.create(*requirements)
-
-        satisfied = lambda { |version|
-          Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version))
-        }
-
-        headers = {}
-        headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
-
-        begin
-          if gh_release
-            releases_uri = "https://github.com/#{repo}/releases"
-            uri = "#{releases_uri}/latest"
-            tag_name = URI.parse(uri).open do |file|
-              return nil if file.base_uri == releases_uri
-
-              latest = File.basename file.base_uri.to_s
-              latest if satisfied.call latest
-            end
-
-            return tag_name unless tag_name.nil?
-
-            uri = "https://api.github.com/repos/#{repo}/releases?per_page=100"
-            tag_name = URI.parse(uri).open(headers) do |file|
-              JSON.parse(file.read).map { |release| release['tag_name'] }
-            end
-                          .find(satisfied)&.peek
-          else
-            uri = "https://api.github.com/repos/#{repo}/tags?per_page=100"
-            tag_name = URI.parse(uri).open(headers) do |file|
-              JSON.parse(file.read).map { |tag| tag['name'] }
-            end
-                          .find(satisfied)&.peek
-          end
-
-          return tag_name unless tag_name.nil?
-        rescue OpenURI::HTTPError => e
-          warn "WARNING:  Error fetching #{uri}: #{e}"
-        end
-
-        requirements.requirements
-                    .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
-                    .find(satisfied)&.peek
-      end
-
       def default_sass_embedded
         repo = 'sass/dart-sass-embedded'
 
-        tag_name = resolve_tag_name(repo, Compiler::REQUIREMENTS)
+        spec = JSON.parse(File.read(File.absolute_path('package.json', __dir__)))
+
+        tag_name = spec['dependencies']['sass-embedded']
 
         os = case Platform::OS
              when 'darwin'

data/ext/sass/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "sass-embedded": "1.49.8"
+  }
+}

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(*_args, **_kwargs)
+      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(

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
@@ -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.16.2'
+    VERSION = '0.18.2'
   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.16.2
+  version: 0.18.2
 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
@@ -121,6 +121,7 @@ files:
 - README.md
 - ext/sass/Makefile
 - ext/sass/extconf.rb
+- ext/sass/package.json
 - ext/sass/unzip.vbs
 - lib/sass-embedded.rb
 - lib/sass.rb
@@ -134,8 +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/compiler/requirements.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.16.2
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.16.2
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.18.2
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.18.2
   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

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

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class Compiler
-      REQUIREMENTS = '~> 1.49.8'
-    end
-  end
-end