sass-embedded 0.2.2 → 0.4.1

data/test/render_test.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+module Sass
+  class RenderTest < MiniTest::Test
+    def test_sass_render
+      assert_equal '', ::Sass.render(data: '')[:css]
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 2rem;
+        }
+      CSS
+
+      assert_equal css, ::Sass.render(data: 'h1 { font-size: 2rem; }')[:css]
+    end
+  end
+end

data/test/source_maps_test.rb

@@ -0,0 +1,178 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+module Sass
+  class SourceMapsTest < MiniTest::Test
+    include TempFileTest
+
+    def setup
+      @embedded = Embedded.new
+    end
+
+    def teardown
+      @embedded.close
+    end
+
+    def test_no_source_map
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss')
+      assert_equal css, result[:css]
+      assert_nil result[:map]
+    end
+
+    def test_source_map_file_as_string
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+        /*# sourceMappingURL=out.map */
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss',
+                                source_map: 'out.map')
+      assert_equal css, result[:css]
+      JSON.parse(result[:map])
+    end
+
+    def test_source_map_true_without_out_file_has_no_effect
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss',
+                                source_map: true)
+      assert_equal css, result[:css]
+      assert_nil result[:map]
+    end
+
+    def test_source_map_true_with_out_file
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+        /*# sourceMappingURL=out.css.map */
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss',
+                                source_map: true,
+                                out_file: 'out.css')
+      assert_equal css, result[:css]
+      JSON.parse(result[:map])
+    end
+
+    def test_omit_source_map_url
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss',
+                                source_map: 'out.map',
+                                omit_source_map_url: true)
+      assert_equal css, result[:css]
+      JSON.parse(result[:map])
+    end
+
+    def test_source_map_embedded
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+        /*# sourceMappingURL=data:application/json;base64,
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss',
+                                source_map: 'out.map',
+                                source_map_embed: true)
+      assert result[:css].start_with? css
+      JSON.parse(result[:map])
+    end
+
+    def test_source_map_root
+      scss = <<~SCSS
+        $size: 40px;
+        h1 {
+          font-size: $size;
+        }
+      SCSS
+
+      css = <<~CSS.chomp
+        h1 {
+          font-size: 40px;
+        }
+        /*# sourceMappingURL=out.map */
+      CSS
+
+      temp_file('style.scss', scss)
+
+      result = @embedded.render(file: 'style.scss',
+                                source_map: 'out.map',
+                                source_map_root: 'assets')
+      assert_equal css, result[:css]
+      assert_equal 'assets', JSON.parse(result[:map])['sourceRoot']
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require 'fileutils'
 require 'minitest/autorun'
 require 'minitest/pride'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.1
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -108,24 +108,54 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  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-rake
+  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'
 description: Use dart-sass with Ruby!
 email:
 - i@ntk.me
 executables: []
 extensions:
-- ext/sass_embedded/extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
 - ".github/workflows/build.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- ext/sass_embedded/.gitignore
-- ext/sass_embedded/Makefile
-- ext/sass_embedded/extconf.rb
+- ext/.gitignore
+- ext/Makefile
+- ext/extconf.rb
 - lib/sass.rb
+- lib/sass/context.rb
 - lib/sass/embedded.rb
 - lib/sass/error.rb
 - lib/sass/platform.rb
@@ -133,12 +163,16 @@ files:
 - lib/sass/util.rb
 - lib/sass/version.rb
 - sass-embedded.gemspec
-- test/compiler_test.rb
-- test/custom_importer_test.rb
-- test/error_test.rb
+- test/concurrency_test.rb
 - test/functions_test.rb
-- test/output_style_test.rb
-- test/sass_test.rb
+- test/importer_test.rb
+- test/include_paths_test.rb
+- test/indented_syntax_test.rb
+- test/input_test.rb
+- test/output_test.rb
+- test/render_error_test.rb
+- test/render_test.rb
+- test/source_maps_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ntkme/embedded-host-ruby
 licenses:
@@ -152,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -164,10 +198,14 @@ signing_key:
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files:
-- test/compiler_test.rb
-- test/custom_importer_test.rb
-- test/error_test.rb
+- test/concurrency_test.rb
 - test/functions_test.rb
-- test/output_style_test.rb
-- test/sass_test.rb
+- test/importer_test.rb
+- test/include_paths_test.rb
+- test/indented_syntax_test.rb
+- test/input_test.rb
+- test/output_test.rb
+- test/render_error_test.rb
+- test/render_test.rb
+- test/source_maps_test.rb
 - test/test_helper.rb

data/ext/sass_embedded/Makefile

@@ -1,35 +0,0 @@
-.PHONY: install
-install:
-ifeq ($(OS),Windows_NT)
-	powershell -command "Get-Item sass_embedded-*.zip | Expand-Archive -DestinationPath (Get-Location) -Force"
-	powershell -command "Get-Item protoc-*.zip | Expand-Archive -DestinationPath protoc -Force"
-	./protoc/bin/protoc --ruby_out=. embedded_sass.proto
-else
-	tar -vxzf sass_embedded-*.tar.gz
-	unzip -od protoc protoc-*.zip
-	./protoc/bin/protoc --ruby_out=. embedded_sass.proto
-endif
-
-.PHONY: clean
-clean:
-ifeq ($(OS),Windows_NT)
-	powershell -command "Remove-Item sass_embedded -Recurse -Force -ErrorAction Ignore"
-	powershell -command "Remove-Item protoc -Recurse -Force -ErrorAction Ignore"
-	powershell -command "Remove-Item embedded_sass_pb.rb -Recurse -Force -ErrorAction Ignore"
-else
-	rm -rf sass_embedded
-	rm -rf protoc
-	rm -rf embedded_sass_pb.rb
-endif
-
-.PHONY: distclean
-distclean: clean
-ifeq ($(OS),Windows_NT)
-	powershell -command "Remove-Item sass_embedded-*.zip -Force -ErrorAction Ignore"
-	powershell -command "Remove-Item protoc-*.zip -Force -ErrorAction Ignore"
-	powershell -command "Remove-Item embedded_sass.proto -Force -ErrorAction Ignore"
-else
-	rm -rf sass_embedded-*.tar.gz
-	rm -rf protoc-*.zip
-	rm -rf embedded_sass.proto
-endif

data/ext/sass_embedded/extconf.rb

@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'mkmf'
-require 'json'
-require 'open-uri'
-require_relative '../../lib/sass/platform'
-
-module Sass
-  class Extconf
-
-    def initialize
-      system('make', '-C', __dir__, 'distclean')
-      download_sass_embedded
-      download_protoc
-      download_embedded_sass_proto
-      system('make', '-C', __dir__, 'install')
-
-      File.open(File.absolute_path("sass_embedded.#{RbConfig::CONFIG['DLEXT']}", __dir__), 'w') {}
-
-      $makefile_created = true
-    end
-
-    private
-
-    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
-
-    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
-              'tar.gz'
-            end
-
-      url = "https://github.com/#{repo}/releases/download/#{release}/sass_embedded-#{release}-#{os}-#{arch}.#{ext}"
-      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
-
-    def download_embedded_sass_proto
-      url = 'https://raw.githubusercontent.com/sass/embedded-protocol/HEAD/embedded_sass.proto'
-      download url
-    end
-
-  end
-end
-
-Sass::Extconf.new