sass-embedded 0.7.28 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207fb46d3fc8d7e4fab04175f2703c72e02bfa95d36c540a59009d868ac23750
-  data.tar.gz: b3da3862145c65095de4d7a6dabbce534a42d7fe45d038f6add1ffe3f2cee54a
+  metadata.gz: c5bcaee2299b4f0b9d4d1d23b25773fdad87d1a294a4a34eeec0028d1f89a25c
+  data.tar.gz: 75ce2615300b0d59e73f715ae43007baf09a9818ea56d80b8be4d54b1f561c69
 SHA512:
-  metadata.gz: 1c85b0bbaae870e2869d494ac32fdf395cdb190cd5d19629d41bb0c2cc5186de40a4c3b4f6a66dc1fe4dcb5d1b13837f88e22b3c96836645d883d1e9db152f20
-  data.tar.gz: c23a80f42bd9f7a02f6627d73bb5e7813b6489749f6e3cc09f8ebba6ea6f1e9c1f00fef44c504064a92e494e690fdcaacef4162903b915f2414a3fbb11237eee
+  metadata.gz: 93cf20b2df8d4c363797df90e459f52c6dedf5e540cb5b6eb1cd110dded76477adf82f6c0bc0652f1b5201f535265053f7838654952a4bcc7f338bcc69c9464a
+  data.tar.gz: c4190c8fc8e60a37fa834dfdac6fe1842e66d39ac8d0ad9bc1c15ea5c18c16766f19e194be746fc963a5604c740f438c6371aa59c10dd59d452a526fea6cbf0d

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

@@ -1,202 +1,224 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'mkmf'
+require 'fileutils'
 require 'json'
+require 'mkmf'
 require 'open-uri'
-require 'fileutils'
-require_relative './dependencies'
-require_relative '../../lib/sass/platform'
+require_relative '../../lib/sass/embedded/compiler/path'
+require_relative '../../lib/sass/embedded/compiler/requirements'
+require_relative '../../lib/sass/embedded/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 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.
-  #
-  # @example
-  #   gem install 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
-  # @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
-      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
+  class Embedded
+    # The dependency downloader. This downloads all the dependencies during gem
+    # installation. The companion Makefile then unpacks all downloaded
+    # 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.
+    #
+    # @example
+    #   gem install 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
+    # @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
+        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
+      private
 
-    def fetch_with_config(config, default)
-      val = with_config(config, default)
-      case val
-      when true
-        if block_given?
-          fetch yield
+      def fetch_with_config(config, default)
+        val = with_config(config, default)
+        case val
+        when true
+          if block_given?
+            fetch yield
+          else
+            fetch default
+          end
+        when false
+          nil
         else
-          fetch default
+          fetch val
         end
-      when false
-        nil
-      else
-        fetch val
       end
-    end
 
-    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)
-        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
+      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)
+          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
+            end
           end
+        else
+          raise
         end
-      else
+      rescue StandardError
+        warn "ERROR:  Error fetching #{uri_s}:"
         raise
       end
-    rescue StandardError
-      warn "ERROR:  Error fetching #{uri_s}:"
-      raise
-    end
 
-    def resolve_tag_name(repo, *requirements, gh_release: true)
-      requirements = Gem::Requirement.create(*requirements)
+      def resolve_tag_name(repo, *requirements, gh_release: true)
+        requirements = Gem::Requirement.create(*requirements)
+
+        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']
 
-      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|
+            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
+
+            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.parse("https://api.github.com/repos/#{repo}/tags?per_page=100").open(headers) do |file|
+            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
-        rescue OpenURI::HTTPError
-          requirements.requirements
-                      .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
+
+          return tag_name unless tag_name.nil?
+        rescue OpenURI::HTTPError => e
+          warn "WARNING:  Error fetching #{uri}: #{e}"
         end
-          .find { |version| Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version)) }
-          &.to_s
+
+        requirements.requirements
+                    .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
+                    .find(satisfied)&.peek
       end
-    end
 
-    def default_sass_embedded
-      repo = 'sass/dart-sass-embedded'
-
-      tag_name = resolve_tag_name(repo, Sass::Dependencies::REQUIREMENTS[repo])
-
-      os = case Platform::OS
-           when 'darwin'
-             'macos'
-           when 'linux'
-             'linux'
-           when 'windows'
-             'windows'
-           else
-             raise "Unsupported OS: #{Platform::OS}"
-           end
-
-      arch = case Platform::ARCH
-             when 'x86_64'
-               'x64'
-             when 'i386'
-               'ia32'
-             when 'aarch64'
-               raise "Unsupported Arch: #{Platform::ARCH}" unless Platform::OS == 'darwin'
-
-               'x64'
+      def default_sass_embedded
+        repo = 'sass/dart-sass-embedded'
+
+        tag_name = resolve_tag_name(repo, Compiler::REQUIREMENTS)
+
+        os = case Platform::OS
+             when 'darwin'
+               'macos'
+             when 'linux'
+               'linux'
+             when 'windows'
+               'windows'
              else
-               raise "Unsupported Arch: #{Platform::ARCH}"
+               raise "Unsupported OS: #{Platform::OS}"
              end
 
-      ext = case os
-            when 'windows'
-              'zip'
-            else
-              'tar.gz'
-            end
+        arch = case Platform::ARCH
+               when 'x86_64'
+                 'x64'
+               when 'i386'
+                 'ia32'
+               when 'aarch64'
+                 raise "Unsupported Arch: #{Platform::ARCH}" unless Platform::OS == 'darwin'
 
-      "https://github.com/#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
-    end
+                 'x64'
+               else
+                 raise "Unsupported Arch: #{Platform::ARCH}"
+               end
 
-    def default_protoc
-      repo = 'protocolbuffers/protobuf'
+        ext = case os
+              when 'windows'
+                'zip'
+              else
+                'tar.gz'
+              end
+
+        "https://github.com/#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{arch}.#{ext}"
+      end
 
-      spec = Gem::Dependency.new('google-protobuf', Sass::Dependencies::REQUIREMENTS[repo]).to_spec
+      def default_protoc
+        repo = 'protocolbuffers/protobuf'
 
-      tag_name = "v#{spec.version}"
+        spec = Gem::Dependency.new('google-protobuf').to_spec
 
-      os = case Platform::OS
-           when 'darwin'
-             'osx'
-           when 'linux'
-             'linux'
-           when 'windows'
-             'win'
-           else
-             raise "Unsupported OS: #{Platform::OS}"
-           end
+        tag_name = "v#{spec.version}"
 
-      arch = case Platform::ARCH
-             when 'aarch64'
-               if Platform::OS == 'darwin'
+        os = case Platform::OS
+             when 'darwin'
+               'osx'
+             when 'linux'
+               'linux'
+             when 'windows'
+               'win'
+             else
+               raise "Unsupported OS: #{Platform::OS}"
+             end
+
+        arch = case Platform::ARCH
+               when 'aarch64'
+                 if Platform::OS == 'darwin'
+                   'x86_64'
+                 else
+                   'aarch_64'
+                 end
+               when 'sparcv9'
+                 's390'
+               when 'i386'
+                 'x86_32'
+               when 'x86_64'
                  'x86_64'
+               when 'powerpc64'
+                 'ppcle_64'
                else
-                 'aarch_64'
+                 raise "Unsupported Arch: #{Platform::ARCH}"
                end
-             when 'sparcv9'
-               's390'
-             when 'i386'
-               'x86_32'
-             when 'x86_64'
-               'x86_64'
-             when 'powerpc64'
-               'ppcle_64'
-             else
-               raise "Unsupported Arch: #{Platform::ARCH}"
-             end
 
-      os_arch = case os
-                when 'win'
-                  os + arch.split('_').last
-                else
-                  "#{os}-#{arch}"
-                end
+        os_arch = case os
+                  when 'win'
+                    os + arch.split('_').last
+                  else
+                    "#{os}-#{arch}"
+                  end
 
-      ext = 'zip'
+        ext = 'zip'
 
-      "https://github.com/#{repo}/releases/download/#{tag_name}/protoc-#{tag_name[1..]}-#{os_arch}.#{ext}"
-    end
+        "https://github.com/#{repo}/releases/download/#{tag_name}/protoc-#{tag_name[1..]}-#{os_arch}.#{ext}"
+      end
 
-    def default_sass_embedded_protocol
-      repo = 'sass/embedded-protocol'
+      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::PATH, '--version']) do |file|
+          JSON.parse(file.read)['protocolVersion']
+        end
 
-      "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
+        "https://raw.githubusercontent.com/#{repo}/#{tag_name}/embedded_sass.proto"
+      end
     end
   end
 end
 
-Sass::Extconf.new
+Sass::Embedded::Extconf.new

data/lib/sass/embedded/channel.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative 'compiler'
+
+module Sass
+  class Embedded
+    # The {Channel} for {Compiler} calls. Each instance creates its own
+    # {Compiler}. A new {Compiler} is automatically created when the existing
+    # {Compiler} runs out of unique request id.
+    class Channel
+      def initialize
+        @mutex = Mutex.new
+        @compiler = Compiler.new
+      end
+
+      def close
+        @mutex.synchronize do
+          @compiler.close
+        end
+      end
+
+      def closed?
+        @mutex.synchronize do
+          @compiler.closed?
+        end
+      end
+
+      def subscribe(observer)
+        @mutex.synchronize do
+          begin
+            id = @compiler.add_observer(observer)
+          rescue IOError
+            @compiler = Compiler.new
+            id = @compiler.add_observer(observer)
+          end
+          Subscription.new @compiler, observer, id
+        end
+      end
+
+      # The {Subscription} between {Compiler} and {Observer}.
+      class Subscription
+        attr_reader :id
+
+        def initialize(compiler, observer, id)
+          @compiler = compiler
+          @observer = observer
+          @id = id
+        end
+
+        def unsubscribe
+          @compiler.delete_observer(@observer)
+        end
+
+        def send_message(*args)
+          @compiler.send_message(*args)
+        end
+      end
+
+      private_constant :Subscription
+    end
+  end
+end