sass-embedded 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edeb1d7a1a3ba0d1485671e579478b4b1bc5d372350a25869cd4b0305bd2f356
-  data.tar.gz: 9eda21b2bdb2d7f278d03c9e5091eeec13956d9e0216ebb4a415988f8ac90b62
+  metadata.gz: 6c14e0ab686080f404d76337be0b59768bb600c48850f817c168cf53929239d9
+  data.tar.gz: e707aa4c0e910e71d0a316e4d3f1609b4c3cc49e49107c42af31d1ba3f9d3b62
 SHA512:
-  metadata.gz: 2cc608b5597a0c820633f1dc386de5e9125b00ed99004c5237e0223d5a181d4782da4b2025983f86fad47409ef738e1a5954e810f35e9f443dd319035b2aa4dc
-  data.tar.gz: a45ad64a3670c8d6f2136a287773eed2f77abaeb6911173931af8570fa1edeeed53a747ebc747288dc5b1941c08eb9ddc5c410ede3c536c380dd3297e0bf8092
+  metadata.gz: c549da93d4a68fb330b1019c462c593d18630c028a7a3add53b13dc72f18918d0f7e815c5abc0612584e749a87752c0c56c71c43fbb477829d8063cdfbb16fa3
+  data.tar.gz: 0c0af0ff5e8d40ac6f4305eb04b268aaccb154526071ab5799f4dfdb148ef7cba1c39ff45c9eb5b274d7a9d5a6170fefaf60be86fdf8ce127d1167799e85da47

data/README.md

@@ -1,5 +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)
+
 This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass-embedded-protocol).
 
 It exposes a Ruby API for Sass that's backed by a native [Dart Sass](https://sass-lang.com/dart-sass) executable.

data/ext/sass_embedded/extconf.rb

@@ -6,119 +6,131 @@ require 'json'
 require 'open-uri'
 require_relative '../../lib/sass/platform'
 
-def api(url)
-  headers = {}
-  headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
-  URI.parse(url).open(headers) do |file|
-    JSON.parse file.read
-  end
-end
+module Sass
+  class Extconf
 
-def download(url)
-  URI.parse(url).open do |source|
-    File.open(File.absolute_path(File.basename(url), __dir__), 'wb') do |destination|
-      destination.write source.read
-    end
-  end
-rescue StandardError
-  raise "Failed to download: #{url}"
-end
+    def initialize
+      system('make', '-C', __dir__, 'distclean')
+      download_sass_embedded
+      download_protoc
+      download_embedded_sass_proto
+      system('make', '-C', __dir__, 'install')
 
-def download_sass_embedded
-  repo = 'sass/dart-sass-embedded'
-
-  release = api("https://api.github.com/repos/#{repo}/releases")[0]['tag_name']
-
-  os = case Sass::Platform::OS
-       when 'darwin'
-         'macos'
-       when 'linux'
-         'linux'
-       when 'windows'
-         'windows'
-       else
-         raise "Unsupported OS: #{Sass::Platform::OS}"
-       end
-
-  arch = case Sass::Platform::ARCH
-         when 'x86_64'
-           'x64'
-         when 'i386'
-           'ia32'
-         else
-           raise "Unsupported Arch: #{Sass::Platform::ARCH}"
-         end
-
-  ext = case os
-        when 'windows'
-          'zip'
-        else
-          'tar.gz'
-        end
+      File.open(File.absolute_path("sass_embedded.#{RbConfig::CONFIG['DLEXT']}", __dir__), 'w') {}
 
-  url = "https://github.com/#{repo}/releases/download/#{release}/sass_embedded-#{release}-#{os}-#{arch}.#{ext}"
-  download url
-end
+      $makefile_created = true
+    end
 
-def download_protoc
-  repo = 'protocolbuffers/protobuf'
+    private
 
-  tag = URI.parse("https://github.com/#{repo}/releases/latest").open do |file|
-    File.basename file.base_uri.to_s
-  end
+    def api(url)
+      headers = {}
+      headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
+      URI.parse(url).open(headers) do |file|
+        JSON.parse file.read
+      end
+    end
 
-  release = tag[1..-1]
-
-  os = case Sass::Platform::OS
-       when 'darwin'
-         'osx'
-       when 'linux'
-         'linux'
-       when 'windows'
-         'win'
-       else
-         raise "Unsupported OS: #{Sass::Platform::OS}"
-       end
-
-  arch = case Sass::Platform::ARCH
-         when 'aarch64'
-           'aarch_64'
-         when 'sparcv9'
-           's390'
-         when 'i386'
-           'x86_32'
-         when 'x86_64'
-           'x86_64'
-         when 'powerpc64'
-           'ppcle_64'
-         else
-           raise "Unsupported Arch: #{Sass::Platform::ARCH}"
-         end
-
-  os_arch = case os
-            when 'win'
-              os + arch.split('_').last
+    def download(url)
+      URI.parse(url).open do |source|
+        File.open(File.absolute_path(File.basename(url), __dir__), 'wb') do |destination|
+          destination.write source.read
+        end
+      end
+    rescue StandardError
+      raise "Failed to download: #{url}"
+    end
+
+    def download_sass_embedded
+      repo = 'sass/dart-sass-embedded'
+
+      release = api("https://api.github.com/repos/#{repo}/releases")[0]['tag_name']
+
+      os = case Sass::Platform::OS
+           when 'darwin'
+             'macos'
+           when 'linux'
+             'linux'
+           when 'windows'
+             'windows'
+           else
+             raise "Unsupported OS: #{Sass::Platform::OS}"
+           end
+
+      arch = case Sass::Platform::ARCH
+             when 'x86_64'
+               'x64'
+             when 'i386'
+               'ia32'
+             else
+               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+             end
+
+      ext = case os
+            when 'windows'
+              'zip'
             else
-              "#{os}-#{arch}"
+              'tar.gz'
             end
 
-  ext = 'zip'
-
-  url = "https://github.com/#{repo}/releases/download/#{tag}/protoc-#{release}-#{os_arch}.#{ext}"
-  download url
-end
+      url = "https://github.com/#{repo}/releases/download/#{release}/sass_embedded-#{release}-#{os}-#{arch}.#{ext}"
+      download url
+    end
 
-def download_embedded_sass_proto
-  url = 'https://raw.githubusercontent.com/sass/embedded-protocol/HEAD/embedded_sass.proto'
-  download url
-end
+    def download_protoc
+      repo = 'protocolbuffers/protobuf'
+
+      tag = URI.parse("https://github.com/#{repo}/releases/latest").open do |file|
+        File.basename file.base_uri.to_s
+      end
+
+      release = tag[1..-1]
+
+      os = case Sass::Platform::OS
+           when 'darwin'
+             'osx'
+           when 'linux'
+             'linux'
+           when 'windows'
+             'win'
+           else
+             raise "Unsupported OS: #{Sass::Platform::OS}"
+           end
+
+      arch = case Sass::Platform::ARCH
+             when 'aarch64'
+               'aarch_64'
+             when 'sparcv9'
+               's390'
+             when 'i386'
+               'x86_32'
+             when 'x86_64'
+               'x86_64'
+             when 'powerpc64'
+               'ppcle_64'
+             else
+               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+             end
+
+      os_arch = case os
+                when 'win'
+                  os + arch.split('_').last
+                else
+                  "#{os}-#{arch}"
+                end
+
+      ext = 'zip'
+
+      url = "https://github.com/#{repo}/releases/download/#{tag}/protoc-#{release}-#{os_arch}.#{ext}"
+      download url
+    end
 
-system('make', '-C', __dir__, 'distclean')
-download_sass_embedded
-download_protoc
-download_embedded_sass_proto
-system('make', '-C', __dir__, 'install')
+    def download_embedded_sass_proto
+      url = 'https://raw.githubusercontent.com/sass/embedded-protocol/HEAD/embedded_sass.proto'
+      download url
+    end
 
-File.open(File.absolute_path("sass_embedded.#{RbConfig::CONFIG['DLEXT']}", __dir__), 'w') {}
+  end
+end
 
-$makefile_created = true
+Sass::Extconf.new

data/lib/sass.rb

@@ -13,7 +13,7 @@ module Sass
   # (semicolon-separated on Windows).
   #
   # @example
-  #   Sass.include_paths << File.dirname(__FILE__ + '/sass')
+  #   Sass.include_paths << File.dirname(__FILE__) + '/sass'
   # @return [Array<String, Pathname>]
   def self.include_paths
     @include_paths ||= if ENV['SASS_PATH']

data/lib/sass/embedded.rb

@@ -209,6 +209,7 @@ module Sass
 
     def close
       @transport.close
+      nil
     end
 
     private

data/lib/sass/transport.rb

@@ -95,6 +95,7 @@ module Sass
       @stdin.close unless @stdin.closed?
       @stdout.close unless @stdout.closed?
       @stderr.close unless @stderr.closed?
+      nil
     end
 
     private
@@ -109,28 +110,28 @@ module Sass
         @stdin.write proto
       end
     end
-  end
 
-  class MessageObserver
-    def initialize(obs, id, &block)
-      @obs = obs
-      @id = id
-      @block = block
-      @obs.add_observer self
-    end
+    class MessageObserver
+      def initialize(obs, id, &block)
+        @obs = obs
+        @id = id
+        @block = block
+        @obs.add_observer self
+      end
 
-    def update(error, message)
-      if error
-        @obs.delete_observer self
-        @block.call error, nil
-      elsif message.error&.id == Sass::Transport::PROTOCOL_ERROR_ID
-        @obs.delete_observer self
-        @block.call Sass::ProtocolError.new(message.error.message), nil
-      else
-        res = message[message.message.to_s]
-        if (res['compilation_id'] || res['id']) == @id
+      def update(error, message)
+        if error
           @obs.delete_observer self
-          @block.call error, res
+          @block.call error, nil
+        elsif message.error&.id == Sass::Transport::PROTOCOL_ERROR_ID
+          @obs.delete_observer self
+          @block.call Sass::ProtocolError.new(message.error.message), nil
+        else
+          res = message[message.message.to_s]
+          if (res['compilation_id'] || res['id']) == @id
+            @obs.delete_observer self
+            @block.call error, res
+          end
         end
       end
     end

data/lib/sass/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - なつき