sass-embedded 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5ecc805dbe549bd19b1e5777bd16500bcd71fc56def8fe364f542c7bb731e0
-  data.tar.gz: 14c15309ebc1aff54a5b9df78cbd5a66e7321c22e4229357724945aa2a0d3647
+  metadata.gz: 5c43ad7fb335b99c12bdc65c8a37af7a239a737f4c8655590ce35ea6be51ca3d
+  data.tar.gz: cbc99b11c3330928a9582cb8befba681fd49db77868e0acdbadde4c7ba14a6ec
 SHA512:
-  metadata.gz: e4d372b8b307ff60d2f21c6b6bf1674833587c0945ff13e6435dae761fb4bfa0e75233f5dfe88aa47d97b7d4cea483ffdc55e71df92ae9d472d29a94c4eb4f21
-  data.tar.gz: 4ecd5d19ca66c2697e0a2cdbfccbb550ab0cb414829d542e71b7f28c77122973f5dc508e2aec3c214aaad777c674cc72a1a8a0b5b90b256728ef20623e16df53
+  metadata.gz: a77c23cd962c9936b9474f9ea0402095b2c65d0e4fca6bc848364d17211f37947e87ccfdf0db3dfff14477bcf6d3a2dadbf1dcc6ed127b6c1424e33b80cb3920
+  data.tar.gz: 64bb51ebf0b1d6dadd39ceb73be714ed1090478dcafa43a34a465032a189a3ac6389aa035d3d0420cd9a243f2b2164d1e9e4b122d5e7f67c8bdd877b455aa1f1

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: distclean
 
 .PHONY: clean
 clean:
-	$(RM) embedded_sass_pb.rb protoc sass_embedded
+	$(RM) embedded_sass_pb.rb sass_embedded
 
 .PHONY: distclean
-distclean: clean
-	$(RM) embedded_sass.proto protoc-*.zip sass_embedded-*.tar.gz
+distclean:
+	$(RM) embedded_sass.proto protoc protoc-* sass_embedded-*
 
 ifeq ($(OS),Windows_NT)
 sass_embedded-*.zip:

data/ext/sass/extconf.rb

@@ -104,14 +104,24 @@ module Sass
         end
       end
 
-      def fetch(uri_s)
-        uri = URI.parse(uri_s)
-        path = URI::DEFAULT_PARSER.unescape(uri.path)
+      def fetch(uri_or_path)
+        begin
+          uri = URI.parse(uri_or_path)
+          path = URI::DEFAULT_PARSER.unescape(uri.path)
+          raise if uri.instance_of?(URI::Generic) && !File.file?(path)
+        rescue StandardError
+          raise unless File.file?(uri_or_path)
+
+          uri = nil
+          path = uri_or_path
+        end
+
         dest = File.absolute_path(File.basename(path), __dir__)
-        if uri.is_a?(URI::File) || uri.instance_of?(URI::Generic)
+
+        if uri.nil? || uri.is_a?(URI::File) || uri.instance_of?(URI::Generic)
           puts "cp -- #{path} #{dest}"
           FileUtils.copy_file(path, dest)
-        elsif uri.respond_to? :open
+        elsif uri.respond_to?(:open)
           puts "curl -fsSLo #{dest} -- #{uri}"
           uri.open do |stream|
             File.binwrite(dest, stream.read)
@@ -120,7 +130,7 @@ module Sass
           raise
         end
       rescue StandardError
-        raise "Failed to fetch #{uri_s}"
+        raise "Failed to fetch #{uri_or_path}"
       end
 
       def default_sass_embedded

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.1'
+    VERSION = '1.0.4'
   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.1
+  version: 1.0.4
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-02-28 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.1
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.1
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.4
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.4
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []