sass-embedded 0.7.5 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 107eda35f850f6a5d3744a89ba8dcd71abf8ea76659f0c51710ecde9f3233c53
-  data.tar.gz: f3e8d8d963f9a3bfffa00908b91e90d17fd4e9a04046a6c9a739e16b3eae5cb5
+  metadata.gz: 1fe00b57149da1071f98028f159b3de560fc365ae0914c96ee7f19fb12b8cacb
+  data.tar.gz: 3891fa06053620354a7714d87a69b395c7c65b174def0eb6b8bdebb782efc45f
 SHA512:
-  metadata.gz: a9e2dcfbd314b616b66c53511fe021006c20e0a359bb9769db7bf87d14d9377443e245abf88f5da6e1b4414d34d4d05e529885b79169db7c86f8029ed3c7f1f5
-  data.tar.gz: d8ade839bab88a4ff4098f1b045b31dfd532570dbadcb76866fc3c13be603c445583ea2fe2b86aa9ba7b2472272f992d9dd28ce21eb64aaf8693d1ec557660b9
+  metadata.gz: 947acbb1be1109a74619248998542fc117a9676f02d43b473d7546eb6e905953abda62f661f1dc2defc389a6439b8bdd69fa1b5cf68372d84172e1e87165d5e5
+  data.tar.gz: '0916a7093b12b3e6fbcf9da1b4d5b3eb5190905cbbea4a518d465feae94dc9f1a084874cfde49fc92980ffaca8c4333844a7f35e4f3970cf9efe35abeb40fbdf'

data/ext/extconf.rb

@@ -84,7 +84,7 @@ module Sass
       # TODO, don't use prerelease once a release is available
       tag_name = latest_release repo, prerelease: true
 
-      os = case Sass::Platform::OS
+      os = case Platform::OS
            when 'darwin'
              'macos'
            when 'linux'
@@ -92,16 +92,20 @@ module Sass
            when 'windows'
              'windows'
            else
-             raise "Unsupported OS: #{Sass::Platform::OS}"
+             raise "Unsupported OS: #{Platform::OS}"
            end
 
-      arch = case Sass::Platform::ARCH
+      arch = case Platform::ARCH
              when 'x86_64'
                'x64'
              when 'i386'
                'ia32'
+             when 'aarch64'
+               raise "Unsupported Arch: #{Platform::ARCH}" unless Platform::OS == 'darwin'
+
+               'x64'
              else
-               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+               raise "Unsupported Arch: #{Platform::ARCH}"
              end
 
       ext = case os
@@ -119,7 +123,7 @@ module Sass
 
       tag_name = latest_release repo
 
-      os = case Sass::Platform::OS
+      os = case Platform::OS
            when 'darwin'
              'osx'
            when 'linux'
@@ -127,12 +131,16 @@ module Sass
            when 'windows'
              'win'
            else
-             raise "Unsupported OS: #{Sass::Platform::OS}"
+             raise "Unsupported OS: #{Platform::OS}"
            end
 
-      arch = case Sass::Platform::ARCH
+      arch = case Platform::ARCH
              when 'aarch64'
-               'aarch_64'
+               if Platform::OS == 'darwin'
+                 'x86_64'
+               else
+                 'aarch_64'
+               end
              when 'sparcv9'
                's390'
              when 'i386'
@@ -142,7 +150,7 @@ module Sass
              when 'powerpc64'
                'ppcle_64'
              else
-               raise "Unsupported Arch: #{Sass::Platform::ARCH}"
+               raise "Unsupported Arch: #{Platform::ARCH}"
              end
 
       os_arch = case os

data/lib/sass.rb

@@ -69,5 +69,5 @@ require_relative 'sass/error'
 require_relative 'sass/transport'
 require_relative 'sass/observer'
 require_relative 'sass/info'
-require_relative 'sass/render'
+require_relative 'sass/compile'
 require_relative 'sass/embedded'

data/lib/sass/{render.rb → compile.rb}

@@ -2,7 +2,7 @@
 
 module Sass
   # The {Observer} for {Embedded#render}.
-  class RenderContext
+  class CompileContext
     include Observer
 
     def initialize(transport, id,
@@ -41,8 +41,6 @@ module Sass
       raise error unless error.nil?
 
       case message
-      when EmbeddedProtocol::ProtocolError
-        raise ProtocolError, message.message
       when EmbeddedProtocol::OutboundMessage::CompileResponse
         return unless message.id == @id
 

data/lib/sass/embedded.rb

@@ -55,16 +55,16 @@ module Sass
       indent_width = parse_indent_width(indent_width)
       linefeed = parse_linefeed(linefeed)
 
-      message = RenderContext.new(@transport, next_id,
-                                  data: data,
-                                  file: file,
-                                  indented_syntax: indented_syntax,
-                                  include_paths: include_paths,
-                                  output_style: output_style,
-                                  source_map: source_map,
-                                  out_file: out_file,
-                                  functions: functions,
-                                  importer: importer).receive_message
+      message = CompileContext.new(@transport, next_id,
+                                   data: data,
+                                   file: file,
+                                   indented_syntax: indented_syntax,
+                                   include_paths: include_paths,
+                                   output_style: output_style,
+                                   source_map: source_map,
+                                   out_file: out_file,
+                                   functions: functions,
+                                   importer: importer).receive_message
 
       if message.failure
         raise RenderError.new(

data/lib/sass/info.rb

@@ -17,8 +17,6 @@ module Sass
       raise error unless error.nil?
 
       case message
-      when EmbeddedProtocol::ProtocolError
-        raise ProtocolError, message.message
       when EmbeddedProtocol::OutboundMessage::VersionResponse
         return unless message.id == @id
 

data/lib/sass/transport.rb

@@ -24,12 +24,14 @@ module Sass
       [field_descriptor.subtype, field_descriptor.name]
     end.to_h
 
+    private_constant :ONEOF_MESSAGE
+
     def initialize
       @observerable_mutex = Mutex.new
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
       poll do
-        $stderr.write @stderr.readline
+        warn(@stderr.readline, uplevel: 1)
       end
       poll do
         receive_proto read
@@ -66,9 +68,7 @@ module Sass
       Thread.new do
         loop do
           yield
-        rescue Interrupt
-          break
-        rescue IOError => e
+        rescue StandardError => e
           notify_observers(e, nil)
           close
           break
@@ -84,8 +84,14 @@ module Sass
     end
 
     def receive_proto(proto)
-      message = EmbeddedProtocol::OutboundMessage.decode(proto)
-      notify_observers(nil, message[message.message.to_s])
+      payload = EmbeddedProtocol::OutboundMessage.decode(proto)
+      message = payload[payload.message.to_s]
+      case message
+      when EmbeddedProtocol::ProtocolError
+        raise ProtocolError, message.message
+      else
+        notify_observers(nil, message)
+      end
     end
 
     def read

data/lib/sass/util.rb

@@ -10,6 +10,8 @@ module Sass
 
     URI_PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 
+    private_constant :URI_PARSER
+
     def file_uri_from_path(path)
       absolute_path = File.absolute_path(path)
 

data/lib/sass/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.10
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -150,12 +150,12 @@ files:
 - ext/Makefile
 - ext/extconf.rb
 - lib/sass.rb
+- lib/sass/compile.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/info.rb
 - lib/sass/observer.rb
 - lib/sass/platform.rb
-- lib/sass/render.rb
 - lib/sass/result.rb
 - lib/sass/struct.rb
 - lib/sass/transport.rb
@@ -165,7 +165,7 @@ 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.5
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.10
 post_install_message:
 rdoc_options: []
 require_paths: