sass-embedded 0.7.11 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f134ae1ed21b1641b3c781ed7dc7c901c059ce3a8c9ac7038f4ee5f2ae9d313
-  data.tar.gz: 3c4758ba9de6440b17acca78d23d9b60ffd7b6683462168bd44f1aff0f466ded
+  metadata.gz: fe31a4373aa2146f0eee250178df2e35383141389699a7af4a7f4c0d672631fd
+  data.tar.gz: 821ce7306f41e0e037720df4bd048e248113461dcdcd7ec8c8bb99a05d72339a
 SHA512:
-  metadata.gz: cbe0c28c51e406f51262ca10bffe6453caa73badc17cbfa61938030bbf94c9a1d9747dacde5471a28b9403409082da526815b5c23f37d0ade1844fd06cfd3ad2
-  data.tar.gz: d57f31a01741d59aa49bbf74be30d41f0da85f26b9d555e8a60695f9490a74e5043e9c7e6e148e6bf9d7fe5a740ea7e9cd34725f52ec68d46998b9a9a0b3cf8b
+  metadata.gz: f1ba39e8ef36ab9b50c51eebded39ee7065fb3e51d93af224c66ef246ff76981a2eec2ea6f5572f0c1d90482c431f0a713a3e7424236bb3ed3af11aa36607cc9
+  data.tar.gz: 96c187418ea97fc784cdb5ade9a837aa2e5671d7bc8dd0a1c34e97f4612079d95c91dfbb0a358ebe7449a5db5a46d209183f3cc4fd0464ce9e243b62721df22f

data/README.md

@@ -1,6 +1,7 @@
 # Embedded Sass Host for Ruby
 
 [![build](https://github.com/ntkme/embedded-host-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ntkme/embedded-host-ruby/actions/workflows/build.yml)
+[![gem](https://badge.fury.io/rb/sass-embedded.svg)](https://rubygems.org/gems/sass-embedded)
 
 This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass-embedded-protocol).
 

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
@@ -62,34 +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, tag: false)
-      if prerelease || tag
-        headers = {}
-        headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
-        if tag
-          URI.parse("https://api.github.com/repos/#{repo}/tags").open(headers) do |file|
-            JSON.parse(file.read)[0]['name']
-          end
-        else
-          URI.parse("https://api.github.com/repos/#{repo}/releases").open(headers) do |file|
-            JSON.parse(file.read)[0]['tag_name']
-          end
-        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'
@@ -125,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'
@@ -172,11 +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: don't use tag once a release is available
-      tag_name = latest_release repo, tag: true
+      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/transport.rb

@@ -107,21 +107,24 @@ module Sass
     end
 
     def read_varint(readable)
-      varint = bits = 0
+      value = bits = 0
       loop do
         byte = readable.readbyte
-        varint += (byte & 0x7f) << bits
+        value |= (byte & 0x7f) << bits
         bits += 7
-        break if byte <= 0x7f
+        break if byte < 0x80
       end
-      varint
+      value
     end
 
-    def write_varint(writeable, varint)
-      while varint.positive?
-        writeable.write ((varint > 0x7f ? 0x80 : 0) | (varint & 0x7f)).chr
-        varint >>= 7
+    def write_varint(writeable, value)
+      bytes = []
+      until value < 0x80
+        bytes << (0x80 | (value & 0x7f))
+        value >>= 7
       end
+      bytes << value
+      writeable.write bytes.pack('C*')
     end
   end
 end

data/lib/sass/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.15
 platform: ruby
 authors:
 - なつき
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-08-26 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.11
-post_install_message:
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.15
+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.22
-signing_key:
+rubygems_version: 3.2.26
+signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []