sass-embedded 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4a71f28bfa6faf9c0e4d39587a78e05d18f907a412b689283fca8b8184195f5
-  data.tar.gz: d7b2f473c517e43f104b81b7818ed709d74f20c8c833103df1a1c6bd3718a563
+  metadata.gz: 7b1b7d4e1bdfae2dbb2f99b43c42c0e06673a5f4f8c92b213efdfa4535a56b5b
+  data.tar.gz: 23fe4aeaeab07ddf717e7f2fad75d3fc9d9c82db4f4606763e52df8450113f59
 SHA512:
-  metadata.gz: 74eb4043c28ddba5c4b189454872057cecccb9d536a637da8345f3b8934e2496cc7f5ff56d7371dda9d794e5610fbc1eda47f1dfde92e16d135f48c6a9f02f6a
-  data.tar.gz: ad9631c22232163d842c5e7a688ea50fd990a54ef199dcb46893bdb6572622b6cc05e71b8f75b4108803cfeea8d00f96acc07825d7bd9de598d743c817e1ebef
+  metadata.gz: 13f8c565606af71bad343b5863ca3c792897d9a7bfea0071f17c510d99b6f0bf4d995441433572ba6aab2ca7489b9202c70fee3db4fc1c63fd15a5d4a5e8f593
+  data.tar.gz: a9bcd6caf920377fd86aa94f1ef536582f41483e0b0fca252718995af25037162eb2e77ee61cf6fc8d761195c10da48ebbf6dcb48de0c723cf0d01d46de0c1c6

data/lib/sass/info.rb

@@ -2,10 +2,15 @@
 
 module Sass
   # The {Observer} for {Embedded#info}.
-  class Version < Observer
+  class Version
+    include Observer
+
     def initialize(transport, id)
-      super(transport, id)
-      @transport.send EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
+      @id = id
+
+      super(transport)
+
+      send_message EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
     end
 
     def update(error, message)

data/lib/sass/observer.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 module Sass
-  # The {Observer} for receiving messages from {Transport}.
-  class Observer
-    def initialize(transport, id)
-      raise NotImplementedError if instance_of? Observer
-
+  # The {Observer} module for receiving messages from {Transport}.
+  module Observer
+    def initialize(transport)
       @transport = transport
-      @id = id
       @mutex = Mutex.new
       @condition_variable = ConditionVariable.new
       @error = nil
@@ -33,5 +30,11 @@ module Sass
         @condition_variable.broadcast
       end
     end
+
+    private
+
+    def send_message(message)
+      @transport.send_message(message)
+    end
   end
 end

data/lib/sass/render.rb

@@ -2,7 +2,9 @@
 
 module Sass
   # The {Observer} for {Embedded#render}.
-  class Render < Observer
+  class Render
+    include Observer
+
     def initialize(transport, id,
                    data:,
                    file:,
@@ -15,8 +17,7 @@ module Sass
                    importer:)
       raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
 
-      super(transport, id)
-
+      @id = id
       @data = data
       @file = file
       @indented_syntax = indented_syntax
@@ -31,7 +32,9 @@ module Sass
       @importer = importer
       @import_responses = {}
 
-      @transport.send compile_request
+      super(transport)
+
+      send_message compile_request
     end
 
     def update(error, message)
@@ -54,13 +57,13 @@ module Sass
         return unless message.compilation_id == @id
 
         Thread.new do
-          @transport.send canonicalize_response message
+          send_message canonicalize_response message
         end
       when EmbeddedProtocol::OutboundMessage::ImportRequest
         return unless message.compilation_id == @id
 
         Thread.new do
-          @transport.send import_response message
+          send_message import_response message
         end
       when EmbeddedProtocol::OutboundMessage::FileImportRequest
         raise NotImplementedError, 'FileImportRequest is not implemented'
@@ -68,7 +71,7 @@ module Sass
         return unless message.compilation_id == @id
 
         Thread.new do
-          @transport.send function_call_response message
+          send_message function_call_response message
         end
       end
     rescue StandardError => e

data/lib/sass/transport.rb

@@ -5,7 +5,7 @@ require 'observer'
 require_relative '../../ext/embedded_sass_pb'
 
 module Sass
-  # The {Observable} {Transport} for low level communication with
+  # The {::Observable} {Transport} for low level communication with
   # `dart-sass-embedded` using protocol buffers via stdio. Received messages
   # can be observed by an {Observer}.
   class Transport
@@ -29,7 +29,7 @@ module Sass
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
       pipe @stderr, $stderr
-      receive
+      receive_message @stdout
     end
 
     def add_observer(*args)
@@ -38,7 +38,7 @@ module Sass
       end
     end
 
-    def send(message)
+    def send_message(message)
       write EmbeddedProtocol::InboundMessage.new(
         ONEOF_MESSAGE[message.class.descriptor] => message
       ).to_proto
@@ -58,17 +58,17 @@ module Sass
 
     private
 
-    def receive
+    def receive_message(readable)
       Thread.new do
         loop do
           bits = length = 0
           loop do
-            byte = @stdout.readbyte
+            byte = readable.readbyte
             length += (byte & 0x7f) << bits
             bits += 7
             break if byte <= 0x7f
           end
-          payload = @stdout.read length
+          payload = readable.read length
           message = EmbeddedProtocol::OutboundMessage.decode payload
           @observerable_mutex.synchronize do
             changed
@@ -87,7 +87,7 @@ module Sass
     def pipe(readable, writeable)
       Thread.new do
         loop do
-          writeable.write readable.read
+          writeable.write readable.readline
         rescue Interrupt
           break
         rescue IOError => e

data/lib/sass/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - なつき