sass-embedded 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7726f0c228a37d01f4c228f26a8bbbf136420beb6d9079551d97924ea9c3724
-  data.tar.gz: 283969599dc5165a5cdc2c8c95c14b8ebd15c70d3f6f3d5aa1ebea4283d10cd5
+  metadata.gz: af257f49189b3ea9e19c67fd67dba0cbf35d010c7a222e36fd820afee7eb3e10
+  data.tar.gz: a63caa77fc2a9793f5138896df09722aae680b85a11db50512da3281fba8fae7
 SHA512:
-  metadata.gz: 1385690d56690bf6197067b9c7421caa472e795c720b43953e82ef547391e7ba9f857b8a639f98a1c88a76f5e30bb0330b6c31b592534c27b53ec4f818ff15ea
-  data.tar.gz: 10fe26fd2b04412246136ee0c04e8f26f9781b05e4a16ccc90151dbc91f69a47a7332078da530eb7747425e6e444f5b00c9b22cc63c0404de0ed649921931329
+  metadata.gz: 1b5e7ea087a76653e6e45ee2338eeb31224a85388b9ece793d90652176f50d77affb4816acccfa6c1dbe5ffb5221bebc3bd1d0a00dcade850e6413125c4d1fc6
+  data.tar.gz: 7de00d938497c9d447c396d69eb4d6907683097c3b897c77ead784a17f3fcc691f8a67ca99bc5fbf9e7ce268db5f443e31d65903e81c8acb966238760db1a35a

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/embedded.rb

@@ -44,7 +44,7 @@ module Sass
                source_map: false,
                out_file: nil,
                omit_source_map_url: false,
-               # source_map_contents: false,
+               source_map_contents: false,
                source_map_embed: false,
                source_map_root: '',
                functions: {},
@@ -87,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,
@@ -120,6 +121,7 @@ module Sass
                          file:,
                          out_file:,
                          source_map:,
+                         source_map_contents:,
                          source_map_root:)
       return if map.nil? || map.empty?
 
@@ -144,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))
+          path = Util.path(source)
+          map_data['sourcesContent'].push(File.read(path)) if source_map_contents
+          Util.relative(source_map_dir, path)
         else
+          map_data['sourcesContent'].push(nil) if source_map_contents
           source
         end
       end
@@ -181,7 +188,7 @@ module Sass
               else
                 source_map
               end
-        css += "#{linefeed}/*# sourceMappingURL=#{url} */"
+        css += "#{linefeed}#{linefeed}/*# sourceMappingURL=#{url} */"
       end
 
       -css

data/lib/sass/error.rb

@@ -7,8 +7,6 @@ module Sass
 
   # The {Error} raised by {Embedded#render}.
   class RenderError < Error
-    include Struct
-
     attr_reader :formatted, :file, :line, :column, :status
 
     def initialize(message, formatted, file, line, column, status)

data/lib/sass/info.rb

@@ -2,10 +2,15 @@
 
 module Sass
   # The {Observer} for {Embedded#info}.
-  class Version < Observer
+  class Version
+    include Observer
+
     def initialize(transport, id)
-      super(transport, id)
-      @transport.send EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
+      @id = id
+
+      super(transport)
+
+      send_message EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)
     end
 
     def update(error, message)

data/lib/sass/observer.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 module Sass
-  # The {Observer} for receiving messages from {Transport}.
-  class Observer
-    def initialize(transport, id)
-      raise NotImplementedError if instance_of? Observer
-
+  # The {Observer} module for receiving messages from {Transport}.
+  module Observer
+    def initialize(transport)
       @transport = transport
-      @id = id
       @mutex = Mutex.new
       @condition_variable = ConditionVariable.new
       @error = nil
@@ -33,5 +30,11 @@ module Sass
         @condition_variable.broadcast
       end
     end
+
+    private
+
+    def send_message(message)
+      @transport.send_message(message)
+    end
   end
 end

data/lib/sass/render.rb

@@ -2,7 +2,9 @@
 
 module Sass
   # The {Observer} for {Embedded#render}.
-  class Render < Observer
+  class Render
+    include Observer
+
     def initialize(transport, id,
                    data:,
                    file:,
@@ -15,8 +17,7 @@ module Sass
                    importer:)
       raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
 
-      super(transport, id)
-
+      @id = id
       @data = data
       @file = file
       @indented_syntax = indented_syntax
@@ -31,7 +32,9 @@ module Sass
       @importer = importer
       @import_responses = {}
 
-      @transport.send compile_request
+      super(transport)
+
+      send_message compile_request
     end
 
     def update(error, message)
@@ -54,13 +57,13 @@ module Sass
         return unless message.compilation_id == @id
 
         Thread.new do
-          @transport.send canonicalize_response message
+          send_message canonicalize_response message
         end
       when EmbeddedProtocol::OutboundMessage::ImportRequest
         return unless message.compilation_id == @id
 
         Thread.new do
-          @transport.send import_response message
+          send_message import_response message
         end
       when EmbeddedProtocol::OutboundMessage::FileImportRequest
         raise NotImplementedError, 'FileImportRequest is not implemented'
@@ -68,7 +71,7 @@ module Sass
         return unless message.compilation_id == @id
 
         Thread.new do
-          @transport.send function_call_response message
+          send_message function_call_response message
         end
       end
     rescue StandardError => e

data/lib/sass/transport.rb

@@ -5,7 +5,7 @@ require 'observer'
 require_relative '../../ext/embedded_sass_pb'
 
 module Sass
-  # The {Observable} {Transport} for low level communication with
+  # 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
@@ -29,7 +29,7 @@ module Sass
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
       pipe @stderr, $stderr
-      receive
+      receive_message @stdout
     end
 
     def add_observer(*args)
@@ -38,7 +38,7 @@ module Sass
       end
     end
 
-    def send(message)
+    def send_message(message)
       write EmbeddedProtocol::InboundMessage.new(
         ONEOF_MESSAGE[message.class.descriptor] => message
       ).to_proto
@@ -58,17 +58,17 @@ module Sass
 
     private
 
-    def receive
+    def receive_message(readable)
       Thread.new do
         loop do
           bits = length = 0
           loop do
-            byte = @stdout.readbyte
+            byte = readable.readbyte
             length += (byte & 0x7f) << bits
             bits += 7
             break if byte <= 0x7f
           end
-          payload = @stdout.read length
+          payload = readable.read length
           message = EmbeddedProtocol::OutboundMessage.decode payload
           @observerable_mutex.synchronize do
             changed
@@ -87,7 +87,7 @@ module Sass
     def pipe(readable, writeable)
       Thread.new do
         loop do
-          writeable.write readable.read
+          writeable.write readable.readline
         rescue Interrupt
           break
         rescue IOError => e

data/lib/sass/version.rb

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

data/test/source_maps_test.rb

@@ -47,6 +47,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=out.map */
       CSS
 
@@ -92,6 +93,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=out.css.map */
       CSS
 
@@ -139,6 +141,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=data:application/json;base64,
       CSS
 
@@ -163,6 +166,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=out.map */
       CSS
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - なつき