sass 3.2.19 → 3.4.25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.yardopts +3 -1
- data/CODE_OF_CONDUCT.md +10 -0
- data/CONTRIBUTING.md +148 -0
- data/MIT-LICENSE +1 -1
- data/README.md +87 -61
- data/Rakefile +119 -15
- data/VERSION +1 -1
- data/VERSION_DATE +1 -1
- data/VERSION_NAME +1 -1
- data/bin/sass +1 -1
- data/bin/scss +1 -1
- data/extra/sass-spec-ref.sh +32 -0
- data/extra/update_watch.rb +1 -1
- data/lib/sass/cache_stores/base.rb +2 -2
- data/lib/sass/cache_stores/chain.rb +2 -1
- data/lib/sass/cache_stores/filesystem.rb +8 -12
- data/lib/sass/cache_stores/memory.rb +5 -6
- data/lib/sass/cache_stores/null.rb +2 -2
- data/lib/sass/callbacks.rb +3 -2
- data/lib/sass/css.rb +22 -23
- data/lib/sass/deprecation.rb +55 -0
- data/lib/sass/engine.rb +487 -191
- data/lib/sass/environment.rb +172 -58
- data/lib/sass/error.rb +21 -24
- data/lib/sass/exec/base.rb +199 -0
- data/lib/sass/exec/sass_convert.rb +283 -0
- data/lib/sass/exec/sass_scss.rb +440 -0
- data/lib/sass/exec.rb +5 -703
- data/lib/sass/features.rb +47 -0
- data/lib/sass/importers/base.rb +50 -7
- data/lib/sass/importers/deprecated_path.rb +51 -0
- data/lib/sass/importers/filesystem.rb +54 -21
- data/lib/sass/importers.rb +1 -0
- data/lib/sass/logger/base.rb +9 -5
- data/lib/sass/logger/delayed.rb +50 -0
- data/lib/sass/logger/log_level.rb +3 -7
- data/lib/sass/logger.rb +9 -7
- data/lib/sass/media.rb +20 -23
- data/lib/sass/plugin/compiler.rb +321 -145
- data/lib/sass/plugin/configuration.rb +45 -34
- data/lib/sass/plugin/merb.rb +3 -3
- data/lib/sass/plugin/rack.rb +3 -3
- data/lib/sass/plugin/rails.rb +1 -1
- data/lib/sass/plugin/staleness_checker.rb +6 -6
- data/lib/sass/plugin.rb +9 -8
- data/lib/sass/repl.rb +3 -3
- data/lib/sass/script/css_lexer.rb +8 -4
- data/lib/sass/script/css_parser.rb +4 -2
- data/lib/sass/script/css_variable_warning.rb +52 -0
- data/lib/sass/script/functions.rb +1583 -433
- data/lib/sass/script/lexer.rb +198 -79
- data/lib/sass/script/parser.rb +463 -133
- data/lib/sass/script/tree/funcall.rb +313 -0
- data/lib/sass/script/tree/interpolation.rb +223 -0
- data/lib/sass/script/tree/list_literal.rb +104 -0
- data/lib/sass/script/tree/literal.rb +49 -0
- data/lib/sass/script/tree/map_literal.rb +64 -0
- data/lib/sass/script/{node.rb → tree/node.rb} +42 -14
- data/lib/sass/script/tree/operation.rb +156 -0
- data/lib/sass/script/tree/selector.rb +26 -0
- data/lib/sass/script/tree/string_interpolation.rb +125 -0
- data/lib/sass/script/{unary_operation.rb → tree/unary_operation.rb} +6 -6
- data/lib/sass/script/tree/variable.rb +57 -0
- data/lib/sass/script/tree.rb +16 -0
- data/lib/sass/script/{arg_list.rb → value/arg_list.rb} +9 -25
- data/lib/sass/script/value/base.rb +241 -0
- data/lib/sass/script/value/bool.rb +35 -0
- data/lib/sass/script/value/color.rb +698 -0
- data/lib/sass/script/value/helpers.rb +272 -0
- data/lib/sass/script/value/list.rb +113 -0
- data/lib/sass/script/value/map.rb +70 -0
- data/lib/sass/script/{null.rb → value/null.rb} +14 -7
- data/lib/sass/script/{number.rb → value/number.rb} +196 -86
- data/lib/sass/script/value/string.rb +138 -0
- data/lib/sass/script/value.rb +11 -0
- data/lib/sass/script.rb +38 -11
- data/lib/sass/scss/css_parser.rb +25 -5
- data/lib/sass/scss/parser.rb +532 -458
- data/lib/sass/scss/rx.rb +21 -14
- data/lib/sass/scss/static_parser.rb +328 -9
- data/lib/sass/scss.rb +0 -2
- data/lib/sass/selector/abstract_sequence.rb +36 -19
- data/lib/sass/selector/comma_sequence.rb +125 -26
- data/lib/sass/selector/pseudo.rb +266 -0
- data/lib/sass/selector/sequence.rb +200 -71
- data/lib/sass/selector/simple.rb +30 -32
- data/lib/sass/selector/simple_sequence.rb +193 -64
- data/lib/sass/selector.rb +65 -194
- data/lib/sass/shared.rb +2 -2
- data/lib/sass/source/map.rb +213 -0
- data/lib/sass/source/position.rb +39 -0
- data/lib/sass/source/range.rb +41 -0
- data/lib/sass/stack.rb +120 -0
- data/lib/sass/supports.rb +19 -23
- data/lib/sass/tree/at_root_node.rb +83 -0
- data/lib/sass/tree/charset_node.rb +1 -1
- data/lib/sass/tree/comment_node.rb +4 -4
- data/lib/sass/tree/css_import_node.rb +19 -11
- data/lib/sass/tree/debug_node.rb +2 -2
- data/lib/sass/tree/directive_node.rb +21 -4
- data/lib/sass/tree/each_node.rb +8 -8
- data/lib/sass/tree/error_node.rb +18 -0
- data/lib/sass/tree/extend_node.rb +14 -7
- data/lib/sass/tree/for_node.rb +4 -4
- data/lib/sass/tree/function_node.rb +14 -4
- data/lib/sass/tree/if_node.rb +1 -1
- data/lib/sass/tree/import_node.rb +10 -10
- data/lib/sass/tree/keyframe_rule_node.rb +15 -0
- data/lib/sass/tree/media_node.rb +4 -14
- data/lib/sass/tree/mixin_def_node.rb +4 -4
- data/lib/sass/tree/mixin_node.rb +21 -8
- data/lib/sass/tree/node.rb +59 -15
- data/lib/sass/tree/prop_node.rb +42 -24
- data/lib/sass/tree/return_node.rb +3 -2
- data/lib/sass/tree/root_node.rb +19 -3
- data/lib/sass/tree/rule_node.rb +49 -26
- data/lib/sass/tree/supports_node.rb +0 -13
- data/lib/sass/tree/trace_node.rb +2 -1
- data/lib/sass/tree/variable_node.rb +9 -3
- data/lib/sass/tree/visitors/base.rb +5 -8
- data/lib/sass/tree/visitors/check_nesting.rb +62 -36
- data/lib/sass/tree/visitors/convert.rb +111 -76
- data/lib/sass/tree/visitors/cssize.rb +206 -74
- data/lib/sass/tree/visitors/deep_copy.rb +11 -6
- data/lib/sass/tree/visitors/extend.rb +19 -17
- data/lib/sass/tree/visitors/perform.rb +308 -190
- data/lib/sass/tree/visitors/set_options.rb +21 -7
- data/lib/sass/tree/visitors/to_css.rb +273 -92
- data/lib/sass/tree/warn_node.rb +2 -2
- data/lib/sass/tree/while_node.rb +2 -2
- data/lib/sass/util/cross_platform_random.rb +19 -0
- data/lib/sass/util/normalized_map.rb +129 -0
- data/lib/sass/util/ordered_hash.rb +192 -0
- data/lib/sass/util/subset_map.rb +5 -5
- data/lib/sass/util/test.rb +0 -1
- data/lib/sass/util.rb +620 -193
- data/lib/sass/version.rb +22 -24
- data/lib/sass.rb +27 -13
- data/test/sass/cache_test.rb +62 -20
- data/test/sass/callbacks_test.rb +1 -1
- data/test/sass/compiler_test.rb +236 -0
- data/test/sass/conversion_test.rb +472 -44
- data/test/sass/css2sass_test.rb +73 -5
- data/test/sass/css_variable_test.rb +132 -0
- data/test/sass/encoding_test.rb +219 -0
- data/test/sass/engine_test.rb +618 -415
- data/test/sass/exec_test.rb +12 -2
- data/test/sass/extend_test.rb +419 -168
- data/test/sass/functions_test.rb +931 -93
- data/test/sass/importer_test.rb +250 -21
- data/test/sass/logger_test.rb +1 -1
- data/test/sass/more_results/more_import.css +1 -1
- data/test/sass/more_templates/more1.sass +10 -10
- data/test/sass/more_templates/more_import.sass +2 -2
- data/test/sass/plugin_test.rb +26 -34
- data/test/sass/results/compact.css +1 -1
- data/test/sass/results/complex.css +4 -4
- data/test/sass/results/expanded.css +1 -1
- data/test/sass/results/import.css +1 -1
- data/test/sass/results/import_charset_ibm866.css +2 -2
- data/test/sass/results/mixins.css +17 -17
- data/test/sass/results/nested.css +1 -1
- data/test/sass/results/parent_ref.css +2 -2
- data/test/sass/results/script.css +5 -5
- data/test/sass/results/scss_import.css +1 -1
- data/test/sass/script_conversion_test.rb +97 -39
- data/test/sass/script_test.rb +911 -102
- data/test/sass/scss/css_test.rb +215 -34
- data/test/sass/scss/rx_test.rb +8 -4
- data/test/sass/scss/scss_test.rb +2424 -325
- data/test/sass/source_map_test.rb +1055 -0
- data/test/sass/superselector_test.rb +210 -0
- data/test/sass/templates/_partial.sass +1 -1
- data/test/sass/templates/basic.sass +10 -10
- data/test/sass/templates/bork1.sass +1 -1
- data/test/sass/templates/bork5.sass +1 -1
- data/test/sass/templates/compact.sass +10 -10
- data/test/sass/templates/complex.sass +187 -187
- data/test/sass/templates/compressed.sass +10 -10
- data/test/sass/templates/expanded.sass +10 -10
- data/test/sass/templates/import.sass +2 -2
- data/test/sass/templates/importee.sass +3 -3
- data/test/sass/templates/mixins.sass +22 -22
- data/test/sass/templates/multiline.sass +4 -4
- data/test/sass/templates/nested.sass +13 -13
- data/test/sass/templates/parent_ref.sass +12 -12
- data/test/sass/templates/script.sass +70 -70
- data/test/sass/templates/scss_import.scss +2 -1
- data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
- data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
- data/test/sass/templates/subdir/subdir.sass +3 -3
- data/test/sass/templates/units.sass +10 -10
- data/test/sass/test_helper.rb +1 -1
- data/test/sass/util/multibyte_string_scanner_test.rb +11 -3
- data/test/sass/util/normalized_map_test.rb +51 -0
- data/test/sass/util/subset_map_test.rb +2 -2
- data/test/sass/util_test.rb +99 -43
- data/test/sass/value_helpers_test.rb +179 -0
- data/test/sass-spec.yml +3 -0
- data/test/test_helper.rb +42 -12
- data/vendor/listen/CHANGELOG.md +1 -228
- data/vendor/listen/Gemfile +5 -15
- data/vendor/listen/README.md +111 -77
- data/vendor/listen/Rakefile +0 -42
- data/vendor/listen/lib/listen/adapter.rb +195 -82
- data/vendor/listen/lib/listen/adapters/bsd.rb +27 -64
- data/vendor/listen/lib/listen/adapters/darwin.rb +21 -58
- data/vendor/listen/lib/listen/adapters/linux.rb +23 -55
- data/vendor/listen/lib/listen/adapters/polling.rb +25 -34
- data/vendor/listen/lib/listen/adapters/windows.rb +50 -46
- data/vendor/listen/lib/listen/directory_record.rb +96 -61
- data/vendor/listen/lib/listen/listener.rb +135 -37
- data/vendor/listen/lib/listen/turnstile.rb +9 -5
- data/vendor/listen/lib/listen/version.rb +1 -1
- data/vendor/listen/lib/listen.rb +33 -19
- data/vendor/listen/listen.gemspec +6 -0
- data/vendor/listen/spec/listen/adapter_spec.rb +43 -77
- data/vendor/listen/spec/listen/adapters/polling_spec.rb +8 -8
- data/vendor/listen/spec/listen/directory_record_spec.rb +81 -56
- data/vendor/listen/spec/listen/listener_spec.rb +128 -39
- data/vendor/listen/spec/listen_spec.rb +15 -21
- data/vendor/listen/spec/spec_helper.rb +4 -0
- data/vendor/listen/spec/support/adapter_helper.rb +52 -15
- data/vendor/listen/spec/support/directory_record_helper.rb +7 -5
- data/vendor/listen/spec/support/listeners_helper.rb +30 -7
- metadata +161 -111
- data/CONTRIBUTING +0 -3
- data/lib/sass/script/bool.rb +0 -18
- data/lib/sass/script/color.rb +0 -606
- data/lib/sass/script/funcall.rb +0 -245
- data/lib/sass/script/interpolation.rb +0 -79
- data/lib/sass/script/list.rb +0 -85
- data/lib/sass/script/literal.rb +0 -221
- data/lib/sass/script/operation.rb +0 -110
- data/lib/sass/script/string.rb +0 -51
- data/lib/sass/script/string_interpolation.rb +0 -103
- data/lib/sass/script/variable.rb +0 -58
- data/lib/sass/scss/script_lexer.rb +0 -15
- data/lib/sass/scss/script_parser.rb +0 -25
- data/test/Gemfile +0 -3
- data/test/Gemfile.lock +0 -10
- data/vendor/listen/lib/listen/dependency_manager.rb +0 -126
- data/vendor/listen/lib/listen/multi_listener.rb +0 -143
- data/vendor/listen/spec/listen/dependency_manager_spec.rb +0 -107
- data/vendor/listen/spec/listen/multi_listener_spec.rb +0 -174
@@ -0,0 +1,272 @@
|
|
1
|
+
module Sass::Script::Value
|
2
|
+
# Provides helper functions for creating sass values from within ruby methods.
|
3
|
+
# @since `3.3.0`
|
4
|
+
# @comment
|
5
|
+
# rubocop:disable ModuleLength
|
6
|
+
module Helpers
|
7
|
+
# Construct a Sass Boolean.
|
8
|
+
#
|
9
|
+
# @param value [Object] A ruby object that will be tested for truthiness.
|
10
|
+
# @return [Sass::Script::Value::Bool] whether the ruby value is truthy.
|
11
|
+
def bool(value)
|
12
|
+
Bool.new(value)
|
13
|
+
end
|
14
|
+
|
15
|
+
# Construct a Sass Color from a hex color string.
|
16
|
+
#
|
17
|
+
# @param value [::String] A string representing a hex color.
|
18
|
+
# The leading hash ("#") is optional.
|
19
|
+
# @param alpha [::Number] The alpha channel. A number between 0 and 1.
|
20
|
+
# @return [Sass::Script::Value::Color] the color object
|
21
|
+
def hex_color(value, alpha = nil)
|
22
|
+
Color.from_hex(value, alpha)
|
23
|
+
end
|
24
|
+
|
25
|
+
# Construct a Sass Color from hsl values.
|
26
|
+
#
|
27
|
+
# @param hue [::Number] The hue of the color in degrees.
|
28
|
+
# A non-negative number, usually less than 360.
|
29
|
+
# @param saturation [::Number] The saturation of the color.
|
30
|
+
# Must be between 0 and 100 inclusive.
|
31
|
+
# @param lightness [::Number] The lightness of the color.
|
32
|
+
# Must be between 0 and 100 inclusive.
|
33
|
+
# @param alpha [::Number] The alpha channel. A number between 0 and 1.
|
34
|
+
#
|
35
|
+
# @return [Sass::Script::Value::Color] the color object
|
36
|
+
def hsl_color(hue, saturation, lightness, alpha = nil)
|
37
|
+
attrs = {:hue => hue, :saturation => saturation, :lightness => lightness}
|
38
|
+
attrs[:alpha] = alpha if alpha
|
39
|
+
Color.new(attrs)
|
40
|
+
end
|
41
|
+
|
42
|
+
# Construct a Sass Color from rgb values.
|
43
|
+
#
|
44
|
+
# @param red [::Number] The red component. Must be between 0 and 255 inclusive.
|
45
|
+
# @param green [::Number] The green component. Must be between 0 and 255 inclusive.
|
46
|
+
# @param blue [::Number] The blue component. Must be between 0 and 255 inclusive.
|
47
|
+
# @param alpha [::Number] The alpha channel. A number between 0 and 1.
|
48
|
+
#
|
49
|
+
# @return [Sass::Script::Value::Color] the color object
|
50
|
+
def rgb_color(red, green, blue, alpha = nil)
|
51
|
+
attrs = {:red => red, :green => green, :blue => blue}
|
52
|
+
attrs[:alpha] = alpha if alpha
|
53
|
+
Color.new(attrs)
|
54
|
+
end
|
55
|
+
|
56
|
+
# Construct a Sass Number from a ruby number.
|
57
|
+
#
|
58
|
+
# @param number [::Number] A numeric value.
|
59
|
+
# @param unit_string [::String] A unit string of the form
|
60
|
+
# `numeral_unit1 * numeral_unit2 ... / denominator_unit1 * denominator_unit2 ...`
|
61
|
+
# this is the same format that is returned by
|
62
|
+
# {Sass::Script::Value::Number#unit_str the `unit_str` method}
|
63
|
+
#
|
64
|
+
# @see Sass::Script::Value::Number#unit_str
|
65
|
+
#
|
66
|
+
# @return [Sass::Script::Value::Number] The sass number representing the given ruby number.
|
67
|
+
def number(number, unit_string = nil)
|
68
|
+
Number.new(number, *parse_unit_string(unit_string))
|
69
|
+
end
|
70
|
+
|
71
|
+
# @overload list(*elements, separator)
|
72
|
+
# Create a space-separated list from the arguments given.
|
73
|
+
# @param elements [Array<Sass::Script::Value::Base>] Each argument will be a list element.
|
74
|
+
# @param separator [Symbol] Either :space or :comma.
|
75
|
+
# @return [Sass::Script::Value::List] The space separated list.
|
76
|
+
#
|
77
|
+
# @overload list(array, separator)
|
78
|
+
# Create a space-separated list from the array given.
|
79
|
+
# @param array [Array<Sass::Script::Value::Base>] A ruby array of Sass values
|
80
|
+
# to make into a list.
|
81
|
+
# @return [Sass::Script::Value::List] The space separated list.
|
82
|
+
def list(*elements)
|
83
|
+
unless elements.last.is_a?(Symbol)
|
84
|
+
raise ArgumentError.new("A list type of :space or :comma must be specified.")
|
85
|
+
end
|
86
|
+
separator = elements.pop
|
87
|
+
if elements.size == 1 && elements.first.is_a?(Array)
|
88
|
+
elements = elements.first
|
89
|
+
end
|
90
|
+
Sass::Script::Value::List.new(elements, separator)
|
91
|
+
end
|
92
|
+
|
93
|
+
# Construct a Sass map.
|
94
|
+
#
|
95
|
+
# @param hash [Hash<Sass::Script::Value::Base,
|
96
|
+
# Sass::Script::Value::Base>] A Ruby map to convert to a Sass map.
|
97
|
+
# @return [Sass::Script::Value::Map] The map.
|
98
|
+
def map(hash)
|
99
|
+
Map.new(hash)
|
100
|
+
end
|
101
|
+
|
102
|
+
# Create a sass null value.
|
103
|
+
#
|
104
|
+
# @return [Sass::Script::Value::Null]
|
105
|
+
def null
|
106
|
+
Sass::Script::Value::Null.new
|
107
|
+
end
|
108
|
+
|
109
|
+
# Create a quoted string.
|
110
|
+
#
|
111
|
+
# @param str [::String] A ruby string.
|
112
|
+
# @return [Sass::Script::Value::String] A quoted string.
|
113
|
+
def quoted_string(str)
|
114
|
+
Sass::Script::String.new(str, :string)
|
115
|
+
end
|
116
|
+
|
117
|
+
# Create an unquoted string.
|
118
|
+
#
|
119
|
+
# @param str [::String] A ruby string.
|
120
|
+
# @return [Sass::Script::Value::String] An unquoted string.
|
121
|
+
def unquoted_string(str)
|
122
|
+
Sass::Script::String.new(str, :identifier)
|
123
|
+
end
|
124
|
+
alias_method :identifier, :unquoted_string
|
125
|
+
|
126
|
+
# Parses a user-provided selector.
|
127
|
+
#
|
128
|
+
# @param value [Sass::Script::Value::String, Sass::Script::Value::List]
|
129
|
+
# The selector to parse. This can be either a string, a list of
|
130
|
+
# strings, or a list of lists of strings as returned by `&`.
|
131
|
+
# @param name [Symbol, nil]
|
132
|
+
# If provided, the name of the selector argument. This is used
|
133
|
+
# for error reporting.
|
134
|
+
# @param allow_parent_ref [Boolean]
|
135
|
+
# Whether the parsed selector should allow parent references.
|
136
|
+
# @return [Sass::Selector::CommaSequence] The parsed selector.
|
137
|
+
# @throw [ArgumentError] if the parse failed for any reason.
|
138
|
+
def parse_selector(value, name = nil, allow_parent_ref = false)
|
139
|
+
str = normalize_selector(value, name)
|
140
|
+
begin
|
141
|
+
Sass::SCSS::StaticParser.new(str, nil, nil, 1, 1, allow_parent_ref).parse_selector
|
142
|
+
rescue Sass::SyntaxError => e
|
143
|
+
err = "#{value.inspect} is not a valid selector: #{e}"
|
144
|
+
err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
|
145
|
+
raise ArgumentError.new(err)
|
146
|
+
end
|
147
|
+
end
|
148
|
+
|
149
|
+
# Parses a user-provided complex selector.
|
150
|
+
#
|
151
|
+
# A complex selector can contain combinators but cannot contain commas.
|
152
|
+
#
|
153
|
+
# @param value [Sass::Script::Value::String, Sass::Script::Value::List]
|
154
|
+
# The selector to parse. This can be either a string or a list of
|
155
|
+
# strings.
|
156
|
+
# @param name [Symbol, nil]
|
157
|
+
# If provided, the name of the selector argument. This is used
|
158
|
+
# for error reporting.
|
159
|
+
# @param allow_parent_ref [Boolean]
|
160
|
+
# Whether the parsed selector should allow parent references.
|
161
|
+
# @return [Sass::Selector::Sequence] The parsed selector.
|
162
|
+
# @throw [ArgumentError] if the parse failed for any reason.
|
163
|
+
def parse_complex_selector(value, name = nil, allow_parent_ref = false)
|
164
|
+
selector = parse_selector(value, name, allow_parent_ref)
|
165
|
+
return seq if selector.members.length == 1
|
166
|
+
|
167
|
+
err = "#{value.inspect} is not a complex selector"
|
168
|
+
err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
|
169
|
+
raise ArgumentError.new(err)
|
170
|
+
end
|
171
|
+
|
172
|
+
# Parses a user-provided compound selector.
|
173
|
+
#
|
174
|
+
# A compound selector cannot contain combinators or commas.
|
175
|
+
#
|
176
|
+
# @param value [Sass::Script::Value::String] The selector to parse.
|
177
|
+
# @param name [Symbol, nil]
|
178
|
+
# If provided, the name of the selector argument. This is used
|
179
|
+
# for error reporting.
|
180
|
+
# @param allow_parent_ref [Boolean]
|
181
|
+
# Whether the parsed selector should allow parent references.
|
182
|
+
# @return [Sass::Selector::SimpleSequence] The parsed selector.
|
183
|
+
# @throw [ArgumentError] if the parse failed for any reason.
|
184
|
+
def parse_compound_selector(value, name = nil, allow_parent_ref = false)
|
185
|
+
assert_type value, :String, name
|
186
|
+
selector = parse_selector(value, name, allow_parent_ref)
|
187
|
+
seq = selector.members.first
|
188
|
+
sseq = seq.members.first
|
189
|
+
if selector.members.length == 1 && seq.members.length == 1 &&
|
190
|
+
sseq.is_a?(Sass::Selector::SimpleSequence)
|
191
|
+
return sseq
|
192
|
+
end
|
193
|
+
|
194
|
+
err = "#{value.inspect} is not a compound selector"
|
195
|
+
err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
|
196
|
+
raise ArgumentError.new(err)
|
197
|
+
end
|
198
|
+
|
199
|
+
# Returns true when the literal is a string containing a calc()
|
200
|
+
#
|
201
|
+
# @param literal [Sass::Script::Value::Base] The value to check
|
202
|
+
# @return boolean
|
203
|
+
def calc?(literal)
|
204
|
+
literal.is_a?(Sass::Script::Value::String) && literal.value =~ /calc\(/
|
205
|
+
end
|
206
|
+
|
207
|
+
private
|
208
|
+
|
209
|
+
# Converts a user-provided selector into string form or throws an
|
210
|
+
# ArgumentError if it's in an invalid format.
|
211
|
+
def normalize_selector(value, name)
|
212
|
+
if (str = selector_to_str(value))
|
213
|
+
return str
|
214
|
+
end
|
215
|
+
|
216
|
+
err = "#{value.inspect} is not a valid selector: it must be a string,\n" +
|
217
|
+
"a list of strings, or a list of lists of strings"
|
218
|
+
err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
|
219
|
+
raise ArgumentError.new(err)
|
220
|
+
end
|
221
|
+
|
222
|
+
# Converts a user-provided selector into string form or returns
|
223
|
+
# `nil` if it's in an invalid format.
|
224
|
+
def selector_to_str(value)
|
225
|
+
return value.value if value.is_a?(Sass::Script::String)
|
226
|
+
return unless value.is_a?(Sass::Script::List)
|
227
|
+
|
228
|
+
if value.separator == :comma
|
229
|
+
return value.to_a.map do |complex|
|
230
|
+
next complex.value if complex.is_a?(Sass::Script::String)
|
231
|
+
return unless complex.is_a?(Sass::Script::List) && complex.separator == :space
|
232
|
+
return unless (str = selector_to_str(complex))
|
233
|
+
str
|
234
|
+
end.join(', ')
|
235
|
+
end
|
236
|
+
|
237
|
+
value.to_a.map do |compound|
|
238
|
+
return unless compound.is_a?(Sass::Script::String)
|
239
|
+
compound.value
|
240
|
+
end.join(' ')
|
241
|
+
end
|
242
|
+
|
243
|
+
# @private
|
244
|
+
VALID_UNIT = /#{Sass::SCSS::RX::NMSTART}#{Sass::SCSS::RX::NMCHAR}|%*/
|
245
|
+
|
246
|
+
# @example
|
247
|
+
# parse_unit_string("em*px/in*%") # => [["em", "px], ["in", "%"]]
|
248
|
+
#
|
249
|
+
# @param unit_string [String] A string adhering to the output of a number with complex
|
250
|
+
# units. E.g. "em*px/in*%"
|
251
|
+
# @return [Array<Array<String>>] A list of numerator units and a list of denominator units.
|
252
|
+
def parse_unit_string(unit_string)
|
253
|
+
denominator_units = numerator_units = Sass::Script::Value::Number::NO_UNITS
|
254
|
+
return numerator_units, denominator_units unless unit_string && unit_string.length > 0
|
255
|
+
num_over_denominator = unit_string.split(%r{ */ *})
|
256
|
+
unless (1..2).include?(num_over_denominator.size)
|
257
|
+
raise ArgumentError.new("Malformed unit string: #{unit_string}")
|
258
|
+
end
|
259
|
+
numerator_units = num_over_denominator[0].split(/ *\* */)
|
260
|
+
denominator_units = (num_over_denominator[1] || "").split(/ *\* */)
|
261
|
+
[[numerator_units, "numerator"], [denominator_units, "denominator"]].each do |units, name|
|
262
|
+
if unit_string =~ %r{/} && units.size == 0
|
263
|
+
raise ArgumentError.new("Malformed unit string: #{unit_string}")
|
264
|
+
end
|
265
|
+
if units.any? {|unit| unit !~ VALID_UNIT}
|
266
|
+
raise ArgumentError.new("Malformed #{name} in unit string: #{unit_string}")
|
267
|
+
end
|
268
|
+
end
|
269
|
+
[numerator_units, denominator_units]
|
270
|
+
end
|
271
|
+
end
|
272
|
+
end
|
@@ -0,0 +1,113 @@
|
|
1
|
+
module Sass::Script::Value
|
2
|
+
# A SassScript object representing a CSS list.
|
3
|
+
# This includes both comma-separated lists and space-separated lists.
|
4
|
+
class List < Base
|
5
|
+
# The Ruby array containing the contents of the list.
|
6
|
+
#
|
7
|
+
# @return [Array<Value>]
|
8
|
+
attr_reader :value
|
9
|
+
alias_method :to_a, :value
|
10
|
+
|
11
|
+
# The operator separating the values of the list.
|
12
|
+
# Either `:comma` or `:space`.
|
13
|
+
#
|
14
|
+
# @return [Symbol]
|
15
|
+
attr_reader :separator
|
16
|
+
|
17
|
+
# Creates a new list.
|
18
|
+
#
|
19
|
+
# @param value [Array<Value>] See \{#value}
|
20
|
+
# @param separator [Symbol] See \{#separator}
|
21
|
+
def initialize(value, separator)
|
22
|
+
super(value)
|
23
|
+
@separator = separator
|
24
|
+
end
|
25
|
+
|
26
|
+
# @see Value#options=
|
27
|
+
def options=(options)
|
28
|
+
super
|
29
|
+
value.each {|v| v.options = options}
|
30
|
+
end
|
31
|
+
|
32
|
+
# @see Value#eq
|
33
|
+
def eq(other)
|
34
|
+
Sass::Script::Value::Bool.new(
|
35
|
+
other.is_a?(List) && value == other.value &&
|
36
|
+
separator == other.separator)
|
37
|
+
end
|
38
|
+
|
39
|
+
def hash
|
40
|
+
@hash ||= [value, separator].hash
|
41
|
+
end
|
42
|
+
|
43
|
+
# @see Value#to_s
|
44
|
+
def to_s(opts = {})
|
45
|
+
raise Sass::SyntaxError.new("() isn't a valid CSS value.") if value.empty?
|
46
|
+
value.
|
47
|
+
reject {|e| e.is_a?(Null) || e.is_a?(List) && e.value.empty?}.
|
48
|
+
map {|e| e.to_s(opts)}.join(sep_str)
|
49
|
+
end
|
50
|
+
|
51
|
+
# @see Value#to_sass
|
52
|
+
def to_sass(opts = {})
|
53
|
+
return "()" if value.empty?
|
54
|
+
members = value.map do |v|
|
55
|
+
if element_needs_parens?(v)
|
56
|
+
"(#{v.to_sass(opts)})"
|
57
|
+
else
|
58
|
+
v.to_sass(opts)
|
59
|
+
end
|
60
|
+
end
|
61
|
+
return "(#{members.first},)" if members.length == 1 && separator == :comma
|
62
|
+
members.join(sep_str(nil))
|
63
|
+
end
|
64
|
+
|
65
|
+
# @see Value#to_h
|
66
|
+
def to_h
|
67
|
+
return Sass::Util.ordered_hash if value.empty?
|
68
|
+
super
|
69
|
+
end
|
70
|
+
|
71
|
+
# @see Value#inspect
|
72
|
+
def inspect
|
73
|
+
"(#{value.map {|e| e.inspect}.join(sep_str(nil))})"
|
74
|
+
end
|
75
|
+
|
76
|
+
# Asserts an index is within the list.
|
77
|
+
#
|
78
|
+
# @private
|
79
|
+
#
|
80
|
+
# @param list [Sass::Script::Value::List] The list for which the index should be checked.
|
81
|
+
# @param n [Sass::Script::Value::Number] The index being checked.
|
82
|
+
def self.assert_valid_index(list, n)
|
83
|
+
if !n.int? || n.to_i == 0
|
84
|
+
raise ArgumentError.new("List index #{n} must be a non-zero integer")
|
85
|
+
elsif list.to_a.size == 0
|
86
|
+
raise ArgumentError.new("List index is #{n} but list has no items")
|
87
|
+
elsif n.to_i.abs > (size = list.to_a.size)
|
88
|
+
raise ArgumentError.new(
|
89
|
+
"List index is #{n} but list is only #{size} item#{'s' if size != 1} long")
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
private
|
94
|
+
|
95
|
+
def element_needs_parens?(element)
|
96
|
+
if element.is_a?(List)
|
97
|
+
return false if element.value.empty?
|
98
|
+
precedence = Sass::Script::Parser.precedence_of(separator)
|
99
|
+
return Sass::Script::Parser.precedence_of(element.separator) <= precedence
|
100
|
+
end
|
101
|
+
|
102
|
+
return false unless separator == :space
|
103
|
+
return false unless element.is_a?(Sass::Script::Tree::UnaryOperation)
|
104
|
+
element.operator == :minus || element.operator == :plus
|
105
|
+
end
|
106
|
+
|
107
|
+
def sep_str(opts = options)
|
108
|
+
return ' ' if separator == :space
|
109
|
+
return ',' if opts && opts[:style] == :compressed
|
110
|
+
', '
|
111
|
+
end
|
112
|
+
end
|
113
|
+
end
|
@@ -0,0 +1,70 @@
|
|
1
|
+
module Sass::Script::Value
|
2
|
+
# A SassScript object representing a map from keys to values. Both keys and
|
3
|
+
# values can be any SassScript object.
|
4
|
+
class Map < Base
|
5
|
+
# The Ruby hash containing the contents of this map.
|
6
|
+
#
|
7
|
+
# @return [Hash<Node, Node>]
|
8
|
+
attr_reader :value
|
9
|
+
alias_method :to_h, :value
|
10
|
+
|
11
|
+
# Creates a new map.
|
12
|
+
#
|
13
|
+
# @param hash [Hash<Node, Node>]
|
14
|
+
def initialize(hash)
|
15
|
+
super(Sass::Util.ordered_hash(hash))
|
16
|
+
end
|
17
|
+
|
18
|
+
# @see Value#options=
|
19
|
+
def options=(options)
|
20
|
+
super
|
21
|
+
value.each do |k, v|
|
22
|
+
k.options = options
|
23
|
+
v.options = options
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
# @see Value#separator
|
28
|
+
def separator
|
29
|
+
:comma unless value.empty?
|
30
|
+
end
|
31
|
+
|
32
|
+
# @see Value#to_a
|
33
|
+
def to_a
|
34
|
+
value.map do |k, v|
|
35
|
+
list = List.new([k, v], :space)
|
36
|
+
list.options = options
|
37
|
+
list
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
# @see Value#eq
|
42
|
+
def eq(other)
|
43
|
+
Bool.new(other.is_a?(Map) && value == other.value)
|
44
|
+
end
|
45
|
+
|
46
|
+
def hash
|
47
|
+
@hash ||= value.hash
|
48
|
+
end
|
49
|
+
|
50
|
+
# @see Value#to_s
|
51
|
+
def to_s(opts = {})
|
52
|
+
raise Sass::SyntaxError.new("#{inspect} isn't a valid CSS value.")
|
53
|
+
end
|
54
|
+
|
55
|
+
def to_sass(opts = {})
|
56
|
+
return "()" if value.empty?
|
57
|
+
|
58
|
+
to_sass = lambda do |value|
|
59
|
+
if value.is_a?(List) && value.separator == :comma
|
60
|
+
"(#{value.to_sass(opts)})"
|
61
|
+
else
|
62
|
+
value.to_sass(opts)
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
"(#{value.map {|(k, v)| "#{to_sass[k]}: #{to_sass[v]}"}.join(', ')})"
|
67
|
+
end
|
68
|
+
alias_method :inspect, :to_sass
|
69
|
+
end
|
70
|
+
end
|
@@ -1,11 +1,18 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
module Sass::Script
|
1
|
+
module Sass::Script::Value
|
4
2
|
# A SassScript object representing a null value.
|
5
|
-
class Null <
|
6
|
-
#
|
7
|
-
|
8
|
-
|
3
|
+
class Null < Base
|
4
|
+
# The null value in SassScript.
|
5
|
+
#
|
6
|
+
# This is assigned before new is overridden below so that we use the default implementation.
|
7
|
+
NULL = new(nil)
|
8
|
+
|
9
|
+
# We override object creation so that users of the core API
|
10
|
+
# will not need to know that null is a specific constant.
|
11
|
+
#
|
12
|
+
# @private
|
13
|
+
# @return [Null] the {NULL} constant.
|
14
|
+
def self.new
|
15
|
+
NULL
|
9
16
|
end
|
10
17
|
|
11
18
|
# @return [Boolean] `false` (the Ruby boolean value)
|