sass 3.1.0 → 3.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/CONTRIBUTING +1 -1
- data/MIT-LICENSE +2 -2
- data/README.md +29 -17
- data/Rakefile +43 -9
- data/VERSION +1 -1
- data/VERSION_DATE +1 -0
- data/VERSION_NAME +1 -1
- data/bin/sass +6 -1
- data/bin/sass-convert +6 -1
- data/bin/scss +6 -1
- data/ext/mkrf_conf.rb +27 -0
- data/lib/sass/cache_stores/base.rb +7 -3
- data/lib/sass/cache_stores/chain.rb +3 -2
- data/lib/sass/cache_stores/filesystem.rb +5 -7
- data/lib/sass/cache_stores/memory.rb +1 -1
- data/lib/sass/cache_stores/null.rb +2 -2
- data/lib/sass/callbacks.rb +2 -1
- data/lib/sass/css.rb +168 -53
- data/lib/sass/engine.rb +502 -174
- data/lib/sass/environment.rb +151 -111
- data/lib/sass/error.rb +7 -7
- data/lib/sass/exec.rb +176 -60
- data/lib/sass/features.rb +40 -0
- data/lib/sass/importers/base.rb +46 -7
- data/lib/sass/importers/deprecated_path.rb +51 -0
- data/lib/sass/importers/filesystem.rb +113 -30
- data/lib/sass/importers.rb +1 -0
- data/lib/sass/logger/base.rb +30 -0
- data/lib/sass/logger/log_level.rb +45 -0
- data/lib/sass/logger.rb +12 -0
- data/lib/sass/media.rb +213 -0
- data/lib/sass/plugin/compiler.rb +194 -104
- data/lib/sass/plugin/configuration.rb +18 -25
- data/lib/sass/plugin/merb.rb +1 -1
- data/lib/sass/plugin/staleness_checker.rb +37 -11
- data/lib/sass/plugin.rb +10 -13
- data/lib/sass/railtie.rb +2 -1
- data/lib/sass/repl.rb +5 -6
- data/lib/sass/script/css_lexer.rb +8 -4
- data/lib/sass/script/css_parser.rb +5 -2
- data/lib/sass/script/functions.rb +1547 -618
- data/lib/sass/script/lexer.rb +122 -72
- data/lib/sass/script/parser.rb +304 -135
- data/lib/sass/script/tree/funcall.rb +306 -0
- data/lib/sass/script/{interpolation.rb → tree/interpolation.rb} +43 -13
- data/lib/sass/script/tree/list_literal.rb +77 -0
- data/lib/sass/script/tree/literal.rb +45 -0
- data/lib/sass/script/tree/map_literal.rb +64 -0
- data/lib/sass/script/{node.rb → tree/node.rb} +30 -12
- data/lib/sass/script/{operation.rb → tree/operation.rb} +33 -21
- data/lib/sass/script/{string_interpolation.rb → tree/string_interpolation.rb} +14 -4
- data/lib/sass/script/{unary_operation.rb → tree/unary_operation.rb} +21 -9
- data/lib/sass/script/tree/variable.rb +57 -0
- data/lib/sass/script/tree.rb +15 -0
- data/lib/sass/script/value/arg_list.rb +36 -0
- data/lib/sass/script/value/base.rb +238 -0
- data/lib/sass/script/value/bool.rb +40 -0
- data/lib/sass/script/{color.rb → value/color.rb} +256 -74
- data/lib/sass/script/value/deprecated_false.rb +55 -0
- data/lib/sass/script/value/helpers.rb +155 -0
- data/lib/sass/script/value/list.rb +128 -0
- data/lib/sass/script/value/map.rb +70 -0
- data/lib/sass/script/value/null.rb +49 -0
- data/lib/sass/script/{number.rb → value/number.rb} +115 -62
- data/lib/sass/script/{string.rb → value/string.rb} +9 -11
- data/lib/sass/script/value.rb +12 -0
- data/lib/sass/script.rb +35 -9
- data/lib/sass/scss/css_parser.rb +2 -12
- data/lib/sass/scss/parser.rb +657 -230
- data/lib/sass/scss/rx.rb +17 -12
- data/lib/sass/scss/static_parser.rb +37 -6
- data/lib/sass/scss.rb +0 -1
- data/lib/sass/selector/abstract_sequence.rb +35 -3
- data/lib/sass/selector/comma_sequence.rb +29 -14
- data/lib/sass/selector/sequence.rb +371 -74
- data/lib/sass/selector/simple.rb +28 -13
- data/lib/sass/selector/simple_sequence.rb +163 -36
- data/lib/sass/selector.rb +138 -36
- data/lib/sass/shared.rb +3 -5
- data/lib/sass/source/map.rb +196 -0
- data/lib/sass/source/position.rb +39 -0
- data/lib/sass/source/range.rb +41 -0
- data/lib/sass/stack.rb +126 -0
- data/lib/sass/supports.rb +228 -0
- data/lib/sass/tree/at_root_node.rb +82 -0
- data/lib/sass/tree/comment_node.rb +34 -29
- data/lib/sass/tree/content_node.rb +9 -0
- data/lib/sass/tree/css_import_node.rb +60 -0
- data/lib/sass/tree/debug_node.rb +3 -3
- data/lib/sass/tree/directive_node.rb +33 -3
- data/lib/sass/tree/each_node.rb +9 -9
- data/lib/sass/tree/extend_node.rb +20 -6
- data/lib/sass/tree/for_node.rb +6 -6
- data/lib/sass/tree/function_node.rb +12 -4
- data/lib/sass/tree/if_node.rb +2 -15
- data/lib/sass/tree/import_node.rb +11 -5
- data/lib/sass/tree/media_node.rb +27 -11
- data/lib/sass/tree/mixin_def_node.rb +15 -4
- data/lib/sass/tree/mixin_node.rb +27 -7
- data/lib/sass/tree/node.rb +69 -35
- data/lib/sass/tree/prop_node.rb +47 -31
- data/lib/sass/tree/return_node.rb +4 -3
- data/lib/sass/tree/root_node.rb +20 -4
- data/lib/sass/tree/rule_node.rb +37 -26
- data/lib/sass/tree/supports_node.rb +38 -0
- data/lib/sass/tree/trace_node.rb +33 -0
- data/lib/sass/tree/variable_node.rb +10 -4
- data/lib/sass/tree/visitors/base.rb +5 -8
- data/lib/sass/tree/visitors/check_nesting.rb +67 -52
- data/lib/sass/tree/visitors/convert.rb +134 -53
- data/lib/sass/tree/visitors/cssize.rb +245 -51
- data/lib/sass/tree/visitors/deep_copy.rb +102 -0
- data/lib/sass/tree/visitors/extend.rb +68 -0
- data/lib/sass/tree/visitors/perform.rb +331 -105
- data/lib/sass/tree/visitors/set_options.rb +125 -0
- data/lib/sass/tree/visitors/to_css.rb +259 -95
- data/lib/sass/tree/warn_node.rb +3 -3
- data/lib/sass/tree/while_node.rb +3 -3
- data/lib/sass/util/cross_platform_random.rb +19 -0
- data/lib/sass/util/multibyte_string_scanner.rb +157 -0
- data/lib/sass/util/normalized_map.rb +130 -0
- data/lib/sass/util/ordered_hash.rb +192 -0
- data/lib/sass/util/subset_map.rb +11 -2
- data/lib/sass/util/test.rb +9 -0
- data/lib/sass/util.rb +565 -39
- data/lib/sass/version.rb +27 -15
- data/lib/sass.rb +39 -4
- data/test/sass/cache_test.rb +15 -0
- data/test/sass/compiler_test.rb +223 -0
- data/test/sass/conversion_test.rb +901 -107
- data/test/sass/css2sass_test.rb +94 -0
- data/test/sass/engine_test.rb +1059 -164
- data/test/sass/exec_test.rb +86 -0
- data/test/sass/extend_test.rb +933 -837
- data/test/sass/fixtures/test_staleness_check_across_importers.css +1 -0
- data/test/sass/fixtures/test_staleness_check_across_importers.scss +1 -0
- data/test/sass/functions_test.rb +995 -136
- data/test/sass/importer_test.rb +338 -18
- data/test/sass/logger_test.rb +58 -0
- data/test/sass/more_results/more_import.css +2 -2
- data/test/sass/plugin_test.rb +114 -30
- data/test/sass/results/cached_import_option.css +3 -0
- data/test/sass/results/filename_fn.css +3 -0
- data/test/sass/results/import.css +2 -2
- data/test/sass/results/import_charset.css +1 -0
- data/test/sass/results/import_charset_1_8.css +1 -0
- data/test/sass/results/import_charset_ibm866.css +1 -0
- data/test/sass/results/import_content.css +1 -0
- data/test/sass/results/script.css +1 -1
- data/test/sass/results/scss_import.css +2 -2
- data/test/sass/results/units.css +2 -2
- data/test/sass/script_conversion_test.rb +43 -1
- data/test/sass/script_test.rb +380 -36
- data/test/sass/scss/css_test.rb +257 -75
- data/test/sass/scss/scss_test.rb +2322 -110
- data/test/sass/source_map_test.rb +887 -0
- data/test/sass/templates/_cached_import_option_partial.scss +1 -0
- data/test/sass/templates/_double_import_loop2.sass +1 -0
- data/test/sass/templates/_filename_fn_import.scss +11 -0
- data/test/sass/templates/_imported_content.sass +3 -0
- data/test/sass/templates/_same_name_different_partiality.scss +1 -0
- data/test/sass/templates/bork5.sass +3 -0
- data/test/sass/templates/cached_import_option.scss +3 -0
- data/test/sass/templates/double_import_loop1.sass +1 -0
- data/test/sass/templates/filename_fn.scss +18 -0
- data/test/sass/templates/import_charset.sass +2 -0
- data/test/sass/templates/import_charset_1_8.sass +2 -0
- data/test/sass/templates/import_charset_ibm866.sass +2 -0
- data/test/sass/templates/import_content.sass +4 -0
- data/test/sass/templates/same_name_different_ext.sass +2 -0
- data/test/sass/templates/same_name_different_ext.scss +1 -0
- data/test/sass/templates/same_name_different_partiality.scss +1 -0
- data/test/sass/templates/single_import_loop.sass +1 -0
- data/test/sass/templates/subdir/import_up1.scss +1 -0
- data/test/sass/templates/subdir/import_up2.scss +1 -0
- data/test/sass/test_helper.rb +1 -1
- data/test/sass/util/multibyte_string_scanner_test.rb +147 -0
- data/test/sass/util/normalized_map_test.rb +51 -0
- data/test/sass/util_test.rb +183 -0
- data/test/sass/value_helpers_test.rb +181 -0
- data/test/test_helper.rb +45 -5
- data/vendor/listen/CHANGELOG.md +228 -0
- data/vendor/listen/CONTRIBUTING.md +38 -0
- data/vendor/listen/Gemfile +30 -0
- data/vendor/listen/Guardfile +8 -0
- data/vendor/{fssm → listen}/LICENSE +1 -1
- data/vendor/listen/README.md +315 -0
- data/vendor/listen/Rakefile +47 -0
- data/vendor/listen/Vagrantfile +96 -0
- data/vendor/listen/lib/listen/adapter.rb +214 -0
- data/vendor/listen/lib/listen/adapters/bsd.rb +112 -0
- data/vendor/listen/lib/listen/adapters/darwin.rb +85 -0
- data/vendor/listen/lib/listen/adapters/linux.rb +113 -0
- data/vendor/listen/lib/listen/adapters/polling.rb +67 -0
- data/vendor/listen/lib/listen/adapters/windows.rb +87 -0
- data/vendor/listen/lib/listen/dependency_manager.rb +126 -0
- data/vendor/listen/lib/listen/directory_record.rb +371 -0
- data/vendor/listen/lib/listen/listener.rb +225 -0
- data/vendor/listen/lib/listen/multi_listener.rb +143 -0
- data/vendor/listen/lib/listen/turnstile.rb +28 -0
- data/vendor/listen/lib/listen/version.rb +3 -0
- data/vendor/listen/lib/listen.rb +40 -0
- data/vendor/listen/listen.gemspec +22 -0
- data/vendor/listen/spec/listen/adapter_spec.rb +183 -0
- data/vendor/listen/spec/listen/adapters/bsd_spec.rb +36 -0
- data/vendor/listen/spec/listen/adapters/darwin_spec.rb +37 -0
- data/vendor/listen/spec/listen/adapters/linux_spec.rb +47 -0
- data/vendor/listen/spec/listen/adapters/polling_spec.rb +68 -0
- data/vendor/listen/spec/listen/adapters/windows_spec.rb +30 -0
- data/vendor/listen/spec/listen/dependency_manager_spec.rb +107 -0
- data/vendor/listen/spec/listen/directory_record_spec.rb +1225 -0
- data/vendor/listen/spec/listen/listener_spec.rb +169 -0
- data/vendor/listen/spec/listen/multi_listener_spec.rb +174 -0
- data/vendor/listen/spec/listen/turnstile_spec.rb +56 -0
- data/vendor/listen/spec/listen_spec.rb +73 -0
- data/vendor/listen/spec/spec_helper.rb +21 -0
- data/vendor/listen/spec/support/adapter_helper.rb +629 -0
- data/vendor/listen/spec/support/directory_record_helper.rb +55 -0
- data/vendor/listen/spec/support/fixtures_helper.rb +29 -0
- data/vendor/listen/spec/support/listeners_helper.rb +156 -0
- data/vendor/listen/spec/support/platform_helper.rb +15 -0
- metadata +344 -271
- data/lib/sass/less.rb +0 -382
- data/lib/sass/script/bool.rb +0 -18
- data/lib/sass/script/funcall.rb +0 -162
- data/lib/sass/script/list.rb +0 -76
- data/lib/sass/script/literal.rb +0 -245
- data/lib/sass/script/variable.rb +0 -54
- data/lib/sass/scss/sass_parser.rb +0 -11
- data/test/sass/less_conversion_test.rb +0 -653
- data/vendor/fssm/README.markdown +0 -55
- data/vendor/fssm/Rakefile +0 -59
- data/vendor/fssm/VERSION.yml +0 -5
- data/vendor/fssm/example.rb +0 -9
- data/vendor/fssm/fssm.gemspec +0 -77
- data/vendor/fssm/lib/fssm/backends/fsevents.rb +0 -36
- data/vendor/fssm/lib/fssm/backends/inotify.rb +0 -26
- data/vendor/fssm/lib/fssm/backends/polling.rb +0 -25
- data/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +0 -131
- data/vendor/fssm/lib/fssm/monitor.rb +0 -26
- data/vendor/fssm/lib/fssm/path.rb +0 -91
- data/vendor/fssm/lib/fssm/pathname.rb +0 -502
- data/vendor/fssm/lib/fssm/state/directory.rb +0 -57
- data/vendor/fssm/lib/fssm/state/file.rb +0 -24
- data/vendor/fssm/lib/fssm/support.rb +0 -63
- data/vendor/fssm/lib/fssm/tree.rb +0 -176
- data/vendor/fssm/lib/fssm.rb +0 -33
- data/vendor/fssm/profile/prof-cache.rb +0 -40
- data/vendor/fssm/profile/prof-fssm-pathname.html +0 -1231
- data/vendor/fssm/profile/prof-pathname.rb +0 -68
- data/vendor/fssm/profile/prof-plain-pathname.html +0 -988
- data/vendor/fssm/profile/prof.html +0 -2379
- data/vendor/fssm/spec/path_spec.rb +0 -75
- data/vendor/fssm/spec/root/duck/quack.txt +0 -0
- data/vendor/fssm/spec/root/file.css +0 -0
- data/vendor/fssm/spec/root/file.rb +0 -0
- data/vendor/fssm/spec/root/file.yml +0 -0
- data/vendor/fssm/spec/root/moo/cow.txt +0 -0
- data/vendor/fssm/spec/spec_helper.rb +0 -14
@@ -0,0 +1,157 @@
|
|
1
|
+
require 'strscan'
|
2
|
+
|
3
|
+
if Sass::Util.ruby1_8?
|
4
|
+
# rubocop:disable ConstantName
|
5
|
+
Sass::Util::MultibyteStringScanner = StringScanner
|
6
|
+
# rubocop:enable ConstantName
|
7
|
+
else
|
8
|
+
if Sass::Util.rbx?
|
9
|
+
# Rubinius's StringScanner class implements some of its methods in terms of
|
10
|
+
# others, which causes us to double-count bytes in some cases if we do
|
11
|
+
# straightforward inheritance. To work around this, we use a delegate class.
|
12
|
+
require 'delegate'
|
13
|
+
class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
|
14
|
+
def initialize(str)
|
15
|
+
super(StringScanner.new(str))
|
16
|
+
@mb_pos = 0
|
17
|
+
@mb_matched_size = nil
|
18
|
+
@mb_last_pos = nil
|
19
|
+
end
|
20
|
+
|
21
|
+
def is_a?(klass)
|
22
|
+
__getobj__.is_a?(klass) || super
|
23
|
+
end
|
24
|
+
end
|
25
|
+
else
|
26
|
+
class Sass::Util::MultibyteStringScanner < StringScanner
|
27
|
+
def initialize(str)
|
28
|
+
super
|
29
|
+
@mb_pos = 0
|
30
|
+
@mb_matched_size = nil
|
31
|
+
@mb_last_pos = nil
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
# A wrapper of the native StringScanner class that works correctly with
|
37
|
+
# multibyte character encodings. The native class deals only in bytes, not
|
38
|
+
# characters, for methods like [#pos] and [#matched_size]. This class deals
|
39
|
+
# only in characters, instead.
|
40
|
+
class Sass::Util::MultibyteStringScanner
|
41
|
+
def self.new(str)
|
42
|
+
return StringScanner.new(str) if str.ascii_only?
|
43
|
+
super
|
44
|
+
end
|
45
|
+
|
46
|
+
alias_method :byte_pos, :pos
|
47
|
+
alias_method :byte_matched_size, :matched_size
|
48
|
+
|
49
|
+
def check(pattern); _match super; end
|
50
|
+
def check_until(pattern); _matched super; end
|
51
|
+
def getch; _forward _match super; end
|
52
|
+
def match?(pattern); _size check(pattern); end
|
53
|
+
def matched_size; @mb_matched_size; end
|
54
|
+
def peek(len); string[@mb_pos, len]; end
|
55
|
+
alias_method :peep, :peek
|
56
|
+
def pos; @mb_pos; end
|
57
|
+
alias_method :pointer, :pos
|
58
|
+
def rest_size; rest.size; end
|
59
|
+
def scan(pattern); _forward _match super; end
|
60
|
+
def scan_until(pattern); _forward _matched super; end
|
61
|
+
def skip(pattern); _size scan(pattern); end
|
62
|
+
def skip_until(pattern); _matched _size scan_until(pattern); end
|
63
|
+
|
64
|
+
def get_byte
|
65
|
+
raise "MultibyteStringScanner doesn't support #get_byte."
|
66
|
+
end
|
67
|
+
|
68
|
+
def getbyte
|
69
|
+
raise "MultibyteStringScanner doesn't support #getbyte."
|
70
|
+
end
|
71
|
+
|
72
|
+
def pos=(n)
|
73
|
+
@mb_last_pos = nil
|
74
|
+
|
75
|
+
# We set position kind of a lot during parsing, so we want it to be as
|
76
|
+
# efficient as possible. This is complicated by the fact that UTF-8 is a
|
77
|
+
# variable-length encoding, so it's difficult to find the byte length that
|
78
|
+
# corresponds to a given character length.
|
79
|
+
#
|
80
|
+
# Our heuristic here is to try to count the fewest possible characters. So
|
81
|
+
# if the new position is close to the current one, just count the
|
82
|
+
# characters between the two; if the new position is closer to the
|
83
|
+
# beginning of the string, just count the characters from there.
|
84
|
+
if @mb_pos - n < @mb_pos / 2
|
85
|
+
# New position is close to old position
|
86
|
+
byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
|
87
|
+
super(byte_pos + byte_delta)
|
88
|
+
else
|
89
|
+
# New position is close to BOS
|
90
|
+
super(string[0...n].bytesize)
|
91
|
+
end
|
92
|
+
@mb_pos = n
|
93
|
+
end
|
94
|
+
|
95
|
+
def reset
|
96
|
+
@mb_pos = 0
|
97
|
+
@mb_matched_size = nil
|
98
|
+
@mb_last_pos = nil
|
99
|
+
super
|
100
|
+
end
|
101
|
+
|
102
|
+
def scan_full(pattern, advance_pointer_p, return_string_p)
|
103
|
+
res = _match super(pattern, advance_pointer_p, true)
|
104
|
+
_forward res if advance_pointer_p
|
105
|
+
return res if return_string_p
|
106
|
+
end
|
107
|
+
|
108
|
+
def search_full(pattern, advance_pointer_p, return_string_p)
|
109
|
+
res = super(pattern, advance_pointer_p, true)
|
110
|
+
_forward res if advance_pointer_p
|
111
|
+
_matched((res if return_string_p))
|
112
|
+
end
|
113
|
+
|
114
|
+
def string=(str)
|
115
|
+
@mb_pos = 0
|
116
|
+
@mb_matched_size = nil
|
117
|
+
@mb_last_pos = nil
|
118
|
+
super
|
119
|
+
end
|
120
|
+
|
121
|
+
def terminate
|
122
|
+
@mb_pos = string.size
|
123
|
+
@mb_matched_size = nil
|
124
|
+
@mb_last_pos = nil
|
125
|
+
super
|
126
|
+
end
|
127
|
+
alias_method :clear, :terminate
|
128
|
+
|
129
|
+
def unscan
|
130
|
+
super
|
131
|
+
@mb_pos = @mb_last_pos
|
132
|
+
@mb_last_pos = @mb_matched_size = nil
|
133
|
+
end
|
134
|
+
|
135
|
+
private
|
136
|
+
|
137
|
+
def _size(str)
|
138
|
+
str && str.size
|
139
|
+
end
|
140
|
+
|
141
|
+
def _match(str)
|
142
|
+
@mb_matched_size = str && str.size
|
143
|
+
str
|
144
|
+
end
|
145
|
+
|
146
|
+
def _matched(res)
|
147
|
+
_match matched
|
148
|
+
res
|
149
|
+
end
|
150
|
+
|
151
|
+
def _forward(str)
|
152
|
+
@mb_last_pos = @mb_pos
|
153
|
+
@mb_pos += str.size if str
|
154
|
+
str
|
155
|
+
end
|
156
|
+
end
|
157
|
+
end
|
@@ -0,0 +1,130 @@
|
|
1
|
+
require 'delegate'
|
2
|
+
require 'sass/util'
|
3
|
+
|
4
|
+
module Sass
|
5
|
+
module Util
|
6
|
+
# A hash that normalizes its string keys while still allowing you to get back
|
7
|
+
# to the original keys that were stored. If several different values normalize
|
8
|
+
# to the same value, whichever is stored last wins.
|
9
|
+
require 'sass/util/ordered_hash' if ruby1_8?
|
10
|
+
class NormalizedMap
|
11
|
+
# Create a normalized map
|
12
|
+
def initialize(map = nil)
|
13
|
+
@key_strings = {}
|
14
|
+
@map = Util.ruby1_8? ? OrderedHash.new : {}
|
15
|
+
|
16
|
+
map.each {|key, value| self[key] = value} if map
|
17
|
+
end
|
18
|
+
|
19
|
+
# Specifies how to transform the key.
|
20
|
+
#
|
21
|
+
# This can be overridden to create other normalization behaviors.
|
22
|
+
def normalize(key)
|
23
|
+
key.tr("-", "_")
|
24
|
+
end
|
25
|
+
|
26
|
+
# Returns the version of `key` as it was stored before
|
27
|
+
# normalization. If `key` isn't in the map, returns it as it was
|
28
|
+
# passed in.
|
29
|
+
#
|
30
|
+
# @return [String]
|
31
|
+
def denormalize(key)
|
32
|
+
@key_strings[normalize(key)] || key
|
33
|
+
end
|
34
|
+
|
35
|
+
# @private
|
36
|
+
def []=(k, v)
|
37
|
+
normalized = normalize(k)
|
38
|
+
@map[normalized] = v
|
39
|
+
@key_strings[normalized] = k
|
40
|
+
v
|
41
|
+
end
|
42
|
+
|
43
|
+
# @private
|
44
|
+
def [](k)
|
45
|
+
@map[normalize(k)]
|
46
|
+
end
|
47
|
+
|
48
|
+
# @private
|
49
|
+
def has_key?(k)
|
50
|
+
@map.has_key?(normalize(k))
|
51
|
+
end
|
52
|
+
|
53
|
+
# @private
|
54
|
+
def delete(k)
|
55
|
+
normalized = normalize(k)
|
56
|
+
@key_strings.delete(normalized)
|
57
|
+
@map.delete(normalized)
|
58
|
+
end
|
59
|
+
|
60
|
+
# @return [Hash] Hash with the keys as they were stored (before normalization).
|
61
|
+
def as_stored
|
62
|
+
Sass::Util.map_keys(@map) {|k| @key_strings[k]}
|
63
|
+
end
|
64
|
+
|
65
|
+
def empty?
|
66
|
+
@map.empty?
|
67
|
+
end
|
68
|
+
|
69
|
+
def values
|
70
|
+
@map.values
|
71
|
+
end
|
72
|
+
|
73
|
+
def keys
|
74
|
+
@map.keys
|
75
|
+
end
|
76
|
+
|
77
|
+
def each
|
78
|
+
@map.each {|k, v| yield(k, v)}
|
79
|
+
end
|
80
|
+
|
81
|
+
def size
|
82
|
+
@map.size
|
83
|
+
end
|
84
|
+
|
85
|
+
def to_hash
|
86
|
+
@map.dup
|
87
|
+
end
|
88
|
+
|
89
|
+
def to_a
|
90
|
+
@map.to_a
|
91
|
+
end
|
92
|
+
|
93
|
+
def map
|
94
|
+
@map.map {|k, v| yield(k, v)}
|
95
|
+
end
|
96
|
+
|
97
|
+
def dup
|
98
|
+
d = super
|
99
|
+
d.send(:instance_variable_set, "@map", @map.dup)
|
100
|
+
d
|
101
|
+
end
|
102
|
+
|
103
|
+
def sort_by
|
104
|
+
@map.sort_by {|k, v| yield k, v}
|
105
|
+
end
|
106
|
+
|
107
|
+
def update(map)
|
108
|
+
map = map.as_stored if map.is_a?(NormalizedMap)
|
109
|
+
map.each {|k, v| self[k] = v}
|
110
|
+
end
|
111
|
+
|
112
|
+
def method_missing(method, *args, &block)
|
113
|
+
if Sass.tests_running
|
114
|
+
raise ArgumentError.new("The method #{method} must be implemented explicitly")
|
115
|
+
end
|
116
|
+
@map.send(method, *args, &block)
|
117
|
+
end
|
118
|
+
|
119
|
+
if Sass::Util.ruby1_8?
|
120
|
+
def respond_to?(method, include_private = false)
|
121
|
+
super || @map.respond_to?(method, include_private)
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
def respond_to_missing?(method, include_private = false)
|
126
|
+
@map.respond_to?(method, include_private)
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end
|
130
|
+
end
|
@@ -0,0 +1,192 @@
|
|
1
|
+
# Copyright (c) 2005-2013 David Heinemeier Hansson
|
2
|
+
#
|
3
|
+
# Permission is hereby granted, free of charge, to any person obtaining
|
4
|
+
# a copy of this software and associated documentation files (the
|
5
|
+
# "Software"), to deal in the Software without restriction, including
|
6
|
+
# without limitation the rights to use, copy, modify, merge, publish,
|
7
|
+
# distribute, sublicense, and/or sell copies of the Software, and to
|
8
|
+
# permit persons to whom the Software is furnished to do so, subject to
|
9
|
+
# the following conditions:
|
10
|
+
#
|
11
|
+
# The above copyright notice and this permission notice shall be
|
12
|
+
# included in all copies or substantial portions of the Software.
|
13
|
+
#
|
14
|
+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
15
|
+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
16
|
+
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
17
|
+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
18
|
+
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
19
|
+
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
20
|
+
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
21
|
+
|
22
|
+
# This class was copied from an old version of ActiveSupport.
|
23
|
+
class OrderedHash < ::Hash
|
24
|
+
# In MRI the Hash class is core and written in C. In particular, methods are
|
25
|
+
# programmed with explicit C function calls and polymorphism is not honored.
|
26
|
+
#
|
27
|
+
# For example, []= is crucial in this implementation to maintain the @keys
|
28
|
+
# array but hash.c invokes rb_hash_aset() originally. This prevents method
|
29
|
+
# reuse through inheritance and forces us to reimplement stuff.
|
30
|
+
#
|
31
|
+
# For instance, we cannot use the inherited #merge! because albeit the algorithm
|
32
|
+
# itself would work, our []= is not being called at all by the C code.
|
33
|
+
|
34
|
+
def initialize(*args)
|
35
|
+
super
|
36
|
+
@keys = []
|
37
|
+
end
|
38
|
+
|
39
|
+
def self.[](*args)
|
40
|
+
ordered_hash = new
|
41
|
+
|
42
|
+
if args.length == 1 && args.first.is_a?(Array)
|
43
|
+
args.first.each do |key_value_pair|
|
44
|
+
next unless key_value_pair.is_a?(Array)
|
45
|
+
ordered_hash[key_value_pair[0]] = key_value_pair[1]
|
46
|
+
end
|
47
|
+
|
48
|
+
return ordered_hash
|
49
|
+
end
|
50
|
+
|
51
|
+
unless args.size.even?
|
52
|
+
raise ArgumentError.new("odd number of arguments for Hash")
|
53
|
+
end
|
54
|
+
|
55
|
+
args.each_with_index do |val, ind|
|
56
|
+
next if ind.odd?
|
57
|
+
ordered_hash[val] = args[ind + 1]
|
58
|
+
end
|
59
|
+
|
60
|
+
ordered_hash
|
61
|
+
end
|
62
|
+
|
63
|
+
def initialize_copy(other)
|
64
|
+
super
|
65
|
+
# make a deep copy of keys
|
66
|
+
@keys = other.keys
|
67
|
+
end
|
68
|
+
|
69
|
+
def []=(key, value)
|
70
|
+
@keys << key unless has_key?(key)
|
71
|
+
super
|
72
|
+
end
|
73
|
+
|
74
|
+
def delete(key)
|
75
|
+
if has_key? key
|
76
|
+
index = @keys.index(key)
|
77
|
+
@keys.delete_at index
|
78
|
+
end
|
79
|
+
super
|
80
|
+
end
|
81
|
+
|
82
|
+
def delete_if
|
83
|
+
super
|
84
|
+
sync_keys!
|
85
|
+
self
|
86
|
+
end
|
87
|
+
|
88
|
+
def reject!
|
89
|
+
super
|
90
|
+
sync_keys!
|
91
|
+
self
|
92
|
+
end
|
93
|
+
|
94
|
+
def reject
|
95
|
+
dup.reject! {|h, k| yield h, k}
|
96
|
+
end
|
97
|
+
|
98
|
+
def keys
|
99
|
+
@keys.dup
|
100
|
+
end
|
101
|
+
|
102
|
+
def values
|
103
|
+
@keys.map {|key| self[key]}
|
104
|
+
end
|
105
|
+
|
106
|
+
def to_hash
|
107
|
+
self
|
108
|
+
end
|
109
|
+
|
110
|
+
def to_a
|
111
|
+
@keys.map {|key| [key, self[key]]}
|
112
|
+
end
|
113
|
+
|
114
|
+
def each_key
|
115
|
+
return to_enum(:each_key) unless block_given?
|
116
|
+
@keys.each {|key| yield key}
|
117
|
+
self
|
118
|
+
end
|
119
|
+
|
120
|
+
def each_value
|
121
|
+
return to_enum(:each_value) unless block_given?
|
122
|
+
@keys.each {|key| yield self[key]}
|
123
|
+
self
|
124
|
+
end
|
125
|
+
|
126
|
+
def each
|
127
|
+
return to_enum(:each) unless block_given?
|
128
|
+
@keys.each {|key| yield [key, self[key]]}
|
129
|
+
self
|
130
|
+
end
|
131
|
+
|
132
|
+
def each_pair
|
133
|
+
return to_enum(:each_pair) unless block_given?
|
134
|
+
@keys.each {|key| yield key, self[key]}
|
135
|
+
self
|
136
|
+
end
|
137
|
+
|
138
|
+
alias_method :select, :find_all
|
139
|
+
|
140
|
+
def clear
|
141
|
+
super
|
142
|
+
@keys.clear
|
143
|
+
self
|
144
|
+
end
|
145
|
+
|
146
|
+
def shift
|
147
|
+
k = @keys.first
|
148
|
+
v = delete(k)
|
149
|
+
[k, v]
|
150
|
+
end
|
151
|
+
|
152
|
+
def merge!(other_hash)
|
153
|
+
if block_given?
|
154
|
+
other_hash.each {|k, v| self[k] = key?(k) ? yield(k, self[k], v) : v}
|
155
|
+
else
|
156
|
+
other_hash.each {|k, v| self[k] = v}
|
157
|
+
end
|
158
|
+
self
|
159
|
+
end
|
160
|
+
|
161
|
+
alias_method :update, :merge!
|
162
|
+
|
163
|
+
def merge(other_hash)
|
164
|
+
if block_given?
|
165
|
+
dup.merge!(other_hash) {|k, v1, v2| yield k, v1, v2}
|
166
|
+
else
|
167
|
+
dup.merge!(other_hash)
|
168
|
+
end
|
169
|
+
end
|
170
|
+
|
171
|
+
# When replacing with another hash, the initial order of our keys must come from the other hash --
|
172
|
+
# ordered or not.
|
173
|
+
def replace(other)
|
174
|
+
super
|
175
|
+
@keys = other.keys
|
176
|
+
self
|
177
|
+
end
|
178
|
+
|
179
|
+
def invert
|
180
|
+
OrderedHash[to_a.map! {|key_value_pair| key_value_pair.reverse}]
|
181
|
+
end
|
182
|
+
|
183
|
+
def inspect
|
184
|
+
"#<OrderedHash #{super}>"
|
185
|
+
end
|
186
|
+
|
187
|
+
private
|
188
|
+
|
189
|
+
def sync_keys!
|
190
|
+
@keys.delete_if {|k| !has_key?(k)}
|
191
|
+
end
|
192
|
+
end
|
data/lib/sass/util/subset_map.rb
CHANGED
@@ -72,7 +72,8 @@ module Sass
|
|
72
72
|
# @see #[]
|
73
73
|
def get(set)
|
74
74
|
res = set.map do |k|
|
75
|
-
|
75
|
+
subsets = @hash[k]
|
76
|
+
next unless subsets
|
76
77
|
subsets.map do |subenum, subset, index|
|
77
78
|
next unless subset.subset?(set)
|
78
79
|
[index, subenum]
|
@@ -83,7 +84,7 @@ module Sass
|
|
83
84
|
res.uniq!
|
84
85
|
res.sort!
|
85
86
|
res.map! {|i, s| [@vals[i], s]}
|
86
|
-
|
87
|
+
res
|
87
88
|
end
|
88
89
|
|
89
90
|
# Same as \{#get}, but doesn't return the subsets of the argument
|
@@ -96,6 +97,14 @@ module Sass
|
|
96
97
|
def [](set)
|
97
98
|
get(set).map {|v, _| v}
|
98
99
|
end
|
100
|
+
|
101
|
+
# Iterates over each value in the subset map. Ignores keys completely. If
|
102
|
+
# multiple keys have the same value, this will return them multiple times.
|
103
|
+
#
|
104
|
+
# @yield [Object] Each value in the map.
|
105
|
+
def each_value
|
106
|
+
@vals.each {|v| yield v}
|
107
|
+
end
|
99
108
|
end
|
100
109
|
end
|
101
110
|
end
|