sass-embedded 0.6.2 → 0.6.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/sass/embedded.rb +3 -3
- data/lib/sass/render.rb +6 -4
- data/lib/sass/result.rb +2 -2
- data/lib/sass/version.rb +1 -1
- data/test/concurrency_test.rb +2 -2
- data/test/functions_test.rb +4 -4
- data/test/importer_test.rb +4 -4
- data/test/include_paths_test.rb +2 -2
- data/test/indented_syntax_test.rb +4 -4
- data/test/input_test.rb +2 -2
- data/test/output_test.rb +18 -18
- data/test/render_test.rb +2 -2
- data/test/source_maps_test.rb +14 -14
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b7726f0c228a37d01f4c228f26a8bbbf136420beb6d9079551d97924ea9c3724
|
4
|
+
data.tar.gz: 283969599dc5165a5cdc2c8c95c14b8ebd15c70d3f6f3d5aa1ebea4283d10cd5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1385690d56690bf6197067b9c7421caa472e795c720b43953e82ef547391e7ba9f857b8a639f98a1c88a76f5e30bb0330b6c31b592534c27b53ec4f818ff15ea
|
7
|
+
data.tar.gz: 10fe26fd2b04412246136ee0c04e8f26f9781b05e4a16ccc90151dbc91f69a47a7332078da530eb7747425e6e444f5b00c9b22cc63c0404de0ed649921931329
|
data/lib/sass/embedded.rb
CHANGED
@@ -30,7 +30,7 @@ module Sass
|
|
30
30
|
#
|
31
31
|
# See {file:README.md#options} for supported options.
|
32
32
|
#
|
33
|
-
# @return [
|
33
|
+
# @return [RenderResult]
|
34
34
|
# @raise [ProtocolError]
|
35
35
|
# @raise [RenderError]
|
36
36
|
def render(data: nil,
|
@@ -101,9 +101,9 @@ module Sass
|
|
101
101
|
|
102
102
|
finish = Util.now
|
103
103
|
|
104
|
-
stats =
|
104
|
+
stats = RenderResult::Stats.new(file.nil? ? 'data' : file, start, finish, finish - start)
|
105
105
|
|
106
|
-
|
106
|
+
RenderResult.new(css, map, stats)
|
107
107
|
end
|
108
108
|
|
109
109
|
def close
|
data/lib/sass/render.rb
CHANGED
@@ -47,15 +47,17 @@ module Sass
|
|
47
47
|
super(nil, message)
|
48
48
|
end
|
49
49
|
when EmbeddedProtocol::OutboundMessage::LogEvent
|
50
|
-
|
50
|
+
return unless message.compilation_id == @id && $stderr.tty?
|
51
|
+
|
52
|
+
warn message.formatted
|
51
53
|
when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
|
52
|
-
return unless message
|
54
|
+
return unless message.compilation_id == @id
|
53
55
|
|
54
56
|
Thread.new do
|
55
57
|
@transport.send canonicalize_response message
|
56
58
|
end
|
57
59
|
when EmbeddedProtocol::OutboundMessage::ImportRequest
|
58
|
-
return unless message
|
60
|
+
return unless message.compilation_id == @id
|
59
61
|
|
60
62
|
Thread.new do
|
61
63
|
@transport.send import_response message
|
@@ -63,7 +65,7 @@ module Sass
|
|
63
65
|
when EmbeddedProtocol::OutboundMessage::FileImportRequest
|
64
66
|
raise NotImplementedError, 'FileImportRequest is not implemented'
|
65
67
|
when EmbeddedProtocol::OutboundMessage::FunctionCallRequest
|
66
|
-
return unless message
|
68
|
+
return unless message.compilation_id == @id
|
67
69
|
|
68
70
|
Thread.new do
|
69
71
|
@transport.send function_call_response message
|
data/lib/sass/result.rb
CHANGED
data/lib/sass/version.rb
CHANGED
data/test/concurrency_test.rb
CHANGED
@@ -15,7 +15,7 @@ module Sass
|
|
15
15
|
end
|
16
16
|
|
17
17
|
def render(data)
|
18
|
-
@embedded.render(data: data)
|
18
|
+
@embedded.render(data: data).css
|
19
19
|
end
|
20
20
|
|
21
21
|
def test_concurrency
|
@@ -23,7 +23,7 @@ module Sass
|
|
23
23
|
threads = []
|
24
24
|
10.times do |i|
|
25
25
|
threads << Thread.new(i) do |id|
|
26
|
-
output = @embedded.render(data: "div { width: #{id} }")
|
26
|
+
output = @embedded.render(data: "div { width: #{id} }").css
|
27
27
|
assert_match(/#{id}/, output)
|
28
28
|
end
|
29
29
|
end
|
data/test/functions_test.rb
CHANGED
@@ -162,7 +162,7 @@ module Sass
|
|
162
162
|
)
|
163
163
|
)
|
164
164
|
}
|
165
|
-
})
|
165
|
+
}).css
|
166
166
|
end
|
167
167
|
|
168
168
|
# rubocop:enable Layout/LineLength
|
@@ -334,7 +334,7 @@ module Sass
|
|
334
334
|
)
|
335
335
|
)
|
336
336
|
}
|
337
|
-
})
|
337
|
+
}).css
|
338
338
|
assert_match(/test_key1/, output)
|
339
339
|
assert_match(/test_key2/, output)
|
340
340
|
assert_match(/test_value/, output)
|
@@ -356,7 +356,7 @@ module Sass
|
|
356
356
|
)
|
357
357
|
)
|
358
358
|
}
|
359
|
-
})
|
359
|
+
}).css
|
360
360
|
|
361
361
|
assert_match(/custom_function/, output)
|
362
362
|
end
|
@@ -368,7 +368,7 @@ module Sass
|
|
368
368
|
'test_function()': lambda {
|
369
369
|
Class.new
|
370
370
|
}
|
371
|
-
})
|
371
|
+
}).css
|
372
372
|
end
|
373
373
|
end
|
374
374
|
|
data/test/importer_test.rb
CHANGED
@@ -15,7 +15,7 @@ module Sass
|
|
15
15
|
end
|
16
16
|
|
17
17
|
def render(data, importer)
|
18
|
-
@embedded.render(data: data, importer: importer)
|
18
|
+
@embedded.render(data: data, importer: importer).css
|
19
19
|
end
|
20
20
|
|
21
21
|
def test_custom_importer_works
|
@@ -121,7 +121,7 @@ module Sass
|
|
121
121
|
lambda { |_url, prev|
|
122
122
|
{ contents: ".#{prev} { color: red; }" }
|
123
123
|
}
|
124
|
-
])
|
124
|
+
]).css
|
125
125
|
|
126
126
|
assert_equal <<~CSS.chomp, output
|
127
127
|
.import-parent-filename.scss {
|
@@ -140,10 +140,10 @@ module Sass
|
|
140
140
|
lambda { |_url, _prev|
|
141
141
|
{ contents: 'h1 { color: black; }' }
|
142
142
|
}
|
143
|
-
])
|
143
|
+
]).css
|
144
144
|
}
|
145
145
|
}
|
146
|
-
])
|
146
|
+
]).css
|
147
147
|
|
148
148
|
assert_equal <<~CSS.chomp, output
|
149
149
|
h1 {
|
data/test/include_paths_test.rb
CHANGED
@@ -31,7 +31,7 @@ module Sass
|
|
31
31
|
assert_equal css, @embedded.render(file: 'styles.scss',
|
32
32
|
include_paths: %w[
|
33
33
|
included_1 included_2
|
34
|
-
])
|
34
|
+
]).css
|
35
35
|
end
|
36
36
|
|
37
37
|
def test_global_include_paths
|
@@ -51,7 +51,7 @@ module Sass
|
|
51
51
|
}
|
52
52
|
CSS
|
53
53
|
|
54
|
-
assert_equal css, @embedded.render(file: 'styles.scss')
|
54
|
+
assert_equal css, @embedded.render(file: 'styles.scss').css
|
55
55
|
end
|
56
56
|
|
57
57
|
def test_include_paths_from_env
|
@@ -35,7 +35,7 @@ module Sass
|
|
35
35
|
@embedded.render(data: sass, indented_syntax: false)
|
36
36
|
end
|
37
37
|
|
38
|
-
assert_equal css, @embedded.render(data: sass, indented_syntax: true)
|
38
|
+
assert_equal css, @embedded.render(data: sass, indented_syntax: true).css
|
39
39
|
end
|
40
40
|
|
41
41
|
def test_input_file_with_indented_syntax
|
@@ -53,9 +53,9 @@ module Sass
|
|
53
53
|
|
54
54
|
temp_file('style.sass', sass)
|
55
55
|
|
56
|
-
assert_equal css, @embedded.render(file: 'style.sass')
|
57
|
-
assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: true)
|
58
|
-
assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: false)
|
56
|
+
assert_equal css, @embedded.render(file: 'style.sass').css
|
57
|
+
assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: true).css
|
58
|
+
assert_equal css, @embedded.render(file: 'style.sass', indented_syntax: false).css
|
59
59
|
end
|
60
60
|
end
|
61
61
|
end
|
data/test/input_test.rb
CHANGED
@@ -30,7 +30,7 @@ module Sass
|
|
30
30
|
CSS
|
31
31
|
|
32
32
|
result = @embedded.render(data: scss)
|
33
|
-
assert_equal css, result
|
33
|
+
assert_equal css, result.css
|
34
34
|
end
|
35
35
|
|
36
36
|
def test_input_file
|
@@ -50,7 +50,7 @@ module Sass
|
|
50
50
|
|
51
51
|
temp_file('style.scss', scss)
|
52
52
|
result = @embedded.render(file: 'style.scss')
|
53
|
-
assert_equal css, result
|
53
|
+
assert_equal css, result.css
|
54
54
|
end
|
55
55
|
end
|
56
56
|
end
|
data/test/output_test.rb
CHANGED
@@ -23,26 +23,26 @@ module Sass
|
|
23
23
|
}
|
24
24
|
SCSS
|
25
25
|
|
26
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :expanded)
|
26
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :expanded).css
|
27
27
|
.foo {
|
28
28
|
baz: bang;
|
29
29
|
}
|
30
30
|
CSS
|
31
31
|
|
32
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :compressed)
|
32
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: data, output_style: :compressed).css
|
33
33
|
.foo{baz:bang}
|
34
34
|
CSS
|
35
35
|
|
36
36
|
assert_raises(ArgumentError) do
|
37
|
-
@embedded.render(data: data, output_style: :nested)
|
37
|
+
@embedded.render(data: data, output_style: :nested).css
|
38
38
|
end
|
39
39
|
|
40
40
|
assert_raises(ArgumentError) do
|
41
|
-
@embedded.render(data: data, output_style: :compact)
|
41
|
+
@embedded.render(data: data, output_style: :compact).css
|
42
42
|
end
|
43
43
|
|
44
44
|
assert_raises(ArgumentError) do
|
45
|
-
@embedded.render(data: data, output_style: nil)
|
45
|
+
@embedded.render(data: data, output_style: nil).css
|
46
46
|
end
|
47
47
|
end
|
48
48
|
|
@@ -55,7 +55,7 @@ module Sass
|
|
55
55
|
SCSS
|
56
56
|
|
57
57
|
def test_output_indent_width
|
58
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 0)
|
58
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 0).css
|
59
59
|
@media all {
|
60
60
|
.foo {
|
61
61
|
baz: bang;
|
@@ -63,7 +63,7 @@ module Sass
|
|
63
63
|
}
|
64
64
|
CSS
|
65
65
|
|
66
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1)
|
66
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1).css
|
67
67
|
@media all {
|
68
68
|
.foo {
|
69
69
|
baz: bang;
|
@@ -71,7 +71,7 @@ module Sass
|
|
71
71
|
}
|
72
72
|
CSS
|
73
73
|
|
74
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 4)
|
74
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 4).css
|
75
75
|
@media all {
|
76
76
|
.foo {
|
77
77
|
baz: bang;
|
@@ -79,7 +79,7 @@ module Sass
|
|
79
79
|
}
|
80
80
|
CSS
|
81
81
|
|
82
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 10)
|
82
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 10).css
|
83
83
|
@media all {
|
84
84
|
.foo {
|
85
85
|
baz: bang;
|
@@ -88,20 +88,20 @@ module Sass
|
|
88
88
|
CSS
|
89
89
|
|
90
90
|
assert_raises(RangeError) do
|
91
|
-
@embedded.render(data: DATA_INDENT_TEST, indent_width: -1)
|
91
|
+
@embedded.render(data: DATA_INDENT_TEST, indent_width: -1).css
|
92
92
|
end
|
93
93
|
|
94
94
|
assert_raises(RangeError) do
|
95
|
-
@embedded.render(data: DATA_INDENT_TEST, indent_width: 11)
|
95
|
+
@embedded.render(data: DATA_INDENT_TEST, indent_width: 11).css
|
96
96
|
end
|
97
97
|
|
98
98
|
assert_raises(ArgumentError) do
|
99
|
-
@embedded.render(data: DATA_INDENT_TEST, indent_width: 3.14)
|
99
|
+
@embedded.render(data: DATA_INDENT_TEST, indent_width: 3.14).css
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
103
103
|
def test_output_indent_type
|
104
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_type: :tab)
|
104
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_type: :tab).css
|
105
105
|
@media all {
|
106
106
|
\t\t.foo {
|
107
107
|
\t\t\t\tbaz: bang;
|
@@ -109,7 +109,7 @@ module Sass
|
|
109
109
|
}
|
110
110
|
CSS
|
111
111
|
|
112
|
-
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1, indent_type: 'tab')
|
112
|
+
assert_equal <<~CSS.chomp, @embedded.render(data: DATA_INDENT_TEST, indent_width: 1, indent_type: 'tab').css
|
113
113
|
@media all {
|
114
114
|
\t.foo {
|
115
115
|
\t\tbaz: bang;
|
@@ -127,10 +127,10 @@ module Sass
|
|
127
127
|
}
|
128
128
|
SCSS
|
129
129
|
|
130
|
-
assert_equal ".foo {\n baz: bang;\n}", @embedded.render(data: data, linefeed: :lf)
|
131
|
-
assert_equal ".foo {\n\r baz: bang;\n\r}", @embedded.render(data: data, linefeed: :lfcr)
|
132
|
-
assert_equal ".foo {\r baz: bang;\r}", @embedded.render(data: data, linefeed: :cr)
|
133
|
-
assert_equal ".foo {\r\n baz: bang;\r\n}", @embedded.render(data: data, linefeed: :crlf)
|
130
|
+
assert_equal ".foo {\n baz: bang;\n}", @embedded.render(data: data, linefeed: :lf).css
|
131
|
+
assert_equal ".foo {\n\r baz: bang;\n\r}", @embedded.render(data: data, linefeed: :lfcr).css
|
132
|
+
assert_equal ".foo {\r baz: bang;\r}", @embedded.render(data: data, linefeed: :cr).css
|
133
|
+
assert_equal ".foo {\r\n baz: bang;\r\n}", @embedded.render(data: data, linefeed: :crlf).css
|
134
134
|
end
|
135
135
|
end
|
136
136
|
end
|
data/test/render_test.rb
CHANGED
@@ -5,7 +5,7 @@ require_relative 'test_helper'
|
|
5
5
|
module Sass
|
6
6
|
class RenderTest < MiniTest::Test
|
7
7
|
def test_sass_render
|
8
|
-
assert_equal '', ::Sass.render(data: '')
|
8
|
+
assert_equal '', ::Sass.render(data: '').css
|
9
9
|
|
10
10
|
css = <<~CSS.chomp
|
11
11
|
h1 {
|
@@ -13,7 +13,7 @@ module Sass
|
|
13
13
|
}
|
14
14
|
CSS
|
15
15
|
|
16
|
-
assert_equal css, ::Sass.render(data: 'h1 { font-size: 2rem; }')
|
16
|
+
assert_equal css, ::Sass.render(data: 'h1 { font-size: 2rem; }').css
|
17
17
|
end
|
18
18
|
end
|
19
19
|
end
|
data/test/source_maps_test.rb
CHANGED
@@ -31,8 +31,8 @@ module Sass
|
|
31
31
|
temp_file('style.scss', scss)
|
32
32
|
|
33
33
|
result = @embedded.render(file: 'style.scss')
|
34
|
-
assert_equal css, result
|
35
|
-
assert_nil result
|
34
|
+
assert_equal css, result.css
|
35
|
+
assert_nil result.map
|
36
36
|
end
|
37
37
|
|
38
38
|
def test_source_map_file_as_string
|
@@ -54,8 +54,8 @@ module Sass
|
|
54
54
|
|
55
55
|
result = @embedded.render(file: 'style.scss',
|
56
56
|
source_map: 'out.map')
|
57
|
-
assert_equal css, result
|
58
|
-
JSON.parse(result
|
57
|
+
assert_equal css, result.css
|
58
|
+
JSON.parse(result.map)
|
59
59
|
end
|
60
60
|
|
61
61
|
def test_source_map_true_without_out_file_has_no_effect
|
@@ -76,8 +76,8 @@ module Sass
|
|
76
76
|
|
77
77
|
result = @embedded.render(file: 'style.scss',
|
78
78
|
source_map: true)
|
79
|
-
assert_equal css, result
|
80
|
-
assert_nil result
|
79
|
+
assert_equal css, result.css
|
80
|
+
assert_nil result.map
|
81
81
|
end
|
82
82
|
|
83
83
|
def test_source_map_true_with_out_file
|
@@ -100,8 +100,8 @@ module Sass
|
|
100
100
|
result = @embedded.render(file: 'style.scss',
|
101
101
|
source_map: true,
|
102
102
|
out_file: 'out.css')
|
103
|
-
assert_equal css, result
|
104
|
-
JSON.parse(result
|
103
|
+
assert_equal css, result.css
|
104
|
+
JSON.parse(result.map)
|
105
105
|
end
|
106
106
|
|
107
107
|
def test_omit_source_map_url
|
@@ -123,8 +123,8 @@ module Sass
|
|
123
123
|
result = @embedded.render(file: 'style.scss',
|
124
124
|
source_map: 'out.map',
|
125
125
|
omit_source_map_url: true)
|
126
|
-
assert_equal css, result
|
127
|
-
JSON.parse(result
|
126
|
+
assert_equal css, result.css
|
127
|
+
JSON.parse(result.map)
|
128
128
|
end
|
129
129
|
|
130
130
|
def test_source_map_embedded
|
@@ -147,8 +147,8 @@ module Sass
|
|
147
147
|
result = @embedded.render(file: 'style.scss',
|
148
148
|
source_map: 'out.map',
|
149
149
|
source_map_embed: true)
|
150
|
-
assert result
|
151
|
-
JSON.parse(result
|
150
|
+
assert result.css.start_with? css
|
151
|
+
JSON.parse(result.map)
|
152
152
|
end
|
153
153
|
|
154
154
|
def test_source_map_root
|
@@ -171,8 +171,8 @@ module Sass
|
|
171
171
|
result = @embedded.render(file: 'style.scss',
|
172
172
|
source_map: 'out.map',
|
173
173
|
source_map_root: 'assets')
|
174
|
-
assert_equal css, result
|
175
|
-
assert_equal 'assets', JSON.parse(result
|
174
|
+
assert_equal css, result.css
|
175
|
+
assert_equal 'assets', JSON.parse(result.map)['sourceRoot']
|
176
176
|
end
|
177
177
|
end
|
178
178
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sass-embedded
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- なつき
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-05-
|
11
|
+
date: 2021-05-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: google-protobuf
|