sass-embedded 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a920bc1fd2f9767c87dcc604c8ad44266b285310a7b0e9e46cf65c7a610ba4d
-  data.tar.gz: 8041922c104b94fb0bc4634735444315692a0d9a37a50db3cf213a9914455bb0
+  metadata.gz: 107eda35f850f6a5d3744a89ba8dcd71abf8ea76659f0c51710ecde9f3233c53
+  data.tar.gz: f3e8d8d963f9a3bfffa00908b91e90d17fd4e9a04046a6c9a739e16b3eae5cb5
 SHA512:
-  metadata.gz: 180d0212926afd166fafc991cf30e8af33adc843171ec69d53a4b42ad7d587857e77a224cf8c25f343af7bacd6b76eeb5f2b93fd7c9886d2fd83105de3d891cc
-  data.tar.gz: 3d91c28089e6157b815a63cdc5b93d8adc2bb81f56828d6e3554c633ed31d845c070361797f32b45ae3bfbc39e034866a2c8e17f80a2222b5c827f9a2669a985
+  metadata.gz: a9e2dcfbd314b616b66c53511fe021006c20e0a359bb9769db7bf87d14d9377443e245abf88f5da6e1b4414d34d4d05e529885b79169db7c86f8029ed3c7f1f5
+  data.tar.gz: d8ade839bab88a4ff4098f1b045b31dfd532570dbadcb76866fc3c13be603c445583ea2fe2b86aa9ba7b2472272f992d9dd28ce21eb64aaf8693d1ec557660b9

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(

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)

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,

data/lib/sass/transport.rb

@@ -28,8 +28,12 @@ module Sass
       @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
+        $stderr.write @stderr.readline
+      end
+      poll do
+        receive_proto read
+      end
     end
 
     def add_observer(*args)
@@ -58,44 +62,37 @@ 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
+          yield
         rescue Interrupt
           break
         rescue IOError => e
-          receive_message(e, nil)
+          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)
+      message = EmbeddedProtocol::OutboundMessage.decode(proto)
+      notify_observers(nil, message[message.message.to_s])
+    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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - なつき
@@ -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.5
 post_install_message:
 rdoc_options: []
 require_paths: