sass-embedded 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94910bd7bdd79a73e57bc9037bf1596bb55b2b2b737eab669bc81f1ec36b66dc
-  data.tar.gz: 3b5182a86f642f29a9632db0c9ca92ae9365281e5afac5878248aa37594ab70f
+  metadata.gz: effcfcc4466c427051f3684ecec0d2f005dbed7570f49e428bda1cee8a84ff75
+  data.tar.gz: 3ca625475d64361a4269e87ad4f600eebe32a5ddba00f4d1987ce709590fbdfa
 SHA512:
-  metadata.gz: 7f6946abef84bf4be5252dd91f73e5d94130306f3a324566480837ef2f4427d896448f8bc0f4291caf8937c8eb9c1f511d7ec56a0b1c4a3aa0f1442c8b74bc57
-  data.tar.gz: 3715abf201c428507274f1f0a07bc5e2637b9d7ff507dc25c2011fbbb539a06428662f4603ffdd1ed63746bfdfcf7b4bc28cede37797b4ecf67454315330b2b7
+  metadata.gz: 2e0d1c4238f2c2ccc4c6da3f01d451419932fd2a5b6f2e39e6e6fa880ae84a6ef78d5b27e3dcee7cf0207d23464d73122d8e51d47d7b4c990d30ce36c942cd0f
+  data.tar.gz: 791d24f2097f84884d3e2f2be87f32e479625ea6db9d03dfe9c0a70e0c0d6bf73fa3e1d929f95e76b0423ece077d78b75db28939bf5a6c426eb1780025831c25

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass-embedded": "1.50.0"
+    "sass-embedded": "1.51.0"
   }
 }

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

@@ -71,7 +71,7 @@ module Sass
             success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
               contents: importer_result.contents,
               syntax: Protofier.to_proto_syntax(importer_result.syntax),
-              source_map_url: importer_result.respond_to?(:source_map_url) ? importer_result.source_map_url&.to_s : nil
+              source_map_url: (importer_result.source_map_url&.to_s if importer_result.respond_to?(:source_map_url))
             )
           )
         rescue StandardError => e

data/lib/sass/embedded/host.rb

@@ -3,7 +3,6 @@
 require_relative 'host/function_registry'
 require_relative 'host/importer_registry'
 require_relative 'host/logger_registry'
-require_relative 'host/no_op_importer'
 require_relative 'host/value_protofier'
 
 module Sass
@@ -55,18 +54,10 @@ module Sass
                           source: source,
                           url: url&.to_s,
                           syntax: Protofier.to_proto_syntax(syntax),
-                          importer: if importer
-                                      @importer_registry.register(importer)
-                                    elsif url&.to_s&.start_with?('file:')
-                                      EmbeddedProtocol::InboundMessage::CompileRequest::Importer.new(
-                                        path: File.absolute_path('.')
-                                      )
-                                    else
-                                      @importer_registry.register(NoOpImporter)
-                                    end
+                          importer: (@importer_registry.register(importer) unless importer.nil?)
                         )
                       end,
-              path: path.nil? ? nil : File.absolute_path(path),
+              path: (File.absolute_path(path) unless path.nil?),
               style: Protofier.to_proto_output_style(style),
               source_map: source_map,
               source_map_include_sources: source_map_include_sources,

data/lib/sass/embedded/protofier.rb

@@ -31,7 +31,7 @@ module Sass
       end
 
       def from_proto_source_span(source_span)
-        return nil if source_span.nil?
+        return if source_span.nil?
 
         Logger::SourceSpan.new(from_proto_source_location(source_span.start),
                                from_proto_source_location(source_span.end),
@@ -41,7 +41,7 @@ module Sass
       end
 
       def from_proto_source_location(source_location)
-        return nil if source_location.nil?
+        return if source_location.nil?
 
         Logger::SourceLocation.new(source_location.offset,
                                    source_location.line,

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.4.2'
+    VERSION = '1.5.0'
   end
 end

data/lib/sass/value/color.rb

@@ -156,7 +156,7 @@ module Sass
 
       # @return [Integer]
       def hash
-        @hash ||= red.hash ^ green.hash ^ blue.hash ^ alpha.hash
+        @hash ||= [red, green, blue, alpha].hash
       end
 
       # @return [Color]

data/lib/sass/value/number.rb

@@ -94,17 +94,7 @@ module Sass
 
       # @return [Integer]
       def hash
-        @hash ||= if unitless?
-                    FuzzyMath.hash(value)
-                  elsif single_unit?
-                    FuzzyMath.hash(
-                      value * Unit.canonical_multiplier_for_unit(numerator_units.first)
-                    )
-                  else
-                    FuzzyMath.hash(
-                      value * Unit.canonical_multiplier(numerator_units) / Unit.canonical_multiplier(denominator_units)
-                    )
-                  end
+        @hash ||= FuzzyMath.hash(canonical_units_value)
       end
 
       # @return [::Boolean]
@@ -265,6 +255,16 @@ module Sass
         numerator_units.length == 1 && denominator_units.empty?
       end
 
+      def canonical_units_value
+        if unitless?
+          value
+        elsif single_unit?
+          value * Unit.canonical_multiplier_for_unit(numerator_units.first)
+        else
+          value * Unit.canonical_multiplier(numerator_units) / Unit.canonical_multiplier(denominator_units)
+        end
+      end
+
       def coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                   coerce_unitless:,
                                   name: nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.28.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -134,7 +134,6 @@ files:
 - lib/sass/embedded/host/function_registry.rb
 - lib/sass/embedded/host/importer_registry.rb
 - lib/sass/embedded/host/logger_registry.rb
-- lib/sass/embedded/host/no_op_importer.rb
 - lib/sass/embedded/host/value_protofier.rb
 - lib/sass/embedded/protofier.rb
 - lib/sass/embedded/structifier.rb
@@ -160,8 +159,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.4.2
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.4.2
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.5.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.5.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

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

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class Host
-      # An importer that never imports any stylesheets.
-      module NoOpImporter
-        module_function
-
-        def canonicalize(*); end
-        def load(*); end
-      end
-
-      private_constant :NoOpImporter
-    end
-  end
-end