sass-embedded 0.7.4 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a920bc1fd2f9767c87dcc604c8ad44266b285310a7b0e9e46cf65c7a610ba4d
-  data.tar.gz: 8041922c104b94fb0bc4634735444315692a0d9a37a50db3cf213a9914455bb0
+  metadata.gz: af2d3d643f4731906f3b71e6340fb733dafdb85a09892c3fbf0ddac377835fcc
+  data.tar.gz: a7827876ce4b50f3f5165aad572a1d1512c0161ac121efe234a0607495aec822
 SHA512:
-  metadata.gz: 180d0212926afd166fafc991cf30e8af33adc843171ec69d53a4b42ad7d587857e77a224cf8c25f343af7bacd6b76eeb5f2b93fd7c9886d2fd83105de3d891cc
-  data.tar.gz: 3d91c28089e6157b815a63cdc5b93d8adc2bb81f56828d6e3554c633ed31d845c070361797f32b45ae3bfbc39e034866a2c8e17f80a2222b5c827f9a2669a985
+  metadata.gz: 6a2f02e3e0506330c5777d0b1bd8c13ef380e7329d3ba8d393d8e3ac7550e208eb27346a333094a9cc5b7ae16b8a031c2285727abff0f5b544f35257fc32451a
+  data.tar.gz: 5b87374beb7554219fccf1cdc9e692f724f595ec39ce710ae2153bd39d0a54fb1759763fabee651b708843081563c21e1fdf42873ccbd217f175cd2d8c75fea3

data/lib/sass.rb

@@ -69,5 +69,5 @@ require_relative 'sass/error'
 require_relative 'sass/transport'
 require_relative 'sass/observer'
 require_relative 'sass/info'
-require_relative 'sass/render'
+require_relative 'sass/compile'
 require_relative 'sass/embedded'

data/lib/sass/{render.rb → compile.rb}

@@ -2,7 +2,7 @@
 
 module Sass
   # The {Observer} for {Embedded#render}.
-  class Render
+  class CompileContext
     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
 

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 = CompileContext.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(

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/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

@@ -10,6 +10,8 @@ module Sass
 
     URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
+    private_constant :URI_PARSER
+
     def file_uri_from_path(path)
       absolute_path = File.absolute_path(path)
 

data/lib/sass/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.9
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -150,12 +150,12 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/sass.rb
+- lib/sass/compile.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/info.rb
 - lib/sass/observer.rb
 - lib/sass/platform.rb
-- lib/sass/render.rb
 - lib/sass/result.rb
 - lib/sass/struct.rb
 - lib/sass/transport.rb
@@ -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.4
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.9
 post_install_message:
 rdoc_options: []
 require_paths: