sass-embedded 0.7.27 → 0.8.2

data/lib/sass/embedded/error.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    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
+end

data/lib/sass/embedded/info.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative 'observer'
+require_relative 'protocol'
+
+module Sass
+  class Embedded
+    # 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
+end

data/lib/sass/embedded/observer.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    # 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
+end

data/lib/sass/embedded/platform.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    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
+end

data/lib/sass/embedded/protocol.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative '../../../ext/sass/embedded_sass_pb'

data/lib/sass/embedded/result.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative 'struct'
+
+module Sass
+  class Embedded
+    # The {RenderResult} of {Embedded#render}.
+    class RenderResult
+      include Struct
+
+      attr_reader :css, :map, :stats
+
+      def initialize(css, map, stats)
+        @css = css
+        @map = map
+        @stats = stats
+      end
+    end
+
+    # The {RenderResultStats} of {Embedded#render}.
+    class RenderResultStats
+      include Struct
+
+      attr_reader :entry, :start, :end, :duration
+
+      def initialize(entry, start, finish, duration)
+        @entry = entry
+        @start = start
+        @end = finish
+        @duration = duration
+      end
+    end
+  end
+end

data/lib/sass/embedded/struct.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    # The {Struct} module.
+    module Struct
+      def [](key)
+        instance_variable_get("@#{key}".to_sym)
+      end
+
+      def to_h
+        instance_variables.map do |variable|
+          [variable[1..].to_sym, instance_variable_get(variable)]
+        end.to_h
+      end
+
+      def to_s
+        to_h.to_s
+      end
+    end
+  end
+end

data/lib/sass/embedded/transport.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'observer'
+require_relative 'compiler'
+require_relative 'error'
+require_relative 'protocol'
+
+module Sass
+  class Embedded
+    # 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
+      include Observable
+
+      ONEOF_MESSAGE = EmbeddedProtocol::InboundMessage
+                      .descriptor
+                      .lookup_oneof('message')
+                      .collect do |field_descriptor|
+        [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(Compiler::DART_SASS_EMBEDDED)
+
+        [@stdin, @stdout].each(&:binmode)
+
+        poll do
+          warn(@stderr.readline, uplevel: 1)
+        end
+        poll do
+          receive_proto read
+        end
+      end
+
+      def add_observer(*args)
+        @observerable_mutex.synchronize do
+          super(*args)
+        end
+      end
+
+      def send_message(message)
+        write EmbeddedProtocol::InboundMessage.new(
+          ONEOF_MESSAGE[message.class.descriptor] => message
+        ).to_proto
+      end
+
+      def close
+        delete_observers
+        @stdin.close unless @stdin.closed?
+        @stdout.close unless @stdout.closed?
+        @stderr.close unless @stderr.closed?
+        nil
+      end
+
+      def closed?
+        @stdin.closed?
+      end
+
+      private
+
+      def poll
+        Thread.new do
+          loop do
+            yield
+          rescue StandardError => e
+            notify_observers(e, nil)
+            close
+            break
+          end
+        end
+      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)
+          @stdin.write payload
+        end
+      end
+
+      def read_varint(readable)
+        value = bits = 0
+        loop do
+          byte = readable.readbyte
+          value |= (byte & 0x7f) << bits
+          bits += 7
+          break if byte < 0x80
+        end
+        value
+      end
+
+      def write_varint(writeable, value)
+        bytes = []
+        until value < 0x80
+          bytes << (0x80 | (value & 0x7f))
+          value >>= 7
+        end
+        bytes << value
+        writeable.write bytes.pack('C*')
+      end
+    end
+  end
+end

data/lib/sass/embedded/util.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require 'uri'
+
+module Sass
+  class Embedded
+    # The {Util} module.
+    module Util
+      URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
+
+      private_constant :URI_PARSER
+
+      module_function
+
+      def file_uri_from_path(path)
+        "file://#{Platform::OS == 'windows' ? File::SEPARATOR : ''}#{URI_PARSER.escape(path)}"
+      end
+
+      def path_from_file_uri(file_uri)
+        URI_PARSER.unescape(file_uri[(Platform::OS == 'windows' ? 8 : 7)..])
+      end
+
+      def relative_path(from, to)
+        Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
+      end
+
+      def now
+        (Time.now.to_f * 1000).to_i
+      end
+    end
+  end
+end

data/lib/sass/{version.rb → embedded/version.rb}

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = '0.7.27'
+  class Embedded
+    VERSION = '0.8.2'
+  end
 end

data/lib/sass/embedded.rb

@@ -2,6 +2,13 @@
 
 require 'base64'
 require 'json'
+require_relative 'embedded/compile'
+require_relative 'embedded/error'
+require_relative 'embedded/info'
+require_relative 'embedded/result'
+require_relative 'embedded/transport'
+require_relative 'embedded/util'
+require_relative 'embedded/version'
 
 module Sass
   # The {Embedded} host for using dart-sass-embedded. Each instance creates
@@ -13,6 +20,14 @@ 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
@@ -243,7 +258,7 @@ module Sass
     def next_id
       @id_semaphore.synchronize do
         @id += 1
-        @id = 0 if @id == Transport::PROTOCOL_ERROR_ID
+        @id = 0 if @id == Compiler::PROTOCOL_ERROR_ID
         @id
       end
     end

data/lib/sass-embedded.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative 'sass'

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,27 +45,15 @@ 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?
+    def instance
+      return @instance if defined?(@instance) && !@instance.closed?
 
-      @embedded = Sass::Embedded.new
+      @instance = Embedded.new
     end
   end
 end
-
-require_relative 'sass/version'
-require_relative 'sass/platform'
-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.7.27
+  version: 0.8.2
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.18.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.27
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.27
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.5
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,27 +134,29 @@ files:
 - LICENSE
 - README.md
 - ext/sass/Makefile
-- ext/sass/dependencies.rb
 - ext/sass/extconf.rb
 - ext/sass/unzip.vbs
+- lib/sass-embedded.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/result.rb
-- lib/sass/struct.rb
-- lib/sass/transport.rb
-- lib/sass/util.rb
-- lib/sass/version.rb
+- lib/sass/embedded/compile.rb
+- lib/sass/embedded/compiler.rb
+- lib/sass/embedded/error.rb
+- lib/sass/embedded/info.rb
+- lib/sass/embedded/observer.rb
+- lib/sass/embedded/platform.rb
+- lib/sass/embedded/protocol.rb
+- lib/sass/embedded/result.rb
+- lib/sass/embedded/struct.rb
+- lib/sass/embedded/transport.rb
+- lib/sass/embedded/util.rb
+- lib/sass/embedded/version.rb
 homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.7.27
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.27
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.8.2
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.8.2
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/ext/sass/dependencies.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  module Dependencies
-    REQUIREMENTS = {
-      'protocolbuffers/protobuf' => '~> 3.18.0',
-      'sass/embedded-protocol' => '~> 1.0.0-beta.12',
-      'sass/dart-sass-embedded' => '~> 1.0.0-beta.11'
-    }.freeze
-  end
-end