sass-embedded 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42eb14d20db4890ec57583655ac03f7ccedd413af931581909a874e020cb3a8b
-  data.tar.gz: bf36fc0fc518277b4693f18452d30e06d39e52677041d9926471af2db6db34b6
+  metadata.gz: 62088f9ce8ff61f56c3191f1d7f941779f92583975db9b763a88f99c0255e8e3
+  data.tar.gz: 3db4302a699a5b014b271f809a9e3f32e94ae5c841ff114bc2d37bcff1563d43
 SHA512:
-  metadata.gz: de5f8d48c8222c65fd4428136d3dd68f5d468942e258ce5d12b151b50e141d3a00ae37e6c1ca4b3ad696e74a56d56fc9508614a9d1e63913e904046451ef2cef
-  data.tar.gz: 61200f58afacf595f8ab4e7ef96e526fea49ff83573239c46a6ca6a5f000a3f4419b1183a32d12e6a6b4d2cf9dc1a81a5856c1b63180430ed0432d4a9c832668
+  metadata.gz: b1eb7486f98a12739ce4b9f19cacc3a13b96e005c6a5cf74053baad538375f5d2c3180a85cfa5b7b264ffda1c8e89ec72ae9f83fc3701ea114ffcdbedf59e3a8
+  data.tar.gz: 47d6f81a0617b759b9ca605ee645245197d9ff5e05da6a6ecce93c13fce8d77cd9e8f7c68f61a2da85f6b0e9ca2fd96a6527d842bf9be88bf62ac83e792ef693

data/ext/sass/Makefile

@@ -6,18 +6,18 @@ endif
 EXTCONF = ruby -- extconf.rb
 
 .PHONY: all
-all: sass_embedded embedded_sass_pb.rb
+all: embedded_sass_pb.rb sass_embedded
 
 .PHONY: install
-install:
+install: clean
+
+.PHONY: uninstall
+uninstall:
+	$(RM) embedded_sass_pb.rb sass_embedded
 
 .PHONY: clean
 clean:
-	$(RM) embedded_sass_pb.rb protoc sass_embedded
-
-.PHONY: distclean
-distclean: clean
-	$(RM) embedded_sass.proto protoc-*.zip sass_embedded-*.tar.gz
+	$(RM) embedded_sass.proto protoc protoc-* sass_embedded-*
 
 ifeq ($(OS),Windows_NT)
 sass_embedded-*.zip:

data/ext/sass/extconf.rb

@@ -106,15 +106,15 @@ 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)
-          source = uri_parser.unescape(uri.path)
-          puts "cp -- #{source} #{path}"
-          FileUtils.copy_file(source, path)
+          puts "cp -- #{path} #{dest}"
+          FileUtils.copy_file(path, dest)
         elsif uri.respond_to? :open
-          puts "curl -fsSLo #{path} -- #{uri}"
+          puts "curl -fsSLo #{dest} -- #{uri}"
           uri.open do |stream|
-            File.binwrite(path, stream.read)
+            File.binwrite(dest, stream.read)
           end
         else
           raise
@@ -123,10 +123,6 @@ module Sass
         raise "Failed to fetch #{uri_s}"
       end
 
-      def uri_parser
-        @uri_parser ||= URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
-      end
-
       def default_sass_embedded
         repo = 'sass/dart-sass-embedded'
 
@@ -214,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/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/host/value_protofier.rb

@@ -29,7 +29,7 @@ module Sass
               )
             )
           when Sass::Value::Color
-            if obj.instance_eval { @hue.nil? }
+            if obj.instance_eval { !defined?(@hue) }
               Sass::EmbeddedProtocol::Value.new(
                 rgb_color: Sass::EmbeddedProtocol::Value::RgbColor.new(
                   red: obj.red,
@@ -38,7 +38,7 @@ module Sass
                   alpha: obj.alpha.to_f
                 )
               )
-            elsif obj.instance_eval { @saturation.nil? }
+            elsif obj.instance_eval { !defined?(@saturation) }
               Sass::EmbeddedProtocol::Value.new(
                 hwb_color: Sass::EmbeddedProtocol::Value::HwbColor.new(
                   hue: obj.hue.to_f,

data/lib/sass/embedded/host.rb

@@ -8,6 +8,7 @@ module Sass
     class Host
       def initialize(channel)
         @channel = channel
+        @mutex = Mutex.new
       end
 
       def id
@@ -118,14 +119,16 @@ module Sass
       private
 
       def await
-        raise EOFError unless @async.nil?
-
-        @connection = @channel.connect(self)
-        @async = Async.new
-        yield
-        @async.await
-      ensure
-        @connection.disconnect
+        @mutex.synchronize do
+          raise EOFError if defined? @async
+
+          @connection = @channel.connect(self)
+          @async = Async.new
+          yield
+          @async.await
+        ensure
+          @connection.disconnect
+        end
       end
     end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.0.0'
+    VERSION = '1.0.3'
   end
 end

data/lib/sass/value/color.rb

@@ -70,37 +70,37 @@ module Sass
       end
 
       def red
-        hsl_to_rgb if @red.nil?
+        hsl_to_rgb unless defined? @red
 
         @red
       end
 
       def green
-        hsl_to_rgb if @green.nil?
+        hsl_to_rgb unless defined? @green
 
         @green
       end
 
       def blue
-        hsl_to_rgb if @blue.nil?
+        hsl_to_rgb unless defined? @blue
 
         @blue
       end
 
       def hue
-        rgb_to_hsl if @hue.nil?
+        rgb_to_hsl unless defined? @hue
 
         @hue
       end
 
       def saturation
-        rgb_to_hsl if @saturation.nil?
+        rgb_to_hsl unless defined? @saturation
 
         @saturation
       end
 
       def lightness
-        rgb_to_hsl if @lightness.nil?
+        rgb_to_hsl unless defined? @lightness
 
         @lightness
       end

data/lib/sass.rb

@@ -77,13 +77,13 @@ module Sass
     private
 
     def instance
-      if @instance.nil?
+      if defined? @instance
+        @instance = Embedded.new if @instance.closed?
+      else
         @instance = Embedded.new
         at_exit do
           @instance.close
         end
-      elsif @instance.closed?
-        @instance = Embedded.new
       end
       @instance
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -162,8 +162,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.3
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.3
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []