sass-embedded 0.7.3 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d80ba547e32d13dc4a4b9f0760e8203df64c5481dea662564e1872bff6bec9
-  data.tar.gz: 363baff44d6a57b5ad5cd6e8963c915b582a147b2c360182e8218ce4ae7a7338
+  metadata.gz: 182ccd964e82f33282215272b2fe64abb8caa446988d81564c85e237236e3db4
+  data.tar.gz: 72ff376803cd9da9de460e6418c8c9025c8c8614d4ce331cf837ed0ac554e713
 SHA512:
-  metadata.gz: 12f310e82141b47c7fe61b06a03df7abd00ec06cb9b268aa6c29bd28a523d7182014caaabdd314bebcaeeddad7c62517cb0fda180a81a4ca276862207f8f796b
-  data.tar.gz: 5d4a397ec28e27cedc67c3467a2ffa91b9d8fe0e3ae02b0939fb29fa05a61a0156a7a5a3a6c6eceb6a8049b23867136a94b3962e360db29dd8d3427032f2a52e
+  metadata.gz: 358fb5171fcfd2af9e687e4a8a1662644504b71892f2b052d7340eaf44c32940958aa0bdf20b387ed5cd33b33fa4091751cceb96e08d9d899000100ca9554a4d
+  data.tar.gz: c94db17eae89bcc55d3ea762bb5e138e701f1b1d209f6033e0f33639a4ee6324865230734a026a96f2a5fa5287e8710e89badbb3965a0bfe7d790eb7d1e8e380

data/lib/sass/embedded.rb

@@ -23,7 +23,7 @@ module Sass
     #
     # @raise [ProtocolError]
     def info
-      @info ||= Version.new(@transport, next_id).message
+      @info ||= VersionContext.new(@transport, next_id).receive_message
     end
 
     # The {Embedded#render} method.
@@ -55,16 +55,16 @@ module Sass
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      message = Render.new(@transport, next_id,
-                           data: data,
-                           file: file,
-                           indented_syntax: indented_syntax,
-                           include_paths: include_paths,
-                           output_style: output_style,
-                           source_map: source_map,
-                           out_file: out_file,
-                           functions: functions,
-                           importer: importer).message
+      message = RenderContext.new(@transport, next_id,
+                                  data: data,
+                                  file: file,
+                                  indented_syntax: indented_syntax,
+                                  include_paths: include_paths,
+                                  output_style: output_style,
+                                  source_map: source_map,
+                                  out_file: out_file,
+                                  functions: functions,
+                                  importer: importer).receive_message
 
       if message.failure
         raise RenderError.new(
@@ -75,7 +75,7 @@ module Sass
           elsif message.failure.span.url == ''
             'stdin'
           else
-            Util.path(message.failure.span.url)
+            Util.path_from_file_uri(message.failure.span.url)
           end,
           message.failure.span ? message.failure.span.start.line + 1 : nil,
           message.failure.span ? message.failure.span.start.column + 1 : nil,
@@ -138,7 +138,7 @@ module Sass
       source_map_dir = File.dirname(source_map_path)
 
       if out_file
-        map_data['file'] = Util.relative(source_map_dir, out_file)
+        map_data['file'] = Util.relative_path(source_map_dir, out_file)
       elsif file
         ext = File.extname(file)
         map_data['file'] = "#{file[0..(ext.empty? ? -1 : -ext.length - 1)]}.css"
@@ -149,10 +149,10 @@ module Sass
       map_data['sourcesContent'] = [] if source_map_contents
 
       map_data['sources'].map! do |source|
-        if source.start_with? Util::FILE_PROTOCOL
-          path = Util.path(source)
+        if source.start_with? 'file://'
+          path = Util.path_from_file_uri(source)
           map_data['sourcesContent'].push(File.read(path)) if source_map_contents
-          Util.relative(source_map_dir, path)
+          Util.relative_path(source_map_dir, path)
         else
           map_data['sourcesContent'].push(nil) if source_map_contents
           source
@@ -184,7 +184,7 @@ module Sass
         url = if source_map_embed
                 "data:application/json;base64,#{Base64.strict_encode64(map)}"
               elsif out_file
-                Util.relative(File.dirname(out_file), source_map)
+                Util.relative_path(File.dirname(out_file), source_map)
               else
                 source_map
               end

data/lib/sass/info.rb

@@ -2,7 +2,7 @@
 
 module Sass
   # The {Observer} for {Embedded#info}.
-  class Version
+  class VersionContext
     include Observer
 
     def initialize(transport, id)
@@ -17,8 +17,6 @@ module Sass
       raise error unless error.nil?
 
       case message
-      when EmbeddedProtocol::ProtocolError
-        raise ProtocolError, message.message
       when EmbeddedProtocol::OutboundMessage::VersionResponse
         return unless message.id == @id
 

data/lib/sass/observer.rb

@@ -12,7 +12,7 @@ module Sass
       @transport.add_observer self
     end
 
-    def message
+    def receive_message
       @mutex.synchronize do
         @condition_variable.wait(@mutex) if @error.nil? && @message.nil?
       end

data/lib/sass/render.rb

@@ -2,7 +2,7 @@
 
 module Sass
   # The {Observer} for {Embedded#render}.
-  class Render
+  class RenderContext
     include Observer
 
     def initialize(transport, id,
@@ -41,8 +41,6 @@ module Sass
       raise error unless error.nil?
 
       case message
-      when EmbeddedProtocol::ProtocolError
-        raise ProtocolError, message.message
       when EmbeddedProtocol::OutboundMessage::CompileResponse
         return unless message.id == @id
 
@@ -97,7 +95,7 @@ module Sass
     end
 
     def canonicalize_response(canonicalize_request)
-      url = Util.file_uri(File.absolute_path(canonicalize_request.url, (@file.nil? ? 'stdin' : @file)))
+      url = Util.file_uri_from_path(File.absolute_path(canonicalize_request.url, (@file.nil? ? 'stdin' : @file)))
 
       begin
         result = @importer[canonicalize_request.importer_id].call canonicalize_request.url, @file
@@ -123,7 +121,7 @@ module Sass
           url: url
         )
       elsif result&.key? :file
-        canonicalized_url = Util.file_uri(result[:file])
+        canonicalized_url = Util.file_uri_from_path(result[:file])
 
         # TODO: FileImportRequest is not supported yet.
         # Workaround by reading contents and return it when server asks
@@ -185,7 +183,7 @@ module Sass
     def url
       return if @file.nil?
 
-      Util.file_uri @file
+      Util.file_uri_from_path @file
     end
 
     def string

data/lib/sass/transport.rb

@@ -24,12 +24,18 @@ module Sass
       [field_descriptor.subtype, field_descriptor.name]
     end.to_h
 
+    private_constant :ONEOF_MESSAGE
+
     def initialize
       @observerable_mutex = Mutex.new
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
-      pipe @stderr, $stderr
-      read @stdout
+      poll do
+        warn(@stderr.readline, uplevel: 1)
+      end
+      poll do
+        receive_proto read
+      end
     end
 
     def add_observer(*args)
@@ -58,44 +64,41 @@ module Sass
 
     private
 
-    def receive_message(error, message)
-      @observerable_mutex.synchronize do
-        changed
-        notify_observers error, message
-      end
-    end
-
-    def pipe(readable, writeable)
+    def poll
       Thread.new do
         loop do
-          writeable.write readable.readline
-        rescue Interrupt
-          break
-        rescue IOError => e
-          receive_message(e, nil)
+          yield
+        rescue StandardError => e
+          notify_observers(e, nil)
           close
           break
         end
       end
     end
 
-    def read(readable)
-      Thread.new do
-        loop do
-          length = read_varint(readable)
-          payload = readable.read(length)
-          message = EmbeddedProtocol::OutboundMessage.decode payload
-          receive_message(nil, message[message.message.to_s])
-        rescue Interrupt
-          break
-        rescue IOError => e
-          receive_message(e, nil)
-          close
-          break
-        end
+    def notify_observers(*args)
+      @observerable_mutex.synchronize do
+        changed
+        super(*args)
       end
     end
 
+    def receive_proto(proto)
+      payload = EmbeddedProtocol::OutboundMessage.decode(proto)
+      message = payload[payload.message.to_s]
+      case message
+      when EmbeddedProtocol::ProtocolError
+        raise ProtocolError, message.message
+      else
+        notify_observers(nil, message)
+      end
+    end
+
+    def read
+      length = read_varint(@stdout)
+      @stdout.read(length)
+    end
+
     def write(payload)
       @stdin_mutex.synchronize do
         write_varint(@stdin, payload.length)

data/lib/sass/util.rb

@@ -1,39 +1,30 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require 'uri'
 
 module Sass
   # The {Util} module.
   module Util
     module_function
 
-    FILE_PROTOCOL = 'file://'
+    URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
-    def file_uri(path)
+    private_constant :URI_PARSER
+
+    def file_uri_from_path(path)
       absolute_path = File.absolute_path(path)
 
-      unless absolute_path.start_with? File::SEPARATOR
-        components = absolute_path.split File::SEPARATOR
-        components[0] = components[0][0].downcase
-        absolute_path = components.join File::SEPARATOR
-      end
+      absolute_path = File::SEPARATOR + absolute_path unless absolute_path.start_with? File::SEPARATOR
 
-      "#{FILE_PROTOCOL}#{absolute_path}"
+      URI_PARSER.escape("file://#{absolute_path}")
     end
 
-    def path(file_uri)
-      absolute_path = file_uri[FILE_PROTOCOL.length..]
-
-      unless absolute_path.start_with? File::SEPARATOR
-        components = absolute_path.split File::SEPARATOR
-        components[0] = "#{components[0].upcase}:"
-        absolute_path = components.join File::SEPARATOR
-      end
-
-      absolute_path
+    def path_from_file_uri(file_uri)
+      URI_PARSER.unescape(file_uri)[7..]
     end
 
-    def relative(from, to)
+    def relative_path(from, to)
       Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
     end
 

data/lib/sass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = '0.7.3'
+  VERSION = '0.7.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.8
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -165,7 +165,7 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.3
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.8
 post_install_message:
 rdoc_options: []
 require_paths: