sass-embedded 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8fe5d208436fad17c2eb0b4542de995dff90b8fb69983b05db6d4519526ee5
-  data.tar.gz: d202c23bdca1b462fedda0284a9ea9a98103beacddcad969be5e0e9e0dbc24c0
+  metadata.gz: 7b1b7d4e1bdfae2dbb2f99b43c42c0e06673a5f4f8c92b213efdfa4535a56b5b
+  data.tar.gz: 23fe4aeaeab07ddf717e7f2fad75d3fc9d9c82db4f4606763e52df8450113f59
 SHA512:
-  metadata.gz: b512dcca31e35eec561f0a6b9dfab8c0d6232934d997e552ba4a1f3574ea9d3edb85ccb9b7ef6df4bfc85e486a05390d0301609515a05df9b05589c2e2348e41
-  data.tar.gz: 0a80a2df0b37ee916bb406b84d598c390d723a3d54500de9aed4b3fce7f129cdb047060442a0d47d4873b8954a88ca5c6b4d85d957a6e16806ada372adae2c5e
+  metadata.gz: 13f8c565606af71bad343b5863ca3c792897d9a7bfea0071f17c510d99b6f0bf4d995441433572ba6aab2ca7489b9202c70fee3db4fc1c63fd15a5d4a5e8f593
+  data.tar.gz: a9bcd6caf920377fd86aa94f1ef536582f41483e0b0fca252718995af25037162eb2e77ee61cf6fc8d761195c10da48ebbf6dcb48de0c723cf0d01d46de0c1c6

data/lib/sass/embedded.rb

@@ -30,7 +30,7 @@ module Sass
     #
     # See {file:README.md#options} for supported options.
     #
-    # @return [Result]
+    # @return [RenderResult]
     # @raise [ProtocolError]
     # @raise [RenderError]
     def render(data: nil,
@@ -44,11 +44,13 @@ 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: {},
                importer: [])
+      raise NotImplementedError, 'source_map_contents is not implemented' unless source_map_contents == false
+
       start = Util.now
 
       indent_type = parse_indent_type(indent_type)
@@ -101,9 +103,9 @@ module Sass
 
       finish = Util.now
 
-      stats = Result::Stats.new(file.nil? ? 'data' : file, start, finish, finish - start)
+      stats = RenderResult::Stats.new(file.nil? ? 'data' : file, start, finish, finish - start)
 
-      Result.new(css, map, stats)
+      RenderResult.new(css, map, stats)
     end
 
     def close
@@ -181,7 +183,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)
@@ -47,26 +50,28 @@ module Sass
           super(nil, message)
         end
       when EmbeddedProtocol::OutboundMessage::LogEvent
-        # not implemented yet
+        return unless message.compilation_id == @id && $stderr.tty?
+
+        warn message.formatted
       when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
-        return unless message['compilation_id'] == @id
+        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
+        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'
       when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
-        return unless message['compilation_id'] == @id
+        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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Sass
-  # The {Result} of {Embedded#render}.
-  class Result
+  # The {RenderResult} of {Embedded#render}.
+  class RenderResult
     include Struct
 
     attr_reader :css, :map, :stats

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.2'
+  VERSION = '0.6.7'
 end

data/test/concurrency_test.rb

@@ -15,7 +15,7 @@ module Sass
     end
 
     def render(data)
-      @embedded.render(data: data)[:css]
+      @embedded.render(data: data).css
     end
 
     def test_concurrency
@@ -23,7 +23,7 @@ module Sass
         threads = []
         10.times do |i|
           threads << Thread.new(i) do |id|
-            output = @embedded.render(data: "div { width: #{id} }")[:css]
+            output = @embedded.render(data: "div { width: #{id} }").css
             assert_match(/#{id}/, output)
           end
         end

data/test/functions_test.rb

@@ -162,7 +162,7 @@ module Sass
                                                     )
                                                   )
                                                 }
-                       })[:css]
+                       }).css
     end
 
     # rubocop:enable Layout/LineLength
@@ -334,7 +334,7 @@ module Sass
                                             )
                                           )
                                         }
-                                      })[:css]
+                                      }).css
             assert_match(/test_key1/, output)
             assert_match(/test_key2/, output)
             assert_match(/test_value/, output)
@@ -356,7 +356,7 @@ module Sass
                                       )
                                     )
                                   }
-                                })[:css]
+                                }).css
 
       assert_match(/custom_function/, output)
     end
@@ -368,7 +368,7 @@ module Sass
                            'test_function()': lambda {
                              Class.new
                            }
-                         })[:css]
+                         }).css
       end
     end
 

data/test/importer_test.rb

@@ -15,7 +15,7 @@ module Sass
     end
 
     def render(data, importer)
-      @embedded.render(data: data, importer: importer)[:css]
+      @embedded.render(data: data, importer: importer).css
     end
 
     def test_custom_importer_works
@@ -121,7 +121,7 @@ module Sass
                                   lambda { |_url, prev|
                                     { contents: ".#{prev} { color: red; }" }
                                   }
-                                ])[:css]
+                                ]).css
 
       assert_equal <<~CSS.chomp, output
         .import-parent-filename.scss {
@@ -140,10 +140,10 @@ module Sass
                                                                    lambda { |_url, _prev|
                                                                      { contents: 'h1 { color: black; }' }
                                                                    }
-                                                                 ])[:css]
+                                                                 ]).css
                                     }
                                   }
-                                ])[:css]
+                                ]).css
 
       assert_equal <<~CSS.chomp, output
         h1 {

data/test/include_paths_test.rb

@@ -31,7 +31,7 @@ module Sass
       assert_equal css, @embedded.render(file: 'styles.scss',
                                          include_paths: %w[
                                            included_1 included_2
-                                         ])[:css]
+                                         ]).css
     end
 
     def test_global_include_paths
@@ -51,7 +51,7 @@ module Sass
         }
       CSS
 
-      assert_equal css, @embedded.render(file: 'styles.scss')[:css]
+      assert_equal css, @embedded.render(file: 'styles.scss').css
     end
 
     def test_include_paths_from_env

data/test/indented_syntax_test.rb

@@ -35,7 +35,7 @@ module Sass
         @embedded.render(data: sass, indented_syntax: false)
       end
 
-      assert_equal css, @embedded.render(data: sass, indented_syntax: true)[:css]
+      assert_equal css, @embedded.render(data: sass, indented_syntax: true).css
     end
 
     def test_input_file_with_indented_syntax
@@ -53,9 +53,9 @@ module Sass
 
       temp_file('style.sass', sass)
 
-      assert_equal css, @embedded.render(file: 'style.sass')[:css]
-      assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: true)[:css]
-      assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: false)[:css]
+      assert_equal css, @embedded.render(file: 'style.sass').css
+      assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: true).css
+      assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: false).css
     end
   end
 end

data/test/input_test.rb

@@ -30,7 +30,7 @@ module Sass
       CSS
 
       result = @embedded.render(data: scss)
-      assert_equal css, result[:css]
+      assert_equal css, result.css
     end
 
     def test_input_file
@@ -50,7 +50,7 @@ module Sass
 
       temp_file('style.scss', scss)
       result = @embedded.render(file: 'style.scss')
-      assert_equal css, result[:css]
+      assert_equal css, result.css
     end
   end
 end

data/test/output_test.rb

@@ -23,26 +23,26 @@ module Sass
         }
       SCSS
 
-      assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :expanded)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :expanded).css
         .foo {
           baz: bang;
         }
       CSS
 
-      assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :compressed)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :compressed).css
         .foo{baz:bang}
       CSS
 
       assert_raises(ArgumentError) do
-        @embedded.render(data: data, output_style: :nested)[:css]
+        @embedded.render(data: data, output_style: :nested).css
       end
 
       assert_raises(ArgumentError) do
-        @embedded.render(data: data, output_style: :compact)[:css]
+        @embedded.render(data: data, output_style: :compact).css
       end
 
       assert_raises(ArgumentError) do
-        @embedded.render(data: data, output_style: nil)[:css]
+        @embedded.render(data: data, output_style: nil).css
       end
     end
 
@@ -55,7 +55,7 @@ module Sass
     SCSS
 
     def test_output_indent_width
-      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 0)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 0).css
         @media all {
         .foo {
         baz: bang;
@@ -63,7 +63,7 @@ module Sass
         }
       CSS
 
-      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1).css
         @media all {
          .foo {
           baz: bang;
@@ -71,7 +71,7 @@ module Sass
         }
       CSS
 
-      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 4)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 4).css
         @media all {
             .foo {
                 baz: bang;
@@ -79,7 +79,7 @@ module Sass
         }
       CSS
 
-      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 10)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 10).css
         @media all {
                   .foo {
                             baz: bang;
@@ -88,20 +88,20 @@ module Sass
       CSS
 
       assert_raises(RangeError) do
-        @embedded.render(data: DATA_INDENT_TEST, indent_width: -1)[:css]
+        @embedded.render(data: DATA_INDENT_TEST, indent_width: -1).css
       end
 
       assert_raises(RangeError) do
-        @embedded.render(data: DATA_INDENT_TEST, indent_width: 11)[:css]
+        @embedded.render(data: DATA_INDENT_TEST, indent_width: 11).css
       end
 
       assert_raises(ArgumentError) do
-        @embedded.render(data: DATA_INDENT_TEST, indent_width: 3.14)[:css]
+        @embedded.render(data: DATA_INDENT_TEST, indent_width: 3.14).css
       end
     end
 
     def test_output_indent_type
-      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_type: :tab)[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_type: :tab).css
         @media all {
         \t\t.foo {
         \t\t\t\tbaz: bang;
@@ -109,7 +109,7 @@ module Sass
         }
       CSS
 
-      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1, indent_type: 'tab')[:css]
+      assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1, indent_type: 'tab').css
         @media all {
         \t.foo {
         \t\tbaz: bang;
@@ -127,10 +127,10 @@ module Sass
         }
       SCSS
 
-      assert_equal ".foo {\n  baz: bang;\n}", @embedded.render(data: data, linefeed: :lf)[:css]
-      assert_equal ".foo {\n\r  baz: bang;\n\r}", @embedded.render(data: data, linefeed: :lfcr)[:css]
-      assert_equal ".foo {\r  baz: bang;\r}", @embedded.render(data: data, linefeed: :cr)[:css]
-      assert_equal ".foo {\r\n  baz: bang;\r\n}", @embedded.render(data: data, linefeed: :crlf)[:css]
+      assert_equal ".foo {\n  baz: bang;\n}", @embedded.render(data: data, linefeed: :lf).css
+      assert_equal ".foo {\n\r  baz: bang;\n\r}", @embedded.render(data: data, linefeed: :lfcr).css
+      assert_equal ".foo {\r  baz: bang;\r}", @embedded.render(data: data, linefeed: :cr).css
+      assert_equal ".foo {\r\n  baz: bang;\r\n}", @embedded.render(data: data, linefeed: :crlf).css
     end
   end
 end

data/test/render_test.rb

@@ -5,7 +5,7 @@ require_relative 'test_helper'
 module Sass
   class RenderTest < MiniTest::Test
     def test_sass_render
-      assert_equal '', ::Sass.render(data: '')[:css]
+      assert_equal '', ::Sass.render(data: '').css
 
       css = <<~CSS.chomp
         h1 {
@@ -13,7 +13,7 @@ module Sass
         }
       CSS
 
-      assert_equal css, ::Sass.render(data: 'h1 { font-size: 2rem; }')[:css]
+      assert_equal css, ::Sass.render(data: 'h1 { font-size: 2rem; }').css
     end
   end
 end

data/test/source_maps_test.rb

@@ -31,8 +31,8 @@ module Sass
       temp_file('style.scss', scss)
 
       result = @embedded.render(file: 'style.scss')
-      assert_equal css, result[:css]
-      assert_nil result[:map]
+      assert_equal css, result.css
+      assert_nil result.map
     end
 
     def test_source_map_file_as_string
@@ -47,6 +47,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=out.map */
       CSS
 
@@ -54,8 +55,8 @@ module Sass
 
       result = @embedded.render(file: 'style.scss',
                                 source_map: 'out.map')
-      assert_equal css, result[:css]
-      JSON.parse(result[:map])
+      assert_equal css, result.css
+      JSON.parse(result.map)
     end
 
     def test_source_map_true_without_out_file_has_no_effect
@@ -76,8 +77,8 @@ module Sass
 
       result = @embedded.render(file: 'style.scss',
                                 source_map: true)
-      assert_equal css, result[:css]
-      assert_nil result[:map]
+      assert_equal css, result.css
+      assert_nil result.map
     end
 
     def test_source_map_true_with_out_file
@@ -92,6 +93,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=out.css.map */
       CSS
 
@@ -100,8 +102,8 @@ module Sass
       result = @embedded.render(file: 'style.scss',
                                 source_map: true,
                                 out_file: 'out.css')
-      assert_equal css, result[:css]
-      JSON.parse(result[:map])
+      assert_equal css, result.css
+      JSON.parse(result.map)
     end
 
     def test_omit_source_map_url
@@ -123,8 +125,8 @@ module Sass
       result = @embedded.render(file: 'style.scss',
                                 source_map: 'out.map',
                                 omit_source_map_url: true)
-      assert_equal css, result[:css]
-      JSON.parse(result[:map])
+      assert_equal css, result.css
+      JSON.parse(result.map)
     end
 
     def test_source_map_embedded
@@ -139,6 +141,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=data:application/json;base64,
       CSS
 
@@ -147,8 +150,8 @@ module Sass
       result = @embedded.render(file: 'style.scss',
                                 source_map: 'out.map',
                                 source_map_embed: true)
-      assert result[:css].start_with? css
-      JSON.parse(result[:map])
+      assert result.css.start_with? css
+      JSON.parse(result.map)
     end
 
     def test_source_map_root
@@ -163,6 +166,7 @@ module Sass
         h1 {
           font-size: 40px;
         }
+
         /*# sourceMappingURL=out.map */
       CSS
 
@@ -171,8 +175,8 @@ module Sass
       result = @embedded.render(file: 'style.scss',
                                 source_map: 'out.map',
                                 source_map_root: 'assets')
-      assert_equal css, result[:css]
-      assert_equal 'assets', JSON.parse(result[:map])['sourceRoot']
+      assert_equal css, result.css
+      assert_equal 'assets', JSON.parse(result.map)['sourceRoot']
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.7
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf