sass-embedded 0.5.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1086f5483670120b40e9741187e5150a5af9e9ad5d38159d6d57459edec350b
-  data.tar.gz: d6afead31f102a04ad4d11c82e1381b597c285ae0206564640763173e2b67fc6
+  metadata.gz: 2ebc21eec151f7d15be984a32a5dfa6a8b4354daef5f6d152aecba17d0e422e1
+  data.tar.gz: bb869d1411ad2182618a065780083db630556cbd880469d0cb183936dcbd26b0
 SHA512:
-  metadata.gz: c8c534da41310d6b7e6228624d26a6e3dd94bccc4b67b2e9a25bff82251cb3b4a5d312c58ec1e498f944731cc99f4fdcb66b117278640cee2fc3d81f95924f66
-  data.tar.gz: 6d8808fc65dbb7fc4b43976beb6c8573635d874e9d72a7949f20eda5406e582ea0933a99f844256ec284e3ecf1e8e6f02b967f50854fde661470bf6834550abb
+  metadata.gz: 53a378c79e47e534273058d2943c0052906f2a099b1a2f0ddab251c53d36404ba2dffbe7acd8f5bf761153ffd9c81b198990a62995111924909fcd27d0734d9f
+  data.tar.gz: '0653995fb97f097939461e982dc08184713eb4621a316b2a8867b79bdbd049d5a33e7bf0a48c6d7d653d18bb4a6a14ec49e54f49e9967840f9d2a230eeb542f3'

data/README.md

@@ -6,6 +6,12 @@ This is a Ruby library that implements the host side of the [Embedded Sass proto
 
 It exposes a Ruby API for Sass that's backed by a native [Dart Sass](https://sass-lang.com/dart-sass) executable.
 
+## Install
+
+``` sh
+gem install sass-embedded
+```
+
 ## Usage
 
 ``` ruby
@@ -14,6 +20,26 @@ require "sass"
 Sass.render(file: "style.scss")
 ```
 
+## Options
+
+`Sass.render()` support the following options:
+
+- [`data`](https://sass-lang.com/documentation/js-api#data)
+- [`file`](https://sass-lang.com/documentation/js-api#file)
+- [`indented_syntax`](https://sass-lang.com/documentation/js-api#indentedsyntax)
+- [`include_paths`](https://sass-lang.com/documentation/js-api#includepaths)
+- [`output_style`](https://sass-lang.com/documentation/js-api#outputstyle)
+- [`indent_type`](https://sass-lang.com/documentation/js-api#indenttype)
+- [`indent_width`](https://sass-lang.com/documentation/js-api#indentwidth)
+- [`linefeed`](https://sass-lang.com/documentation/js-api#linefeed)
+- [`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_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)
+- [`importer`](https://sass-lang.com/documentation/js-api#importer)
+
 ---
 
 Disclaimer: this is not an official Google product.

data/ext/extconf.rb

@@ -8,9 +8,9 @@ require 'fileutils'
 require_relative '../lib/sass/platform'
 
 module Sass
-  # The dependency downloader. This will download all the dependencies
-  # during gem installation, and the Makefile will unpack all downloaded
-  # dependencies. By default it will download the latest release of each
+  # The dependency downloader. This downloads all the dependencies during gem
+  # installation. The companion Makefile then unpacks all downloaded
+  # dependencies. By default it downloads the latest release of each
   # dependency from GitHub releases.
   #
   # It is possible to specify an alternative source or version of each
@@ -18,9 +18,9 @@ module Sass
   #
   # @example
   #   gem install sass-embedded -- \
-  #     --with-protoc=file:///path/to/protoc-*.zip
+  #     --with-protoc=file:///path/to/protoc-*.zip \
   #     --with-sass-embedded=file:///path/to/sass_embedded-*.(tar.gz|zip) \
-  #     --with-sass-embedded-protocol=file:///path/to/embedded_sass.proto \
+  #     --with-sass-embedded-protocol=file:///path/to/embedded_sass.proto
   class Extconf
     def initialize
       get_with_config('protoc', true) { latest_protoc }

data/lib/sass.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-# The Sass module. This module will communicate with Embedded Dart Sass using
+# The Sass module. This communicates with Embedded Dart Sass using
 # the Embedded Sass protocol.
 module Sass
   class << self
-    # The global include_paths for Sass files. This is meant for plugins and
+    # The global {.include_paths} for Sass files. This is meant for plugins and
     # libraries to register the paths to their Sass stylesheets to that they may
-    # be `@imported`. This include path is used by every instance of
-    # {Sass::Embedded}. They are lower-precedence than any include paths passed
-    # in via the `:include_paths` option.
+    # be included via `@import` or `@use`. This include path is used by every
+    # instance of {Sass::Embedded}. They are lower-precedence than any include
+    # paths passed in via the `include_paths` option.
     #
     # If the `SASS_PATH` environment variable is set,
     # the initial value of `include_paths` will be initialized based on that.
@@ -17,7 +17,7 @@ module Sass
     #
     # @example
     #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
-    # @return [Array<String, Pathname>]
+    # @return [Array]
     def include_paths
       @include_paths ||= if ENV['SASS_PATH']
                            ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
@@ -26,19 +26,26 @@ module Sass
                          end
     end
 
+    # The global {.info} method. This instantiates a global {Embedded} instance
+    # and calls {Embedded#info}.
+    #
+    # @raise [ProtocolError]
     def info
       embedded.info
     end
 
-    # The global render method. This method automatically instantiates a
-    # global {Sass::Embedded} instance when invoked the first time and call
-    # `:render` method on the instance thereafter. See {Sass::Embedded#render}
-    # for supported options.
+    # The global {.render} method. This instantiates a global {Embedded} instance
+    # and calls {Embedded#render}.
+    #
+    # See {file:README.md#options} for supported options.
+    #
     # @example
     #   Sass.render(data: 'h1 { font-size: 40px; }')
     # @example
     #   Sass.render(file: 'style.css')
-    # @return [Hash]
+    # @return [Result]
+    # @raise [ProtocolError]
+    # @raise [RenderError]
     def render(**kwargs)
       embedded.render(**kwargs)
     end
@@ -53,12 +60,13 @@ module Sass
   end
 end
 
-require_relative 'sass/version'
-require_relative 'sass/error'
 require_relative 'sass/platform'
 require_relative 'sass/util'
+require_relative 'sass/struct'
+require_relative 'sass/result'
+require_relative 'sass/error'
 require_relative 'sass/transport'
 require_relative 'sass/observer'
-require_relative 'sass/info'
+require_relative 'sass/version'
 require_relative 'sass/render'
 require_relative 'sass/embedded'

data/lib/sass/embedded.rb

@@ -4,8 +4,9 @@ require 'base64'
 require 'json'
 
 module Sass
-  # The {Embedded} user interface for using dart-sass-embedded. Each instance
-  # will create its own {Transport}.
+  # The {Embedded} host for using dart-sass-embedded. Each instance creates
+  # its own {Transport}.
+  #
   # @example
   #   embedded = Sass::Embedded.new
   #   result = embedded.render(data: 'h1 { font-size: 40px; }')
@@ -18,69 +19,79 @@ module Sass
       @id = 0
     end
 
+    # The {Embedded#info} method.
+    #
+    # @raise [ProtocolError]
     def info
-      @info ||= Info.new(@transport, next_id).fetch
+      @info ||= Version.new(@transport, next_id).message
     end
 
+    # The {Embedded#render} method.
+    #
+    # See {file:README.md#options} for supported options.
+    #
+    # @return [RenderResult]
+    # @raise [ProtocolError]
+    # @raise [RenderError]
     def render(data: nil,
                file: nil,
                indented_syntax: false,
                include_paths: [],
                output_style: :expanded,
-               # precision: 5,
                indent_type: :space,
                indent_width: 2,
                linefeed: :lf,
-               # source_comments: false,
                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)
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      result = 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).fetch
-
-      if result.failure
+      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
+
+      if message.failure
         raise RenderError.new(
-          result.failure.message,
-          result.failure.formatted,
-          if result.failure.span.nil?
+          message.failure.message,
+          message.failure.formatted,
+          if message.failure.span.nil?
             nil
-          elsif result.failure.span.url == ''
+          elsif message.failure.span.url == ''
             'stdin'
           else
-            Util.path(result.failure.span.url)
+            Util.path(message.failure.span.url)
           end,
-          result.failure.span ? result.failure.span.start.line + 1 : nil,
-          result.failure.span ? result.failure.span.start.column + 1 : nil,
+          message.failure.span ? message.failure.span.start.line + 1 : nil,
+          message.failure.span ? message.failure.span.start.column + 1 : nil,
           1
         )
       end
 
-      map, source_map = post_process_map(map: result.success.source_map,
+      map, source_map = post_process_map(map: message.success.source_map,
                                          file: file,
                                          out_file: out_file,
                                          source_map: source_map,
                                          source_map_root: source_map_root)
 
-      css = post_process_css(css: result.success.css,
+      css = post_process_css(css: message.success.css,
                              indent_type: indent_type,
                              indent_width: indent_width,
                              linefeed: linefeed,
@@ -92,16 +103,9 @@ module Sass
 
       finish = Util.now
 
-      {
-        css: css,
-        map: map,
-        stats: {
-          entry: file.nil? ? 'data' : file,
-          start: start,
-          end: finish,
-          duration: finish - start
-        }
-      }
+      stats = RenderResult::Stats.new(file.nil? ? 'data' : file, start, finish, finish - start)
+
+      RenderResult.new(css, map, stats)
     end
 
     def close

data/lib/sass/error.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
 module Sass
-  class SassError < StandardError; end
+  class Error < StandardError; end
 
-  class ProtocolError < SassError; end
+  class ProtocolError < Error; end
 
-  # The error returned by {Embedded#render}.
-  class RenderError < SassError
-    attr_accessor :formatted, :file, :line, :column, :status
+  # 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)
+      super(message)
       @formatted = formatted
       @file = file
       @line = line
       @column = column
       @status = status
-      super(message)
     end
 
     def backtrace

data/lib/sass/info.rb

@@ -2,7 +2,7 @@
 
 module Sass
   # The {Observer} for {Embedded#info}.
-  class Info < Observer
+  class Version < Observer
     def initialize(transport, id)
       super(transport, id)
       @transport.send EmbeddedProtocol::InboundMessage::VersionRequest.new(id: @id)

data/lib/sass/observer.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  # The abstract {Observer} for tracking state and observing messages
-  # from {Transport}.
+  # The {Observer} for receiving messages from {Transport}.
   class Observer
     def initialize(transport, id)
       raise NotImplementedError if instance_of? Observer
@@ -16,7 +15,7 @@ module Sass
       @transport.add_observer self
     end
 
-    def fetch
+    def message
       @mutex.synchronize do
         @condition_variable.wait(@mutex) if @error.nil? && @message.nil?
       end

data/lib/sass/render.rb

@@ -47,15 +47,17 @@ 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
         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
@@ -63,7 +65,7 @@ module Sass
       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

data/lib/sass/result.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Sass
+  # The {RenderResult} of {Embedded#render}.
+  class RenderResult
+    include Struct
+
+    attr_reader :css, :map, :stats
+
+    def initialize(css, map, stats)
+      @css = css
+      @map = map
+      @stats = stats
+    end
+
+    # The {Stats} of {Embedded#render}.
+    class Stats
+      include Struct
+
+      attr_reader :entry, :start, :end, :duration
+
+      def initialize(entry, start, finish, duration)
+        @entry = entry
+        @start = start
+        @end = finish
+        @duration = duration
+      end
+    end
+  end
+end

data/lib/sass/struct.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Sass
+  # The {Struct} module.
+  module Struct
+    def [](key)
+      instance_variable_get("@#{key}".to_sym)
+    end
+
+    def to_h
+      instance_variables.map do |variable|
+        [variable[1..].to_sym, instance_variable_get(variable)]
+      end.to_h
+    end
+
+    def to_s
+      to_h.to_s
+    end
+  end
+end

data/lib/sass/transport.rb

@@ -6,7 +6,7 @@ require_relative '../../ext/embedded_sass_pb'
 
 module Sass
   # The {Observable} {Transport} for low level communication with
-  # dart-sass-embedded using protocol buffers via stdio. Received messages
+  # `dart-sass-embedded` using protocol buffers via stdio. Received messages
   # can be observed by an {Observer}.
   class Transport
     include Observable

data/lib/sass/util.rb

@@ -3,7 +3,7 @@
 require 'pathname'
 
 module Sass
-  # The utilitiy module.
+  # The {Util} module.
   module Util
     module_function
 

data/lib/sass/version.rb

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

data/sass-embedded.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['i@ntk.me']
   spec.summary       = 'Use dart-sass with Ruby!'
   spec.description   = 'Use dart-sass with Ruby!'
-  spec.homepage      = 'https://github.com/ntkme/embedded-host-ruby'
+  spec.homepage      = 'https://github.com/ntkme/sass-embedded-host-ruby'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

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
@@ -54,8 +54,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 +76,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
@@ -100,8 +100,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 +123,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
@@ -147,8 +147,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
@@ -171,8 +171,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.5.0
+  version: 0.6.4
 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
@@ -161,6 +161,8 @@ files:
 - lib/sass/observer.rb
 - lib/sass/platform.rb
 - lib/sass/render.rb
+- lib/sass/result.rb
+- lib/sass/struct.rb
 - lib/sass/transport.rb
 - lib/sass/util.rb
 - lib/sass/version.rb
@@ -176,7 +178,7 @@ files:
 - test/render_test.rb
 - test/source_maps_test.rb
 - test/test_helper.rb
-homepage: https://github.com/ntkme/embedded-host-ruby
+homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata: {}