sass 3.4.24 → 3.4.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +39 -10
  3. data/VERSION +1 -1
  4. data/VERSION_DATE +1 -1
  5. data/lib/sass.rb +3 -3
  6. data/lib/sass/css.rb +1 -1
  7. data/lib/sass/deprecation.rb +55 -0
  8. data/lib/sass/engine.rb +13 -5
  9. data/lib/sass/environment.rb +1 -1
  10. data/lib/sass/plugin.rb +1 -1
  11. data/lib/sass/plugin/compiler.rb +1 -1
  12. data/lib/sass/plugin/configuration.rb +1 -1
  13. data/lib/sass/plugin/rack.rb +2 -2
  14. data/lib/sass/plugin/staleness_checker.rb +1 -1
  15. data/lib/sass/script.rb +1 -1
  16. data/lib/sass/script/functions.rb +2 -2
  17. data/lib/sass/script/lexer.rb +1 -1
  18. data/lib/sass/script/parser.rb +4 -3
  19. data/lib/sass/script/tree/node.rb +1 -1
  20. data/lib/sass/script/tree/operation.rb +43 -16
  21. data/lib/sass/script/value/base.rb +1 -1
  22. data/lib/sass/script/value/string.rb +5 -12
  23. data/lib/sass/scss/static_parser.rb +7 -0
  24. data/lib/sass/selector/comma_sequence.rb +13 -1
  25. data/lib/sass/selector/simple.rb +1 -0
  26. data/lib/sass/tree/node.rb +2 -2
  27. data/lib/sass/tree/rule_node.rb +13 -4
  28. data/lib/sass/tree/visitors/deep_copy.rb +1 -1
  29. data/lib/sass/tree/visitors/perform.rb +3 -2
  30. data/test/sass/conversion_test.rb +3 -3
  31. data/test/sass/css2sass_test.rb +1 -1
  32. data/test/sass/engine_test.rb +56 -50
  33. data/test/sass/extend_test.rb +14 -8
  34. data/test/sass/functions_test.rb +5 -2
  35. data/test/sass/more_templates/more1.sass +10 -10
  36. data/test/sass/more_templates/more_import.sass +2 -2
  37. data/test/sass/plugin_test.rb +3 -3
  38. data/test/sass/script_test.rb +38 -29
  39. data/test/sass/scss/css_test.rb +2 -2
  40. data/test/sass/scss/scss_test.rb +25 -10
  41. data/test/sass/source_map_test.rb +13 -13
  42. data/test/sass/templates/_partial.sass +1 -1
  43. data/test/sass/templates/basic.sass +10 -10
  44. data/test/sass/templates/bork1.sass +1 -1
  45. data/test/sass/templates/bork5.sass +1 -1
  46. data/test/sass/templates/compact.sass +10 -10
  47. data/test/sass/templates/complex.sass +187 -187
  48. data/test/sass/templates/compressed.sass +10 -10
  49. data/test/sass/templates/expanded.sass +10 -10
  50. data/test/sass/templates/import.sass +2 -2
  51. data/test/sass/templates/importee.sass +3 -3
  52. data/test/sass/templates/mixins.sass +22 -22
  53. data/test/sass/templates/multiline.sass +4 -4
  54. data/test/sass/templates/nested.sass +13 -13
  55. data/test/sass/templates/parent_ref.sass +12 -12
  56. data/test/sass/templates/script.sass +70 -70
  57. data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
  58. data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
  59. data/test/sass/templates/subdir/subdir.sass +3 -3
  60. data/test/sass/templates/units.sass +10 -10
  61. data/test/sass/util/multibyte_string_scanner_test.rb +10 -2
  62. metadata +25 -24
data/test/sass/util/multibyte_string_scanner_test.rb CHANGED
@@ -140,8 +140,16 @@ unless Sass::Util.ruby1_8?
140
140
  def assert_scanner_state(pos, byte_pos, matched_size, byte_matched_size)
141
141
  assert_equal pos, @scanner.pos, 'pos'
142
142
  assert_equal byte_pos, @scanner.byte_pos, 'byte_pos'
143
- assert_equal matched_size, @scanner.matched_size, 'matched_size'
144
- assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
143
+ if matched_size.nil?
144
+ assert_nil @scanner.matched_size, 'matched_size'
145
+ else
146
+ assert_equal matched_size, @scanner.matched_size, 'matched_size'
147
+ end
148
+ if byte_matched_size.nil?
149
+ assert_nil @scanner.byte_matched_size, 'byte_matched_size'
150
+ else
151
+ assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
152
+ end
145
153
  end
146
154
  end
147
155
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.24
4
+ version: 3.4.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Natalie Weizenbaum
@@ -10,22 +10,22 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-05-19 00:00:00.000000000 Z
13
+ date: 2017-07-07 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: yard
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - ">="
19
+ - - "~>"
20
20
  - !ruby/object:Gem::Version
21
- version: 0.9.8
21
+ version: 0.8.7.6
22
22
  type: :development
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - ">="
26
+ - - "~>"
27
27
  - !ruby/object:Gem::Version
28
- version: 0.9.8
28
+ version: 0.8.7.6
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: redcarpet
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
92
92
  - lib/sass/cache_stores/null.rb
93
93
  - lib/sass/callbacks.rb
94
94
  - lib/sass/css.rb
95
+ - lib/sass/deprecation.rb
95
96
  - lib/sass/engine.rb
96
97
  - lib/sass/environment.rb
97
98
  - lib/sass/error.rb
@@ -396,34 +397,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
396
397
  version: '0'
397
398
  requirements: []
398
399
  rubyforge_project: sass
399
- rubygems_version: 2.6.11
400
+ rubygems_version: 2.4.8
400
401
  signing_key:
401
402
  specification_version: 4
402
403
  summary: A powerful but elegant CSS compiler that makes CSS fun again.
403
404
  test_files:
405
+ - test/sass/extend_test.rb
406
+ - test/sass/css2sass_test.rb
407
+ - test/sass/util_test.rb
408
+ - test/sass/superselector_test.rb
409
+ - test/sass/value_helpers_test.rb
404
410
  - test/sass/plugin_test.rb
411
+ - test/sass/logger_test.rb
412
+ - test/sass/functions_test.rb
413
+ - test/sass/conversion_test.rb
414
+ - test/sass/source_map_test.rb
415
+ - test/sass/cache_test.rb
405
416
  - test/sass/encoding_test.rb
406
- - test/sass/importer_test.rb
417
+ - test/sass/script_test.rb
407
418
  - test/sass/callbacks_test.rb
419
+ - test/sass/script_conversion_test.rb
408
420
  - test/sass/scss/css_test.rb
409
421
  - test/sass/scss/rx_test.rb
410
422
  - test/sass/scss/scss_test.rb
411
- - test/sass/util/multibyte_string_scanner_test.rb
412
- - test/sass/util/normalized_map_test.rb
413
- - test/sass/util/subset_map_test.rb
414
- - test/sass/functions_test.rb
415
- - test/sass/util_test.rb
416
- - test/sass/cache_test.rb
417
423
  - test/sass/exec_test.rb
418
- - test/sass/value_helpers_test.rb
419
- - test/sass/conversion_test.rb
420
- - test/sass/script_test.rb
421
- - test/sass/logger_test.rb
422
- - test/sass/compiler_test.rb
424
+ - test/sass/importer_test.rb
423
425
  - test/sass/engine_test.rb
424
- - test/sass/css2sass_test.rb
425
- - test/sass/superselector_test.rb
426
- - test/sass/script_conversion_test.rb
427
426
  - test/sass/css_variable_test.rb
428
- - test/sass/source_map_test.rb
429
- - test/sass/extend_test.rb
427
+ - test/sass/compiler_test.rb
428
+ - test/sass/util/subset_map_test.rb
429
+ - test/sass/util/normalized_map_test.rb
430
+ - test/sass/util/multibyte_string_scanner_test.rb