sass-embedded 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af257f49189b3ea9e19c67fd67dba0cbf35d010c7a222e36fd820afee7eb3e10
-  data.tar.gz: a63caa77fc2a9793f5138896df09722aae680b85a11db50512da3281fba8fae7
+  metadata.gz: 107eda35f850f6a5d3744a89ba8dcd71abf8ea76659f0c51710ecde9f3233c53
+  data.tar.gz: f3e8d8d963f9a3bfffa00908b91e90d17fd4e9a04046a6c9a739e16b3eae5cb5
 SHA512:
-  metadata.gz: 1b5e7ea087a76653e6e45ee2338eeb31224a85388b9ece793d90652176f50d77affb4816acccfa6c1dbe5ffb5221bebc3bd1d0a00dcade850e6413125c4d1fc6
-  data.tar.gz: 7de00d938497c9d447c396d69eb4d6907683097c3b897c77ead784a17f3fcc691f8a67ca99bc5fbf9e7ce268db5f443e31d65903e81c8acb966238760db1a35a
+  metadata.gz: a9e2dcfbd314b616b66c53511fe021006c20e0a359bb9769db7bf87d14d9377443e245abf88f5da6e1b4414d34d4d05e529885b79169db7c86f8029ed3c7f1f5
+  data.tar.gz: d8ade839bab88a4ff4098f1b045b31dfd532570dbadcb76866fc3c13be603c445583ea2fe2b86aa9ba7b2472272f992d9dd28ce21eb64aaf8693d1ec557660b9

data/lib/sass.rb

@@ -60,6 +60,7 @@ module Sass
   end
 end
 
+require_relative 'sass/version'
 require_relative 'sass/platform'
 require_relative 'sass/util'
 require_relative 'sass/struct'
@@ -67,6 +68,6 @@ require_relative 'sass/result'
 require_relative 'sass/error'
 require_relative 'sass/transport'
 require_relative 'sass/observer'
-require_relative 'sass/version'
+require_relative 'sass/info'
 require_relative 'sass/render'
 require_relative 'sass/embedded'

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(
@@ -75,7 +75,7 @@ module Sass
           elsif message.failure.span.url == ''
             'stdin'
           else
-            Util.path(message.failure.span.url)
+            Util.path_from_file_uri(message.failure.span.url)
           end,
           message.failure.span ? message.failure.span.start.line + 1 : nil,
           message.failure.span ? message.failure.span.start.column + 1 : nil,
@@ -102,7 +102,7 @@ module Sass
 
       finish = Util.now
 
-      stats = RenderResult::Stats.new(file.nil? ? 'data' : file, start, finish, finish - start)
+      stats = RenderResultStats.new(file.nil? ? 'data' : file, start, finish, finish - start)
 
       RenderResult.new(css, map, stats)
     end
@@ -138,7 +138,7 @@ module Sass
       source_map_dir = File.dirname(source_map_path)
 
       if out_file
-        map_data['file'] = Util.relative(source_map_dir, out_file)
+        map_data['file'] = Util.relative_path(source_map_dir, out_file)
       elsif file
         ext = File.extname(file)
         map_data['file'] = "#{file[0..(ext.empty? ? -1 : -ext.length - 1)]}.css"
@@ -149,10 +149,10 @@ module Sass
       map_data['sourcesContent'] = [] if source_map_contents
 
       map_data['sources'].map! do |source|
-        if source.start_with? Util::FILE_PROTOCOL
-          path = Util.path(source)
+        if source.start_with? 'file://'
+          path = Util.path_from_file_uri(source)
           map_data['sourcesContent'].push(File.read(path)) if source_map_contents
-          Util.relative(source_map_dir, path)
+          Util.relative_path(source_map_dir, path)
         else
           map_data['sourcesContent'].push(nil) if source_map_contents
           source
@@ -184,7 +184,7 @@ module Sass
         url = if source_map_embed
                 "data:application/json;base64,#{Base64.strict_encode64(map)}"
               elsif out_file
-                Util.relative(File.dirname(out_file), source_map)
+                Util.relative_path(File.dirname(out_file), source_map)
               else
                 source_map
               end

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,
@@ -97,7 +97,7 @@ module Sass
     end
 
     def canonicalize_response(canonicalize_request)
-      url = Util.file_uri(File.absolute_path(canonicalize_request.url, (@file.nil? ? 'stdin' : @file)))
+      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
@@ -123,7 +123,7 @@ module Sass
           url: url
         )
       elsif result&.key? :file
-        canonicalized_url = Util.file_uri(result[:file])
+        canonicalized_url = Util.file_uri_from_path(result[:file])
 
         # TODO: FileImportRequest is not supported yet.
         # Workaround by reading contents and return it when server asks
@@ -185,7 +185,7 @@ module Sass
     def url
       return if @file.nil?
 
-      Util.file_uri @file
+      Util.file_uri_from_path @file
     end
 
     def string

data/lib/sass/result.rb

@@ -12,19 +12,19 @@ module Sass
       @map = map
       @stats = stats
     end
+  end
 
-    # The {Stats} of {Embedded#render}.
-    class Stats
-      include Struct
+  # The {RenderResultStats} of {Embedded#render}.
+  class RenderResultStats
+    include Struct
 
-      attr_reader :entry, :start, :end, :duration
+    attr_reader :entry, :start, :end, :duration
 
-      def initialize(entry, start, finish, duration)
-        @entry = entry
-        @start = start
-        @end = finish
-        @duration = duration
-      end
+    def initialize(entry, start, finish, duration)
+      @entry = entry
+      @start = start
+      @end = finish
+      @duration = duration
     end
   end
 end

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
-      receive_message @stdout
+      poll do
+        $stderr.write @stderr.readline
+      end
+      poll do
+        receive_proto read
+      end
     end
 
     def add_observer(*args)
@@ -58,57 +62,60 @@ module Sass
 
     private
 
-    def receive_message(readable)
+    def poll
       Thread.new do
         loop do
-          bits = length = 0
-          loop do
-            byte = readable.readbyte
-            length += (byte & 0x7f) << bits
-            bits += 7
-            break if byte <= 0x7f
-          end
-          payload = readable.read length
-          message = EmbeddedProtocol::OutboundMessage.decode payload
-          @observerable_mutex.synchronize do
-            changed
-            notify_observers nil, message[message.message.to_s]
-          end
+          yield
         rescue Interrupt
           break
         rescue IOError => e
-          notify_observers e, nil
+          notify_observers(e, nil)
           close
           break
         end
       end
     end
 
-    def pipe(readable, writeable)
-      Thread.new do
-        loop do
-          writeable.write readable.readline
-        rescue Interrupt
-          break
-        rescue IOError => e
-          @observerable_mutex.synchronize do
-            notify_observers e, nil
-          end
-          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
-        length = payload.length
-        while length.positive?
-          @stdin.write ((length > 0x7f ? 0x80 : 0) | (length & 0x7f)).chr
-          length >>= 7
-        end
+        write_varint(@stdin, payload.length)
         @stdin.write payload
       end
     end
+
+    def read_varint(readable)
+      varint = bits = 0
+      loop do
+        byte = readable.readbyte
+        varint += (byte & 0x7f) << bits
+        bits += 7
+        break if byte <= 0x7f
+      end
+      varint
+    end
+
+    def write_varint(writeable, varint)
+      while varint.positive?
+        writeable.write ((varint > 0x7f ? 0x80 : 0) | (varint & 0x7f)).chr
+        varint >>= 7
+      end
+    end
   end
 end

data/lib/sass/util.rb

@@ -1,39 +1,28 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require 'uri'
 
 module Sass
   # The {Util} module.
   module Util
     module_function
 
-    FILE_PROTOCOL = 'file://'
+    URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
-    def file_uri(path)
+    def file_uri_from_path(path)
       absolute_path = File.absolute_path(path)
 
-      unless absolute_path.start_with? File::SEPARATOR
-        components = absolute_path.split File::SEPARATOR
-        components[0] = components[0][0].downcase
-        absolute_path = components.join File::SEPARATOR
-      end
+      absolute_path = File::SEPARATOR + absolute_path unless absolute_path.start_with? File::SEPARATOR
 
-      "#{FILE_PROTOCOL}#{absolute_path}"
+      URI_PARSER.escape("file://#{absolute_path}")
     end
 
-    def path(file_uri)
-      absolute_path = file_uri[FILE_PROTOCOL.length..]
-
-      unless absolute_path.start_with? File::SEPARATOR
-        components = absolute_path.split File::SEPARATOR
-        components[0] = "#{components[0].upcase}:"
-        absolute_path = components.join File::SEPARATOR
-      end
-
-      absolute_path
+    def path_from_file_uri(file_uri)
+      URI_PARSER.unescape(file_uri)[7..]
     end
 
-    def relative(from, to)
+    def relative_path(from, to)
       Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
     end
 

data/lib/sass/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -136,7 +136,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Use dart-sass with Ruby!
+description: A Ruby library that will communicate with Embedded Dart Sass using the
+  Embedded Sass protocol.
 email:
 - i@ntk.me
 executables: []
@@ -144,14 +145,8 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- ext/.gitignore
 - ext/Makefile
 - ext/extconf.rb
 - lib/sass.rb
@@ -166,22 +161,11 @@ files:
 - lib/sass/transport.rb
 - lib/sass/util.rb
 - lib/sass/version.rb
-- sass-embedded.gemspec
-- test/concurrency_test.rb
-- test/functions_test.rb
-- test/importer_test.rb
-- test/include_paths_test.rb
-- test/indented_syntax_test.rb
-- test/input_test.rb
-- test/output_test.rb
-- test/render_error_test.rb
-- test/render_test.rb
-- test/source_maps_test.rb
-- test/test_helper.rb
 homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.5
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -201,15 +185,4 @@ rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Use dart-sass with Ruby!
-test_files:
-- test/concurrency_test.rb
-- test/functions_test.rb
-- test/importer_test.rb
-- test/include_paths_test.rb
-- test/indented_syntax_test.rb
-- test/input_test.rb
-- test/output_test.rb
-- test/render_error_test.rb
-- test/render_test.rb
-- test/source_maps_test.rb
-- test/test_helper.rb
+test_files: []