sass-embedded 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9afb73da6288ecf0360685cc9ddb4c072eb8840da50acaa8a52b67f09998e6c
-  data.tar.gz: 1a20d885e2e9f55ffd861f9428499f4c3bdea64a4aea81e44f356af8be69eccc
+  metadata.gz: 44a04b95b0d29cda95382a09cb00512ff6c2bb3f2c93b04f6171678856f648b7
+  data.tar.gz: 944fefc7cc7507a20ebea9154c412bd99cc5cf9e2d698d604bcf0dd71e287aeb
 SHA512:
-  metadata.gz: 679cfc5b502de2fdc5b33c8117b7e1d68f94acd62c7afbe04ebb17f9bceacdc677e8b35197cf239f92fed4e3d523468d71798d899c360d8402be127bdb50ac48
-  data.tar.gz: e1d698b3980914299ee2ce570bd1f109a875859c147f8930366df8e2dabcae94f0e0795339f6614f3f7828e365c191ba24554e30869e4bd106f565f1cbbb9af2
+  metadata.gz: a6088c2f97962305cea6dadcf4e5b5cb24d8332b9de55a2c42ebcc7c1929661d84dc40598e4167b5c74489eeeb898e8f47cdb638c0492a63c22124b7b14f1641
+  data.tar.gz: 2894b4ae45d5f2eea15d99a403b1641f6ec5192d79b06765b3c7d765aa11255c3513f2f754d8405a8c9b32dc51f6f6ace8caf928f412e6e1334c0d979c6ae0b8

data/lib/sass.rb

@@ -2,43 +2,51 @@
 
 # The Sass module
 module Sass
-  # The global include_paths for Sass files. This is meant for plugins and
-  # libraries to register the paths to their Sass stylesheets to that they may
-  # be `@imported`. This include path is used by every instance of
-  # {Sass::Embedded}. They are lower-precedence than any include paths passed
-  # in via the `:include_paths` option.
-  #
-  # If the `SASS_PATH` environment variable is set,
-  # the initial value of `include_paths` will be initialized based on that.
-  # The variable should be a colon-separated list of path names
-  # (semicolon-separated on Windows).
-  #
-  # @example
-  #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
-  # @return [Array<String, Pathname>]
-  def self.include_paths
-    @include_paths ||= if ENV['SASS_PATH']
-                         ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
-                       else
-                         []
-                       end
-  end
+  class << self
+    # The global include_paths for Sass files. This is meant for plugins and
+    # libraries to register the paths to their Sass stylesheets to that they may
+    # be `@imported`. This include path is used by every instance of
+    # {Sass::Embedded}. They are lower-precedence than any include paths passed
+    # in via the `:include_paths` option.
+    #
+    # If the `SASS_PATH` environment variable is set,
+    # the initial value of `include_paths` will be initialized based on that.
+    # The variable should be a colon-separated list of path names
+    # (semicolon-separated on Windows).
+    #
+    # @example
+    #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
+    # @return [Array<String, Pathname>]
+    def include_paths
+      @include_paths ||= if ENV['SASS_PATH']
+                           ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
+                         else
+                           []
+                         end
+    end
+
+    def info
+      embedded.info
+    end
+
+    # The global render methods. This method automatically instantiates a
+    # global {Sass::Embedded} instance when invoked the first time and call
+    # `:render` method on the instance thereafter. The global {Sass::Embedded}
+    # is automatically closed via {Kernel.at_exit}.
+    # @example
+    #   Sass.render(options)
+    # @return [Hash]
+    def render(**kwargs)
+      embedded.render(**kwargs)
+    end
+
+    private
+
+    def embedded
+      return @embedded if defined?(@embedded) && !@embedded.closed?
 
-  # The global render methods. This method automatically instantiates a
-  # global {Sass::Embedded} instance when invoked the first time and call
-  # `:render` method on the instance thereafter. The global {Sass::Embedded}
-  # is automatically closed via {Kernel.at_exit}.
-  # @example
-  #   Sass.render(options)
-  # @return [Hash]
-  def self.render(**kwargs)
-    unless defined? @embedded
       @embedded = Sass::Embedded.new
-      at_exit do
-        @embedded.close
-      end
     end
-    @embedded.render(**kwargs)
   end
 end
 
@@ -47,4 +55,5 @@ require_relative 'sass/error'
 require_relative 'sass/platform'
 require_relative 'sass/util'
 require_relative 'sass/transport'
+require_relative 'sass/context'
 require_relative 'sass/embedded'

data/lib/sass/context.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Sass
+  # An abstract context for maintaining state and observing transport
+  class Context
+    def initialize(transport, id)
+      raise NotImplementedError if instance_of? Context
+
+      @transport = transport
+      @id = id
+      @mutex = Mutex.new
+      @condition_variable = ConditionVariable.new
+      @response = nil
+      @error = nil
+      @transport.add_observer self
+    end
+
+    def fetch
+      @mutex.synchronize do
+        @condition_variable.wait(@mutex) if @error.nil? && @response.nil?
+      end
+
+      raise @error unless @error.nil?
+
+      @response
+    end
+
+    def update(error, message)
+      @transport.delete_observer self
+      @mutex.synchronize do
+        @error = error
+        @response = message
+        @condition_variable.broadcast
+      end
+    end
+  end
+end

data/lib/sass/embedded.rb

@@ -13,9 +13,7 @@ module Sass
     end
 
     def info
-      @transport.send EmbeddedProtocol::InboundMessage::VersionRequest.new(
-        id: next_id
-      )
+      @info ||= InfoContext.new(@transport, next_id).fetch
     end
 
     def render(data: nil,
@@ -42,44 +40,24 @@ module Sass
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      compilation_id = next_id
-
-      renderer = Renderer.new(
-        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
-      )
-
-      response = @transport.send renderer.compile_request(compilation_id), compilation_id
-
-      loop do
-        case response
-        when EmbeddedProtocol::OutboundMessage::CompileResponse
-          break
-        when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
-          response = @transport.send renderer.canonicalize_response(response), compilation_id
-        when EmbeddedProtocol::OutboundMessage::ImportRequest
-          response = @transport.send renderer.import_response(response), compilation_id
-        when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
-          response = @transport.send renderer.function_call_response(response), compilation_id
-        when EmbeddedProtocol::ProtocolError
-          raise ProtocolError, response.message
-        else
-          raise ProtocolError, "Unexpected packet received: #{response}"
-        end
-      end
+      response = 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).fetch
 
       if response.failure
         raise RenderError.new(
           response.failure.message,
           response.failure.formatted,
-          if response.failure.span&.url == ''
+          if response.failure.span.nil?
+            nil
+          elsif response.failure.span.url == ''
             'stdin'
           else
             Util.path(response.failure.span.url)
@@ -122,7 +100,10 @@ module Sass
 
     def close
       @transport.close
-      nil
+    end
+
+    def closed?
+      @transport.closed?
     end
 
     private
@@ -239,9 +220,39 @@ module Sass
       end
     end
 
-    # Helper class that maintains render state
-    class Renderer
-      def initialize(data:,
+    # InfoContext
+    class InfoContext < Context
+      def initialize(transport, id)
+        super(transport, id)
+        @transport.send EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
+      end
+
+      def update(error, message)
+        raise error unless error.nil?
+
+        response = message[message.message.to_s]
+
+        case response
+        when EmbeddedProtocol::ProtocolError
+          raise ProtocolError, response.message
+        when EmbeddedProtocol::OutboundMessage::VersionResponse
+          return unless response.id == @id
+
+          Thread.new do
+            super(nil, response)
+          end
+        end
+      rescue StandardError => e
+        Thread.new do
+          super(e, nil)
+        end
+      end
+    end
+
+    # RenderContext
+    class RenderContext < Context
+      def initialize(transport, id,
+                     data:,
                      file:,
                      indented_syntax:,
                      include_paths:,
@@ -252,6 +263,8 @@ module Sass
                      importer:)
         raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
 
+        super(transport, id)
+
         @data = data
         @file = file
         @indented_syntax = indented_syntax
@@ -265,11 +278,58 @@ module Sass
         end
         @importer = importer
         @import_responses = {}
+
+        @transport.send compile_request
+      end
+
+      def update(error, message)
+        raise error unless error.nil?
+
+        response = message[message.message.to_s]
+
+        case response
+        when EmbeddedProtocol::ProtocolError
+          raise ProtocolError, response.message
+        when EmbeddedProtocol::OutboundMessage::CompileResponse
+          return unless response.id == @id
+
+          Thread.new do
+            super(nil, response)
+          end
+        when EmbeddedProtocol::OutboundMessage::LogEvent
+          # not implemented yet
+        when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
+          return unless response['compilation_id'] == @id
+
+          Thread.new do
+            @transport.send canonicalize_response(response)
+          end
+        when EmbeddedProtocol::OutboundMessage::ImportRequest
+          return unless response['compilation_id'] == @id
+
+          Thread.new do
+            @transport.send import_response(response)
+          end
+        when EmbeddedProtocol::OutboundMessage::FileImportRequest
+          raise NotImplementedError, 'FileImportRequest is not implemented'
+        when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
+          return unless response['compilation_id'] == @id
+
+          Thread.new do
+            @transport.send function_call_response(response)
+          end
+        end
+      rescue StandardError => e
+        Thread.new do
+          super(e, nil)
+        end
       end
 
-      def compile_request(id)
+      private
+
+      def compile_request
         EmbeddedProtocol::InboundMessage::CompileRequest.new(
-          id: id,
+          id: @id,
           string: string,
           path: path,
           style: style,
@@ -359,8 +419,6 @@ module Sass
         )
       end
 
-      private
-
       def syntax
         if @indented_syntax == true
           EmbeddedProtocol::Syntax::INDENTED

data/lib/sass/transport.rb

@@ -25,37 +25,16 @@ module Sass
       receive
     end
 
-    def send(req, id)
-      mutex = Mutex.new
-      resource = ConditionVariable.new
-
-      req_kind = req.class.name.split('::').last.gsub(/\B(?=[A-Z])/, '_').downcase
-
-      message = EmbeddedProtocol::InboundMessage.new(req_kind => req)
-
-      error = nil
-      res = nil
-
+    def add_observer(*args)
       @observerable_semaphore.synchronize do
-        MessageObserver.new self, id do |e, r|
-          mutex.synchronize do
-            error = e
-            res = r
-
-            resource.signal
-          end
-        end
-      end
-
-      mutex.synchronize do
-        write message.to_proto
-
-        resource.wait(mutex)
+        super(*args)
       end
+    end
 
-      raise error if error
-
-      res
+    def send(req)
+      req_kind = req.class.name.split('::').last.gsub(/\B(?=[A-Z])/, '_').downcase
+      message = EmbeddedProtocol::InboundMessage.new(req_kind => req)
+      write message.to_proto
     end
 
     def close
@@ -66,6 +45,10 @@ module Sass
       nil
     end
 
+    def closed?
+      @stdin.closed?
+    end
+
     private
 
     def receive
@@ -78,10 +61,11 @@ module Sass
             bits += 7
             break if byte <= 0x7f
           end
-          changed
           payload = @stdout.read length
+          message = EmbeddedProtocol::OutboundMessage.decode payload
           @observerable_semaphore.synchronize do
-            notify_observers nil, EmbeddedProtocol::OutboundMessage.decode(payload)
+            changed
+            notify_observers nil, message
           end
         rescue Interrupt
           break
@@ -119,32 +103,5 @@ module Sass
         @stdin.write payload
       end
     end
-
-    # The observer used to listen on messages from stdout, check if id
-    # matches the given request id, and yield back to the given block.
-    class MessageObserver
-      def initialize(obs, id, &block)
-        @obs = obs
-        @id = id
-        @block = block
-        @obs.add_observer self
-      end
-
-      def update(error, message)
-        if error
-          @obs.delete_observer self
-          @block.call error, nil
-        elsif message.error&.id == Transport::PROTOCOL_ERROR_ID
-          @obs.delete_observer self
-          @block.call ProtocolError.new(message.error.message), nil
-        else
-          res = message[message.message.to_s]
-          if (res['compilation_id'] || res['id']) == @id
-            @obs.delete_observer self
-            @block.call error, res
-          end
-        end
-      end
-    end
   end
 end

data/lib/sass/version.rb

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

data/sass-embedded.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.require_paths = ['lib']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -155,6 +155,7 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/sass.rb
+- lib/sass/context.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/platform.rb
@@ -185,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="