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

data/REVISION

@@ -1 +1 @@
-7da08d3193ce8d6faa0e9dbb081ec33172d08b12
+51c4cbbd637d60c316c8a39e187e6a4a5add1d14

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.293
+3.2.0.alpha.294

data/VERSION_DATE

@@ -1 +1 @@
-11 August 2012 00:40:09 GMT
+11 August 2012 00:50:21 GMT

data/lib/sass/tree/visitors/perform.rb

@@ -274,7 +274,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   end
 
   def visit_content(node)
-    return unless content = @environment.content
+    return [] unless content = @environment.content
     @stack.push(:filename => node.filename, :line => node.line, :name => '@content')
     trace_node = Sass::Tree::TraceNode.from_node('@content', node)
     with_environment(@environment.caller) {trace_node.children = content.map {|c| visit(c.dup)}.flatten}

data/test/sass/engine_test.rb

@@ -152,7 +152,6 @@ MSG
     "=foo\n  @content\n    b: c" => "Illegal nesting: Nothing may be nested beneath @content directives.",
     "@content" => '@content may only be used within a mixin.',
     "=simple\n  .simple\n    color: red\n+simple\n  color: blue" => ['Mixin "simple" does not accept a content block.', 4],
-    "=foo\n  @content\n+foo" => ["No @content passed.", 2],
     "@import \"foo\" // bar" => "Invalid CSS after \"\"foo\" \": expected media query list, was \"// bar\"",
 
     # Regression tests
@@ -3027,22 +3026,26 @@ SASS
   end
 
   def test_content_not_seen_through_mixin
-    render(<<SASS)
+    assert_equal <<CSS, render(<<SASS)
+a foo {
+  mixin: foo;
+  a: b; }
+  a foo bar {
+    mixin: bar; }
+CSS
 =foo
   foo
+    mixin: foo
     @content
     +bar
 =bar
   bar
+    mixin: bar
     @content
 a
   +foo
     a: b
 SASS
-    assert(false, "Expected exception")
-  rescue Sass::SyntaxError => e
-    assert_equal("No @content passed.", e.message)
-    assert_equal(7, e.sass_line)
   end
 
   def test_content_backtrace_for_perform

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302423
+  hash: 592302417
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 293
-  version: 3.2.0.alpha.293
+  - 294
+  version: 3.2.0.alpha.294
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -98,21 +98,21 @@ files:
 - lib/sass/repl.rb
 - lib/sass/root.rb
 - lib/sass/script.rb
-- lib/sass/script/bool.rb
 - lib/sass/script/color.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/lexer.rb
 - lib/sass/script/css_lexer.rb
 - lib/sass/script/css_parser.rb
 - lib/sass/script/funcall.rb
 - lib/sass/script/functions.rb
 - lib/sass/script/interpolation.rb
-- lib/sass/script/lexer.rb
 - lib/sass/script/list.rb
 - lib/sass/script/literal.rb
+- lib/sass/script/null.rb
 - lib/sass/script/node.rb
 - lib/sass/script/number.rb
 - lib/sass/script/operation.rb
 - lib/sass/script/parser.rb
-- lib/sass/script/null.rb
 - lib/sass/script/string.rb
 - lib/sass/script/string_interpolation.rb
 - lib/sass/script/unary_operation.rb
@@ -138,21 +138,22 @@ files:
 - lib/sass/tree/directive_node.rb
 - lib/sass/tree/extend_node.rb
 - lib/sass/tree/debug_node.rb
-- lib/sass/tree/media_node.rb
+- lib/sass/tree/function_node.rb
 - lib/sass/tree/each_node.rb
-- lib/sass/tree/node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/tree/for_node.rb
-- lib/sass/tree/function_node.rb
+- lib/sass/tree/mixin_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
 - lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/prop_node.rb
-- lib/sass/tree/mixin_node.rb
 - lib/sass/tree/rule_node.rb
+- lib/sass/tree/content_node.rb
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
-- lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
+- lib/sass/tree/supports_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -165,7 +166,6 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/tree/supports_node.rb
 - lib/sass/tree/trace_node.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
@@ -237,13 +237,13 @@ files:
 - test/sass/results/complex.css
 - test/sass/results/compressed.css
 - test/sass/results/expanded.css
-- test/sass/results/units.css
+- test/sass/results/script.css
 - test/sass/results/if.css
 - test/sass/results/import.css
 - test/sass/results/import_charset.css
 - test/sass/results/import_charset_1_8.css
 - test/sass/results/import_charset_ibm866.css
-- test/sass/results/script.css
+- test/sass/results/units.css
 - test/sass/results/line_numbers.css
 - test/sass/results/mixins.css
 - test/sass/results/multiline.css