sass 3.2.0.alpha.273 → 3.2.0.alpha.274

data/REVISION

@@ -1 +1 @@
-9b1820a2b092ba228eb20bea33b07ddd0793146f
+0bba15c5b6c701c739c3b40b0e78c1655a27be6f

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.273
+3.2.0.alpha.274

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

@@ -148,7 +148,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_media(node)
-    "#{tab_str}@media #{interp_to_src(node.query)}#{yield}"
+    "#{tab_str}@media #{media_interp_to_src(node.query)}#{yield}"
   end
 
   def visit_supports(node)
@@ -243,6 +243,22 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     end.join
   end
 
+  # Like interp_to_src, but removes the unnecessary `#{}` around the keys and
+  # values in media expressions.
+  def media_interp_to_src(interp)
+    Sass::Util.enum_with_index(interp).map do |r, i|
+      next r if r.is_a?(String)
+      before, after = interp[i-1], interp[i+1]
+      if before.is_a?(String) && after.is_a?(String) &&
+          ((before[-1] == ?( && after[0] == ?:) ||
+           (before =~ /:\s*/ && after[0] == ?)))
+        r.to_sass(@options)
+      else
+        "\#{#{r.to_sass(@options)}}"
+      end
+    end.join
+  end
+
   def selector_to_src(sel)
     @format == :sass ? selector_to_sass(sel) : selector_to_scss(sel)
   end

data/test/sass/conversion_test.rb

@@ -1160,14 +1160,13 @@ SCSS
   end
 
   def test_media_with_expressions
-    # TODO: get rid of the #{} in the expression output
     assert_sass_to_scss <<SCSS, <<SASS
 $media1: screen;
 $media2: print;
 $var: -webkit-min-device-pixel-ratio;
 $val: 20;
 
-@media \#{$media1} and (\#{$var + "-foo"}: \#{$val + 5}), only \#{$media2} {
+@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2} {
   a: b;
 }
 SCSS
@@ -1186,7 +1185,7 @@ $media2: print
 $var: -webkit-min-device-pixel-ratio
 $val: 20
 
-@media \#{$media1} and (\#{$var + "-foo"}: \#{$val + 5}), only \#{$media2}
+@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
   a: b
 SASS
 $media1: screen;
@@ -1565,6 +1564,16 @@ SCSS
 
   ## Regression Tests
 
+  def test_media_query_with_expr
+    assert_scss_to_sass <<SASS, <<SCSS
+@media foo and (bar: baz)
+  a: b
+SASS
+@media foo and (bar: baz) {
+  a: b; }
+SCSS
+  end
+
   def test_empty_lists
     assert_renders(<<SASS, <<SCSS)
 $foo: ()

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302399
+  hash: 592302393
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 273
-  version: 3.2.0.alpha.273
+  - 274
+  version: 3.2.0.alpha.274
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -154,7 +154,6 @@ files:
 - lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
 - lib/sass/tree/variable_node.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -164,6 +163,7 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - 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