Skip to content

Commit ed13e36

Browse files
mgretermgreter
committed
Update to sass 3.5 and adjust test cases
1 parent 920a2e2 commit ed13e36

13 files changed

+25
-26
lines changed

‎META.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@
6868
"url" : "https://github.com/sass/perl-libsass"
6969
}
7070
},
71-
"version" : "v3.4.13"
71+
"version" : "v3.5.0"
7272
}

‎META.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ resources:
3939
homepage: https://metacpan.org/release/CSS-Sass
4040
license: http://opensource.org/licenses/MIT
4141
repository: https://github.com/sass/perl-libsass
42-
version: v3.4.13
42+
version: v3.5.0

‎Sass.xs

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ union Sass_Value* sv_to_sass_value(SV* sv)
204204
enum Sass_Separator sep = SASS_COMMA;
205205
// special check for space separated lists
206206
if (sv_derived_from(org, "CSS::Sass::Value::List::Space")) sep = SASS_SPACE;
207-
union Sass_Value* list = sass_make_list(av_len(av) + 1, sep); // , false
207+
union Sass_Value* list = sass_make_list(av_len(av) + 1, sep, false);
208208
size_t i;
209209
for (i = 0; i < sass_list_get_length(list); i++) {
210210
SV** value_svp = av_fetch(av, i, false);

‎lib/CSS/Sass.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ our @EXPORT = qw(
6969
SASS2SCSS_CONVERT_COMMENT
7070
);
7171

72-
our $VERSION = "3.4.13";
72+
our $VERSION = "3.5.0";
7373

7474
require XSLoader;
7575
XSLoader::load('CSS::Sass', $VERSION);

‎lib/CSS/Sass/Plugins.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use warnings;
2424

2525
################################################################################
2626
package CSS::Sass::Plugins;
27-
our $VERSION = "3.4.13";
27+
our $VERSION = "3.5.0";
2828
################################################################################
2929
# collect plugins
3030
our %plugins;

‎lib/CSS/Sass/Value.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use CSS::Sass;
3939

4040
################################################################################
4141
package CSS::Sass::Value;
42-
our $VERSION = "3.4.13";
42+
our $VERSION = "3.5.0";
4343
################################################################################
4444
use CSS::Sass qw(import_sv);
4545
use CSS::Sass qw(sass_operation);

‎lib/CSS/Sass/Watchdog.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use CSS::Sass;
2525

2626
################################################################################
2727
package CSS::Sass::Watchdog;
28-
our $VERSION = "3.4.13";
28+
our $VERSION = "3.5.0";
2929
################################################################################
3030

3131
use Exporter 'import'; # gives you Exporter's import() method directly

‎libsass

Submodule libsass updated 167 files

‎plugins/img-size

‎t/01_xs.t

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ BEGIN { use_ok('CSS::Sass') };
1313
my $r;
1414
$r = CSS::Sass::compile_sass("this is invalid sass source", {});
1515
is ($r->{error_status}, 1, "Failed compile sets error_status");
16-
like($r->{error_message}, qr/on line 1 of stdin/, "Failed compile sets error_message");
16+
like($r->{error_message}, qr/on line 1:22 of stdin/, "Failed compile sets error_message");
1717
is ($r->{output_string}, undef, "Failed compile sets output_string to undef");
1818

19-
2019
$r = CSS::Sass::compile_sass(".valid { color: red; }", {});
2120
is ($r->{error_status}, 0, "Successful compile clears error_status");
2221
is ($r->{error_message}, undef, "Successful compile sets error_message to undef");
@@ -70,7 +69,7 @@ like ($r->{output_string}, qr/foo \{-äöü-\r color: red; \}/, "custom linefe
7069
$r = CSS::Sass::compile_sass('@import "colors"; .valid { color: $red; }', { });
7170

7271
is ($r->{error_status}, 1, "failed import sets error_status");
73-
like ($r->{error_message}, qr/on line 1 of stdin/, "failed import sets error_message");
72+
like ($r->{error_message}, qr/on line 1:1 of stdin/, "failed import sets error_message");
7473
is ($r->{output_string}, undef, "failed import output_string is undef");
7574

7675
$r = CSS::Sass::compile_sass('@import "colors"; .valid { color: $red; }', { include_paths => 't/inc' });
@@ -86,18 +85,18 @@ like ($r->{output_string}, qr/#ff1111/, "import w/ 2 paths imported red");
8685

8786
$r = CSS::Sass::compile_sass('@import "colors"; .valid { color: $red; }', { include_paths => [ 'wrong type' ] });
8887
is ($r->{error_status}, 1, "import w/ bad type sets error_status but doesn't crash");
89-
like ($r->{error_message}, qr/on line 1 of stdin/, "import w/ bad type sets error_message");
88+
like ($r->{error_message}, qr/on line 1:1 of stdin/, "import w/ bad type sets error_message");
9089

9190

9291
$r = CSS::Sass::compile_sass('.valid { width: #{(1/3)}; }', { });
9392
is ($r->{error_status}, 0, "import no error_status");
9493
is ($r->{error_message}, undef, "import error_message is undef");
95-
like ($r->{output_string}, qr/0\.33333;/, "default float precision is 5");
94+
like ($r->{output_string}, qr/0\.3333333333;/, "default float precision is 10");
9695

97-
$r = CSS::Sass::compile_sass('.valid { width: #{(1/3)}; }', { precision => 10 });
96+
$r = CSS::Sass::compile_sass('.valid { width: #{(1/3)}; }', { precision => 5 });
9897
is ($r->{error_status}, 0, "import no error_status");
9998
is ($r->{error_message}, undef, "import error_message is undef");
100-
like ($r->{output_string}, qr/0\.3333333333;/, "float precision of 10");
99+
like ($r->{output_string}, qr/0\.33333;/, "float precision of 5");
101100

102101
use CSS::Sass qw(auto_quote);
103102

‎t/02_perl.t

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $r = $sass->compile(".valid { color: red; }");
1414
isnt ($r, undef, "Successful compile returns something");
1515

1616
$r = eval { $sass->compile("this is invalid sass source") };
17-
like ($@, qr/on line 1 of stdin/, "Failed compile dies with error message");
17+
like ($@, qr/on line 1:22 of stdin/, "Failed compile dies with error message");
1818

1919
$sass->options->{dont_die} = 1;
2020
eval {
@@ -23,12 +23,12 @@ eval {
2323
};
2424
fail ( "dont_die option doesn't die") if $@;
2525
is ($r, undef, "dont_die option returns undef on error");
26-
like ($sass->last_error, qr/on line 1 of stdin/, "Failed compile saves error message in last_error");
26+
like ($sass->last_error, qr/on line 1:22 of stdin/, "Failed compile saves error message in last_error");
2727

2828

2929
$sass->options->{dont_die} = 0;
3030
$r = eval { $sass->compile('@import "colors"; .valid { color: $red; }') };
31-
like ($@, qr/on line 1 of stdin/, "failed import dies with error message");
31+
like ($@, qr/on line 1:1 of stdin/, "failed import dies with error message");
3232

3333
$sass = CSS::Sass->new(include_paths => ['t/inc']);
3434
$r = eval { $sass->compile('@import "colors"; .valid { color: $red; }') };
@@ -47,7 +47,7 @@ is ($err, undef, "Successful compile returns no errors")
4747

4848
($r, $err) = sass_compile("this is invalid sass source");
4949
is ($r, undef, "Failed compile returns no code");
50-
like ($err, qr/on line 1 of stdin/, "Failed compile returns an error");
50+
like ($err, qr/on line 1:22 of stdin/, "Failed compile returns an error");
5151

5252
$r = sass_compile(".valid { color: red; }");
5353
isnt ($r, undef, "Successful compile scalar context returns something");
@@ -84,7 +84,7 @@ $fh->autoflush(); binmode $fh;
8484
print $fh "this is invalid sass source";
8585
close $fh;
8686
$r = eval { $sass->compile_file($filename) };
87-
like ($@, qr/on line 1 of .*\.scss/, "Failed compile dies with error message");
87+
like ($@, qr/on line 1:22 of .*\.scss/, "Failed compile dies with error message");
8888

8989
($fh, $filename) = tempfile( SUFFIX => '.scss');
9090
$fh->autoflush(); binmode $fh;
@@ -97,7 +97,7 @@ eval {
9797
};
9898
fail ( "dont_die option doesn't die") if $@;
9999
is ($r, undef, "dont_die option returns undef on error");
100-
like ($sass->last_error, qr/on line 1 of .*\.scss/, "Failed compile saves error message in last_error");
100+
like ($sass->last_error, qr/on line 1:22 of .*\.scss/, "Failed compile saves error message in last_error");
101101

102102

103103
($fh, $filename) = tempfile( SUFFIX => '.scss');
@@ -106,7 +106,7 @@ print $fh '@import "colors"; .valid { color: $red; }';
106106
close $fh;
107107
$sass->options->{dont_die} = 0;
108108
$r = eval { $sass->compile_file($filename) };
109-
like ($@, qr/on line 1 of .*\.scss/, "failed import dies with error message");
109+
like ($@, qr/on line 1:1 of .*\.scss/, "failed import dies with error message");
110110

111111
($fh, $filename) = tempfile( SUFFIX => '.scss');
112112
$fh->autoflush(); binmode $fh;
@@ -140,7 +140,7 @@ print $fh "this is invalid sass source";
140140
close $fh;
141141
($r, $err) = sass_compile_file($filename);
142142
is ($r, undef, "Failed compile returns no code");
143-
like ($err, qr/on line 1 of .*\.scss/, "Failed compile returns an error");
143+
like ($err, qr/on line 1:22 of .*\.scss/, "Failed compile returns an error");
144144

145145
($fh, $filename) = tempfile( SUFFIX => '.scss');
146146
$fh->autoflush(); binmode $fh;

‎t/99_sass_specs.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ sub load_tests()
427427
my $root = new DIR;
428428
$root->{start} = 0;
429429
$root->{end} = 999;
430-
$root->{prec} = 5;
430+
$root->{prec} = 10;
431431
my @dirs = (['t/sass-spec/spec', $root]);
432432
# walk through all directories
433433
# no recursion for performance

‎t/sass-spec

Submodule sass-spec updated 17289 files

0 commit comments

Comments
 (0)