sass 3.1.0.alpha.49 → 3.1.0.alpha.50

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.49
+3.1.0.alpha.50

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.49
+3.1.0.alpha.50

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

@@ -144,12 +144,13 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
 
     yield
 
+    result = node.children.dup
     if !node.resolved_value.empty? || node.children.empty?
       node.send(:check!)
-      node.children.unshift(node)
+      result.unshift(node)
     end
 
-    node.children
+    result
   end
 
   # Resolves parent references and nested selectors,

data/test/sass/engine_test.rb

@@ -2009,6 +2009,180 @@ WARN
     end
   end
 
+  def test_media_bubbling
+    assert_equal <<CSS, render(<<SASS)
+.foo {
+  a: b; }
+  @media bar {
+    .foo {
+      c: d; } }
+  .foo .baz {
+    e: f; }
+    @media bip {
+      .foo .baz {
+        g: h; } }
+
+.other {
+  i: j; }
+CSS
+.foo
+  a: b
+  @media bar
+    c: d
+  .baz
+    e: f
+    @media bip
+      g: h
+
+.other
+  i: j
+SASS
+
+    assert_equal <<CSS, render(<<SASS, :style => :compact)
+.foo { a: b; }
+@media bar { .foo { c: d; } }
+.foo .baz { e: f; }
+@media bip { .foo .baz { g: h; } }
+
+.other { i: j; }
+CSS
+.foo
+  a: b
+  @media bar
+    c: d
+  .baz
+    e: f
+    @media bip
+      g: h
+
+.other
+  i: j
+SASS
+
+    assert_equal <<CSS, render(<<SASS, :style => :expanded)
+.foo {
+  a: b;
+}
+@media bar {
+  .foo {
+    c: d;
+  }
+}
+.foo .baz {
+  e: f;
+}
+@media bip {
+  .foo .baz {
+    g: h;
+  }
+}
+
+.other {
+  i: j;
+}
+CSS
+.foo
+  a: b
+  @media bar
+    c: d
+  .baz
+    e: f
+    @media bip
+      g: h
+
+.other
+  i: j
+SASS
+  end
+
+  def test_double_media_bubbling
+    assert_equal <<CSS, render(<<SASS)
+@media bar and baz {
+  .foo {
+    c: d; } }
+CSS
+@media bar
+  @media baz
+    .foo
+      c: d
+SASS
+
+    assert_equal <<CSS, render(<<SASS)
+@media bar {
+  .foo {
+    a: b; } }
+  @media bar and baz {
+    .foo {
+      c: d; } }
+CSS
+.foo
+  @media bar
+    a: b
+    @media baz
+      c: d
+SASS
+  end
+
+  def test_rule_media_rule_bubbling
+    assert_equal <<CSS, render(<<SASS)
+@media bar {
+  .foo {
+    a: b;
+    e: f; }
+    .foo .baz {
+      c: d; } }
+CSS
+.foo
+  @media bar
+    a: b
+    .baz
+      c: d
+    e: f
+SASS
+  end
+
+  def test_nested_media_around_properties
+    assert_equal <<CSS, render(<<SASS)
+.outside {
+  color: red;
+  background: blue; }
+  @media print {
+    .outside {
+      color: black; } }
+    @media print and nested {
+      .outside .inside {
+        border: 1px solid black; } }
+  .outside .middle {
+    display: block; }
+CSS
+.outside
+  color: red
+  @media print
+    color: black
+    .inside
+      @media nested
+        border: 1px solid black
+  background: blue
+  .middle
+    display: block
+SASS
+  end
+
+  def test_media_with_parent_references
+    sass_str = <<SASS
+.outside
+  @media print
+    &.inside
+      border: 1px solid black
+SASS
+    css_str = <<CSS
+@media print {
+  .outside.inside {
+    border: 1px solid black; } }
+CSS
+    assert_equal css_str, render(sass_str)
+  end
+
   # Regression tests
 
   def test_parens_in_mixins
@@ -2247,178 +2421,14 @@ foo
 SASS
   end
 
-  def test_media_bubbling
-    assert_equal <<CSS, render(<<SASS)
-.foo {
-  a: b; }
-  @media bar {
-    .foo {
-      c: d; } }
-  .foo .baz {
-    e: f; }
-    @media bip {
-      .foo .baz {
-        g: h; } }
-
-.other {
-  i: j; }
-CSS
-.foo
-  a: b
-  @media bar
-    c: d
-  .baz
-    e: f
-    @media bip
-      g: h
-
-.other
-  i: j
-SASS
-
-    assert_equal <<CSS, render(<<SASS, :style => :compact)
-.foo { a: b; }
-@media bar { .foo { c: d; } }
-.foo .baz { e: f; }
-@media bip { .foo .baz { g: h; } }
-
-.other { i: j; }
-CSS
-.foo
-  a: b
-  @media bar
-    c: d
-  .baz
-    e: f
-    @media bip
-      g: h
-
-.other
-  i: j
-SASS
-
-    assert_equal <<CSS, render(<<SASS, :style => :expanded)
-.foo {
-  a: b;
-}
-@media bar {
-  .foo {
-    c: d;
-  }
-}
-.foo .baz {
-  e: f;
-}
-@media bip {
-  .foo .baz {
-    g: h;
-  }
-}
-
-.other {
-  i: j;
-}
-CSS
-.foo
-  a: b
-  @media bar
-    c: d
-  .baz
-    e: f
-    @media bip
-      g: h
-
-.other
-  i: j
-SASS
-  end
-
-  def test_double_media_bubbling
-    assert_equal <<CSS, render(<<SASS)
-@media bar and baz {
-  .foo {
-    c: d; } }
-CSS
-@media bar
-  @media baz
-    .foo
-      c: d
-SASS
-
-    assert_equal <<CSS, render(<<SASS)
-@media bar {
-  .foo {
-    a: b; } }
-  @media bar and baz {
-    .foo {
-      c: d; } }
-CSS
-.foo
-  @media bar
-    a: b
-    @media baz
-      c: d
-SASS
-  end
-
-  def test_rule_media_rule_bubbling
-    assert_equal <<CSS, render(<<SASS)
-@media bar {
-  .foo {
-    a: b;
-    e: f; }
-    .foo .baz {
-      c: d; } }
-CSS
-.foo
-  @media bar
-    a: b
-    .baz
-      c: d
-    e: f
-SASS
-  end
-
-  def test_nested_media_around_properties
+  def test_unknown_directive
     assert_equal <<CSS, render(<<SASS)
-.outside {
-  color: red;
-  background: blue; }
-  @media print {
-    .outside {
-      color: black; } }
-    @media print and nested {
-      .outside .inside {
-        border: 1px solid black; } }
-  .outside .middle {
-    display: block; }
+@baz {
+  c: d; }
 CSS
-.outside
-  color: red
-  @media print
-    color: black
-    .inside
-      @media nested
-        border: 1px solid black
-  background: blue
-  .middle
-    display: block
-SASS
-  end
-
-  def test_media_with_parent_references
-    sass_str = <<SASS
-.outside
-  @media print
-    &.inside
-      border: 1px solid black
+@baz
+  c: d
 SASS
-    css_str = <<CSS
-@media print {
-  .outside.inside {
-    border: 1px solid black; } }
-CSS
-    assert_equal css_str, render(sass_str)
   end
 
   # Encodings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.49
+  version: 3.1.0.alpha.50
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2010-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,9 +124,9 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/warn_node.rb
-- lib/sass/tree/each_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/each_node.rb
 - lib/sass/tree/media_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/convert.rb