sass-embedded 0.7.28 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207fb46d3fc8d7e4fab04175f2703c72e02bfa95d36c540a59009d868ac23750
-  data.tar.gz: b3da3862145c65095de4d7a6dabbce534a42d7fe45d038f6add1ffe3f2cee54a
+  metadata.gz: 6e1fbbdbc66fbfb15634d950059400fe7f9f35992595f789ebf3167e987fd573
+  data.tar.gz: e9064bae379c032b002c289cb868d2ebca91923e6acef439ad48e3ab9f2c72b2
 SHA512:
-  metadata.gz: 1c85b0bbaae870e2869d494ac32fdf395cdb190cd5d19629d41bb0c2cc5186de40a4c3b4f6a66dc1fe4dcb5d1b13837f88e22b3c96836645d883d1e9db152f20
-  data.tar.gz: c23a80f42bd9f7a02f6627d73bb5e7813b6489749f6e3cc09f8ebba6ea6f1e9c1f00fef44c504064a92e494e690fdcaacef4162903b915f2414a3fbb11237eee
+  metadata.gz: 5e4fddfa90b8e26fd1b810e959f8b7c62b2af1a277e9e183cef0e1757516a1f43aa0bd2fb192db0dba29bdd34f0acbc8d0f9295ba3e6b6a23e0e92f6770bc6a7
+  data.tar.gz: fc3ee301812358653a249ea5631b3e2c59bdcd415f2a8c4431509e38f0a255b57f0cbc2d1a3bfc8a5027293ba1b55de41b343fe0a5aac77cc886e53b903e0098

data/ext/sass/Makefile

@@ -44,7 +44,7 @@ else
 	unzip -od $@ $<
 endif
 
-embedded_sass.proto:
+embedded_sass.proto: sass_embedded
 	$(EXTCONF) --with-sass-embedded-protocol
 
 %_pb.rb: %.proto protoc

data/ext/sass/extconf.rb

@@ -5,8 +5,8 @@ require 'mkmf'
 require 'json'
 require 'open-uri'
 require 'fileutils'
-require_relative './dependencies'
 require_relative '../../lib/sass/platform'
+require_relative '../../lib/sass/compiler'
 
 module Sass
   # The dependency downloader. This downloads all the dependencies during gem
@@ -75,36 +75,53 @@ module Sass
     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
+      satisfied = lambda { |version|
+        Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version))
+      }
+
+      headers = {}
+      headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
+
+      begin
+        if gh_release
+          releases_uri = "https://github.com/#{repo}/releases"
+          uri = "#{releases_uri}/latest"
+          tag_name = URI.parse(uri).open do |file|
+            return nil if file.base_uri == releases_uri
+
+            latest = File.basename file.base_uri.to_s
+            latest if satisfied.call latest
           end
-        rescue OpenURI::HTTPError
-          requirements.requirements
-                      .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
+
+          return tag_name unless tag_name.nil?
+
+          uri = "https://api.github.com/repos/#{repo}/releases?per_page=100"
+          tag_name = URI.parse(uri).open(headers) do |file|
+            JSON.parse(file.read).map { |release| release['tag_name'] }
+          end
+                        .find(satisfied)&.peek
+        else
+          uri = "https://api.github.com/repos/#{repo}/tags?per_page=100"
+          tag_name = URI.parse(uri).open(headers) do |file|
+            JSON.parse(file.read).map { |tag| tag['name'] }
+          end
+                        .find(satisfied)&.peek
         end
-          .find { |version| Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version)) }
-          &.to_s
+
+        return tag_name unless tag_name.nil?
+      rescue OpenURI::HTTPError => e
+        warn "WARNING:  Error fetching #{uri}: #{e}"
       end
+
+      requirements.requirements
+                  .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
+                  .find(satisfied)&.peek
     end
 
     def default_sass_embedded
       repo = 'sass/dart-sass-embedded'
 
-      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo])
+      tag_name = resolve_tag_name(repo, Compiler::REQUIREMENTS)
 
       os = case Platform::OS
            when 'darwin'
@@ -143,7 +160,7 @@ module Sass
     def default_protoc
       repo = 'protocolbuffers/protobuf'
 
-      spec = Gem::Dependency.new('google-protobuf', Sass::Dependencies::REQUIREMENTS[repo]).to_spec
+      spec = Gem::Dependency.new('google-protobuf').to_spec
 
       tag_name = "v#{spec.version}"
 
@@ -192,7 +209,9 @@ module Sass
     def default_sass_embedded_protocol
       repo = 'sass/embedded-protocol'
 
-      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo], gh_release: false)
+      tag_name = IO.popen([Compiler::DART_SASS_EMBEDDED, '--version']) do |file|
+        JSON.parse(file.read)['protocolVersion']
+      end
 
       "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
     end

data/lib/sass/compiler.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Sass
+  module Compiler
+    DART_SASS_EMBEDDED = File.absolute_path(
+      "../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
+    )
+
+    PROTOCOL_ERROR_ID = 4_294_967_295
+
+    REQUIREMENTS = '~> 1.0.0-beta.11'
+  end
+end

data/lib/sass/embedded.rb

@@ -243,7 +243,7 @@ module Sass
     def next_id
       @id_semaphore.synchronize do
         @id += 1
-        @id = 0 if @id == Transport::PROTOCOL_ERROR_ID
+        @id = 0 if @id == Compiler::PROTOCOL_ERROR_ID
         @id
       end
     end

data/lib/sass/transport.rb

@@ -11,12 +11,6 @@ module Sass
   class Transport
     include Observable
 
-    DART_SASS_EMBEDDED = File.absolute_path(
-      "../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
-    )
-
-    PROTOCOL_ERROR_ID = 4_294_967_295
-
     ONEOF_MESSAGE = EmbeddedProtocol::InboundMessage
                     .descriptor
                     .lookup_oneof('message')
@@ -29,7 +23,7 @@ module Sass
     def initialize
       @observerable_mutex = Mutex.new
       @stdin_mutex = Mutex.new
-      @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
+      @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(Compiler::DART_SASS_EMBEDDED)
 
       [@stdin, @stdout].each(&:binmode)
 

data/lib/sass/version.rb

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

data/lib/sass.rb

@@ -62,6 +62,7 @@ end
 
 require_relative 'sass/version'
 require_relative 'sass/platform'
+require_relative 'sass/compiler'
 require_relative 'sass/util'
 require_relative 'sass/struct'
 require_relative 'sass/result'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.28
+  version: 0.8.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -120,11 +120,11 @@ files:
 - LICENSE
 - README.md
 - ext/sass/Makefile
-- ext/sass/dependencies.rb
 - ext/sass/extconf.rb
 - ext/sass/unzip.vbs
 - lib/sass.rb
 - lib/sass/compile.rb
+- lib/sass/compiler.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/info.rb
@@ -139,8 +139,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.7.28
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.28
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.8.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.8.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []

data/ext/sass/dependencies.rb

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