sass 3.2.0.alpha.57 → 3.2.0.alpha.59

data/test/sass/script_test.rb

@@ -432,6 +432,11 @@ SASS
     assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}
   end
 
+  def test_boolean_ops_short_circuit
+    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Bool.new(false)))
+    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Bool.new(true)))
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/css_test.rb

@@ -479,7 +479,7 @@ SCSS
 
   def test_media_directive_with_keywords
     assert_parses <<SCSS
-@media screen and (-webkit-min-device-pixel-ratio:0) {
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
   a: b; }
 SCSS
     assert_parses <<SCSS

data/test/sass/scss/scss_test.rb

@@ -266,7 +266,7 @@ SCSS
     assert_equal "@import url(foo.css);\n", render('@import "foo.css";')
     assert_equal "@import url(foo.css);\n", render("@import 'foo.css';")
     assert_equal "@import url(\"foo.css\");\n", render('@import url("foo.css");')
-    assert_equal "@import url('foo.css');\n", render("@import url('foo.css');")
+    assert_equal "@import url(\"foo.css\");\n", render('@import url("foo.css");')
     assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
   end
 
@@ -279,6 +279,15 @@ SCSS
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";"))
   end
 
+  def test_import_with_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+@import url("http://fonts.googleapis.com/css?family=Droid+Sans");
+CSS
+$family: unquote("Droid+Sans");
+@import url("http://fonts.googleapis.com/css?family=\#{$family}");
+SCSS
+  end
+
   def test_url_import
     assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass);"))
   end
@@ -865,6 +874,39 @@ foo {\#{"baz" + "bang"}: blip}
 SCSS
   end
 
+  def test_directive_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+@foo bar12 qux {
+  a: b; }
+CSS
+$baz: 12;
+@foo bar\#{$baz} qux {a: b}
+SCSS
+  end
+
+  def test_media_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+@media bar12 {
+  a: b; }
+CSS
+$baz: 12;
+@media bar\#{$baz} {a: b}
+SCSS
+  end
+
+  def test_variables_in_media
+    assert_equal <<CSS, render(<<SCSS)
+@media screen and (-webkit-min-device-pixel-ratio: 20), only print {
+  a: b; }
+CSS
+$media1: screen;
+$media2: print;
+$var: -webkit-min-device-pixel-ratio;
+$val: 20;
+@media $media1 and ($var: $val), only $media2 {a: b}
+SCSS
+  end
+
   ## Errors
 
   def test_mixin_defs_only_at_toplevel
@@ -1064,26 +1106,6 @@ flim {
 SCSS
   end
 
-  def test_no_interpolation_in_media_queries
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
-Invalid CSS after "...nd (min-width: ": expected expression (e.g. 1px, bold), was "\#{100}px) {"
-MESSAGE
-@media screen and (min-width: \#{100}px) {
-  foo {bar: baz}
-}
-SCSS
-  end
-
-  def test_no_interpolation_in_unrecognized_directives
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
-Invalid CSS after "@foo ": expected selector or at-rule, was "\#{100} {"
-MESSAGE
-@foo \#{100} {
-  foo {bar: baz}
-}
-SCSS
-  end
-
   def test_no_lonely_else
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS: @else must come after @if
@@ -1223,11 +1245,11 @@ SCSS
 
 
   def test_newlines_removed_from_selectors_when_compressed
-    assert_equal <<CSS, render(<<SCSS, :style=>:compressed)
+    assert_equal <<CSS, render(<<SCSS, :style => :compressed)
 z a,z b{display:block}
 CSS
-a,
-b {
+a
+, b {
   z & {
     display: block;
   }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302959
+  hash: 592302955
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 57
-  version: 3.2.0.alpha.57
+  - 59
+  version: 3.2.0.alpha.59
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 -05:00
+date: 2012-01-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
 - lib/sass/logger/log_level.rb
+- lib/sass/util.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
@@ -133,7 +134,7 @@ files:
 - lib/sass/shared.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
-- lib/sass/tree/node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
 - lib/sass/tree/each_node.rb
@@ -142,14 +143,15 @@ files:
 - lib/sass/tree/function_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
-- lib/sass/tree/media_node.rb
 - lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/mixin_node.rb
 - lib/sass/tree/prop_node.rb
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
+- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -161,8 +163,7 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/tree/trace_node.rb
-- lib/sass/util.rb
+- lib/sass/media.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb