sass-embedded 1.0.20 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 461898edc1bf1973531300e4531e473494686b4479c10ae335c10fe9968ad5f3
-  data.tar.gz: 53625b1f7874ee086abd63516b9f9432cb861bb50d5549d45af44c063d0d1258
+  metadata.gz: 4e63fe59310ae93bfce4710d847ee1a3d57a3678ea42754eebeb239c0510c933
+  data.tar.gz: d0f0e73bdd5952dfb1471ca23807584be64468e605f9e7c325e471b63d2a6f75
 SHA512:
-  metadata.gz: 9e7d149a7f719d7828ddb567b05c87e8fff2d8cd10e2abaf218cd002bb899545709dd76dd1298ba39ee21d995cb1b6218ed0e2ab09070269a940e8cc77a46640
-  data.tar.gz: '0299bef191ec02ee4b984dd4e0236569a3ad103968a8193cc4167481ceb62c59a5371da5ed25a19a72ae3b0f69e4b050141b9450d1807eb97bf6fd0ef849357f'
+  metadata.gz: 416f46659daf522785ec25b98a1b40df6e07216cffa7783004706404b49da57626cfca7c4e4f52a2da7d4981aca89a85cb926f1a49686390b9f3ff963eb288cf
+  data.tar.gz: 7e5ffe58da7e814fab55ea43d17b16b7b53382b915cde3874e215b58919055c73e1120df8a5f934fe6aa71c70126cbe21965cf381ef45f024c982536e852ef7a

data/README.md

@@ -35,6 +35,8 @@ result = Sass.compile_string('h1 { font-size: 40px; }')
 puts result.css
 ```
 
+See [rubydoc.info/gems/sass-embedded](https://rubydoc.info/gems/sass-embedded) for full API documentation.
+
 ---
 
 Disclaimer: this is not an official Google product.

data/ext/sass/Rakefile

@@ -63,45 +63,54 @@ module FileUtils
         sh 'unzip', '-od', dest, archive
       end
     else
-      raise "Unknown archive format #{archive}"
+      raise ArgumentError, "Unknown archive format #{archive}"
     end
   end
 
-  def fetch(uri_or_path, dest = nil)
-    require 'open-uri'
+  def fetch(source_uri, dest_path = nil)
+    require 'rubygems/remote_fetcher'
 
-    begin
-      uri = URI.parse(uri_or_path)
-      path = URI::DEFAULT_PARSER.unescape(uri.path)
-      if uri.instance_of?(URI::File) || uri.instance_of?(URI::Generic)
-        path = path.delete_prefix('/') if Gem.win_platform? && !File.file?(path)
-        raise unless File.file?(path)
+    unless source_uri.is_a?(URI::Generic)
+      begin
+        source_uri = URI.parse(source_uri)
+      rescue StandardError
+        source_uri = URI.parse(URI::DEFAULT_PARSER.escape(source_uri.to_s))
       end
-    rescue StandardError
-      raise unless File.file?(uri_or_path)
+    end
+
+    scheme = source_uri.scheme
+    source_path = URI::DEFAULT_PARSER.unescape(source_uri.path)
 
-      uri = nil
-      path = uri_or_path
+    if Gem.win_platform? && scheme =~ /^[a-z]$/i && !source_path.include?(':')
+      source_path = "#{scheme}:#{source_path}"
+      scheme = nil
     end
 
-    dest = File.basename(path) if dest.nil?
+    dest_path = File.basename(source_path) if dest_path.nil?
 
-    if uri.nil? || uri.instance_of?(URI::File) || uri.instance_of?(URI::Generic)
-      cp path, dest
-    elsif uri.respond_to?(:open)
-      Rake.rake_output_message "curl -fsSLo #{dest} -- #{uri}" if Rake::FileUtilsExt.verbose_flag
-      unless Rake::FileUtilsExt.nowrite_flag
-        uri.open do |stream|
-          File.binwrite(dest, stream.read)
-        end
+    case scheme
+    when nil, 'file'
+      if Gem.win_platform? && source_path[0].chr == '/' && source_path[1].chr =~ /[a-z]/i && source_path[2].chr == ':'
+        source_path = source_path[1..]
       end
+      cp source_path, dest_path
     else
-      raise
+      fetcher = Gem::RemoteFetcher.fetcher
+      symbol = "fetch_#{scheme}".to_sym
+      raise ArgumentError, "Unsupported URI scheme #{scheme}" unless fetcher.respond_to?(symbol)
+
+      if Rake::FileUtilsExt.verbose_flag
+        redacted_uri = Gem::RemoteFetcher::FetchError.new('', source_uri).uri
+        Rake.rake_output_message "fetch #{redacted_uri}"
+      end
+
+      unless Rake::FileUtilsExt.nowrite_flag
+        data = fetcher.public_send(symbol, source_uri)
+        Gem.write_binary(dest_path, data)
+      end
     end
 
-    dest
-  rescue StandardError
-    raise IOError, "Failed to fetch #{uri_or_path}"
+    dest_path
   end
 end
 
@@ -111,6 +120,8 @@ module Configuration
     OS = case RbConfig::CONFIG['host_os'].downcase
          when /darwin/
            'darwin'
+         when /linux-musl/
+           'linux-musl'
          when /linux/
            'linux'
          when *Gem::WIN_PATTERNS
@@ -119,23 +130,25 @@ module Configuration
            RbConfig::CONFIG['host_os'].downcase
          end
 
-    ARCH = case RbConfig::CONFIG['host_cpu'].downcase
-           when /amd64|x86_64|x64/
-             'x86_64'
-           when /i\d86|x86|i86pc/
-             'i386'
-           when /arm64|aarch64/
-             'aarch64'
-           when /arm/
-             # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
-             OS == 'darwin' ? 'aarch64' : 'arm'
-           when /ppc64le|powerpc64le/
-             'powerpc64le'
-           when /s390x/
-             's390x'
-           else
-             RbConfig::CONFIG['host_cpu']
-           end
+    CPU = case RbConfig::CONFIG['host_cpu'].downcase
+          when /amd64|x86_64|x64/
+            'x86_64'
+          when /i\d86|x86|i86pc/
+            'i386'
+          when /arm64|aarch64/
+            'aarch64'
+          when /arm/
+            # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
+            OS == 'darwin' ? 'aarch64' : 'arm'
+          when /ppc64le|powerpc64le/
+            'powerpc64le'
+          when /s390x/
+            's390x'
+          else
+            RbConfig::CONFIG['host_cpu']
+          end
+
+    ARCH = "#{CPU}-#{OS}"
   end
 
   private_constant :Platform
@@ -151,7 +164,7 @@ module Configuration
 
     tag_name = spec['dependencies']['sass-embedded']
 
-    message = "sass_embedded for #{Platform::OS}/#{Platform::ARCH} not available at #{repo}/releases/tag/#{tag_name}"
+    message = "sass_embedded for #{Platform::ARCH} not available at #{repo}/releases/tag/#{tag_name}"
 
     os = case Platform::OS
          when 'darwin'
@@ -164,20 +177,20 @@ module Configuration
            raise NotImplementedError, message
          end
 
-    arch = case Platform::ARCH
-           when 'i386'
-             'ia32'
-           when 'x86_64'
-             'x64'
-           when 'aarch64'
-             Platform::OS == 'darwin' ? 'x64' : 'arm64'
-           else
-             raise NotImplementedError, message
-           end
+    cpu = case Platform::CPU
+          when 'i386'
+            'ia32'
+          when 'x86_64'
+            'x64'
+          when 'aarch64'
+            Platform::OS == 'darwin' ? 'x64' : 'arm64'
+          else
+            raise NotImplementedError, message
+          end
 
     ext = Gem.win_platform? ? 'zip' : 'tar.gz'
 
-    "#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
+    "#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{cpu}.#{ext}"
   end
 
   def default_protoc
@@ -185,7 +198,7 @@ module Configuration
 
     version = Gem::Dependency.new('google-protobuf').to_spec.version
 
-    message = "protoc for #{Platform::OS}/#{Platform::ARCH} not available at #{repo}/#{version}"
+    message = "protoc for #{Platform::ARCH} not available at #{repo}/#{version}"
 
     os = case Platform::OS
          when 'darwin'
@@ -198,22 +211,22 @@ module Configuration
            raise NotImplementedError, message
          end
 
-    arch = case Platform::ARCH
-           when 'i386'
-             'x86_32'
-           when 'x86_64'
-             'x86_64'
-           when 'aarch64'
-             'aarch_64'
-           when 'powerpc64le'
-             'ppcle_64'
-           when 's390x'
-             's390_64'
-           else
-             raise NotImplementedError, message
-           end
-
-    "#{repo}/#{version}/protoc-#{version}-#{os}-#{arch}.exe"
+    cpu = case Platform::CPU
+          when 'i386'
+            'x86_32'
+          when 'x86_64'
+            'x86_64'
+          when 'aarch64'
+            'aarch_64'
+          when 'powerpc64le'
+            'ppcle_64'
+          when 's390x'
+            's390_64'
+          else
+            raise NotImplementedError, message
+          end
+
+    "#{repo}/#{version}/protoc-#{version}-#{os}-#{cpu}.exe"
   end
 
   def default_sass_embedded_protocol

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

@@ -124,9 +124,10 @@ module Sass
             )
           when :number
             Sass::Value::Number.new(
-              obj.value,
-              obj.numerators.to_a,
-              obj.denominators.to_a
+              obj.value, {
+                numerator_units: obj.numerators.to_a,
+                denominator_units: obj.denominators.to_a
+              }
             )
           when :rgb_color
             Sass::Value::Color.new(

data/lib/sass/embedded/host.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'host/function_registry'
+require_relative 'host/importer_registry'
+require_relative 'host/logger_registry'
+require_relative 'host/value_protofier'
+
 module Sass
   class Embedded
     # The {Host} class.

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.0.20'
+    VERSION = '1.1.1'
   end
 end

data/lib/sass/embedded.rb

@@ -9,30 +9,12 @@ require_relative 'embedded/channel'
 require_relative 'embedded/compiler'
 require_relative 'embedded/dispatcher'
 require_relative 'embedded/host'
-require_relative 'embedded/host/function_registry'
-require_relative 'embedded/host/importer_registry'
-require_relative 'embedded/host/logger_registry'
-require_relative 'embedded/host/value_protofier'
 require_relative 'embedded/protofier'
 require_relative 'embedded/structifier'
 require_relative 'embedded/varint'
 require_relative 'embedded/version'
 require_relative 'logger'
-require_relative 'logger/source_location'
-require_relative 'logger/source_span'
-require_relative 'script_error'
 require_relative 'value'
-require_relative 'value/list'
-require_relative 'value/argument_list'
-require_relative 'value/boolean'
-require_relative 'value/color'
-require_relative 'value/function'
-require_relative 'value/fuzzy_math'
-require_relative 'value/map'
-require_relative 'value/null'
-require_relative 'value/number'
-require_relative 'value/number/unit'
-require_relative 'value/string'
 
 module Sass
   # The {Embedded} host for using dart-sass-embedded. Each instance creates

data/lib/sass/logger.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative 'logger/source_location'
+require_relative 'logger/source_span'
+
 module Sass
   # A namespace for built-in Loggers.
   #

data/lib/sass/script_error.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Sass
+  # An exception thrown by Sass Script.
   class ScriptError < StandardError; end
 end

data/lib/sass/value/function.rb

@@ -8,8 +8,11 @@ module Sass
     class Function
       include Value
 
-      # @param id_or_signature [Numeric, ::String]
-      # @param callback [Proc]
+      # @overload initialize(id)
+      #   @param id [Numeric]
+      # @overload initialize(signature, callback)
+      #   @param signature [::String]
+      #   @param callback [Proc]
       def initialize(id_or_signature, callback = nil)
         if id_or_signature.is_a? Numeric
           @id = id_or_signature

data/lib/sass/value/number.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'number/unit'
+
 module Sass
   module Value
     # Sass's number type.
@@ -9,11 +11,26 @@ module Sass
       include Value
 
       # @param value [Numeric]
-      # @param numerator_units [Array<::String>, ::String]
-      # @param denominator_units [Array<::String>, ::String]
-      def initialize(value, numerator_units = [], denominator_units = [])
-        numerator_units = [numerator_units] if numerator_units.is_a?(::String)
-        denominator_units = [denominator_units] if denominator_units.is_a?(::String)
+      # @param unit [::String, Hash]
+      # @option unit [Array<::String>] :numerator_units
+      # @option unit [Array<::String>] :denominator_units
+      def initialize(value, unit = nil)
+        case unit
+        when nil
+          numerator_units = []
+          denominator_units = []
+        when ::String
+          numerator_units = [unit]
+          denominator_units = []
+        when ::Hash
+          numerator_units = unit.fetch(:numerator_units, [])
+          raise error "invalid numerator_units #{numerator_units.inspect}" unless numerator_units.is_a? Array
+
+          denominator_units = unit.fetch(:denominator_units, [])
+          raise error "invalid denominator_units #{denominator_units.inspect}" unless denominator_units.is_a? Array
+        else
+          raise error "invalid unit #{unit.inspect}"
+        end
 
         unless denominator_units.empty? && numerator_units.empty?
           value = value.dup
@@ -159,8 +176,10 @@ module Sass
       # @param new_denominator_units [Array<::String>]
       # @return [Number]
       def convert(new_numerator_units, new_denominator_units, name = nil)
-        Number.new(convert_value(new_numerator_units, new_denominator_units, name), new_numerator_units,
-                   new_denominator_units)
+        Number.new(convert_value(new_numerator_units, new_denominator_units, name), {
+                     numerator_units: new_numerator_units,
+                     denominator_units: new_denominator_units
+                   })
       end
 
       # @param new_numerator_units [Array<::String>]
@@ -175,7 +194,10 @@ module Sass
       # @param other [Number]
       # @return [Number]
       def convert_to_match(other, name = nil, other_name = nil)
-        Number.new(convert_value_to_match(other, name, other_name), other.numerator_units, other.denominator_units)
+        Number.new(convert_value_to_match(other, name, other_name), {
+                     numerator_units: other.numerator_units,
+                     denominator_units: other.denominator_units
+                   })
       end
 
       # @param other [Number]
@@ -192,8 +214,10 @@ module Sass
       # @param new_denominator_units [Array<::String>]
       # @return [Number]
       def coerce(new_numerator_units, new_denominator_units, name = nil)
-        Number.new(coerce_value(new_numerator_units, new_denominator_units, name), new_numerator_units,
-                   new_denominator_units)
+        Number.new(coerce_value(new_numerator_units, new_denominator_units, name), {
+                     numerator_units: new_numerator_units,
+                     denominator_units: new_denominator_units
+                   })
       end
 
       # @param new_numerator_units [Array<::String>]
@@ -214,7 +238,10 @@ module Sass
       # @param other [Number]
       # @return [Number]
       def coerce_to_match(other, name = nil, other_name = nil)
-        Number.new(coerce_value_to_match(other, name, other_name), other.numerator_units, other.denominator_units)
+        Number.new(coerce_value_to_match(other, name, other_name), {
+                     numerator_units: other.numerator_units,
+                     denominator_units: other.denominator_units
+                   })
       end
 
       # @param other [Number]

data/lib/sass/value/string.rb

@@ -9,7 +9,7 @@ module Sass
       include Value
 
       # @param text [::String]
-      # @param quoted: [::Boolean]
+      # @param quoted [::Boolean]
       def initialize(text = '', quoted: true)
         @text = text.freeze
         @quoted = quoted

data/lib/sass/value.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'script_error'
+
 module Sass
   # The abstract base class of Sass's value types.
   #
@@ -117,3 +119,14 @@ module Sass
     end
   end
 end
+
+require_relative 'value/list'
+require_relative 'value/argument_list'
+require_relative 'value/boolean'
+require_relative 'value/color'
+require_relative 'value/function'
+require_relative 'value/fuzzy_math'
+require_relative 'value/map'
+require_relative 'value/null'
+require_relative 'value/number'
+require_relative 'value/string'

data/lib/sass.rb

@@ -13,21 +13,27 @@ require_relative 'sass/embedded'
 #   Sass.compile_string('h1 { font-size: 40px; }')
 module Sass
   class << self
-    # @return [CompileResult]
-    # @raise [CompileError]
+    # Compiles the Sass file at +path+ to CSS.
+    # @param (see Embedded#compile)
+    # @return (see Embedded#compile)
+    # @raise (see Embedded#compile)
     # @see Embedded#compile
     def compile(path, **kwargs)
       instance.compile(path, **kwargs)
     end
 
-    # @return [CompileResult]
-    # @raise [CompileError]
+    # Compiles a stylesheet whose contents is +source+ to CSS.
+    # @param (see Embedded#compile_string)
+    # @return (see Embedded#compile_string)
+    # @raise (see Embedded#compile_string)
     # @see Embedded#compile_string
     def compile_string(source, **kwargs)
       instance.compile_string(source, **kwargs)
     end
 
-    # @return [String]
+    # @param (see Embedded#info)
+    # @return (see Embedded#info)
+    # @raise (see Embedded#info)
     # @see Embedded#info
     def info
       instance.info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.1.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -160,8 +160,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.20
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.20
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.1.1
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.1.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []