csspool 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. data/CHANGELOG.txt +6 -0
  2. data/Rakefile +1 -1
  3. data/lib/css/sac/conditions/attribute_condition.rb +1 -1
  4. data/lib/css/sac/conditions/combinator_condition.rb +1 -1
  5. data/lib/css/sac/conditions/id_condition.rb +1 -1
  6. data/lib/css/sac/conditions/pseudo_class_condition.rb +1 -1
  7. data/lib/css/sac/generated_parser.rb +274 -255
  8. data/lib/css/sac/parser.rb +6 -2
  9. data/lib/css/sac/selectors/child_selector.rb +1 -1
  10. data/lib/css/sac/selectors/conditional_selector.rb +4 -2
  11. data/lib/css/sac/selectors/descendant_selector.rb +1 -1
  12. data/lib/css/sac/selectors/element_selector.rb +1 -1
  13. data/lib/css/sac/selectors/sibling_selector.rb +1 -1
  14. data/lib/css/sac/selectors/simple_selector.rb +1 -1
  15. data/lib/css/stylesheet/rule.rb +10 -2
  16. data/lib/css/stylesheet/stylesheet.rb +4 -2
  17. data/lib/parser.y +8 -2
  18. data/test/test_specificity.rb +8 -8
  19. metadata +45 -52
data/CHANGELOG.txt CHANGED
@@ -1,3 +1,9 @@
1
+ == 0.2.4
2
+
3
+ * Fixed error handling on at rules. Thanks Dan for tests!
4
+ * Made specificity an array
5
+ * Made StyleSheet::Rule comparable on specificity
6
+
1
7
  == 0.2.3
2
8
 
3
9
  * Fixed a bug where nil selectors on conditional selectors were being visited.
data/Rakefile CHANGED
@@ -7,7 +7,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
7
7
  GENERATED_PARSER = "lib/css/sac/generated_parser.rb"
8
8
  GENERATED_PROPERTY_PARSER = "lib/css/sac/generated_property_parser.rb"
9
9
 
10
- Hoe.new('csspool', "0.2.3") do |p|
10
+ Hoe.new('csspool', "0.2.4") do |p|
11
11
  p.rubyforge_name = 'csspool'
12
12
  p.author = 'Aaron Patterson'
13
13
  p.email = 'aaronp@rubyforge.org'
data/lib/css/sac/conditions/attribute_condition.rb CHANGED
@@ -39,7 +39,7 @@ module CSS
39
39
  end
40
40
 
41
41
  def specificity
42
- 10
42
+ [0, 0, 1, 0]
43
43
  end
44
44
 
45
45
  def ==(other)
data/lib/css/sac/conditions/combinator_condition.rb CHANGED
@@ -24,7 +24,7 @@ module CSS
24
24
  end
25
25
 
26
26
  def specificity
27
- first.specificity + second.specificity
27
+ first.specificity.zip(second.specificity).map { |x,y| x + y }
28
28
  end
29
29
 
30
30
  def ==(other)
data/lib/css/sac/conditions/id_condition.rb CHANGED
@@ -19,7 +19,7 @@ module CSS
19
19
  end
20
20
 
21
21
  def specificity
22
- 100
22
+ [0, 1, 0, 0]
23
23
  end
24
24
  end
25
25
  end
data/lib/css/sac/conditions/pseudo_class_condition.rb CHANGED
@@ -16,7 +16,7 @@ module CSS
16
16
  end
17
17
 
18
18
  def specificity
19
- 0
19
+ [0, 0, 0, 0]
20
20
  end
21
21
  end
22
22
  end
data/lib/css/sac/generated_parser.rb CHANGED
@@ -23,113 +23,117 @@ module CSS
23
23
 
24
24
  racc_reduce_table = [
25
25
  0, 0, :racc_error,
26
- 6, 43, :_reduce_none,
26
+ 7, 43, :_reduce_none,
27
27
  3, 43, :_reduce_none,
28
+ 3, 47, :_reduce_none,
29
+ 3, 47, :_reduce_none,
30
+ 3, 47, :_reduce_none,
31
+ 2, 47, :_reduce_none,
32
+ 2, 47, :_reduce_none,
33
+ 2, 47, :_reduce_none,
34
+ 0, 47, :_reduce_none,
35
+ 7, 51, :_reduce_10,
36
+ 8, 54, :_reduce_11,
37
+ 5, 54, :_reduce_12,
28
38
  3, 46, :_reduce_none,
29
39
  3, 46, :_reduce_none,
30
- 3, 46, :_reduce_none,
31
- 2, 46, :_reduce_none,
32
- 2, 46, :_reduce_none,
33
- 2, 46, :_reduce_none,
34
40
  0, 46, :_reduce_none,
35
- 7, 50, :_reduce_10,
36
- 8, 54, :_reduce_11,
37
- 5, 54, :_reduce_12,
38
- 3, 45, :_reduce_none,
39
- 3, 45, :_reduce_none,
40
- 0, 45, :_reduce_none,
41
- 7, 48, :_reduce_16,
42
- 2, 55, :_reduce_17,
43
- 3, 55, :_reduce_18,
44
- 2, 58, :_reduce_none,
41
+ 7, 49, :_reduce_16,
42
+ 2, 56, :_reduce_17,
43
+ 3, 56, :_reduce_18,
44
+ 2, 59, :_reduce_none,
45
45
  1, 53, :_reduce_none,
46
46
  0, 53, :_reduce_none,
47
- 4, 57, :_reduce_22,
48
- 1, 57, :_reduce_23,
49
- 7, 49, :_reduce_24,
50
- 4, 59, :_reduce_25,
51
- 1, 61, :_reduce_none,
52
- 0, 61, :_reduce_none,
53
- 2, 62, :_reduce_28,
47
+ 4, 58, :_reduce_22,
48
+ 1, 58, :_reduce_23,
49
+ 7, 50, :_reduce_24,
50
+ 4, 60, :_reduce_25,
51
+ 1, 62, :_reduce_none,
54
52
  0, 62, :_reduce_none,
55
- 2, 63, :_reduce_none,
56
- 2, 63, :_reduce_none,
53
+ 2, 63, :_reduce_28,
57
54
  0, 63, :_reduce_none,
58
- 2, 64, :_reduce_33,
59
- 2, 64, :_reduce_34,
60
- 1, 64, :_reduce_35,
61
- 1, 65, :_reduce_none,
62
- 1, 65, :_reduce_none,
63
- 2, 66, :_reduce_none,
64
- 5, 47, :_reduce_39,
65
- 2, 56, :_reduce_none,
66
- 1, 56, :_reduce_none,
67
- 0, 56, :_reduce_none,
68
- 1, 68, :_reduce_43,
69
- 3, 67, :_reduce_44,
70
- 3, 67, :_reduce_45,
71
- 2, 67, :_reduce_46,
72
- 4, 70, :_reduce_47,
55
+ 2, 64, :_reduce_none,
56
+ 2, 64, :_reduce_none,
57
+ 0, 64, :_reduce_none,
58
+ 2, 65, :_reduce_33,
59
+ 2, 65, :_reduce_34,
60
+ 1, 65, :_reduce_35,
61
+ 1, 66, :_reduce_none,
62
+ 1, 66, :_reduce_none,
63
+ 2, 67, :_reduce_none,
64
+ 5, 48, :_reduce_39,
65
+ 2, 57, :_reduce_none,
66
+ 1, 57, :_reduce_none,
67
+ 0, 57, :_reduce_none,
68
+ 1, 69, :_reduce_43,
69
+ 3, 68, :_reduce_44,
70
+ 3, 68, :_reduce_45,
71
+ 2, 68, :_reduce_46,
72
+ 4, 71, :_reduce_47,
73
+ 1, 71, :_reduce_none,
74
+ 2, 72, :_reduce_49,
75
+ 1, 72, :_reduce_50,
76
+ 3, 70, :_reduce_51,
73
77
  1, 70, :_reduce_none,
74
- 2, 71, :_reduce_49,
75
- 1, 71, :_reduce_50,
76
- 3, 69, :_reduce_51,
77
- 1, 69, :_reduce_none,
78
- 2, 75, :_reduce_53,
79
- 1, 72, :_reduce_54,
80
- 1, 72, :_reduce_55,
81
- 6, 76, :_reduce_56,
82
- 2, 78, :_reduce_57,
83
- 2, 78, :_reduce_58,
84
- 5, 80, :_reduce_59,
85
- 4, 60, :_reduce_none,
86
- 5, 60, :_reduce_61,
87
- 4, 60, :_reduce_62,
88
- 1, 60, :_reduce_none,
89
- 4, 60, :_reduce_none,
90
- 0, 60, :_reduce_none,
91
- 2, 83, :_reduce_none,
92
- 1, 82, :_reduce_none,
93
- 0, 82, :_reduce_none,
94
- 3, 81, :_reduce_69,
95
- 1, 81, :_reduce_none,
96
- 2, 84, :_reduce_71,
97
- 1, 84, :_reduce_72,
98
- 2, 84, :_reduce_none,
99
- 2, 84, :_reduce_none,
78
+ 2, 76, :_reduce_53,
79
+ 1, 73, :_reduce_54,
80
+ 1, 73, :_reduce_55,
81
+ 6, 77, :_reduce_56,
82
+ 2, 79, :_reduce_57,
83
+ 2, 79, :_reduce_58,
84
+ 5, 81, :_reduce_59,
85
+ 4, 61, :_reduce_none,
86
+ 5, 61, :_reduce_61,
87
+ 4, 61, :_reduce_62,
88
+ 1, 61, :_reduce_none,
89
+ 4, 61, :_reduce_none,
90
+ 0, 61, :_reduce_none,
100
91
  2, 84, :_reduce_none,
101
- 1, 84, :_reduce_none,
102
- 1, 84, :_reduce_none,
103
- 2, 85, :_reduce_none,
104
- 2, 85, :_reduce_none,
105
- 2, 85, :_reduce_none,
106
- 2, 85, :_reduce_none,
107
- 2, 85, :_reduce_none,
92
+ 1, 83, :_reduce_none,
93
+ 0, 83, :_reduce_none,
94
+ 3, 82, :_reduce_69,
95
+ 1, 82, :_reduce_none,
96
+ 2, 85, :_reduce_71,
97
+ 1, 85, :_reduce_72,
108
98
  2, 85, :_reduce_none,
109
99
  2, 85, :_reduce_none,
110
100
  2, 85, :_reduce_none,
111
- 5, 79, :_reduce_86,
112
- 6, 79, :_reduce_87,
101
+ 1, 85, :_reduce_none,
102
+ 1, 85, :_reduce_none,
113
103
  2, 86, :_reduce_none,
114
- 1, 73, :_reduce_none,
115
- 0, 73, :_reduce_none,
116
- 2, 74, :_reduce_91,
117
- 2, 74, :_reduce_92,
118
- 2, 74, :_reduce_93,
119
- 2, 74, :_reduce_94,
120
- 1, 74, :_reduce_none,
121
- 1, 74, :_reduce_none,
122
- 1, 74, :_reduce_none,
104
+ 2, 86, :_reduce_none,
105
+ 2, 86, :_reduce_none,
106
+ 2, 86, :_reduce_none,
107
+ 2, 86, :_reduce_none,
108
+ 2, 86, :_reduce_none,
109
+ 2, 86, :_reduce_none,
110
+ 2, 86, :_reduce_none,
111
+ 5, 80, :_reduce_86,
112
+ 6, 80, :_reduce_87,
113
+ 2, 87, :_reduce_none,
123
114
  1, 74, :_reduce_none,
124
- 1, 87, :_reduce_99,
125
- 4, 77, :_reduce_100,
126
- 4, 77, :_reduce_101,
127
- 0, 77, :_reduce_none,
128
- 1, 88, :_reduce_none,
129
- 1, 88, :_reduce_none,
130
- 1, 88, :_reduce_none,
115
+ 0, 74, :_reduce_none,
116
+ 2, 75, :_reduce_91,
117
+ 2, 75, :_reduce_92,
118
+ 2, 75, :_reduce_93,
119
+ 2, 75, :_reduce_94,
120
+ 1, 75, :_reduce_none,
121
+ 1, 75, :_reduce_none,
122
+ 1, 75, :_reduce_none,
123
+ 1, 75, :_reduce_none,
124
+ 1, 88, :_reduce_99,
125
+ 4, 78, :_reduce_100,
126
+ 4, 78, :_reduce_101,
127
+ 0, 78, :_reduce_none,
128
+ 1, 89, :_reduce_none,
129
+ 1, 89, :_reduce_none,
130
+ 1, 89, :_reduce_none,
131
131
  1, 52, :_reduce_none,
132
132
  1, 52, :_reduce_none,
133
+ 3, 55, :_reduce_none,
134
+ 3, 55, :_reduce_none,
135
+ 1, 55, :_reduce_none,
136
+ 1, 55, :_reduce_none,
133
137
  2, 44, :_reduce_none,
134
138
  2, 44, :_reduce_none,
135
139
  2, 44, :_reduce_none,
@@ -137,188 +141,194 @@ racc_reduce_table = [
137
141
  1, 44, :_reduce_none,
138
142
  1, 44, :_reduce_none,
139
143
  0, 44, :_reduce_none,
140
- 2, 51, :_reduce_none,
141
- 0, 51, :_reduce_none ]
144
+ 2, 45, :_reduce_none,
145
+ 0, 45, :_reduce_none ]
142
146
 
143
- racc_reduce_n = 117
147
+ racc_reduce_n = 121
144
148
 
145
- racc_shift_n = 220
149
+ racc_shift_n = 227
146
150
 
147
151
  racc_action_table = [
148
- -70, 156, 53, 183, 184, 34, 54, 107, 48, 75,
149
- 17, 162, 73, 52, 41, 132, 75, 47, 34, 73,
150
- 4, 92, 4, -70, 7, 2, 3, 2, 3, -70,
151
- 10, -70, 16, 163, 102, 22, 25, 30, 48, -70,
152
- 157, 185, 117, 121, 133, 16, 127, 110, 22, 113,
153
- 30, 91, 116, 118, 119, 122, 124, 126, 109, 111,
154
- 141, 48, 4, 41, 142, 117, 121, 2, 3, 127,
155
- 110, 114, 113, 215, 214, 116, 118, 119, 122, 124,
156
- 126, 109, 111, 34, 48, 62, 63, 65, 117, 121,
157
- 89, 34, 127, 110, 114, 113, 17, 34, 116, 118,
158
- 119, 122, 124, 126, 109, 111, 7, 41, 41, 129,
159
- 16, 34, 10, 22, 4, 30, 17, 114, 16, 2,
160
- 3, 22, 25, 30, 16, 34, 41, 22, 4, 30,
161
- 17, 28, 32, 2, 3, 34, 131, 41, 16, 34,
162
- 134, 22, 25, 30, 17, 28, 32, 135, 7, 78,
163
- 41, 41, 16, 34, 10, 22, 25, 30, 17, 28,
164
- 32, 41, 16, 41, 143, 22, 16, 30, 34, 22,
165
- 25, 30, 34, 28, 32, 41, 145, 17, 93, 93,
166
- 16, 34, 4, 22, 25, 30, 17, 2, 3, 34,
167
- 150, 41, 28, 32, 17, 16, 41, 84, 22, 16,
168
- 30, 41, 22, 25, 30, 41, 41, 83, 16, 41,
169
- 41, 22, 25, 30, 84, 84, 16, 41, 41, 22,
170
- 25, 30, 41, 41, 83, 83, -116, 84, 84, 41,
171
- 41, 84, 41, 41, 41, 41, 41, 83, 83, 41,
172
- 41, 83, 41, -116, -116, 116, 118, 119, 122, 124,
173
- 126, 109, 111, 4, 41, 41, -116, -116, 2, 3,
174
- -116, 4, 7, 41, 4, 9, 2, 3, 10, 2,
175
- 3, 172, 41, 41, 41, 52, 41, 41, 179, 41,
176
- 41, 186, 187, 93, 189, 41, 41, 41, 55, 41,
177
- 46, 41, 44, 43, 199, 200, 41, 93, 41, 204,
178
- 41, 206, 41, 208, 15, 41, 41, 98, 41, 41,
179
- 41, 41 ]
152
+ 161, -70, 50, 186, 187, 50, 120, 123, 135, 7,
153
+ 130, 112, 168, 115, 49, 10, 119, 121, 122, 124,
154
+ 126, 128, 111, 114, -70, 56, 189, 7, 75, 57,
155
+ -70, 73, -70, 10, 169, 116, 55, 136, 50, 162,
156
+ -70, 188, 120, 123, 142, 4, 130, 112, 143, 115,
157
+ 2, 3, 119, 121, 122, 124, 126, 128, 111, 114,
158
+ 34, 50, 106, 41, -120, 120, 123, -120, 34, 130,
159
+ 112, 116, 115, 19, 41, 119, 121, 122, 124, 126,
160
+ 128, 111, 114, 34, 41, 41, -120, 18, 19, -120,
161
+ 22, 34, 29, 41, 116, 18, 19, 84, 22, 25,
162
+ 29, 132, 7, 133, 34, 41, 134, 82, 10, 19,
163
+ 18, 99, 34, 22, 25, 29, 137, 19, 18, 34,
164
+ 34, 22, 25, 29, 27, 31, -120, 34, 65, 66,
165
+ 67, 18, 27, 31, 22, 25, 29, 221, 220, 18,
166
+ 34, 97, 22, 25, 29, 19, 18, 18, 34, 22,
167
+ 22, 29, 29, 19, 18, 34, 41, 22, 41, 29,
168
+ 27, 31, 96, 34, 144, 41, 146, 18, 19, 41,
169
+ 22, 25, 29, 90, 95, 18, 34, 90, 22, 25,
170
+ 29, 19, 18, 27, 31, 22, 41, 29, 154, 89,
171
+ 18, 84, 84, 22, 25, 29, 27, 31, 41, 41,
172
+ 41, 82, 82, 18, 84, 84, 22, 25, 29, 84,
173
+ 41, 41, 41, 41, 82, 82, 109, 41, 4, 82,
174
+ -120, -120, 41, 2, 3, 75, 107, 41, 73, 41,
175
+ 4, 41, 41, -120, -120, 2, 3, 41, -120, 119,
176
+ 121, 122, 124, 126, 128, 111, 114, 7, 41, 4,
177
+ 8, 4, 41, 10, 2, 3, 2, 3, 4, 41,
178
+ 4, 41, 4, 2, 3, 2, 3, 2, 3, 4,
179
+ 75, 107, 41, 73, 2, 3, 75, 107, 41, 73,
180
+ 41, 41, 41, 177, 41, 41, 55, 77, 182, 41,
181
+ 41, 41, 41, 191, 41, 41, 90, 41, 196, 41,
182
+ 41, 41, 41, 54, 41, 46, 41, 44, 206, 41,
183
+ 90, 41, 210, 211, 41, 213, 41, 215, 41, 41,
184
+ 15, 41, 41, 41, 41, 41 ]
180
185
 
181
186
  racc_action_check = [
182
- 120, 115, 20, 144, 144, 64, 20, 79, 16, 40,
183
- 64, 120, 40, 20, 19, 85, 79, 16, 38, 79,
184
- 29, 58, 33, 120, 42, 29, 29, 33, 33, 120,
185
- 42, 120, 64, 120, 66, 64, 64, 64, 170, 120,
186
- 115, 144, 170, 170, 85, 38, 170, 170, 38, 170,
187
- 38, 57, 170, 170, 170, 170, 170, 170, 170, 170,
188
- 95, 164, 24, 74, 95, 164, 164, 24, 24, 164,
189
- 164, 170, 164, 203, 203, 164, 164, 164, 164, 164,
190
- 164, 164, 164, 37, 81, 31, 31, 31, 81, 81,
191
- 53, 178, 81, 81, 164, 81, 178, 35, 81, 81,
192
- 81, 81, 81, 81, 81, 81, 45, 52, 48, 82,
193
- 37, 106, 45, 37, 11, 37, 106, 81, 178, 11,
194
- 11, 178, 178, 178, 35, 67, 83, 35, 8, 35,
195
- 67, 106, 106, 8, 8, 18, 84, 44, 106, 56,
196
- 86, 106, 106, 106, 56, 67, 67, 87, 78, 43,
197
- 92, 93, 67, 6, 78, 67, 67, 67, 6, 56,
198
- 56, 94, 18, 41, 96, 18, 56, 18, 39, 56,
199
- 56, 56, 60, 6, 6, 98, 103, 60, 105, 59,
200
- 6, 140, 4, 6, 6, 6, 140, 4, 4, 88,
201
- 107, 108, 60, 60, 88, 39, 109, 51, 39, 60,
202
- 39, 110, 60, 60, 60, 51, 111, 51, 140, 113,
203
- 32, 140, 140, 140, 138, 196, 88, 116, 117, 88,
204
- 88, 88, 138, 196, 138, 196, 51, 175, 173, 118,
205
- 119, 171, 62, 122, 124, 175, 173, 175, 173, 171,
206
- 126, 171, 127, 138, 196, 128, 128, 128, 128, 128,
207
- 128, 128, 128, 3, 30, 129, 175, 173, 3, 3,
208
- 171, 2, 1, 131, 0, 1, 2, 2, 1, 0,
209
- 0, 132, 133, 134, 135, 136, 28, 27, 141, 143,
210
- 26, 145, 148, 151, 156, 157, 162, 163, 22, 63,
211
- 15, 172, 10, 9, 176, 177, 7, 180, 181, 182,
212
- 187, 188, 189, 194, 5, 199, 200, 61, 206, 208,
213
- 214, 215 ]
187
+ 118, 125, 176, 145, 145, 18, 176, 176, 86, 43,
188
+ 176, 176, 125, 176, 18, 43, 176, 176, 176, 176,
189
+ 176, 176, 176, 176, 125, 23, 146, 45, 40, 23,
190
+ 125, 40, 125, 45, 125, 176, 23, 86, 170, 118,
191
+ 125, 145, 170, 170, 92, 33, 170, 170, 92, 170,
192
+ 33, 33, 170, 170, 170, 170, 170, 170, 170, 170,
193
+ 37, 81, 77, 107, 107, 81, 81, 107, 88, 81,
194
+ 81, 170, 81, 88, 66, 81, 81, 81, 81, 81,
195
+ 81, 81, 81, 141, 65, 110, 110, 37, 141, 110,
196
+ 37, 181, 37, 82, 81, 88, 181, 148, 88, 88,
197
+ 88, 83, 106, 84, 6, 148, 85, 148, 106, 6,
198
+ 141, 63, 64, 141, 141, 141, 87, 64, 181, 16,
199
+ 17, 181, 181, 181, 6, 6, 148, 20, 35, 35,
200
+ 35, 6, 64, 64, 6, 6, 6, 209, 209, 64,
201
+ 59, 62, 64, 64, 64, 59, 16, 17, 68, 16,
202
+ 17, 16, 17, 68, 20, 39, 90, 20, 91, 20,
203
+ 59, 59, 61, 151, 93, 95, 98, 59, 151, 99,
204
+ 59, 59, 59, 105, 60, 68, 69, 58, 68, 68,
205
+ 68, 69, 39, 151, 151, 39, 108, 39, 109, 56,
206
+ 151, 204, 53, 151, 151, 151, 69, 69, 111, 204,
207
+ 53, 204, 53, 69, 174, 178, 69, 69, 69, 175,
208
+ 112, 55, 174, 178, 174, 178, 79, 175, 36, 175,
209
+ 204, 53, 114, 36, 36, 79, 79, 115, 79, 50,
210
+ 0, 119, 120, 174, 178, 0, 0, 121, 175, 113,
211
+ 113, 113, 113, 113, 113, 113, 113, 1, 122, 2,
212
+ 1, 3, 124, 1, 2, 2, 3, 3, 28, 44,
213
+ 4, 126, 9, 28, 28, 4, 4, 9, 9, 11,
214
+ 152, 152, 128, 152, 11, 11, 155, 155, 130, 155,
215
+ 132, 133, 134, 135, 136, 137, 138, 42, 142, 144,
216
+ 41, 74, 32, 150, 31, 30, 153, 29, 161, 162,
217
+ 168, 169, 27, 22, 21, 15, 177, 10, 180, 8,
218
+ 183, 184, 185, 190, 191, 194, 196, 203, 7, 206,
219
+ 5, 211, 213, 215, 220, 221 ]
214
220
 
215
221
  racc_action_pointer = [
216
- 255, 237, 252, 244, 173, 304, 147, 287, 119, 283,
217
- 281, 105, nil, nil, nil, 290, 6, nil, 129, 5,
218
- 1, nil, 277, nil, 53, nil, 271, 268, 267, 11,
219
- 245, 78, 201, 13, nil, 91, nil, 77, 12, 162,
220
- -1, 154, -1, 119, 128, 81, nil, nil, 99, nil,
221
- nil, 196, 98, 85, nil, nil, 133, 46, 16, 168,
222
- 166, 296, 223, 280, -1, nil, 23, 119, nil, nil,
223
- nil, nil, nil, nil, 54, nil, nil, nil, 123, 6,
224
- nil, 82, 76, 117, 106, 14, 108, 117, 183, nil,
225
- nil, nil, 141, 142, 152, 59, 152, nil, 166, nil,
226
- nil, nil, nil, 143, nil, 167, 105, 181, 182, 187,
227
- 192, 197, nil, 200, nil, 0, 208, 209, 220, 221,
228
- -1, nil, 224, nil, 225, nil, 231, 233, 229, 246,
229
- nil, 254, 241, 263, 264, 265, 263, nil, 213, nil,
230
- 175, 273, nil, 270, 0, 270, nil, nil, 252, nil,
231
- nil, 272, nil, nil, nil, nil, 244, 276, nil, nil,
232
- nil, nil, 277, 278, 59, nil, nil, nil, nil, nil,
233
- 36, 230, 282, 227, nil, 226, 262, 263, 85, nil,
234
- 286, 289, 260, nil, nil, nil, nil, 291, 271, 293,
235
- nil, nil, nil, nil, 279, nil, 214, nil, nil, 296,
236
- 297, nil, nil, 63, nil, nil, 299, nil, 300, nil,
237
- nil, nil, nil, nil, 301, 302, nil, nil, nil, nil ]
222
+ 221, 222, 240, 242, 251, 320, 98, 309, 300, 253,
223
+ 296, 260, nil, nil, nil, 305, 113, 114, 3, nil,
224
+ 121, 295, 292, 24, nil, nil, nil, 293, 249, 288,
225
+ 286, 285, 283, 36, nil, 121, 209, 54, nil, 149,
226
+ 18, 281, 277, -16, 250, 2, nil, nil, nil, nil,
227
+ 220, nil, nil, 191, nil, 202, 184, nil, 166, 134,
228
+ 163, 157, 130, 106, 106, 75, 65, nil, 142, 170,
229
+ nil, nil, nil, nil, 282, nil, nil, 32, nil, 215,
230
+ nil, 59, 84, 71, 73, 73, 7, 84, 62, nil,
231
+ 147, 149, 43, 152, nil, 156, nil, nil, 133, 160,
232
+ nil, nil, nil, nil, nil, 162, 77, 54, 177, 179,
233
+ 76, 189, 201, 223, 213, 218, nil, nil, -1, 222,
234
+ 223, 228, 239, nil, 243, 0, 252, nil, 263, nil,
235
+ 269, nil, 271, 272, 273, 253, 275, 276, 274, nil,
236
+ nil, 77, 283, nil, 280, 0, 15, nil, 96, nil,
237
+ 263, 157, 260, 285, nil, 266, nil, nil, nil, nil,
238
+ nil, 258, 290, nil, nil, nil, nil, nil, 291, 292,
239
+ 36, nil, nil, nil, 203, 208, 0, 297, 204, nil,
240
+ 276, 85, nil, 299, 302, 273, nil, nil, nil, nil,
241
+ 281, 305, nil, nil, 285, nil, 307, nil, nil, nil,
242
+ nil, nil, nil, 293, 190, nil, 310, nil, nil, 127,
243
+ nil, 312, nil, 313, nil, 314, nil, nil, nil, nil,
244
+ 315, 316, nil, nil, nil, nil, nil ]
238
245
 
239
246
  racc_action_default = [
240
- -114, -15, -112, -113, -111, -117, -9, -116, -114, -117,
241
- -117, -114, -109, -110, -108, -117, -117, -54, -98, -116,
242
- -48, -2, -117, -43, -114, -55, -116, -116, -116, -114,
243
- -116, -52, -116, -114, -99, -90, -50, -96, -97, -95,
244
- -117, -116, -15, -117, -116, -15, 220, -58, -116, -57,
245
- -94, -65, -116, -117, -46, -53, -6, -117, -117, -117,
246
- -7, -117, -116, -116, -117, -35, -27, -8, -49, -89,
247
- -92, -93, -91, -107, -116, -106, -115, -13, -15, -117,
248
- -14, -117, -117, -116, -117, -63, -117, -117, -117, -45,
249
- -3, -44, -116, -116, -116, -117, -23, -4, -116, -33,
250
- -34, -51, -26, -29, -5, -21, -9, -117, -116, -116,
251
- -116, -116, -77, -116, -36, -117, -116, -116, -116, -116,
252
- -32, -37, -116, -72, -116, -76, -116, -116, -117, -116,
253
- -38, -116, -117, -116, -116, -116, -48, -47, -65, -19,
254
- -42, -117, -17, -116, -102, -117, -25, -20, -117, -1,
255
- -12, -21, -84, -74, -85, -75, -117, -116, -78, -88,
256
- -79, -80, -116, -116, -117, -81, -82, -83, -73, -71,
257
- -117, -65, -116, -65, -39, -65, -117, -117, -41, -18,
258
- -117, -116, -117, -104, -105, -103, -28, -116, -117, -116,
259
- -86, -31, -30, -69, -68, -62, -65, -60, -64, -116,
260
- -116, -40, -22, -117, -56, -10, -116, -87, -116, -59,
261
- -67, -61, -24, -16, -116, -116, -11, -66, -100, -101 ]
247
+ -118, -15, -116, -117, -115, -121, -9, -120, -120, -118,
248
+ -121, -118, -113, -114, -112, -121, -97, -95, -121, -54,
249
+ -98, -120, -121, -48, -2, -55, -43, -120, -118, -120,
250
+ -120, -120, -120, -118, -99, -52, -118, -90, -50, -96,
251
+ -121, -120, -121, -15, -120, -15, 227, -93, -91, -58,
252
+ -120, -57, -94, -65, -53, -120, -121, -46, -121, -6,
253
+ -121, -121, -27, -121, -7, -120, -120, -35, -121, -8,
254
+ -49, -89, -92, -107, -120, -106, -119, -121, -13, -121,
255
+ -14, -121, -120, -121, -121, -121, -63, -121, -121, -45,
256
+ -120, -120, -121, -23, -3, -120, -44, -26, -29, -120,
257
+ -4, -33, -34, -51, -5, -21, -15, -110, -120, -121,
258
+ -111, -120, -120, -121, -120, -120, -36, -77, -121, -120,
259
+ -120, -120, -120, -37, -120, -32, -120, -72, -120, -76,
260
+ -120, -38, -120, -120, -120, -121, -120, -120, -48, -47,
261
+ -19, -42, -121, -17, -120, -102, -121, -25, -65, -20,
262
+ -121, -9, -121, -21, -12, -121, -84, -74, -71, -85,
263
+ -75, -121, -120, -78, -88, -79, -80, -81, -120, -120,
264
+ -121, -82, -83, -73, -65, -65, -121, -120, -65, -39,
265
+ -121, -41, -18, -121, -120, -121, -104, -105, -103, -28,
266
+ -121, -120, -1, -109, -121, -108, -120, -86, -31, -30,
267
+ -69, -64, -62, -68, -65, -60, -120, -40, -22, -121,
268
+ -56, -120, -10, -120, -87, -120, -59, -67, -61, -16,
269
+ -120, -120, -24, -11, -66, -100, -101 ]
262
270
 
263
271
  racc_goto_table = [
264
- 40, 86, 6, 148, 178, 74, 115, 21, 95, 177,
265
- 50, 164, 51, 146, 103, 64, 136, 101, 137, 57,
266
- 58, 59, 68, 61, 94, 66, 182, 69, 49, 70,
267
- 71, 72, 5, 209, 76, 210, 169, 79, 181, nil,
268
- nil, 81, 178, 77, 108, 88, 80, 201, nil, 188,
269
- nil, nil, nil, nil, nil, 99, 100, 90, nil, nil,
270
- nil, 97, nil, nil, nil, nil, nil, 105, 104, nil,
271
- nil, nil, nil, nil, nil, nil, 130, nil, nil, 106,
272
- nil, nil, nil, nil, nil, 138, 139, 140, 176, 193,
273
- nil, 144, nil, nil, nil, 194, nil, nil, nil, nil,
274
- nil, 151, 152, 153, 154, nil, 155, 149, nil, 158,
275
- 159, 160, 161, nil, nil, 165, nil, 166, nil, 167,
276
- 168, 195, 170, 197, 171, 198, 173, 174, 175, 202,
277
- 1, nil, 12, 13, 14, nil, 180, nil, 42, nil,
278
- nil, 45, nil, nil, nil, nil, 211, nil, nil, nil,
279
- 190, nil, nil, nil, 56, 191, 192, nil, nil, 60,
280
- nil, nil, nil, 67, nil, 196, nil, nil, nil, nil,
281
- nil, nil, nil, nil, 203, nil, nil, nil, nil, nil,
282
- 205, nil, 207, nil, nil, nil, nil, nil, nil, nil,
283
- nil, nil, 212, 213, nil, nil, nil, nil, nil, 216,
284
- nil, 217, nil, nil, nil, nil, nil, 218, 219 ]
272
+ 40, 42, 24, 92, 118, 6, 108, 147, 150, 98,
273
+ 180, 181, 47, 48, 53, 91, 52, 170, 68, 138,
274
+ 58, 87, 60, 61, 62, 63, 103, 139, 70, 74,
275
+ 185, 51, 5, 71, 76, 72, 216, 79, 217, 158,
276
+ 184, nil, nil, 81, nil, nil, nil, 78, 88, 80,
277
+ 207, 181, nil, nil, nil, 94, 194, nil, 101, 102,
278
+ 100, nil, nil, nil, nil, 104, nil, 105, nil, nil,
279
+ nil, nil, nil, nil, nil, 131, nil, nil, nil, 193,
280
+ nil, nil, 195, 140, 141, nil, nil, nil, 145, nil,
281
+ nil, nil, 148, 200, nil, nil, nil, nil, nil, 203,
282
+ 152, 153, nil, 155, 156, 157, nil, 159, 160, nil,
283
+ 151, nil, 163, 164, 165, 166, 190, 167, nil, 171,
284
+ nil, 172, nil, 173, nil, 174, 175, 176, 208, 178,
285
+ 179, nil, nil, nil, nil, nil, nil, 183, nil, nil,
286
+ nil, nil, 201, 202, nil, nil, 205, 192, nil, nil,
287
+ nil, nil, nil, nil, 1, 197, 12, 13, 14, nil,
288
+ nil, 198, 199, 43, nil, 45, nil, nil, nil, nil,
289
+ 204, nil, 218, nil, nil, nil, nil, 209, nil, nil,
290
+ nil, nil, 59, nil, 212, nil, nil, 64, nil, 214,
291
+ 69, nil, nil, nil, nil, nil, nil, nil, nil, 219,
292
+ nil, nil, nil, nil, 222, nil, 223, nil, 224, nil,
293
+ nil, nil, nil, 225, 226 ]
285
294
 
286
295
  racc_goto_check = [
287
- 9, 18, 3, 11, 5, 10, 39, 4, 15, 14,
288
- 32, 21, 9, 20, 19, 22, 26, 27, 28, 9,
289
- 9, 9, 31, 9, 13, 9, 35, 32, 37, 32,
290
- 32, 32, 1, 40, 9, 41, 43, 9, 46, nil,
291
- nil, 9, 5, 3, 10, 9, 3, 14, nil, 11,
292
- nil, nil, nil, nil, nil, 9, 9, 4, nil, nil,
293
- nil, 4, nil, nil, nil, nil, nil, 9, 4, nil,
294
- nil, nil, nil, nil, nil, nil, 9, nil, nil, 3,
295
- nil, nil, nil, nil, nil, 9, 9, 9, 18, 39,
296
- nil, 9, nil, nil, nil, 39, nil, nil, nil, nil,
297
- nil, 9, 9, 9, 9, nil, 9, 4, nil, 9,
298
- 9, 9, 9, nil, nil, 9, nil, 9, nil, 9,
299
- 9, 18, 9, 18, 9, 18, 9, 9, 9, 15,
300
- 2, nil, 2, 2, 2, nil, 9, nil, 2, nil,
301
- nil, 2, nil, nil, nil, nil, 18, nil, nil, nil,
302
- 9, nil, nil, nil, 2, 9, 9, nil, nil, 2,
303
- nil, nil, nil, 2, nil, 9, nil, nil, nil, nil,
304
- nil, nil, nil, nil, 9, nil, nil, nil, nil, nil,
305
- 9, nil, 9, nil, nil, nil, nil, nil, nil, nil,
306
- nil, nil, 9, 9, nil, nil, nil, nil, nil, 9,
307
- nil, 9, nil, nil, nil, nil, nil, 9, 9 ]
296
+ 3, 3, 5, 16, 40, 4, 13, 21, 11, 20,
297
+ 15, 6, 33, 33, 3, 14, 33, 22, 23, 27,
298
+ 3, 19, 3, 3, 3, 3, 28, 29, 32, 10,
299
+ 36, 38, 1, 33, 3, 33, 41, 3, 42, 44,
300
+ 47, nil, nil, 3, nil, nil, nil, 4, 3, 4,
301
+ 15, 6, nil, nil, nil, 5, 11, nil, 3, 3,
302
+ 5, nil, nil, nil, nil, 5, nil, 3, nil, nil,
303
+ nil, nil, nil, nil, nil, 3, nil, nil, nil, 13,
304
+ nil, nil, 13, 3, 3, nil, nil, nil, 3, nil,
305
+ nil, nil, 3, 40, nil, nil, nil, nil, nil, 40,
306
+ 3, 3, nil, 3, 3, 3, nil, 3, 3, nil,
307
+ 4, nil, 3, 3, 3, 3, 19, 3, nil, 3,
308
+ nil, 3, nil, 3, nil, 3, 3, 3, 16, 3,
309
+ 3, nil, nil, nil, nil, nil, nil, 3, nil, nil,
310
+ nil, nil, 19, 19, nil, nil, 19, 5, nil, nil,
311
+ nil, nil, nil, nil, 2, 3, 2, 2, 2, nil,
312
+ nil, 3, 3, 2, nil, 2, nil, nil, nil, nil,
313
+ 3, nil, 19, nil, nil, nil, nil, 3, nil, nil,
314
+ nil, nil, 2, nil, 3, nil, nil, 2, nil, 3,
315
+ 2, nil, nil, nil, nil, nil, nil, nil, nil, 3,
316
+ nil, nil, nil, nil, 3, nil, 3, nil, 3, nil,
317
+ nil, nil, nil, 3, 3 ]
308
318
 
309
319
  racc_goto_pointer = [
310
- nil, 32, 130, 1, 1, -136, nil, nil, nil, -7,
311
- -35, -102, nil, -35, -131, -51, nil, nil, -50, -52,
312
- -90, -109, -16, nil, nil, nil, -72, -47, -70, nil,
313
- nil, -13, -8, nil, nil, -118, nil, 12, nil, -75,
314
- -161, -159, nil, -92, nil, nil, -106 ]
320
+ nil, 32, 154, -7, 4, -4, -130, nil, nil, nil,
321
+ -11, -97, nil, -73, -43, -131, -55, nil, nil, -32,
322
+ -53, -91, -108, -17, nil, nil, nil, -69, -42, -61,
323
+ nil, nil, -9, -4, nil, nil, -115, nil, 13, nil,
324
+ -77, -167, -165, nil, -74, nil, nil, -105 ]
315
325
 
316
326
  racc_goto_default = [
317
- nil, nil, nil, nil, nil, 24, 29, 33, 8, 87,
318
- nil, nil, 11, nil, nil, 147, 96, 27, nil, nil,
319
- nil, nil, nil, 128, 82, 19, 20, 23, 26, 31,
320
- 35, nil, 36, 37, 38, nil, 18, 112, 85, nil,
321
- nil, nil, 120, 123, 125, 39, nil ]
327
+ nil, nil, nil, 83, nil, nil, 28, 33, 36, 9,
328
+ 110, nil, 11, nil, nil, nil, 149, 93, 32, nil,
329
+ nil, nil, nil, nil, 113, 85, 21, 23, 26, 30,
330
+ 35, 37, nil, 38, 39, 16, nil, 20, 117, 86,
331
+ nil, nil, nil, 125, 127, 129, 17, nil ]
322
332
 
323
333
  racc_token_table = {
324
334
  false => 0,
@@ -430,16 +440,17 @@ Racc_token_to_s_table = [
430
440
  '$start',
431
441
  'stylesheet',
432
442
  's_cdo_cdc_0toN',
443
+ 's_0toN',
433
444
  'import_0toN',
434
445
  'ruleset_media_page_0toN',
435
446
  'ruleset',
436
447
  'media',
437
448
  'page',
438
449
  'import',
439
- 's_0toN',
440
450
  'string_or_uri',
441
451
  'medium_0toN',
442
452
  'ignorable_at',
453
+ 'string_uri_or_ident_1toN',
443
454
  'medium_rollup',
444
455
  'ruleset_0toN',
445
456
  'medium_1toN',
@@ -964,6 +975,14 @@ module_eval <<'.,.,', 'lib/parser.y', 268
964
975
 
965
976
  # reduce 116 omitted
966
977
 
978
+ # reduce 117 omitted
979
+
980
+ # reduce 118 omitted
981
+
982
+ # reduce 119 omitted
983
+
984
+ # reduce 120 omitted
985
+
967
986
  def _reduce_none( val, _values, result )
968
987
  result
969
988
  end
data/lib/css/sac/parser.rb CHANGED
@@ -14,7 +14,7 @@ module CSS
14
14
  module SAC
15
15
  class Parser < CSS::SAC::GeneratedParser
16
16
  # The version of CSSPool you're using
17
- VERSION = '0.2.3'
17
+ VERSION = '0.2.4'
18
18
 
19
19
  TOKENIZER = Tokenizer.new
20
20
 
@@ -82,7 +82,11 @@ module CSS
82
82
  token = next_token
83
83
  eliminate_pair_matches(token[1])
84
84
  logger.warn("Eliminated token: #{token.join(' ')}") if logger
85
- break if token[1] == pairs[error_value]
85
+ if token[1] == pairs[error_value]
86
+ @position -= 1
87
+ @tokens[@position] = Token.new(:S, ' ', nil) # super hack
88
+ break
89
+ end
86
90
  }
87
91
  end
88
92
  end
data/lib/css/sac/selectors/child_selector.rb CHANGED
@@ -24,7 +24,7 @@ module CSS
24
24
  end
25
25
 
26
26
  def specificity
27
- parent.specificity + selector.specificity
27
+ parent.specificity.zip(selector.specificity).map { |x,y| x + y }
28
28
  end
29
29
 
30
30
  def ==(other)
data/lib/css/sac/selectors/conditional_selector.rb CHANGED
@@ -30,8 +30,10 @@ module CSS
30
30
  end
31
31
 
32
32
  def specificity
33
- (selector ? selector.specificity : 0) +
34
- (condition ? condition.specificity : 0)
33
+ (selector ? selector.specificity : ([0] * 4)).zip(
34
+ (condition ? condition.specificity : ([0] * 4))).map { |x,y|
35
+ x + y
36
+ }
35
37
  end
36
38
 
37
39
  def ==(other)
data/lib/css/sac/selectors/descendant_selector.rb CHANGED
@@ -24,7 +24,7 @@ module CSS
24
24
  end
25
25
 
26
26
  def specificity
27
- ancestor.specificity + selector.specificity
27
+ ancestor.specificity.zip(selector.specificity).map { |x,y| x + y }
28
28
  end
29
29
 
30
30
  def ==(other)
data/lib/css/sac/selectors/element_selector.rb CHANGED
@@ -23,7 +23,7 @@ module CSS
23
23
  end
24
24
 
25
25
  def specificity
26
- 1
26
+ [0, 0, 0, 1]
27
27
  end
28
28
 
29
29
  def ==(other)
data/lib/css/sac/selectors/sibling_selector.rb CHANGED
@@ -23,7 +23,7 @@ module CSS
23
23
  end
24
24
 
25
25
  def specificity
26
- selector.specificity + sibling.specificity
26
+ selector.specificity.zip(sibling.specificity).map { |x,y| x + y }
27
27
  end
28
28
 
29
29
  def ==(other)
data/lib/css/sac/selectors/simple_selector.rb CHANGED
@@ -17,7 +17,7 @@ module CSS
17
17
  end
18
18
 
19
19
  def specificity
20
- 0
20
+ [0, 0, 0, 0]
21
21
  end
22
22
  end
23
23
  end
data/lib/css/stylesheet/rule.rb CHANGED
@@ -2,10 +2,18 @@ require 'set'
2
2
  module CSS
3
3
  class StyleSheet
4
4
  class Rule
5
- attr_accessor :selector, :properties
6
- def initialize(selector, properties = [])
5
+ include Comparable
6
+
7
+ attr_accessor :selector, :properties, :index
8
+ def initialize(selector, index, properties = [])
7
9
  @selector = selector
8
10
  @properties = Set.new(properties)
11
+ @index = index
12
+ end
13
+
14
+ def <=>(other)
15
+ comp = selector.specificity <=> other.selector.specificity
16
+ comp == 0 ? index <=> other.index : comp
9
17
  end
10
18
  end
11
19
  end
data/lib/css/stylesheet/stylesheet.rb CHANGED
@@ -6,17 +6,19 @@ module CSS
6
6
  @sac = sac
7
7
  @rules = []
8
8
  @current_rules = []
9
+ @selector_index = 0
9
10
  end
10
11
 
11
12
  def start_selector(selectors)
12
13
  selectors.each { |selector|
13
- @current_rules << Rule.new(selector)
14
+ @current_rules << Rule.new(selector, @selector_index)
14
15
  }
15
16
  end
16
17
 
17
18
  def end_selector(selectors)
18
19
  @rules += @current_rules
19
20
  @current_rules = []
21
+ @selector_index += 1
20
22
  reduce!
21
23
  end
22
24
 
@@ -47,7 +49,7 @@ module CSS
47
49
  alias :=~ :rules_matching
48
50
 
49
51
  def create_rule(rule)
50
- Rule.new(@sac.parse_rule(rule).first)
52
+ Rule.new(@sac.parse_rule(rule).first, @selector_index += 1)
51
53
  end
52
54
 
53
55
  def property(name, value, important)
data/lib/parser.y CHANGED
@@ -6,7 +6,7 @@ token IMPORTANT_SYM IMPORT_SYM MEDIA_SYM PAGE_SYM CHARSET_SYM DIMENSION
6
6
 
7
7
  rule
8
8
  stylesheet
9
- : s_cdo_cdc_0toN CHARSET_SYM STRING ';' import_0toN ruleset_media_page_0toN
9
+ : s_cdo_cdc_0toN CHARSET_SYM s_0toN STRING ';' import_0toN ruleset_media_page_0toN
10
10
  | s_cdo_cdc_0toN import_0toN ruleset_media_page_0toN
11
11
  ;
12
12
  ruleset_media_page_0toN
@@ -24,7 +24,7 @@ rule
24
24
  }
25
25
  ;
26
26
  ignorable_at
27
- : '@' IDENT s_0toN string_or_uri s_0toN medium_0toN ';' s_0toN {
27
+ : '@' IDENT s_0toN string_uri_or_ident_1toN s_0toN medium_0toN ';' s_0toN {
28
28
  self.document_handler.ignorable_at_rule(val[1])
29
29
  }
30
30
  | '@' IDENT s_0toN error S {
@@ -278,6 +278,12 @@ rule
278
278
  : STRING
279
279
  | URI
280
280
  ;
281
+ string_uri_or_ident_1toN
282
+ : string_or_uri s_0toN string_uri_or_ident_1toN
283
+ | IDENT s_0toN string_uri_or_ident_1toN
284
+ | IDENT
285
+ | string_or_uri
286
+ ;
281
287
  s_cdo_cdc_0toN
282
288
  : S s_cdo_cdc_0toN
283
289
  | CDO s_cdo_cdc_0toN
data/test/test_specificity.rb CHANGED
@@ -22,55 +22,55 @@ class SpecificityTest < Test::Unit::TestCase
22
22
  @sac.parse('* {}')
23
23
  selector = @sac.document_handler.selectors.first
24
24
  assert_not_nil selector
25
- assert_equal 0, selector.specificity
25
+ assert_equal [0, 0, 0, 0], selector.specificity
26
26
  end
27
27
 
28
28
  def test_li
29
29
  @sac.parse('li {}')
30
30
  selector = @sac.document_handler.selectors.first
31
31
  assert_not_nil selector
32
- assert_equal 1, selector.specificity
32
+ assert_equal [0, 0, 0, 1], selector.specificity
33
33
  end
34
34
 
35
35
  def test_ul_li
36
36
  @sac.parse('ul li {}')
37
37
  selector = @sac.document_handler.selectors.first
38
38
  assert_not_nil selector
39
- assert_equal 2, selector.specificity
39
+ assert_equal [0, 0, 0, 2], selector.specificity
40
40
  end
41
41
 
42
42
  def test_ul_ol_plus_li
43
43
  @sac.parse('ul ol+li {}')
44
44
  selector = @sac.document_handler.selectors.first
45
45
  assert_not_nil selector
46
- assert_equal 3, selector.specificity
46
+ assert_equal [0, 0, 0, 3], selector.specificity
47
47
  end
48
48
 
49
49
  def test_h1_attributes
50
50
  @sac.parse('h1 + *[REL=up] {}')
51
51
  selector = @sac.document_handler.selectors.first
52
52
  assert_not_nil selector
53
- assert_equal 11, selector.specificity
53
+ assert_equal [0, 0, 1, 1], selector.specificity
54
54
  end
55
55
 
56
56
  def test_one_class_selector
57
57
  @sac.parse('ul ol li.red {}')
58
58
  selector = @sac.document_handler.selectors.first
59
59
  assert_not_nil selector
60
- assert_equal 13, selector.specificity
60
+ assert_equal [0, 0, 1, 3], selector.specificity
61
61
  end
62
62
 
63
63
  def test_two_class_selectors
64
64
  @sac.parse('li.red.level {}')
65
65
  selector = @sac.document_handler.selectors.first
66
66
  assert_not_nil selector
67
- assert_equal 21, selector.specificity
67
+ assert_equal [0, 0, 2, 1], selector.specificity
68
68
  end
69
69
 
70
70
  def test_id_selector
71
71
  @sac.parse('#x34y {}')
72
72
  selector = @sac.document_handler.selectors.first
73
73
  assert_not_nil selector
74
- assert_equal 100, selector.specificity
74
+ assert_equal [0, 1, 0, 0], selector.specificity
75
75
  end
76
76
  end
metadata CHANGED
@@ -1,36 +1,33 @@
1
1
  --- !ruby/object:Gem::Specification
2
+ rubygems_version: 0.9.4
3
+ specification_version: 1
2
4
  name: csspool
3
5
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
5
- platform: ""
6
- authors:
7
- - Aaron Patterson
6
+ version: 0.2.4
7
+ date: 2007-12-06 00:00:00 -08:00
8
+ summary: Parses CSS
9
+ require_paths:
10
+ - lib
11
+ email: aaronp@rubyforge.org
12
+ homepage: http://csspool.rubyforge.org/
13
+ rubyforge_project: csspool
14
+ description: CSSpool (pronounced "cesspool") is a validating SAC parser for CSS. The parser calls methods on a document handler depending on what it has found. CSSPool currently only supports CSS 2.1. CSSPool will not yield invalid properties or selectors.
8
15
  autorequire:
9
- bindir: bin
10
- cert_chain: []
11
-
12
- date: 2007-12-05 00:00:00 -08:00
13
16
  default_executable:
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
16
- name: hoe
17
- version_requirement:
18
- version_requirements: !ruby/object:Gem::Requirement
19
- requirements:
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 1.3.0
23
- version:
24
- description: CSSpool (pronounced "cesspool") is a validating SAC parser for CSS. The parser calls methods on a document handler depending on what it has found. CSSPool currently only supports CSS 2.1. CSSPool will not yield invalid properties or selectors.
25
- email: aaronp@rubyforge.org
26
- executables: []
27
-
28
- extensions: []
29
-
30
- extra_rdoc_files:
31
- - CHANGELOG.txt
32
- - Manifest.txt
33
- - README.txt
17
+ bindir: bin
18
+ has_rdoc: true
19
+ required_ruby_version: !ruby/object:Gem::Version::Requirement
20
+ requirements:
21
+ - - ">"
22
+ - !ruby/object:Gem::Version
23
+ version: 0.0.0
24
+ version:
25
+ platform: ruby
26
+ signing_key:
27
+ cert_chain:
28
+ post_install_message:
29
+ authors:
30
+ - Aaron Patterson
34
31
  files:
35
32
  - CHANGELOG.txt
36
33
  - Manifest.txt
@@ -110,32 +107,28 @@ files:
110
107
  - test/test_token.rb
111
108
  - test/test_tokenizer.rb
112
109
  - test/test_xpath.rb
113
- has_rdoc: true
114
- homepage: http://csspool.rubyforge.org/
115
- post_install_message:
110
+ test_files:
111
+ - test/test_all.rb
116
112
  rdoc_options:
117
113
  - --main
118
114
  - README.txt
119
- require_paths:
120
- - lib
121
- required_ruby_version: !ruby/object:Gem::Requirement
122
- requirements:
123
- - - ">="
124
- - !ruby/object:Gem::Version
125
- version: "0"
126
- version:
127
- required_rubygems_version: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - ">="
130
- - !ruby/object:Gem::Version
131
- version: "0"
132
- version:
115
+ extra_rdoc_files:
116
+ - CHANGELOG.txt
117
+ - Manifest.txt
118
+ - README.txt
119
+ executables: []
120
+
121
+ extensions: []
122
+
133
123
  requirements: []
134
124
 
135
- rubyforge_project: csspool
136
- rubygems_version: 0.9.5
137
- signing_key:
138
- specification_version: 2
139
- summary: Parses CSS
140
- test_files:
141
- - test/test_all.rb
125
+ dependencies:
126
+ - !ruby/object:Gem::Dependency
127
+ name: hoe
128
+ version_requirement:
129
+ version_requirements: !ruby/object:Gem::Version::Requirement
130
+ requirements:
131
+ - - ">="
132
+ - !ruby/object:Gem::Version
133
+ version: 1.3.0
134
+ version: