sass-embedded 0.13.0 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11917ed4d9543adf380300ee5ba1db25d8681a69db35b6e4fe6ac83b4e1b07a6
-  data.tar.gz: ca18113ebee1ba530183bb477e4f927c0966903caa12174bba54382006ab5a8d
+  metadata.gz: 891f4a0e1dbda14a01b411167cc6c9e6e0a73bd42b4a5ac903335619da08f95e
+  data.tar.gz: 97371b93430f4232eb68d9e5e1b4d15b9f75246ed530935e525160d383f5ec88
 SHA512:
-  metadata.gz: 420269d9de74346fcceb81c391b7eafef25b9001d4c3ce67959bb1d6da1d4a6838c1ae9a22f794fc31b44ad2961ed55ecbf94f0bf980dc316ee7a6e51b87b88d
-  data.tar.gz: dd7bb981674b7a19f91169c402e540ff2d77abf50461383b7431a986cab21f06c7de8124825050325cfb8296f8066a95b2a03ebdd3c3da754aeb50bf4cf998aa
+  metadata.gz: 0c4aabe5670786260198093754baaf57a4142894829a2242af0db4268394794b302fce042050e396f3dc495be1036a5df29cf73e47ea1dd661236f3d55692db6
+  data.tar.gz: 87ebbf21f8c9c87c662b0eca0010d008ec62aab94653059cbc64af607737544413154c3b88133c63c4eec11e15e4175fb05844d3371de44b966aa7382c5a52c4

data/lib/sass/embedded/compile_context.rb

@@ -34,7 +34,7 @@ module Sass
         @path = path
         @source = source
 
-        @importer = importer
+        @importer = to_struct(importer)
         @load_paths = load_paths
         @syntax = syntax
         @url = url
@@ -48,14 +48,14 @@ module Sass
         @functions = functions.transform_keys do |key|
           key.to_s.split('(')[0].chomp
         end
-        @importers = importers
+        @importers = importers.map do |obj|
+          to_struct(obj)
+        end
 
         @alert_ascii = alert_ascii
         @alert_color = alert_color
 
-        %i[debug warn].each do |sym|
-          instance_variable_set("@#{sym}".to_sym, get_method(logger, sym))
-        end
+        @logger = to_struct(logger)
 
         @quiet_deps = quiet_deps
         @verbose = verbose
@@ -115,26 +115,26 @@ module Sass
       def log(event)
         case event.type
         when :DEBUG
-          if @debug.nil?
-            Kernel.warn(event.formatted)
+          if @logger.respond_to? :debug
+            @logger.debug(event.message, span: Logger::SourceSpan.from_proto(event.span))
           else
-            @debug.call(event.message, span: Logger::SourceSpan.from_proto(event.span))
+            Kernel.warn(event.formatted)
           end
         when :DEPRECATION_WARNING
-          if @warn.nil?
-            Kernel.warn(event.formatted)
+          if @logger.respond_to? :warn
+            @logger.warn(event.message, deprecation: true,
+                                        span: Logger::SourceSpan.from_proto(event.span),
+                                        stack: event.stack_trace)
           else
-            @warn.call(event.message, deprecation: true,
-                                      span: Logger::SourceSpan.from_proto(event.span),
-                                      stack: event.stack_trace)
+            Kernel.warn(event.formatted)
           end
         when :WARNING
-          if @warn.nil?
-            Kernel.warn(event.formatted)
+          if @logger.respond_to? :warn
+            @logger.warn(event.message, deprecation: false,
+                                        span: Logger::SourceSpan.from_proto(event.span),
+                                        stack: event.stack_trace)
           else
-            @warn.call(event.message, deprecation: false,
-                                      span: Logger::SourceSpan.from_proto(event.span),
-                                      stack: event.stack_trace)
+            Kernel.warn(event.formatted)
           end
         end
       end
@@ -162,9 +162,9 @@ module Sass
       end
 
       def canonicalize_response(canonicalize_request)
-        importer = importer_with_id(canonicalize_request.importer_id)
-        url = get_method(importer, :canonicalize).call canonicalize_request.url,
-                                                       from_import: canonicalize_request.from_import
+        importer = importer_of_id canonicalize_request.importer_id
+        url = importer.canonicalize canonicalize_request.url,
+                                    from_import: canonicalize_request.from_import
 
         EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
           id: canonicalize_request.id,
@@ -178,15 +178,15 @@ module Sass
       end
 
       def import_response(import_request)
-        importer = importer_with_id(import_request.importer_id)
-        importer_result = get_method(importer, :load).call import_request.url
+        importer = importer_of_id import_request.importer_id
+        importer_result = to_struct importer.load(import_request.url)
 
         EmbeddedProtocol::InboundMessage::ImportResponse.new(
           id: import_request.id,
           success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-            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)
+            contents: importer_result.contents,
+            syntax: to_proto_syntax(importer_result.syntax),
+            source_map_url: importer_result.respond_to?(:source_map_url) ? importer_result.source_map_url : nil
           )
         )
       rescue StandardError => e
@@ -197,9 +197,9 @@ module Sass
       end
 
       def file_import_response(file_import_request)
-        file_importer = importer_with_id(file_import_request.importer_id)
-        file_url = get_method(file_importer, :find_file_url).call file_import_request.url,
-                                                                  from_import: file_import_request.from_import
+        importer = importer_of_id file_import_request.importer_id
+        file_url = importer.find_file_url 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:')
 
@@ -254,8 +254,8 @@ module Sass
       end
 
       def to_proto_importer(importer, id)
-        is_importer = get_method(importer, :canonicalize) && get_method(importer, :load)
-        is_file_importer = get_method(importer, :find_file_url)
+        is_importer = importer.respond_to?(:canonicalize) && importer.respond_to?(:load)
+        is_file_importer = importer.respond_to?(:find_file_url)
 
         if is_importer && !is_file_importer
           EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
@@ -284,7 +284,7 @@ module Sass
         proto_importers
       end
 
-      def importer_with_id(id)
+      def importer_of_id(id)
         if id == @importers.length
           @importer
         else
@@ -292,30 +292,22 @@ module Sass
         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 to_struct(obj)
+        return obj unless obj.is_a? Hash
 
-      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]
+        struct = Object.new
+        obj.each do |key, value|
+          if value.respond_to? :call
+            struct.define_singleton_method key.to_sym do |*args, **kwargs|
+              value.call(*args, **kwargs)
+            end
+          else
+            struct.define_singleton_method key.to_sym do
+              value
+            end
           end
         end
+        struct
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Sass
   class Embedded
     class Compiler
-      REQUIREMENTS = '~> 1.49.6'
+      REQUIREMENTS = '~> 1.49.7'
     end
   end
 end

data/lib/sass/embedded/url.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'uri'
+require_relative 'platform'
 
 module Sass
   class Embedded

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.13.0'
+    VERSION = '0.13.4'
   end
 end

data/lib/sass/embedded.rb

@@ -2,13 +2,13 @@
 
 require_relative 'compile_error'
 require_relative 'compile_result'
-require_relative 'importer_result'
 require_relative 'embedded/channel'
 require_relative 'embedded/compile_context'
 require_relative 'embedded/render'
 require_relative 'embedded/url'
 require_relative 'embedded/version'
 require_relative 'embedded/version_context'
+require_relative 'importer_result'
 require_relative 'logger'
 
 module Sass
@@ -123,7 +123,7 @@ module Sass
     #
     # @raise [ProtocolError]
     def info
-      @info ||= VersionContext.new(@channel).receive_message
+      @info ||= "sass-embedded\t#{VersionContext.new(@channel).receive_message.implementation_version}"
     end
 
     def close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.4
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -192,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.13.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.13.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.13.4
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.13.4
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []