sass-embedded 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62088f9ce8ff61f56c3191f1d7f941779f92583975db9b763a88f99c0255e8e3
-  data.tar.gz: 3db4302a699a5b014b271f809a9e3f32e94ae5c841ff114bc2d37bcff1563d43
+  metadata.gz: bb22fd222502bd171a92c0f112b0644dda7b3c6badf12c9f9aa9b079c0856681
+  data.tar.gz: fd6f3666396b577de10d2c8403dd3bbdcf382b9d7e6a656d2da7ca6750ff0e38
 SHA512:
-  metadata.gz: b1eb7486f98a12739ce4b9f19cacc3a13b96e005c6a5cf74053baad538375f5d2c3180a85cfa5b7b264ffda1c8e89ec72ae9f83fc3701ea114ffcdbedf59e3a8
-  data.tar.gz: 47d6f81a0617b759b9ca605ee645245197d9ff5e05da6a6ecce93c13fce8d77cd9e8f7c68f61a2da85f6b0e9ca2fd96a6527d842bf9be88bf62ac83e792ef693
+  metadata.gz: e75993c794dfde2f004cff309537562914b6cf5efcc9898f5b5b5b2e92c8cf5f616397ba363477768c36c2e42a1548c3f6897d2d28cdd4c4010489b744ff0626
+  data.tar.gz: 1116525243f799d4fa7ac0fb52fe3f59f5a5d2c08256d347c88ff19a48eef714ce3e2ccc58e8b71b61ebb055b80322b84017df207b5b047a802b8dea585fd73c

data/ext/sass/Makefile

@@ -9,14 +9,14 @@ EXTCONF = ruby -- extconf.rb
 all: embedded_sass_pb.rb sass_embedded
 
 .PHONY: install
-install: clean
-
-.PHONY: uninstall
-uninstall:
-	$(RM) embedded_sass_pb.rb sass_embedded
+install: distclean
 
 .PHONY: clean
 clean:
+	$(RM) embedded_sass_pb.rb sass_embedded
+
+.PHONY: distclean
+distclean:
 	$(RM) embedded_sass.proto protoc protoc-* sass_embedded-*
 
 ifeq ($(OS),Windows_NT)

data/ext/sass/extconf.rb

@@ -104,14 +104,27 @@ 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)
+          if uri.instance_of?(URI::File) || uri.instance_of?(URI::Generic)
+            path = path.delete_prefix('/') if Platform::OS == 'windows' && !File.file?(path)
+            raise unless File.file?(path)
+          end
+        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.instance_of?(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 +133,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
@@ -138,7 +151,7 @@ module Sass
              when 'windows'
                'windows'
              else
-               raise "Unsupported OS: #{Platform::OS}"
+               raise release_asset_not_available_error(repo, tag_name)
              end
 
         arch = case Platform::ARCH
@@ -147,11 +160,9 @@ module Sass
                when 'i386'
                  'ia32'
                when 'aarch64'
-                 raise "Unsupported Arch: #{Platform::ARCH}" unless Platform::OS == 'darwin'
-
-                 'x64'
+                 Platform::OS == 'darwin' ? 'x64' : 'arm64'
                else
-                 raise "Unsupported Arch: #{Platform::ARCH}"
+                 raise release_asset_not_available_error(repo, tag_name)
                end
 
         ext = case os
@@ -179,16 +190,12 @@ module Sass
              when 'windows'
                'win'
              else
-               raise "Unsupported OS: #{Platform::OS}"
+               raise release_asset_not_available_error(repo, tag_name)
              end
 
         arch = case Platform::ARCH
                when 'aarch64'
-                 if Platform::OS == 'darwin'
-                   'x86_64'
-                 else
-                   'aarch_64'
-                 end
+                 Platform::OS == 'darwin' ? 'x86_64' : 'aarch_64'
                when 'sparcv9'
                  's390'
                when 'i386'
@@ -198,7 +205,7 @@ module Sass
                when 'powerpc64'
                  'ppcle_64'
                else
-                 raise "Unsupported Arch: #{Platform::ARCH}"
+                 raise release_asset_not_available_error(repo, tag_name)
                end
 
         os_arch = case os
@@ -222,7 +229,13 @@ module Sass
 
         tag_name = JSON.parse(stdout)['protocolVersion']
 
-        "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
+        "https://github.com/#{repo}/raw/#{tag_name}/embedded_sass.proto"
+      end
+
+      def release_asset_not_available_error(repo, tag_name)
+        platform = "#{Platform::OS} #{Platform::ARCH}"
+        url = "https://github.com/#{repo}/releases/tag/#{tag_name}"
+        NotImplementedError.new("Release asset for #{platform} not available at #{url}")
       end
     end
   end

data/lib/sass/embedded/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -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.3
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.3
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/1.0.6
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.0.6
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []