sass-embedded 0.7.14 → 0.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fcfb496509a39af1ede196579891f3f618c8ae112a636abded14712811acbc6
-  data.tar.gz: ce47457cf14a9f79129a638909785a3edda3c93835fdd2d5d29a1d721c7dd3ba
+  metadata.gz: e965e28f53b4aff087309c3aea24f5fe4196c3871a644c4ce6f9d21ededb6d44
+  data.tar.gz: 45691d3cf07370ddebbecc001aeed6d57fb97050565b7190e41f52fc56c2bbfe
 SHA512:
-  metadata.gz: 8233f64b021b3a51c199383ad9327a5d9ddf4df340c151a761a2fa54cd403e96c003d7922ea8bd7ead2c5b66be15c101d297528d81fe7b597e36527df4a5637b
-  data.tar.gz: '058dfbfbfe9afe0f39d23191c943ca00ebdcd94706fb0d9cfca68ecd347d45ed935c011e387812c4fe2579c1f16b42cf9f183b83dd74c7166e2ebcb5f8a54200'
+  metadata.gz: 3551a6f3ddf029aaae49a38ed80cca8cc5a2daf06116a27dd7cad2e4f815247cb3b7289837bc59b893d8763d9e83f11cecee22f23414892e5fee41f1a9bad1e0
+  data.tar.gz: 3a98b6277c1bf21af5d285e8cfa701a503af54781f97e531e1ca1e1219d112395f714fcf46c403b718ba21d4d98d33b585d3b1724ad3577a4a52318eb711ed38

data/README.md

@@ -1,6 +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)
+[![gem](https://badge.fury.io/rb/sass-embedded.svg)](https://rubygems.org/gems/sass-embedded)
 
 This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass-embedded-protocol).
 

data/ext/{extconf.rb → sass/extconf.rb}

@@ -6,7 +6,7 @@ require 'json'
 require 'open-uri'
 require 'fileutils'
 require_relative './dependencies'
-require_relative '../lib/sass/platform'
+require_relative '../../lib/sass/platform'
 
 module Sass
   # The dependency downloader. This downloads all the dependencies during gem
@@ -27,10 +27,19 @@ module Sass
       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 }
+      mkmf
     end
 
     private
 
+    def mkmf
+      return if File.exist? File.basename(__FILE__)
+
+      File.write('Makefile',
+                 format(DATA.read, __dir__: Pathname.new(__dir__).relative_path_from(Pathname.new(Dir.pwd)),
+                                   DLLIB: "#{File.basename(__dir__)}.#{RbConfig::MAKEFILE_CONFIG['DLEXT']}"))
+    end
+
     def get_with_config(config, default)
       val = with_config(config, default)
       case val
@@ -194,3 +203,17 @@ module Sass
 end
 
 Sass::Extconf.new
+
+__END__
+ifeq ($(OS),Windows_NT)
+	TOUCH = cmd /c copy NUL
+else
+	TOUCH = touch
+endif
+
+.PHONY: all
+all: %{DLLIB}
+	$(MAKE) -C %{__dir__}
+
+%{DLLIB}:
+	$(TOUCH) $@

data/lib/sass/embedded.rb

@@ -84,6 +84,7 @@ module Sass
       end
 
       map, source_map = post_process_map(map: message.success.source_map,
+                                         data: data,
                                          file: file,
                                          out_file: out_file,
                                          source_map: source_map,
@@ -118,6 +119,7 @@ module Sass
     private
 
     def post_process_map(map:,
+                         data:,
                          file:,
                          out_file:,
                          source_map:,
@@ -148,10 +150,21 @@ module Sass
 
       map_data['sourcesContent'] = [] if source_map_contents
 
+      file = File.absolute_path(file) unless file.nil?
+
       map_data['sources'].map! do |source|
         if source.start_with? 'file://'
           path = Util.path_from_file_uri(source)
-          map_data['sourcesContent'].push(File.read(path)) if source_map_contents
+          content = if path == file && !data.nil?
+                      data
+                    else
+                      begin
+                        File.read(path)
+                      rescue StandardError
+                        nil
+                      end
+                    end
+          map_data['sourcesContent'].push(content) if source_map_contents
           Util.relative_path(source_map_dir, path)
         else
           map_data['sourcesContent'].push(nil) if source_map_contents

data/lib/sass/transport.rb

@@ -2,7 +2,7 @@
 
 require 'open3'
 require 'observer'
-require_relative '../../ext/embedded_sass_pb'
+require_relative '../../ext/sass/embedded_sass_pb'
 
 module Sass
   # The {::Observable} {Transport} for low level communication with
@@ -12,7 +12,7 @@ module Sass
     include Observable
 
     DART_SASS_EMBEDDED = File.absolute_path(
-      "../../ext/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
+      "../../ext/sass/sass_embedded/dart-sass-embedded#{Platform::OS == 'windows' ? '.bat' : ''}", __dir__
     )
 
     PROTOCOL_ERROR_ID = 4_294_967_295
@@ -30,6 +30,9 @@ module Sass
       @observerable_mutex = Mutex.new
       @stdin_mutex = Mutex.new
       @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(DART_SASS_EMBEDDED)
+
+      [@stdin, @stdout].each(&:binmode)
+
       poll do
         warn(@stderr.readline, uplevel: 1)
       end
@@ -107,21 +110,24 @@ module Sass
     end
 
     def read_varint(readable)
-      varint = bits = 0
+      value = bits = 0
       loop do
         byte = readable.readbyte
-        varint += (byte & 0x7f) << bits
+        value |= (byte & 0x7f) << bits
         bits += 7
-        break if byte <= 0x7f
+        break if byte < 0x80
       end
-      varint
+      value
     end
 
-    def write_varint(writeable, varint)
-      while varint.positive?
-        writeable.write ((varint > 0x7f ? 0x80 : 0) | (varint & 0x7f)).chr
-        varint >>= 7
+    def write_varint(writeable, value)
+      bytes = []
+      until value < 0x80
+        bytes << (0x80 | (value & 0x7f))
+        value >>= 7
       end
+      bytes << value
+      writeable.write bytes.pack('C*')
     end
   end
 end

data/lib/sass/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.18
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +128,14 @@ email:
 - i@ntk.me
 executables: []
 extensions:
-- ext/extconf.rb
+- ext/sass/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- ext/Makefile
-- ext/dependencies.rb
-- ext/extconf.rb
+- ext/sass/Makefile
+- ext/sass/dependencies.rb
+- ext/sass/extconf.rb
 - lib/sass.rb
 - lib/sass/compile.rb
 - lib/sass/embedded.rb
@@ -166,7 +152,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.14
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.7.18
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -182,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!