sass-embedded 1.64.0 → 1.64.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ab7f4ccdb57babfe8dc2af27348ef74956b60b6051389839211004aee50b4a
-  data.tar.gz: f423e6703e1beeaaf12d87c2085f2f918812ac6eed6639b939108128abf5b0b1
+  metadata.gz: 8ad47619555545c26106956262a00b251d6f6f7c736c86ea8e634f88f58afef2
+  data.tar.gz: 1c25d4bb801671dfa714ba3cd6e2df8f0ff75151ec34eeae6f4616d7dffdaacc
 SHA512:
-  metadata.gz: df45e1d1804557bd66f0062f4c46f015f74f9ade4349bf0094c61557d32ae2f0b26aea707e449e722d629b41e866ffa0a67fba24d15a1ce5cfc5119ecd7f9261
-  data.tar.gz: 5eec5885c830ad9d5d2e68ce637c3754c22186da39aa8c12353e38d38ed80748cacbe4b6cf3f2a566950e65fbcff8f8c3852de41657c2a9c8b305c75ec2062ec
+  metadata.gz: daa146506e5dc03f2569316a6a1df7b58784d8f7a503bf595c5c30b1e9aee496ed579dc03dd3e541038d2921f4b5fe69a50c597618bf14676385061f998ede12
+  data.tar.gz: 84741c2ce654be853b96e627299d0f325b91e14cfda693238e10b18ad899ba2b2286438c9880bacb5b5175a1c001231d9f4fc757035d4f997f79908099a03036

data/ext/sass/Rakefile

@@ -413,10 +413,10 @@ module SassConfig
   end
 
   def gem_platform
-    platform = Gem::Platform.new("#{RbConfig::CONFIG['host_cpu']}-#{RbConfig::CONFIG['host_os']}")
+    platform = Gem::Platform.new("#{Platform::EMULATION || Platform::CPU}-#{RbConfig::CONFIG['host_os']}")
     case Platform::OS
     when 'darwin'
-      Gem::Platform.new([platform.cpu, platform.os])
+      Gem::Platform.new([RbConfig::CONFIG['host_cpu'], platform.os])
     when 'linux'
       if platform.version&.start_with?('gnu')
         platform
@@ -424,11 +424,9 @@ module SassConfig
         Gem::Platform.new([platform.cpu, platform.os, "gnu#{platform.version}"])
       end
     when 'windows'
-      case Platform::EMULATION || Platform::CPU
+      case platform.cpu
       when 'x86_64'
         Gem::Platform.new('x64-mingw32')
-      when 'i386'
-        Gem::Platform.new('x86-mingw32')
       else
         Gem::Platform.new([platform.cpu, 'mingw32'])
       end

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.64.0"
+    "sass": "1.64.2"
   }
 }

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

@@ -230,39 +230,11 @@ module Sass
           end
 
           def from_proto(obj)
-            case obj.name
-            when 'calc'
-              if obj.arguments.length != 1
-                raise Sass::ScriptError,
-                      'Value.Calculation.arguments must have exactly one argument for calc().'
-              end
-
-              Sass::Value::Calculation.calc(*obj.arguments.map { |argument| CalculationValue.from_proto(argument) })
-            when 'clamp'
-              if obj.arguments.length != 3
-                raise Sass::ScriptError,
-                      'Value.Calculation.arguments must have exactly 3 arguments for clamp().'
-              end
-
-              Sass::Value::Calculation.clamp(*obj.arguments.map { |argument| CalculationValue.from_proto(argument) })
-            when 'min'
-              if obj.arguments.empty?
-                raise Sass::ScriptError,
-                      'Value.Calculation.arguments must have at least 1 argument for min().'
-              end
-
-              Sass::Value::Calculation.min(obj.arguments.map { |argument| CalculationValue.from_proto(argument) })
-            when 'max'
-              if obj.arguments.empty?
-                raise Sass::ScriptError,
-                      'Value.Calculation.arguments must have at least 1 argument for max().'
-              end
-
-              Sass::Value::Calculation.max(obj.arguments.map { |argument| CalculationValue.from_proto(argument) })
-            else
-              raise Sass::ScriptError,
-                    "Value.Calculation.name #{calculation.name.inspect} is not a recognized calculation type."
-            end
+            Sass::Value::Calculation.send(
+              :new,
+              obj.name,
+              obj.arguments.map { |argument| CalculationValue.from_proto(argument) }
+            )
           end
         end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.64.0'
+    VERSION = '1.64.2'
   end
 end

data/lib/sass/value/calculation.rb

@@ -9,38 +9,24 @@ module Sass
       include Value
       include CalculationValue
 
-      def initialize(name, arguments)
-        @name = name.freeze
-        @arguments = arguments.freeze
-      end
-
-      # @return [::String]
-      attr_reader :name
-
-      # @return [Array<CalculationValue>]
-      attr_reader :arguments
-
-      private_class_method :new
-
       class << self
+        private :new
+
         # @param argument [CalculationValue]
         # @return [Calculation]
         def calc(argument)
-          argument.assert_calculation_value
           new('calc', [argument])
         end
 
         # @param arguments [Array<CalculationValue>]
         # @return [Calculation]
         def min(arguments)
-          arguments.each(&:assert_calculation_value)
           new('min', arguments)
         end
 
         # @param arguments [Array<CalculationValue>]
         # @return [Calculation]
         def max(arguments)
-          arguments.each(&:assert_calculation_value)
           new('max', arguments)
         end
 
@@ -54,11 +40,7 @@ module Sass
             raise Sass::ScriptError, 'Argument must be an unquoted SassString or CalculationInterpolation.'
           end
 
-          arguments = [min]
-          arguments.push(value) unless value.nil?
-          arguments.push(max) unless max.nil?
-          arguments.each(&:assert_calculation_value)
-          new('clamp', arguments)
+          new('clamp', [min, value, max].compact)
         end
 
         private
@@ -69,6 +51,23 @@ module Sass
         end
       end
 
+      private
+
+      def initialize(name, arguments)
+        arguments.each(&:assert_calculation_value)
+
+        @name = name.freeze
+        @arguments = arguments.freeze
+      end
+
+      public
+
+      # @return [::String]
+      attr_reader :name
+
+      # @return [Array<CalculationValue>]
+      attr_reader :arguments
+
       # @return [Calculation]
       def assert_calculation(_name = nil)
         self

data/lib/sass/value/string.rb

@@ -41,8 +41,8 @@ module Sass
 
       # @return [CalculationValue]
       # @raise [ScriptError]
-      def assert_calculation_value(_name = nil)
-        raise Sass::ScriptError, "Expected #{self} to be an unquoted string." if quoted?
+      def assert_calculation_value(name = nil)
+        raise Sass::ScriptError.new("Expected #{self} to be an unquoted string.", name) if quoted?
 
         self
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.64.0
+  version: 1.64.2
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -98,8 +98,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.64.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.64.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.64.2
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.64.2
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []