sass-embedded 0.3.0 → 0.6.0

data/test/{error_test.rb → render_error_test.rb}

@@ -3,7 +3,9 @@
 require_relative 'test_helper'
 
 module Sass
-  class ErrorTest < MiniTest::Test
+  class RenderErrorTest < MiniTest::Test
+    include TempFileTest
+
     def setup
       @embedded = Embedded.new
     end
@@ -12,7 +14,7 @@ module Sass
       @embedded.close
     end
 
-    def test_first_backtrace_is_sass
+    def test_first_backtrace_is_stdin
       template = <<~SCSS
         .foo {
           baz: bang;
@@ -25,5 +27,18 @@ module Sass
       expected = 'stdin:3:20'
       assert_equal expected, e.backtrace.first
     end
+
+    def test_first_backtrace_is_file
+      temp_file('style.scss', <<~SCSS)
+        .foo {
+          baz: bang;
+          padding top: 10px;
+        }
+      SCSS
+
+      @embedded.render(file: 'style.scss')
+    rescue RenderError => e
+      assert e.backtrace.first.end_with? '/style.scss:3:20'
+    end
   end
 end

data/test/{sass_test.rb → render_test.rb}

@@ -3,8 +3,8 @@
 require_relative 'test_helper'
 
 module Sass
-  class SassTest < MiniTest::Test
-    def test_sass_works
+  class RenderTest < MiniTest::Test
+    def test_sass_render
       assert_equal '', ::Sass.render(data: '')[:css]
 
       css = <<~CSS.chomp
@@ -12,6 +12,7 @@ module Sass
           font-size: 2rem;
         }
       CSS
+
       assert_equal css, ::Sass.render(data: 'h1 { font-size: 2rem; }')[:css]
     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.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - なつき
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -157,17 +157,26 @@ files:
 - lib/sass.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
 - 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:
@@ -181,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -193,10 +202,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/test/compiler_test.rb

@@ -1,262 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'test_helper'
-
-module Sass
-  class EmbeddedTest < MiniTest::Test
-    include TempFileTest
-
-    def setup
-      @embedded = Embedded.new
-    end
-
-    def teardown
-      @embedded.close
-    end
-
-    def render(data)
-      @embedded.render(data: data)[:css]
-    end
-
-    def test_line_comments
-      skip 'not supported'
-
-      template = <<~SCSS
-        .foo {
-          baz: bang; }
-      SCSS
-      expected_output = <<~CSS
-        /* line 1, stdin */
-        .foo {
-          baz: bang;
-        }
-      CSS
-      output = @embedded.render(data: template,
-                                source_comments: true)
-      assert_equal expected_output, output[:css]
-    end
-
-    def test_one_line_comments
-      assert_equal <<~CSS.chomp, render(<<~SCSS)
-        .foo {
-          baz: bang;
-        }
-      CSS
-        .foo {// bar: baz;}
-          baz: bang; //}
-        }
-      SCSS
-      assert_equal <<~CSS.chomp, render(<<~SCSS)
-        .foo bar[val="//"] {
-          baz: bang;
-        }
-      CSS
-        .foo bar[val="//"] {
-          baz: bang; //}
-        }
-      SCSS
-    end
-
-    def test_variables
-      assert_equal <<~CSS.chomp, render(<<~SCSS)
-        blat {
-          a: foo;
-        }
-      CSS
-                $var: foo;
-        #{'        '}
-                blat {a: $var}
-      SCSS
-
-      assert_equal <<~CSS.chomp, render(<<~SCSS)
-        foo {
-          a: 2;
-          b: 6;
-        }
-      CSS
-        foo {
-          $var: 2;
-          $another-var: 4;
-          a: $var;
-          b: $var + $another-var;}
-      SCSS
-    end
-
-    def test_precision
-      skip 'not supported'
-
-      template = <<~SCSS
-        $var: 1;
-        .foo {
-          baz: $var / 3; }
-      SCSS
-      expected_output = <<~CSS.chomp
-        .foo {
-          baz: 0.33333333;
-        }
-      CSS
-      output = @embedded.render(data: template,
-                                precision: 8)
-      assert_equal expected_output, output
-    end
-
-    def test_precision_not_specified
-      template = <<~SCSS
-        $var: 1;
-        .foo {
-          baz: $var / 3; }
-      SCSS
-      expected_output = <<~CSS.chomp
-        .foo {
-          baz: 0.3333333333;
-        }
-      CSS
-      output = render(template)
-      assert_equal expected_output, output
-    end
-
-    def test_source_map
-      temp_dir('admin')
-
-      temp_file('admin/text-color.scss', <<~SCSS)
-        p {
-          color: red;
-        }
-      SCSS
-      temp_file('style.scss', <<~SCSS)
-                @use 'admin/text-color';
-        #{'        '}
-                p {
-                  padding: 20px;
-                }
-      SCSS
-      output = @embedded.render(data: File.read('style.scss'),
-                                source_map: 'style.scss.map')
-
-      assert output[:map].start_with? '{"version":3,'
-    end
-
-    def test_no_source_map
-      output = @embedded.render(data: '$size: 30px;')
-      assert_equal '', output[:map]
-    end
-
-    def test_include_paths
-      temp_dir('included_1')
-      temp_dir('included_2')
-
-      temp_file('included_1/import_parent.scss', '$s: 30px;')
-      temp_file('included_2/import.scss', "@use 'import_parent' as *; $size: $s;")
-      temp_file('styles.scss', "@use 'import.scss' as *; .hi { width: $size; }")
-
-      assert_equal ".hi {\n  width: 30px;\n}", @embedded.render(data: File.read('styles.scss'),
-                                                                include_paths: %w[
-                                                                  included_1 included_2
-                                                                ])[:css]
-    end
-
-    def test_global_include_paths
-      temp_dir('included_1')
-      temp_dir('included_2')
-
-      temp_file('included_1/import_parent.scss', '$s: 30px;')
-      temp_file('included_2/import.scss', "@use 'import_parent' as *; $size: $s;")
-      temp_file('styles.scss', "@use 'import.scss' as *; .hi { width: $size; }")
-
-      ::Sass.include_paths << 'included_1'
-      ::Sass.include_paths << 'included_2'
-
-      assert_equal ".hi {\n  width: 30px;\n}", render(File.read('styles.scss'))
-    end
-
-    def test_env_include_paths
-      expected_include_paths = %w[included_3 included_4]
-
-      ::Sass.instance_eval { @include_paths = nil }
-
-      ENV['SASS_PATH'] = expected_include_paths.join(File::PATH_SEPARATOR)
-
-      assert_equal expected_include_paths, ::Sass.include_paths
-
-      ::Sass.include_paths.clear
-    end
-
-    def test_include_paths_not_configured
-      temp_dir('included_5')
-      temp_dir('included_6')
-      temp_file('included_5/import_parent.scss', '$s: 30px;')
-      temp_file('included_6/import.scss', "@use 'import_parent' as *; $size: $s;")
-      temp_file('styles.scss', "@use 'import.scss' as *; .hi { width: $size; }")
-
-      assert_raises(RenderError) do
-        render(File.read('styles.scss'))
-      end
-    end
-
-    def test_sass_variation
-      sass = <<~SASS
-        $size: 30px
-        .foo
-          width: $size
-      SASS
-
-      css = <<~CSS.chomp
-        .foo {
-          width: 30px;
-        }
-      CSS
-
-      assert_equal css, @embedded.render(data: sass, indented_syntax: true)[:css]
-      assert_raises(RenderError) do
-        @embedded.render(data: sass, indented_syntax: false)
-      end
-    end
-
-    def test_inline_source_maps
-      skip 'not supported'
-
-      template = <<~SCSS
-        .foo {
-          baz: bang; }
-      SCSS
-
-      output = @embedded.render(data: template,
-                                source_map: '.',
-                                source_map_embed: true,
-                                source_map_contents: true)[:css]
-
-      assert_match(/sourceMappingURL/, output)
-      assert_match(/.foo/, output)
-    end
-
-    def test_empty_template
-      output = render('')
-      assert_equal '', output
-    end
-
-    def test_import_plain_css
-      temp_file('test.css', '.something{color: red}')
-      expected_output = <<~CSS.chomp
-        .something {
-          color: red;
-        }
-      CSS
-
-      output = render("@use 'test';")
-      assert_equal expected_output, output
-    end
-
-    def test_concurrency
-      10.times do
-        threads = []
-        10.times do |i|
-          threads << Thread.new(i) do |id|
-            output = @embedded.render(data: "div { width: #{id} }")[:css]
-            assert_match(/#{id}/, output)
-          end
-        end
-        threads.each(&:join)
-      end
-    end
-  end
-end