sass 3.2.0.alpha.293 → 3.2.0.alpha.294

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.
data/REVISION CHANGED
@@ -1 +1 @@
1
- 7da08d3193ce8d6faa0e9dbb081ec33172d08b12
1
+ 51c4cbbd637d60c316c8a39e187e6a4a5add1d14
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.2.0.alpha.293
1
+ 3.2.0.alpha.294
@@ -1 +1 @@
1
- 11 August 2012 00:40:09 GMT
1
+ 11 August 2012 00:50:21 GMT
@@ -274,7 +274,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
274
274
  end
275
275
 
276
276
  def visit_content(node)
277
- return unless content = @environment.content
277
+ return [] unless content = @environment.content
278
278
  @stack.push(:filename => node.filename, :line => node.line, :name => '@content')
279
279
  trace_node = Sass::Tree::TraceNode.from_node('@content', node)
280
280
  with_environment(@environment.caller) {trace_node.children = content.map {|c| visit(c.dup)}.flatten}
@@ -152,7 +152,6 @@ MSG
152
152
  "=foo\n @content\n b: c" => "Illegal nesting: Nothing may be nested beneath @content directives.",
153
153
  "@content" => '@content may only be used within a mixin.',
154
154
  "=simple\n .simple\n color: red\n+simple\n color: blue" => ['Mixin "simple" does not accept a content block.', 4],
155
- "=foo\n @content\n+foo" => ["No @content passed.", 2],
156
155
  "@import \"foo\" // bar" => "Invalid CSS after \"\"foo\" \": expected media query list, was \"// bar\"",
157
156
 
158
157
  # Regression tests
@@ -3027,22 +3026,26 @@ SASS
3027
3026
  end
3028
3027
 
3029
3028
  def test_content_not_seen_through_mixin
3030
- render(<<SASS)
3029
+ assert_equal <<CSS, render(<<SASS)
3030
+ a foo {
3031
+ mixin: foo;
3032
+ a: b; }
3033
+ a foo bar {
3034
+ mixin: bar; }
3035
+ CSS
3031
3036
  =foo
3032
3037
  foo
3038
+ mixin: foo
3033
3039
  @content
3034
3040
  +bar
3035
3041
  =bar
3036
3042
  bar
3043
+ mixin: bar
3037
3044
  @content
3038
3045
  a
3039
3046
  +foo
3040
3047
  a: b
3041
3048
  SASS
3042
- assert(false, "Expected exception")
3043
- rescue Sass::SyntaxError => e
3044
- assert_equal("No @content passed.", e.message)
3045
- assert_equal(7, e.sass_line)
3046
3049
  end
3047
3050
 
3048
3051
  def test_content_backtrace_for_perform
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- hash: 592302423
4
+ hash: 592302417
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 3
8
8
  - 2
9
9
  - 0
10
10
  - alpha
11
- - 293
12
- version: 3.2.0.alpha.293
11
+ - 294
12
+ version: 3.2.0.alpha.294
13
13
  platform: ruby
14
14
  authors:
15
15
  - Nathan Weizenbaum
@@ -98,21 +98,21 @@ files:
98
98
  - lib/sass/repl.rb
99
99
  - lib/sass/root.rb
100
100
  - lib/sass/script.rb
101
- - lib/sass/script/bool.rb
102
101
  - lib/sass/script/color.rb
102
+ - lib/sass/script/bool.rb
103
+ - lib/sass/script/lexer.rb
103
104
  - lib/sass/script/css_lexer.rb
104
105
  - lib/sass/script/css_parser.rb
105
106
  - lib/sass/script/funcall.rb
106
107
  - lib/sass/script/functions.rb
107
108
  - lib/sass/script/interpolation.rb
108
- - lib/sass/script/lexer.rb
109
109
  - lib/sass/script/list.rb
110
110
  - lib/sass/script/literal.rb
111
+ - lib/sass/script/null.rb
111
112
  - lib/sass/script/node.rb
112
113
  - lib/sass/script/number.rb
113
114
  - lib/sass/script/operation.rb
114
115
  - lib/sass/script/parser.rb
115
- - lib/sass/script/null.rb
116
116
  - lib/sass/script/string.rb
117
117
  - lib/sass/script/string_interpolation.rb
118
118
  - lib/sass/script/unary_operation.rb
@@ -138,21 +138,22 @@ files:
138
138
  - lib/sass/tree/directive_node.rb
139
139
  - lib/sass/tree/extend_node.rb
140
140
  - lib/sass/tree/debug_node.rb
141
- - lib/sass/tree/media_node.rb
141
+ - lib/sass/tree/function_node.rb
142
142
  - lib/sass/tree/each_node.rb
143
- - lib/sass/tree/node.rb
143
+ - lib/sass/tree/media_node.rb
144
144
  - lib/sass/tree/for_node.rb
145
- - lib/sass/tree/function_node.rb
145
+ - lib/sass/tree/mixin_node.rb
146
146
  - lib/sass/tree/if_node.rb
147
147
  - lib/sass/tree/import_node.rb
148
148
  - lib/sass/tree/mixin_def_node.rb
149
+ - lib/sass/tree/node.rb
149
150
  - lib/sass/tree/prop_node.rb
150
- - lib/sass/tree/mixin_node.rb
151
151
  - lib/sass/tree/rule_node.rb
152
+ - lib/sass/tree/content_node.rb
152
153
  - lib/sass/tree/return_node.rb
153
154
  - lib/sass/tree/root_node.rb
154
- - lib/sass/tree/content_node.rb
155
155
  - lib/sass/tree/css_import_node.rb
156
+ - lib/sass/tree/supports_node.rb
156
157
  - lib/sass/tree/variable_node.rb
157
158
  - lib/sass/tree/visitors/base.rb
158
159
  - lib/sass/tree/visitors/check_nesting.rb
@@ -165,7 +166,6 @@ files:
165
166
  - lib/sass/tree/visitors/to_css.rb
166
167
  - lib/sass/tree/warn_node.rb
167
168
  - lib/sass/tree/while_node.rb
168
- - lib/sass/tree/supports_node.rb
169
169
  - lib/sass/tree/trace_node.rb
170
170
  - lib/sass/util/multibyte_string_scanner.rb
171
171
  - lib/sass/util/subset_map.rb
@@ -237,13 +237,13 @@ files:
237
237
  - test/sass/results/complex.css
238
238
  - test/sass/results/compressed.css
239
239
  - test/sass/results/expanded.css
240
- - test/sass/results/units.css
240
+ - test/sass/results/script.css
241
241
  - test/sass/results/if.css
242
242
  - test/sass/results/import.css
243
243
  - test/sass/results/import_charset.css
244
244
  - test/sass/results/import_charset_1_8.css
245
245
  - test/sass/results/import_charset_ibm866.css
246
- - test/sass/results/script.css
246
+ - test/sass/results/units.css
247
247
  - test/sass/results/line_numbers.css
248
248
  - test/sass/results/mixins.css
249
249
  - test/sass/results/multiline.css