sass-embedded 0.6.7 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1b7d4e1bdfae2dbb2f99b43c42c0e06673a5f4f8c92b213efdfa4535a56b5b
-  data.tar.gz: 23fe4aeaeab07ddf717e7f2fad75d3fc9d9c82db4f4606763e52df8450113f59
+  metadata.gz: 8a920bc1fd2f9767c87dcc604c8ad44266b285310a7b0e9e46cf65c7a610ba4d
+  data.tar.gz: 8041922c104b94fb0bc4634735444315692a0d9a37a50db3cf213a9914455bb0
 SHA512:
-  metadata.gz: 13f8c565606af71bad343b5863ca3c792897d9a7bfea0071f17c510d99b6f0bf4d995441433572ba6aab2ca7489b9202c70fee3db4fc1c63fd15a5d4a5e8f593
-  data.tar.gz: a9bcd6caf920377fd86aa94f1ef536582f41483e0b0fca252718995af25037162eb2e77ee61cf6fc8d761195c10da48ebbf6dcb48de0c723cf0d01d46de0c1c6
+  metadata.gz: 180d0212926afd166fafc991cf30e8af33adc843171ec69d53a4b42ad7d587857e77a224cf8c25f343af7bacd6b76eeb5f2b93fd7c9886d2fd83105de3d891cc
+  data.tar.gz: 3d91c28089e6157b815a63cdc5b93d8adc2bb81f56828d6e3554c633ed31d845c070361797f32b45ae3bfbc39e034866a2c8e17f80a2222b5c827f9a2669a985

data/README.md

@@ -22,7 +22,7 @@ Sass.render(file: "style.scss")
 
 ## Options
 
-`Sass.render()` support the following options:
+`Sass.render(**kwargs)` supports the following options:
 
 - [`data`](https://sass-lang.com/documentation/js-api#data)
 - [`file`](https://sass-lang.com/documentation/js-api#file)
@@ -35,6 +35,7 @@ Sass.render(file: "style.scss")
 - [`source_map`](https://sass-lang.com/documentation/js-api#sourcemap)
 - [`out_file`](https://sass-lang.com/documentation/js-api#outfile)
 - [`omit_source_map_url`](https://sass-lang.com/documentation/js-api#omitsourcemapurl)
+- [`source_map_contents`](https://sass-lang.com/documentation/js-api#sourcemapcontents)
 - [`source_map_embed`](https://sass-lang.com/documentation/js-api#sourcemapembed)
 - [`source_map_root`](https://sass-lang.com/documentation/js-api#sourcemaproot)
 - [`functions`](https://sass-lang.com/documentation/js-api#functions)

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

@@ -49,8 +49,6 @@ module Sass
                source_map_root: '',
                functions: {},
                importer: [])
-      raise NotImplementedError, 'source_map_contents is not implemented' unless source_map_contents == false
-
       start = Util.now
 
       indent_type = parse_indent_type(indent_type)
@@ -77,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,
@@ -89,6 +87,7 @@ module Sass
                                          file: file,
                                          out_file: out_file,
                                          source_map: source_map,
+                                         source_map_contents: source_map_contents,
                                          source_map_root: source_map_root)
 
       css = post_process_css(css: message.success.css,
@@ -103,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
@@ -122,6 +121,7 @@ module Sass
                          file:,
                          out_file:,
                          source_map:,
+                         source_map_contents:,
                          source_map_root:)
       return if map.nil? || map.empty?
 
@@ -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"
@@ -146,10 +146,15 @@ module Sass
         map_data['file'] = 'stdin.css'
       end
 
+      map_data['sourcesContent'] = [] if source_map_contents
+
       map_data['sources'].map! do |source|
-        if source.start_with? Util::FILE_PROTOCOL
-          Util.relative(source_map_dir, 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_path(source_map_dir, path)
         else
+          map_data['sourcesContent'].push(nil) if source_map_contents
           source
         end
       end
@@ -179,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/render.rb

@@ -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

@@ -29,7 +29,7 @@ module Sass
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
       pipe @stderr, $stderr
-      receive_message @stdout
+      read @stdout
     end
 
     def add_observer(*args)
@@ -58,42 +58,38 @@ module Sass
 
     private
 
-    def receive_message(readable)
+    def receive_message(error, message)
+      @observerable_mutex.synchronize do
+        changed
+        notify_observers error, message
+      end
+    end
+
+    def pipe(readable, writeable)
       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
+          writeable.write readable.readline
         rescue Interrupt
           break
         rescue IOError => e
-          notify_observers e, nil
+          receive_message(e, nil)
           close
           break
         end
       end
     end
 
-    def pipe(readable, writeable)
+    def read(readable)
       Thread.new do
         loop do
-          writeable.write readable.readline
+          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
-          @observerable_mutex.synchronize do
-            notify_observers e, nil
-          end
+          receive_message(e, nil)
           close
           break
         end
@@ -102,13 +98,27 @@ module Sass
 
     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.6.7'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.4
 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.4
 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: []

data/.github/workflows/build.yml

@@ -1,44 +0,0 @@
-name: build
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        ruby-version: ['2.6', '2.7', '3.0']
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
-
-    - name: Download dart-sass-embedded
-      run: bundle exec rake extconf
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Test
-      run: bundle exec rake
-
-    - name: Install Gem
-      run: rake install
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Test Gem
-      run: |-
-        ruby -r sass -e "puts Sass.render(data: 'h1 { color: black; }')[:css]"