sass-embedded 0.7.26 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a75289553b969294761ec97f67b855d1522e0ca404e803d1af47e852e7fb0d2
-  data.tar.gz: d2a8bf2480f3e6350b7b810bf439e6f9f0fcaaae8a522c35bfd55966febe56a9
+  metadata.gz: 36aa31c9cb340c6a95c73c93ea480ab565a9f8f009094ec0f7f7a2239e647f2b
+  data.tar.gz: 71f325cdb5e5db87b97a931b92749c6e0ebbc91b376945fc5aa7b2fb5590928a
 SHA512:
-  metadata.gz: a22732e3510e908263c1a3ab69d9b14b390d27dec9a5884a3e1a71bff1a225791165e6e72e7e59cb4256b0f34006e2e02dbc03165d1c70257f603286ad1eccc3
-  data.tar.gz: e0fd839af7c2dfab077651eae2904cb3349b33c4dbc26a5bbfebf0e877ac8fb8bc2186e634bdea94fb986b3a8f3265be84e6dc6e9f483f73ffc7600067d221d8
+  metadata.gz: 7f136169a9f697db2cc04c466e2268230d090db81a01e54da74880a5dde4bba1acdafe425cf8b7f35f4030a2ec4d52b56e20dbba82911be974f9c000138f1e67
+  data.tar.gz: 79507aae38d81b506a0d38ddc312bd12533bbe1d6647e0634a3755ff154c4a0a7be917d9cfbe8f7604ce2196fda9a7eb45f0f77a89c0b23513aec5b43f88abb2

data/ext/sass/Makefile

@@ -3,7 +3,7 @@ RM = powershell -c "cmd.exe /c del /f /q /s"
 else
 RM = rm -fr
 endif
-EXTCONF = ruby -- extconf.rb --without-sass-embedded --without-sass-embedded-protocol --without-protoc
+EXTCONF = ruby -- extconf.rb
 
 .PHONY: all
 all: sass_embedded embedded_sass_pb.rb
@@ -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
@@ -22,32 +22,37 @@ module Sass
   #     --with-protoc=file:///path/to/protoc-*.zip \
   #     --with-sass-embedded=file:///path/to/sass_embedded-*.(tar.gz|zip) \
   #     --with-sass-embedded-protocol=file:///path/to/embedded_sass.proto
+  # @example
+  #   bundle config build.sass-embedded \
+  #     --with-protoc=file:///path/to/protoc-*.zip \
+  #     --with-sass-embedded=file:///path/to/sass_embedded-*.(tar.gz|zip) \
+  #     --with-sass-embedded-protocol=file:///path/to/embedded_sass.proto
   class Extconf
     def initialize
-      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 }
+      fetch_with_config('protoc', false) { default_protoc }
+      fetch_with_config('sass-embedded', false) { default_sass_embedded }
+      fetch_with_config('sass-embedded-protocol', false) { default_sass_embedded_protocol }
     end
 
     private
 
-    def get_with_config(config, default)
+    def fetch_with_config(config, default)
       val = with_config(config, default)
       case val
       when true
         if block_given?
-          get yield
+          fetch yield
         else
-          get default
+          fetch default
         end
       when false
         nil
       else
-        get val
+        fetch val
       end
     end
 
-    def get(uri_s)
+    def fetch(uri_s)
       uri = URI.parse(uri_s)
       path = File.absolute_path(File.basename(uri.path), __dir__)
       if uri.is_a?(URI::File) || uri.instance_of?(URI::Generic)
@@ -63,43 +68,60 @@ module Sass
         raise
       end
     rescue StandardError
-      warn "Failed to get: #{uri_s}"
+      warn "ERROR:  Error fetching #{uri_s}:"
       raise
     end
 
     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'
@@ -138,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}"
 
@@ -187,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.26'
+  VERSION = '0.8.1'
 end

data/lib/sass-embedded.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative 'sass'

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.26
+  version: 0.8.1
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -25,103 +25,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.18.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.14.4
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-around
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: minitest-around
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-minitest
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.5
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -134,11 +134,12 @@ files:
 - LICENSE
 - README.md
 - ext/sass/Makefile
-- ext/sass/dependencies.rb
 - ext/sass/extconf.rb
 - ext/sass/unzip.vbs
+- lib/sass-embedded.rb
 - lib/sass.rb
 - lib/sass/compile.rb
+- lib/sass/compiler.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/info.rb
@@ -153,7 +154,9 @@ 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.26
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.8.1
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.8.1
+  funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
 require_paths:

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