sass-embedded 0.7.10 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe00b57149da1071f98028f159b3de560fc365ae0914c96ee7f19fb12b8cacb
-  data.tar.gz: 3891fa06053620354a7714d87a69b395c7c65b174def0eb6b8bdebb782efc45f
+  metadata.gz: 5fcfb496509a39af1ede196579891f3f618c8ae112a636abded14712811acbc6
+  data.tar.gz: ce47457cf14a9f79129a638909785a3edda3c93835fdd2d5d29a1d721c7dd3ba
 SHA512:
-  metadata.gz: 947acbb1be1109a74619248998542fc117a9676f02d43b473d7546eb6e905953abda62f661f1dc2defc389a6439b8bdd69fa1b5cf68372d84172e1e87165d5e5
-  data.tar.gz: '0916a7093b12b3e6fbcf9da1b4d5b3eb5190905cbbea4a518d465feae94dc9f1a084874cfde49fc92980ffaca8c4333844a7f35e4f3970cf9efe35abeb40fbdf'
+  metadata.gz: 8233f64b021b3a51c199383ad9327a5d9ddf4df340c151a761a2fa54cd403e96c003d7922ea8bd7ead2c5b66be15c101d297528d81fe7b597e36527df4a5637b
+  data.tar.gz: '058dfbfbfe9afe0f39d23191c943ca00ebdcd94706fb0d9cfca68ecd347d45ed935c011e387812c4fe2579c1f16b42cf9f183b83dd74c7166e2ebcb5f8a54200'

data/ext/dependencies.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Sass
+  module Dependencies
+    REQUIREMENTS = {
+      'protocolbuffers/protobuf' => '~> 3.17',
+      'sass/embedded-protocol' => '~> 1.0.0-beta.12',
+      'sass/dart-sass-embedded' => '~> 1.0.0-beta.10'
+    }.freeze
+  end
+end

data/ext/extconf.rb

@@ -5,13 +5,14 @@ require 'mkmf'
 require 'json'
 require 'open-uri'
 require 'fileutils'
+require_relative './dependencies'
 require_relative '../lib/sass/platform'
 
 module Sass
   # The dependency downloader. This downloads all the dependencies during gem
   # installation. The companion Makefile then unpacks all downloaded
-  # dependencies. By default it downloads the latest release of each
-  # dependency from GitHub releases.
+  # dependencies. By default it downloads the release of each dependency
+  # from GitHub releases.
   #
   # It is possible to specify an alternative source or version of each
   # dependency. Local sources can be used for offline installation.
@@ -23,9 +24,9 @@ module Sass
   #     --with-sass-embedded-protocol=file:///path/to/embedded_sass.proto
   class Extconf
     def initialize
-      get_with_config('protoc', true) { latest_protoc }
-      get_with_config('sass-embedded', true) { latest_sass_embedded }
-      get_with_config('sass-embedded-protocol', true) { latest_sass_embedded_protocol }
+      get_with_config('protoc', true) { default_protoc }
+      get_with_config('sass-embedded', true) { default_sass_embedded }
+      get_with_config('sass-embedded-protocol', true) { default_sass_embedded_protocol }
     end
 
     private
@@ -52,6 +53,7 @@ module Sass
       if uri.is_a?(URI::File) || uri.instance_of?(URI::Generic)
         FileUtils.copy_file uri.path, path
       elsif uri.respond_to? :open
+        puts "curl -fsSLo #{path} -- #{uri}"
         uri.open do |source|
           File.open(path, 'wb') do |destination|
             destination.write source.read
@@ -61,28 +63,42 @@ module Sass
         raise
       end
     rescue StandardError
-      raise "Failed to get: #{uri}"
+      raise "Failed to get: #{uri_s}"
     end
 
-    def latest_release(repo, prerelease: false)
-      if prerelease
-        headers = {}
-        headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
-        URI.parse("https://api.github.com/repos/#{repo}/releases").open(headers) do |file|
-          JSON.parse(file.read)[0]['tag_name']
-        end
-      else
+    def resolve_tag_name(repo, *requirements, gh_release: true)
+      requirements = Gem::Requirement.create(*requirements)
+
+      if requirements == Gem::Requirement.default && gh_release
         URI.parse("https://github.com/#{repo}/releases/latest").open do |file|
           File.basename file.base_uri.to_s
         end
+      else
+        begin
+          headers = {}
+          headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
+          if gh_release
+            URI.parse("https://api.github.com/repos/#{repo}/releases?per_page=100").open(headers) do |file|
+              JSON.parse(file.read).map { |release| release['tag_name'] }
+            end
+          else
+            URI.parse("https://api.github.com/repos/#{repo}/tags?per_page=100").open(headers) do |file|
+              JSON.parse(file.read).map { |tag| tag['name'] }
+            end
+          end
+        rescue OpenURI::HTTPError
+          requirements.requirements
+                      .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
+        end
+          .find { |version| Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version)) }
+          &.to_s
       end
     end
 
-    def latest_sass_embedded
+    def default_sass_embedded
       repo = 'sass/dart-sass-embedded'
 
-      # TODO, don't use prerelease once a release is available
-      tag_name = latest_release repo, prerelease: true
+      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo])
 
       os = case Platform::OS
            when 'darwin'
@@ -118,10 +134,12 @@ module Sass
       "https://github.com/#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
     end
 
-    def latest_protoc
+    def default_protoc
       repo = 'protocolbuffers/protobuf'
 
-      tag_name = latest_release repo
+      spec = Gem::Dependency.new('google-protobuf', Sass::Dependencies::REQUIREMENTS[repo]).to_spec
+
+      tag_name = "v#{spec.version}"
 
       os = case Platform::OS
            when 'darwin'
@@ -165,12 +183,10 @@ module Sass
       "https://github.com/#{repo}/releases/download/#{tag_name}/protoc-#{tag_name[1..]}-#{os_arch}.#{ext}"
     end
 
-    def latest_sass_embedded_protocol
+    def default_sass_embedded_protocol
       repo = 'sass/embedded-protocol'
 
-      # TODO: use latest release once available
-      # tag_name = latest_release repo
-      tag_name = 'HEAD'
+      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo], gh_release: false)
 
       "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
     end

data/lib/sass/compile.rb

@@ -161,9 +161,13 @@ module Sass
     end
 
     def function_call_response(function_call_request)
+      # TODO: convert argument_list to **kwargs
       EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
         id: function_call_request.id,
-        success: @functions[function_call_request.name].call(*function_call_request.arguments)
+        success: @functions[function_call_request.name].call(*function_call_request.arguments),
+        accessed_argument_lists: function_call_request.arguments
+          .filter { |argument| argument.value == :argument_list }
+          .map { |argument| argument.argument_list.id }
       )
     rescue StandardError => e
       EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(

data/lib/sass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sass
-  VERSION = '0.7.10'
+  VERSION = '0.7.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.14
 platform: ruby
 authors:
 - なつき
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: '3.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: '3.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - LICENSE
 - README.md
 - ext/Makefile
+- ext/dependencies.rb
 - ext/extconf.rb
 - lib/sass.rb
 - lib/sass/compile.rb
@@ -165,8 +166,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.10
-post_install_message:
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.14
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.2.26
+signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []