sass 3.3.0.alpha.127 → 3.3.0.alpha.128

data/REVISION

@@ -1 +1 @@
-37a46f42d51efbb1bb31d4b35c92442d2bed1b98
+d283283c32570b09f5a535083992236aab4e0a93

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.127
+3.3.0.alpha.128

data/VERSION_DATE

@@ -1 +1 @@
-18 April 2013 00:24:47 GMT
+20 April 2013 01:38:19 GMT

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

@@ -433,7 +433,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
     end
 
-    return if mixins.empty?
+    return unless mixins.include?(node.name)
     raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
 
     msg << "\n" << Sass::Util.enum_cons(mixins.reverse + [node.name], 2).map do |m1, m2|

data/test/sass/engine_test.rb

@@ -520,6 +520,21 @@ MESSAGE
     assert_hash_has(err.sass_backtrace[2], :mixin => "foo", :line => 2)
   end
 
+  def test_mixin_loop_with_content
+    render <<SASS
+=foo
+  @content
+=bar
+  +foo
+    +bar
++bar
+SASS
+    assert(false, "Exception not raised")
+  rescue Sass::SyntaxError => err
+    assert_equal("An @include loop has been found: bar includes itself", err.message)
+    assert_hash_has(err.sass_backtrace[0], :mixin => "@content", :line => 5)
+  end
+
   def test_basic_import_loop_exception
     import = filename_for_test
     importer = MockImporter.new
@@ -2416,6 +2431,24 @@ SASS
 
   # Regression tests
 
+  def test_parent_mixin_in_content_nested
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: c; }
+CSS
+=foo
+  @content
+
+=bar
+  +foo
+    +foo
+      a
+        b: c
+
++bar
+SASS
+  end
+
   def test_supports_bubbles
     assert_equal <<CSS, render(<<SASS)
 parent {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303091
+  hash: 592302605
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 127
-  version: 3.3.0.alpha.127
+  - 128
+  version: 3.3.0.alpha.128
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-17 00:00:00 -04:00
+date: 2013-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency