sass-embedded 0.19.6 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914b5726d70add284fd3028fc0b8c7c3929d4a37b869887425a3d7265aac5053
-  data.tar.gz: 34dd1b5ffb948c63e195472e2f3287497ef77b79f485d7631edeb898d055bbec
+  metadata.gz: 5f5ecc805dbe549bd19b1e5777bd16500bcd71fc56def8fe364f542c7bb731e0
+  data.tar.gz: 14c15309ebc1aff54a5b9df78cbd5a66e7321c22e4229357724945aa2a0d3647
 SHA512:
-  metadata.gz: 1b17e913eca2f5d5c7565a3ae02e5bc98887624332d2a03653f27793bfe772d1b444135628f99ebf42db40302509c8ce183ac57375120758bfd5677adee7f624
-  data.tar.gz: 5a8f24ac6b0bfa83f810639de88c7f8022b202cc2aeccf63f6eb8f50b6dc10928a2341cb342d5725cc667a64355728de7ee0341c9503f99e44effb638be3d133
+  metadata.gz: e4d372b8b307ff60d2f21c6b6bf1674833587c0945ff13e6435dae761fb4bfa0e75233f5dfe88aa47d97b7d4cea483ffdc55e71df92ae9d472d29a94c4eb4f21
+  data.tar.gz: 4ecd5d19ca66c2697e0a2cdbfccbb550ab0cb414829d542e71b7f28c77122973f5dc508e2aec3c214aaad777c674cc72a1a8a0b5b90b256728ef20623e16df53

data/ext/sass/extconf.rb

@@ -106,20 +106,21 @@ module Sass
 
       def fetch(uri_s)
         uri = URI.parse(uri_s)
-        path = File.absolute_path(File.basename(uri.path), __dir__)
+        path = URI::DEFAULT_PARSER.unescape(uri.path)
+        dest = File.absolute_path(File.basename(path), __dir__)
         if uri.is_a?(URI::File) || uri.instance_of?(URI::Generic)
-          FileUtils.copy_file uri.path, path
+          puts "cp -- #{path} #{dest}"
+          FileUtils.copy_file(path, dest)
         elsif uri.respond_to? :open
-          puts "curl -fsSLo #{path} -- #{uri}"
-          uri.open do |source|
-            File.binwrite(path, source.read)
+          puts "curl -fsSLo #{dest} -- #{uri}"
+          uri.open do |stream|
+            File.binwrite(dest, stream.read)
           end
         else
           raise
         end
       rescue StandardError
-        warn "ERROR:  Error fetching #{uri_s}:"
-        raise
+        raise "Failed to fetch #{uri_s}"
       end
 
       def default_sass_embedded
@@ -209,7 +210,7 @@ module Sass
 
         ext = 'zip'
 
-        "https://github.com/#{repo}/releases/download/#{tag_name}/protoc-#{tag_name[1..]}-#{os_arch}.#{ext}"
+        "https://github.com/#{repo}/releases/download/#{tag_name}/protoc-#{tag_name.delete_prefix('v')}-#{os_arch}.#{ext}"
       end
 
       def default_sass_embedded_protocol

data/lib/sass/embedded/channel.rb

@@ -7,8 +7,8 @@ module Sass
     # It establishes connection between {Host} and {Dispatcher}.
     class Channel
       def initialize
-        @mutex = Mutex.new
         @dispatcher = Dispatcher.new
+        @mutex = Mutex.new
       end
 
       def close

data/lib/sass/embedded/compiler.rb

@@ -13,11 +13,11 @@ module Sass
       )
 
       def initialize
+        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(PATH)
+        @stdin.binmode
+        @stdout.binmode
         @stdin_mutex = Mutex.new
         @stdout_mutex = Mutex.new
-        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(PATH)
-
-        [@stdin, @stdout].each(&:binmode)
 
         Thread.new do
           loop do

data/lib/sass/embedded/host/function_registry.rb

@@ -49,7 +49,7 @@ module Sass
 
           success = value_protofier.to_proto(get(function_call_request).call(arguments))
           accessed_argument_lists = arguments
-                                    .filter do |argument|
+                                    .select do |argument|
                                       argument.is_a?(Sass::Value::ArgumentList) && argument.instance_eval do
                                         @keywords_accessed
                                       end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.19.6'
+    VERSION = '1.0.1'
   end
 end

data/lib/sass.rb

@@ -12,7 +12,6 @@ require_relative 'sass/embedded/host/function_registry'
 require_relative 'sass/embedded/host/importer_registry'
 require_relative 'sass/embedded/host/logger_registry'
 require_relative 'sass/embedded/host/value_protofier'
-require_relative 'sass/embedded/legacy'
 require_relative 'sass/embedded/protofier'
 require_relative 'sass/embedded/structifier'
 require_relative 'sass/embedded/varint'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.19.6
+  version: 1.0.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -137,7 +137,6 @@ files:
 - lib/sass/embedded/host/importer_registry.rb
 - lib/sass/embedded/host/logger_registry.rb
 - lib/sass/embedded/host/value_protofier.rb
-- lib/sass/embedded/legacy.rb
 - lib/sass/embedded/protofier.rb
 - lib/sass/embedded/structifier.rb
 - lib/sass/embedded/varint.rb
@@ -163,8 +162,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.19.6
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.19.6
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.1
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/lib/sass/embedded/legacy.rb

@@ -1,406 +0,0 @@
-# frozen_string_literal: true
-
-# The Sass module.
-#
-# This communicates with Embedded Dart Sass using the Embedded Sass protocol.
-module Sass
-  class << self
-    # @deprecated
-    # 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 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.
-    # The variable should be a colon-separated list of path names
-    # (semicolon-separated on Windows).
-    #
-    # @example
-    #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
-    # @return [Array]
-    def include_paths
-      Embedded.include_paths
-    end
-
-    # @deprecated
-    # The global {.render} method. This instantiates a global {Embedded} instance
-    # and calls {Embedded#render}.
-    #
-    # See {Embedded#render} for supported options.
-    #
-    # @example
-    #   Sass.render(data: 'h1 { font-size: 40px; }')
-    # @example
-    #   Sass.render(file: 'style.css')
-    # @return [Result]
-    # @raise [RenderError]
-    def render(**kwargs)
-      instance.render(**kwargs)
-    end
-  end
-
-  # The {Embedded} host for using dart-sass-embedded. Each instance creates
-  # its own {Channel}.
-  #
-  # @example
-  #   embedded = Sass::Embedded.new
-  #   result = embedded.compile_string('h1 { font-size: 40px; }')
-  #   result = embedded.compile('style.scss')
-  #   embedded.close
-  class Embedded
-    # @deprecated
-    def self.include_paths
-      @include_paths ||= if ENV['SASS_PATH']
-                           ENV['SASS_PATH'].split(File::PATH_SEPARATOR)
-                         else
-                           []
-                         end
-    end
-
-    # @deprecated
-    # The {Embedded#render} method.
-    #
-    # See {file:README.md#options} for supported options.
-    #
-    # @return [RenderResult]
-    # @raise [RenderError]
-    def render(data: nil,
-               file: nil,
-               indented_syntax: false,
-               include_paths: [],
-               output_style: :expanded,
-               indent_type: :space,
-               indent_width: 2,
-               linefeed: :lf,
-               source_map: false,
-               out_file: nil,
-               omit_source_map_url: false,
-               source_map_contents: false,
-               source_map_embed: false,
-               source_map_root: '',
-               functions: {},
-               importer: [])
-      raise ArgumentError, 'either data or file must be set' if file.nil? && data.nil?
-
-      start = now
-
-      indent_type = parse_indent_type(indent_type)
-      indent_width = parse_indent_width(indent_width)
-      linefeed = parse_linefeed(linefeed)
-
-      load_paths = include_paths + Embedded.include_paths
-
-      source_map_option = source_map.is_a?(String) || (source_map == true && !out_file.nil?)
-
-      begin
-        compile_result = if data
-                           compile_string(data, load_paths: load_paths,
-                                                syntax: indented_syntax ? :indented : :scss,
-                                                url: (Url.path_to_file_url(File.absolute_path(file)) unless file.nil?),
-                                                source_map: source_map_option,
-                                                source_map_include_sources: source_map_contents,
-                                                style: output_style,
-                                                functions: functions,
-                                                importers: importer.map do |legacy_importer|
-                                                             LegacyImporter.new(legacy_importer, file)
-                                                           end)
-                         else
-                           compile(file, load_paths: load_paths,
-                                         source_map: source_map_option,
-                                         source_map_include_sources: source_map_contents,
-                                         style: output_style,
-                                         functions: functions,
-                                         importers: importer.map do |legacy_importer|
-                                                      LegacyImporter.new(legacy_importer, file)
-                                                    end)
-                         end
-      rescue CompileError => e
-        raise RenderError.new(
-          e.message,
-          e.full_message,
-          if e.span.nil?
-            nil
-          elsif e.span.url.nil?
-            'stdin'
-          else
-            Url.file_url_to_path(e.span.url)
-          end,
-          e.span.start.line + 1,
-          e.span.start.column + 1,
-          1
-        )
-      end
-
-      map, source_map = post_process_map(map: compile_result.source_map,
-                                         file: file,
-                                         out_file: out_file,
-                                         source_map: source_map,
-                                         source_map_root: source_map_root)
-
-      css = post_process_css(css: compile_result.css,
-                             indent_type: indent_type,
-                             indent_width: indent_width,
-                             linefeed: linefeed,
-                             map: map,
-                             out_file: out_file,
-                             omit_source_map_url: omit_source_map_url,
-                             source_map: source_map,
-                             source_map_embed: source_map_embed)
-
-      finish = now
-
-      stats = RenderResultStats.new(file.nil? ? 'data' : file, start, finish, finish - start)
-
-      RenderResult.new(css, map, stats)
-    end
-
-    # @deprecated
-    # The {RenderResult} of {Embedded#render}.
-    class RenderResult
-      attr_reader :css, :map, :stats
-
-      def initialize(css, map, stats)
-        @css = css
-        @map = map
-        @stats = stats
-      end
-    end
-
-    # @deprecated
-    # The {RenderResultStats} of {Embedded#render}.
-    class RenderResultStats
-      attr_reader :entry, :start, :end, :duration
-
-      def initialize(entry, start, finish, duration)
-        @entry = entry
-        @start = start
-        @end = finish
-        @duration = duration
-      end
-    end
-
-    # @deprecated
-    # The {RenderError} raised by {Embedded#render}.
-    class RenderError < StandardError
-      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
-      end
-
-      def backtrace
-        return nil if super.nil?
-
-        ["#{@file}:#{@line}:#{@column}"] + super
-      end
-    end
-
-    private
-
-    # @deprecated
-    def post_process_map(map:,
-                         file:,
-                         out_file:,
-                         source_map:,
-                         source_map_root:)
-      return if map.nil? || map.empty?
-
-      require 'json'
-
-      map_data = JSON.parse(map)
-
-      map_data['sourceRoot'] = source_map_root
-
-      source_map_path = if source_map.is_a? String
-                          source_map
-                        else
-                          "#{out_file}.map"
-                        end
-
-      source_map_dir = File.dirname(source_map_path)
-
-      if out_file
-        map_data['file'] = 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"
-      else
-        map_data['file'] = 'stdin.css'
-      end
-
-      map_data['sources'].map! do |source|
-        if source.start_with? 'file://'
-          path = Url.file_url_to_path(source)
-          relative_path(source_map_dir, path)
-        else
-          source
-        end
-      end
-
-      [-JSON.generate(map_data), source_map_path]
-    end
-
-    # @deprecated
-    def post_process_css(css:,
-                         indent_type:,
-                         indent_width:,
-                         linefeed:,
-                         map:,
-                         omit_source_map_url:,
-                         out_file:,
-                         source_map:,
-                         source_map_embed:)
-      css = +css
-      if indent_width != 2 || indent_type.to_sym != :space
-        indent = indent_type * indent_width
-        css.gsub!(/^ +/) do |space|
-          indent * (space.length / 2)
-        end
-      end
-      css.gsub!("\n", linefeed) if linefeed != "\n"
-
-      unless map.nil? || omit_source_map_url == true
-        url = if source_map_embed
-                require 'base64'
-
-                "data:application/json;base64,#{Base64.strict_encode64(map)}"
-              elsif out_file
-                relative_path(File.dirname(out_file), source_map)
-              else
-                source_map
-              end
-        css += "#{linefeed}#{linefeed}/*# sourceMappingURL=#{url} */"
-      end
-
-      -css
-    end
-
-    # @deprecated
-    def parse_indent_type(indent_type)
-      case indent_type.to_sym
-      when :space
-        ' '
-      when :tab
-        "\t"
-      else
-        raise ArgumentError, 'indent_type must be one of :space, :tab'
-      end
-    end
-
-    # @deprecated
-    def parse_indent_width(indent_width)
-      raise ArgumentError, 'indent_width must be an integer' unless indent_width.is_a? Integer
-      raise RangeError, 'indent_width must be in between 0 and 10 (inclusive)' unless indent_width.between? 0, 10
-
-      indent_width
-    end
-
-    # @deprecated
-    def parse_linefeed(linefeed)
-      case linefeed.to_sym
-      when :lf
-        "\n"
-      when :lfcr
-        "\n\r"
-      when :cr
-        "\r"
-      when :crlf
-        "\r\n"
-      else
-        raise ArgumentError, 'linefeed must be one of :lf, :lfcr, :cr, :crlf'
-      end
-    end
-
-    # @deprecated
-    def now
-      (Time.now.to_f * 1000).to_i
-    end
-
-    # @deprecated
-    def relative_path(from, to)
-      require 'pathname'
-
-      Pathname.new(File.absolute_path(to)).relative_path_from(Pathname.new(File.absolute_path(from))).to_s
-    end
-
-    # @deprecated
-    # The {LegacyImporter} for {Embedded#render}.
-    class LegacyImporter
-      def initialize(importer, file)
-        super()
-        @file = file
-        @importer = importer
-        @importer_results = {}
-      end
-
-      def canonicalize(url, **_kwargs)
-        path = Url.file_url_to_path(url)
-        canonical_url = Url.path_to_file_url(File.absolute_path(path, (@file.nil? ? 'stdin' : @file)))
-
-        result = @importer.call canonical_url, @file
-
-        raise result if result.is_a? StandardError
-
-        if result&.key? :contents
-          @importer_results[canonical_url] = {
-            contents: result[:contents],
-            syntax: :scss
-          }
-          canonical_url
-        elsif result&.key? :file
-          canonical_url = Url.path_to_file_url(File.absolute_path(result[:file]))
-          @importer_results[canonical_url] = {
-            contents: File.read(result[:file]),
-            syntax: :scss
-          }
-          canonical_url
-        end
-      end
-
-      def load(canonical_url)
-        @importer_results[canonical_url]
-      end
-    end
-
-    # @deprecated
-    # The {Url} module.
-    module Url
-      FILE_SCHEME = 'file://'
-
-      private_constant :FILE_SCHEME
-
-      module_function
-
-      def path_to_file_url(path)
-        if File.absolute_path? path
-          Url.uri_parser.escape "#{FILE_SCHEME}#{Gem.win_platform? ? '/' : ''}#{path}"
-        else
-          Url.uri_parser.escape path
-        end
-      end
-
-      def file_url_to_path(url)
-        if url.start_with? FILE_SCHEME
-          Url.uri_parser.unescape url[(FILE_SCHEME.length + (Gem.win_platform? ? 1 : 0))..]
-        else
-          Url.uri_parser.unescape url
-        end
-      end
-
-      def uri_parser
-        require 'uri'
-
-        @uri_parser ||= URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
-      end
-    end
-
-    private_constant :LegacyImporter
-  end
-end