sass-embedded 0.6.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ebc21eec151f7d15be984a32a5dfa6a8b4354daef5f6d152aecba17d0e422e1
-  data.tar.gz: bb869d1411ad2182618a065780083db630556cbd880469d0cb183936dcbd26b0
+  metadata.gz: e292d8b2c097a1d19fd12d808600c91ae39dbc93180bc34cd2c56bf0cebf494c
+  data.tar.gz: 6507777d01910a91c93e793a46efdcc6990ccc0a422881643a0e5b7f395892ff
 SHA512:
-  metadata.gz: 53a378c79e47e534273058d2943c0052906f2a099b1a2f0ddab251c53d36404ba2dffbe7acd8f5bf761153ffd9c81b198990a62995111924909fcd27d0734d9f
-  data.tar.gz: '0653995fb97f097939461e982dc08184713eb4621a316b2a8867b79bdbd049d5a33e7bf0a48c6d7d653d18bb4a6a14ec49e54f49e9967840f9d2a230eeb542f3'
+  metadata.gz: 79485c6293b91b1b709ab7630f431ab01d8c0af6033ab86c0c11fa05e27c390864fff433a6d91cc5251e5e5a77f11be0709d04eed2c2b8762acef162235ce247
+  data.tar.gz: b6cce9f847c0681df0891e32044f7a9fea3d79a4c0d1736e192537d07a30763b494750f86f1d843a640c49a13758140e22e40305ce0e07b726d0a223ecb6d28b

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

@@ -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)
@@ -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?
 
@@ -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))
+          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
@@ -183,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/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

@@ -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
+      read @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,42 +58,38 @@ module Sass
 
     private
 
-    def receive
+    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 = @stdout.readbyte
-            length += (byte & 0x7f) << bits
-            bits += 7
-            break if byte <= 0x7f
-          end
-          payload = @stdout.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.read
+          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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = '0.6.4'
+  VERSION = '0.7.1'
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.1
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf