sass-embedded 1.0.19 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5254ca2c7b3c19b2ea114590c6e7ce58afb95943a7a3e9c43124cfd42e1db68
-  data.tar.gz: 9469c9e41981803da8a50764a0db94b51035898a6d7892328ec96faafd1cfb10
+  metadata.gz: 105fb9a8f27198dc74d89911ec31eafc40e7cf786a9567d993f584c956169014
+  data.tar.gz: e381b1d5c74d5356dfa9c6085bc7f6ed088259c90a80051dc22cbdf975fc1642
 SHA512:
-  metadata.gz: 530179e9bc1aa1e513b26fc56aeeb889236c689113ba1e7ca6d5b7a3e29b43e8078356ff1279bab315435553cb387fe4a988d4766f3c73270c0864d0b9053864
-  data.tar.gz: 8f0605fcee9c7630be7e6babdd707edae0b9e310ac616eb4ebb8988a5bceb249da92034296ca62752b9adb4724152455513b280961ba7291a5ac5cbad8c034a5
+  metadata.gz: a33ebf10f59766f644e2c88be19ea2aa72bb78a45684f65092be5c386d977437f928fa5d63a9dde96d31f777e72a6a30b36be8959a22dbc4da02c090278ff01d
+  data.tar.gz: '096e8913f2d9d4f402625d2f479e68ca772fffeaa8135ef078538af43052765753339fe9c1e3f378464f8d26d5dcffb113f2783754cd17bb24e097343a12b8fb'

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

@@ -111,6 +111,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 +121,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 +155,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 +168,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 +189,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 +202,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/dispatcher.rb

@@ -69,17 +69,17 @@ module Sass
       end
 
       def receive_message(outbound_message)
-        message = outbound_message.public_send(outbound_message.message)
-
-        case outbound_message.message
+        oneof = outbound_message.message
+        message = outbound_message.public_send(oneof)
+        case oneof
         when :error
           half_close
-          @observers[message.id]&.public_send(outbound_message.message, message)
+          @observers[message.id]&.public_send(oneof, message)
         when :compile_response, :version_response
-          @observers[message.id].public_send(outbound_message.message, message)
+          @observers[message.id].public_send(oneof, message)
         when :log_event, :canonicalize_request, :import_request, :file_import_request, :function_call_request
           Thread.new(@observers[message.compilation_id]) do |observer|
-            observer.public_send(outbound_message.message, message)
+            observer.public_send(oneof, message)
           end
         else
           raise ArgumentError, "Unknown OutboundMessage.message #{message}"

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

@@ -114,8 +114,9 @@ module Sass
         end
 
         def from_proto(proto)
-          obj = proto.public_send(proto.value)
-          case proto.value
+          oneof = proto.value
+          obj = proto.public_send(oneof)
+          case oneof
           when :string
             Sass::Value::String.new(
               obj.text,
@@ -123,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/protofier.rb

@@ -9,8 +9,9 @@ module Sass
       module_function
 
       def from_proto_compile_response(compile_response)
-        result = compile_response.public_send(compile_response.result)
-        case compile_response.result
+        oneof = compile_response.result
+        result = compile_response.public_send(oneof)
+        case oneof
         when :failure
           raise CompileError.new(
             result.message,

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.0.19'
+    VERSION = '1.1.0'
   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.19
+  version: 1.1.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-03-18 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.19
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.19
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.1.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.1.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []