sass-embedded 0.8.1 → 0.9.2

data/lib/sass/embedded.rb

@@ -2,10 +2,17 @@
 
 require 'base64'
 require 'json'
+require_relative 'embedded/channel'
+require_relative 'embedded/compile_context'
+require_relative 'embedded/error'
+require_relative 'embedded/result'
+require_relative 'embedded/util'
+require_relative 'embedded/version'
+require_relative 'embedded/version_context'
 
 module Sass
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
-  # its own {Transport}.
+  # its own {Channel}.
   #
   # @example
   #   embedded = Sass::Embedded.new
@@ -13,17 +20,23 @@ module Sass
   #   result = embedded.render(file: 'style.css')
   #   embedded.close
   class Embedded
+    def self.include_paths
+      @include_paths ||= if ENV['SASS_PATH']
+                           ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
+                         else
+                           []
+                         end
+    end
+
     def initialize
-      @transport = Transport.new
-      @id_semaphore = Mutex.new
-      @id = 0
+      @channel = Channel.new
     end
 
     # The {Embedded#info} method.
     #
     # @raise [ProtocolError]
     def info
-      @info ||= VersionContext.new(@transport, next_id).receive_message
+      @info ||= VersionContext.new(@channel).receive_message
     end
 
     # The {Embedded#render} method.
@@ -55,7 +68,7 @@ module Sass
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      message = CompileContext.new(@transport, next_id,
+      message = CompileContext.new(@channel,
                                    data: data,
                                    file: file,
                                    indented_syntax: indented_syntax,
@@ -109,11 +122,11 @@ module Sass
     end
 
     def close
-      @transport.close
+      @channel.close
     end
 
     def closed?
-      @transport.closed?
+      @channel.closed?
     end
 
     private
@@ -239,13 +252,5 @@ module Sass
         raise ArgumentError, 'linefeed must be one of :lf, :lfcr, :cr, :crlf'
       end
     end
-
-    def next_id
-      @id_semaphore.synchronize do
-        @id += 1
-        @id = 0 if @id == Compiler::PROTOCOL_ERROR_ID
-        @id
-      end
-    end
   end
 end

data/lib/sass/embedded_protocol.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative '../../ext/sass/embedded_sass_pb'
+
+module Sass
+  module EmbeddedProtocol
+    PROTOCOL_ERROR_ID = 4_294_967_295
+  end
+end

data/lib/sass.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'sass/embedded'
+
 # The Sass module. This communicates with Embedded Dart Sass using
 # the Embedded Sass protocol.
 module Sass
@@ -19,11 +21,7 @@ module Sass
     #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
     # @return [Array]
     def include_paths
-      @include_paths ||= if ENV['SASS_PATH']
-                           ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
-                         else
-                           []
-                         end
+      Embedded.include_paths
     end
 
     # The global {.info} method. This instantiates a global {Embedded} instance
@@ -31,7 +29,7 @@ module Sass
     #
     # @raise [ProtocolError]
     def info
-      embedded.info
+      instance.info
     end
 
     # The global {.render} method. This instantiates a global {Embedded} instance
@@ -47,28 +45,21 @@ module Sass
     # @raise [ProtocolError]
     # @raise [RenderError]
     def render(**kwargs)
-      embedded.render(**kwargs)
+      instance.render(**kwargs)
     end
 
     private
 
-    def embedded
-      return @embedded if defined?(@embedded) && !@embedded.closed?
-
-      @embedded = Sass::Embedded.new
+    def instance
+      if @instance.nil?
+        @instance = Embedded.new
+        at_exit do
+          @instance.close
+        end
+      elsif @instance.closed?
+        @instance = Embedded.new
+      end
+      @instance
     end
   end
 end
-
-require_relative 'sass/version'
-require_relative 'sass/platform'
-require_relative 'sass/compiler'
-require_relative 'sass/util'
-require_relative 'sass/struct'
-require_relative 'sass/result'
-require_relative 'sass/error'
-require_relative 'sass/transport'
-require_relative 'sass/observer'
-require_relative 'sass/info'
-require_relative 'sass/compile'
-require_relative 'sass/embedded'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.2
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.18.0
+        version: 3.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.18.0
+        version: 3.18.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.22.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.22.1
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -138,24 +138,26 @@ files:
 - ext/sass/unzip.vbs
 - lib/sass-embedded.rb
 - lib/sass.rb
-- lib/sass/compile.rb
-- lib/sass/compiler.rb
 - lib/sass/embedded.rb
-- lib/sass/error.rb
-- lib/sass/info.rb
-- lib/sass/observer.rb
-- lib/sass/platform.rb
-- lib/sass/result.rb
-- lib/sass/struct.rb
-- lib/sass/transport.rb
-- lib/sass/util.rb
-- lib/sass/version.rb
+- lib/sass/embedded/channel.rb
+- lib/sass/embedded/compile_context.rb
+- lib/sass/embedded/compiler.rb
+- lib/sass/embedded/compiler/path.rb
+- lib/sass/embedded/compiler/requirements.rb
+- lib/sass/embedded/error.rb
+- lib/sass/embedded/observer.rb
+- lib/sass/embedded/platform.rb
+- lib/sass/embedded/result.rb
+- lib/sass/embedded/util.rb
+- lib/sass/embedded/version.rb
+- lib/sass/embedded/version_context.rb
+- lib/sass/embedded_protocol.rb
 homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.8.1
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.8.1
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.9.2
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.9.2
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass/compile.rb

@@ -1,249 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # The {Observer} for {Embedded#render}.
-  class CompileContext
-    include Observer
-
-    def initialize(transport, id,
-                   data:,
-                   file:,
-                   indented_syntax:,
-                   include_paths:,
-                   output_style:,
-                   source_map:,
-                   out_file:,
-                   functions:,
-                   importer:)
-      raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
-
-      @id = 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
-      @global_functions = functions.keys
-      @functions = functions.transform_keys do |key|
-        key.to_s.split('(')[0].chomp
-      end
-      @importer = importer
-      @import_responses = {}
-
-      super(transport)
-
-      send_message compile_request
-    end
-
-    def update(error, message)
-      raise error unless error.nil?
-
-      case message
-      when EmbeddedProtocol::OutboundMessage::CompileResponse
-        return unless message.id == @id
-
-        Thread.new do
-          super(nil, message)
-        end
-      when EmbeddedProtocol::OutboundMessage::LogEvent
-        return unless message.compilation_id == @id && $stderr.tty?
-
-        warn message.formatted
-      when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
-        return unless message.compilation_id == @id
-
-        Thread.new do
-          send_message canonicalize_response message
-        end
-      when EmbeddedProtocol::OutboundMessage::ImportRequest
-        return unless message.compilation_id == @id
-
-        Thread.new do
-          send_message import_response message
-        end
-      when EmbeddedProtocol::OutboundMessage::FileImportRequest
-        raise NotImplementedError, 'FileImportRequest is not implemented'
-      when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
-        return unless message.compilation_id == @id
-
-        Thread.new do
-          send_message function_call_response message
-        end
-      end
-    rescue StandardError => e
-      Thread.new do
-        super(e, nil)
-      end
-    end
-
-    private
-
-    def compile_request
-      EmbeddedProtocol::InboundMessage::CompileRequest.new(
-        id: @id,
-        string: string,
-        path: path,
-        style: style,
-        source_map: source_map,
-        importers: importers,
-        global_functions: global_functions,
-        alert_color: $stderr.tty?,
-        alert_ascii: Platform::OS == 'windows'
-      )
-    end
-
-    def canonicalize_response(canonicalize_request)
-      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
-        raise result if result.is_a? StandardError
-      rescue StandardError => e
-        return EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
-          id: canonicalize_request.id,
-          error: e.message
-        )
-      end
-
-      if result&.key? :contents
-        @import_responses[url] = EmbeddedProtocol::InboundMessage::ImportResponse.new(
-          id: canonicalize_request.id,
-          success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-            contents: result[:contents],
-            syntax: EmbeddedProtocol::Syntax::SCSS,
-            source_map_url: nil
-          )
-        )
-        EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
-          id: canonicalize_request.id,
-          url: url
-        )
-      elsif result&.key? :file
-        canonicalized_url = Util.file_uri_from_path(File.absolute_path(result[:file]))
-
-        # TODO: FileImportRequest is not supported yet.
-        # Workaround by reading contents and return it when server asks
-        @import_responses[canonicalized_url] = EmbeddedProtocol::InboundMessage::ImportResponse.new(
-          id: canonicalize_request.id,
-          success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-            contents: File.read(result[:file]),
-            syntax: EmbeddedProtocol::Syntax::SCSS,
-            source_map_url: nil
-          )
-        )
-
-        EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
-          id: canonicalize_request.id,
-          url: canonicalized_url
-        )
-      else
-        EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
-          id: canonicalize_request.id
-        )
-      end
-    end
-
-    def import_response(import_request)
-      url = import_request.url
-
-      if @import_responses.key? url
-        @import_responses[url].id = import_request.id
-      else
-        @import_responses[url] = EmbeddedProtocol::InboundMessage::ImportResponse.new(
-          id: import_request.id,
-          error: "Failed to import: #{url}"
-        )
-      end
-
-      @import_responses[url]
-    end
-
-    def function_call_response(function_call_request)
-      # TODO: convert argument_list to **kwargs
-      EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
-        id: function_call_request.id,
-        success: @functions[function_call_request.name].call(*function_call_request.arguments),
-        accessed_argument_lists: function_call_request.arguments
-          .filter { |argument| argument.value == :argument_list }
-          .map { |argument| argument.argument_list.id }
-      )
-    rescue StandardError => e
-      EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
-        id: function_call_request.id,
-        error: e.message
-      )
-    end
-
-    def syntax
-      if @indented_syntax == true
-        EmbeddedProtocol::Syntax::INDENTED
-      else
-        EmbeddedProtocol::Syntax::SCSS
-      end
-    end
-
-    def url
-      return if @file.nil?
-
-      Util.file_uri_from_path File.absolute_path @file
-    end
-
-    def string
-      return if @data.nil?
-
-      EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
-        source: @data,
-        url: url,
-        syntax: syntax
-      )
-    end
-
-    def path
-      @file if @data.nil?
-    end
-
-    def style
-      case @output_style&.to_sym
-      when :expanded
-        EmbeddedProtocol::OutputStyle::EXPANDED
-      when :compressed
-        EmbeddedProtocol::OutputStyle::COMPRESSED
-      else
-        raise ArgumentError, 'output_style must be one of :expanded, :compressed'
-      end
-    end
-
-    def source_map
-      @source_map.is_a?(String) || (@source_map == true && !@out_file.nil?)
-    end
-
-    attr_reader :global_functions
-
-    # Order
-    # 1. Loading a file relative to the file in which the @use or @import appeared.
-    # 2. Each custom importer.
-    # 3. Loading a file relative to the current working directory.
-    # 4. Each load path in includePaths
-    # 5. Each load path specified in the SASS_PATH environment variable, which should
-    #    be semicolon-separated on Windows and colon-separated elsewhere.
-    def importers
-      custom_importers = @importer.map.with_index do |_, id|
-        EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
-          importer_id: id
-        )
-      end
-
-      include_path_importers = @include_paths
-                               .concat(Sass.include_paths)
-                               .map do |include_path|
-        EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
-          path: File.absolute_path(include_path)
-        )
-      end
-
-      custom_importers.concat include_path_importers
-    end
-  end
-end

data/lib/sass/compiler.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  module Compiler
-    DART_SASS_EMBEDDED = File.absolute_path(
-      "../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
-    )
-
-    PROTOCOL_ERROR_ID = 4_294_967_295
-
-    REQUIREMENTS = '~> 1.0.0-beta.11'
-  end
-end

data/lib/sass/error.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Error < StandardError; end
-
-  class ProtocolError < Error; end
-
-  # The {Error} raised by {Embedded#render}.
-  class RenderError < Error
-    attr_reader :formatted, :file, :line, :column, :status
-
-    def initialize(message, formatted, file, line, column, status)
-      super(message)
-      @formatted = formatted
-      @file = file
-      @line = line
-      @column = column
-      @status = status
-    end
-
-    def backtrace
-      return nil if super.nil?
-
-      ["#{@file}:#{@line}:#{@column}"] + super
-    end
-  end
-end

data/lib/sass/info.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # The {Observer} for {Embedded#info}.
-  class VersionContext
-    include Observer
-
-    def initialize(transport, id)
-      @id = id
-
-      super(transport)
-
-      send_message EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
-    end
-
-    def update(error, message)
-      raise error unless error.nil?
-
-      case message
-      when EmbeddedProtocol::OutboundMessage::VersionResponse
-        return unless message.id == @id
-
-        Thread.new do
-          super(nil, message)
-        end
-      end
-    rescue StandardError => e
-      Thread.new do
-        super(e, nil)
-      end
-    end
-  end
-end

data/lib/sass/observer.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  # The {Observer} module for receiving messages from {Transport}.
-  module Observer
-    def initialize(transport)
-      @transport = transport
-      @mutex = Mutex.new
-      @condition_variable = ConditionVariable.new
-      @error = nil
-      @message = nil
-      @transport.add_observer self
-    end
-
-    def receive_message
-      @mutex.synchronize do
-        @condition_variable.wait(@mutex) if @error.nil? && @message.nil?
-      end
-
-      raise @error unless @error.nil?
-
-      @message
-    end
-
-    def update(error, message)
-      @transport.delete_observer self
-      @mutex.synchronize do
-        @error = error
-        @message = message
-        @condition_variable.broadcast
-      end
-    end
-
-    private
-
-    def send_message(message)
-      @transport.send_message(message)
-    end
-  end
-end

data/lib/sass/platform.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  module Platform
-    OS = case RbConfig::CONFIG['host_os'].downcase
-         when /linux/
-           'linux'
-         when /darwin/
-           'darwin'
-         when /freebsd/
-           'freebsd'
-         when /netbsd/
-           'netbsd'
-         when /openbsd/
-           'openbsd'
-         when /dragonfly/
-           'dragonflybsd'
-         when /sunos|solaris/
-           'solaris'
-         when /mingw|mswin/
-           'windows'
-         else
-           RbConfig::CONFIG['host_os'].downcase
-         end
-
-    OSVERSION = RbConfig::CONFIG['host_os'].gsub(/[^\d]/, '').to_i
-
-    CPU = RbConfig::CONFIG['host_cpu']
-
-    ARCH = case CPU.downcase
-           when /amd64|x86_64|x64/
-             'x86_64'
-           when /i\d86|x86|i86pc/
-             'i386'
-           when /ppc64|powerpc64/
-             'powerpc64'
-           when /ppc|powerpc/
-             'powerpc'
-           when /sparcv9|sparc64/
-             'sparcv9'
-           when /arm64|aarch64/  # MacOS calls it "arm64", other operating systems "aarch64"
-             'aarch64'
-           when /^arm/
-             if OS == 'darwin'   # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
-               'aarch64'
-             else
-               'arm'
-             end
-           else
-             RbConfig::CONFIG['host_cpu']
-           end
-  end
-end