sass 3.2.0.alpha.274 → 3.2.0.alpha.275

data/REVISION

@@ -1 +1 @@
-0bba15c5b6c701c739c3b40b0e78c1655a27be6f
+1edbe5841971a4cdab0ac63de360973289e700ec

data/VERSION

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

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

@@ -73,6 +73,20 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
   end
 
+  def invalid_function_parent?(parent, child)
+    "Functions may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
+  end
+
+  VALID_FUNCTION_CHILDREN = [
+    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
+    Sass::Tree::VariableNode, Sass::Tree::WarnNode
+  ] + CONTROL_NODES
+  def invalid_function_child?(parent, child)
+    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
+      "Functions can only contain variable declarations and control directives."
+    end
+  end
+
   INVALID_IMPORT_PARENTS = CONTROL_NODES +
     [Sass::Tree::MixinDefNode, Sass::Tree::MixinNode]
   def invalid_import_parent?(parent, child)
@@ -81,6 +95,10 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
     return if parent.is_a?(Sass::Tree::RootNode)
     return "CSS import directives may only be used at the root of a document." if child.css_import?
+    # If this is a nested @import, we need to make sure it doesn't have anything
+    # that's legal at top-level but not in the current context (e.g. mixin defs).
+    child.imported_file.to_tree.children.each {|c| visit(c)}
+    nil
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:filename => child.imported_file.options[:filename])
     e.add_backtrace(:filename => child.filename, :line => child.line)
@@ -88,25 +106,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def invalid_mixindef_parent?(parent, child)
-    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
-      return "Mixins may not be defined within control directives or other mixins."
-    end
-  end
-
-  def invalid_function_parent?(parent, child)
-    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
-      return "Functions may not be defined within control directives or other mixins."
-    end
-  end
-
-  VALID_FUNCTION_CHILDREN = [
-    Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
-    Sass::Tree::VariableNode, Sass::Tree::WarnNode
-  ] + CONTROL_NODES
-  def invalid_function_child?(parent, child)
-    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
-      "Functions can only contain variable declarations and control directives."
-    end
+    "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
   VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode, Sass::Tree::MixinNode] + CONTROL_NODES

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 #{media_interp_to_src(node.query)}#{yield}"
+    "#{tab_str}@media #{interp_to_src(node.query)}#{yield}"
   end
 
   def visit_supports(node)
@@ -243,22 +243,6 @@ 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/lib/sass/tree/visitors/perform.rb

@@ -113,7 +113,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # Loads the function into the environment.
   def visit_function(node)
-    @environment.set_local_function(node.name,
+    @environment.set_function(node.name,
       Sass::Callable.new(node.name, node.args, @environment, node.children, !:has_content))
     []
   end
@@ -155,7 +155,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # Loads a mixin into the environment.
   def visit_mixindef(node)
-    @environment.set_local_mixin(node.name,
+    @environment.set_mixin(node.name,
       Sass::Callable.new(node.name, node.args, @environment, node.children, node.has_content))
     []
   end

data/test/sass/conversion_test.rb

@@ -1160,13 +1160,14 @@ 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
@@ -1185,7 +1186,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;
@@ -1564,16 +1565,6 @@ 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: ()

data/test/sass/engine_test.rb

@@ -73,7 +73,7 @@ MSG
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
     "=foo\n  :color red\n.bar\n  +bang_bop" => "Undefined mixin 'bang_bop'.",
     "=foo\n  :color red\n.bar\n  +bang-bop" => "Undefined mixin 'bang-bop'.",
-    ".foo\n  =foo\n    :color red\n.bar\n  +foo" => "Undefined mixin 'foo'.",
+    ".bar\n  =foo\n    :color red\n" => ["Mixins may only be defined at the root of a document.", 2],
     "    a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 1],
     " \n   \n\t\n  a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 4],
     "a\n  b: c\n b: c" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 3],
@@ -105,6 +105,7 @@ MSG
     "@function foo($)\n  @return 1" => ['Invalid CSS after "(": expected variable (e.g. $foo), was "$)"', 1],
     "@function foo()\n  @return" => 'Invalid @return: expected expression.',
     "@function foo()\n  @return 1\n    $var: val" => 'Illegal nesting: Nothing may be nested beneath return directives.',
+    "foo\n  @function bar()\n    @return 1" => ['Functions may only be defined at the root of a document.', 2],
     "@function foo($a)\n  @return 1\na\n  b: foo()" => 'Function foo is missing argument $a',
     "@function foo()\n  @return 1\na\n  b: foo(2)" => 'Wrong number of arguments (1 for 0) for `foo\'',
     "@function foo()\n  @return 1\na\n  b: foo($a: 1)" => "Function foo doesn't have an argument named $a",
@@ -273,7 +274,7 @@ SASS
   end
 
   def test_imported_exception
-    [1, 2, 3, 4].each do |i|
+    [1, 2, 3, 4, 5].each do |i|
       begin
         Sass::Engine.new("@import bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -295,7 +296,7 @@ SASS
   end
 
   def test_double_imported_exception
-    [1, 2, 3, 4].each do |i|
+    [1, 2, 3, 4, 5].each do |i|
       begin
         Sass::Engine.new("@import nested_bork#{i}", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
       rescue Sass::SyntaxError => err
@@ -722,6 +723,24 @@ CSS
 SASS
   end
 
+  def test_nested_import_with_toplevel_constructs
+    Sass::Engine.new(".foo\n  @import importee", :load_paths => [File.dirname(__FILE__) + '/templates/']).render
+  rescue Sass::SyntaxError => err
+    assert_equal(3, err.sass_line)
+    assert_match(/(\/|^)importee\.sass$/, err.sass_filename)
+
+    assert_hash_has(err.sass_backtrace.first,
+      :filename => err.sass_filename, :line => err.sass_line)
+
+    assert_nil(err.sass_backtrace[1][:filename])
+    assert_equal(2, err.sass_backtrace[1][:line])
+
+    assert_match(/(\/|^)importee\.sass:3$/, err.backtrace.first)
+    assert_equal("(sass):2", err.backtrace[1])
+  else
+    assert(false, "Exception not raised for importing mixins nested")
+  end
+
   def test_units
     renders_correctly "units"
   end

data/test/sass/scss/scss_test.rb

@@ -1073,83 +1073,17 @@ $domain: "sass-lang.com";
 SCSS
   end
 
-  def test_nested_mixin_def
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  a: b; }
-CSS
-foo {
-  @mixin bar {a: b}
-  @include bar; }
-SCSS
-  end
-
-  def test_nested_mixin_shadow
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  c: d; }
-
-baz {
-  a: b; }
-CSS
-@mixin bar {a: b}
-
-foo {
-  @mixin bar {c: d}
-  @include bar;
-}
-
-baz {@include bar}
-SCSS
-  end
-
-  def test_nested_function_def
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  a: 1; }
-
-bar {
-  b: foo(); }
-CSS
-foo {
-  @function foo() {@return 1}
-  a: foo(); }
-
-bar {b: foo()}
-SCSS
-  end
-
-  def test_nested_function_shadow
-    assert_equal <<CSS, render(<<SCSS)
-foo {
-  a: 2; }
-
-baz {
-  b: 1; }
-CSS
-@function foo() {@return 1}
-
-foo {
-  @function foo() {@return 2}
-  a: foo();
-}
-
-baz {b: foo()}
-SCSS
-  end
-
   ## Errors
 
-  def test_nested_mixin_def_is_scoped
+  def test_mixin_defs_only_at_toplevel
     render <<SCSS
 foo {
   @mixin bar {a: b}}
-bar {@include bar}
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal "Undefined mixin 'bar'.", e.message
-    assert_equal 3, e.sass_line
+    assert_equal "Mixins may only be defined at the root of a document.", e.message
+    assert_equal 2, e.sass_line
   end
 
   def test_rules_beneath_properties

data/test/sass/templates/bork5.sass

@@ -0,0 +1,3 @@
+foo
+  @function bar($a)
+    @return $a

data/test/sass/templates/nested_bork5.sass

@@ -0,0 +1,2 @@
+
+@import bork5

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302393
+  hash: 592302395
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 274
-  version: 3.2.0.alpha.274
+  - 275
+  version: 3.2.0.alpha.275
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-20 00:00:00 -04:00
+date: 2012-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,10 +110,10 @@ files:
 - lib/sass/script/list.rb
 - lib/sass/script/literal.rb
 - lib/sass/script/node.rb
+- lib/sass/script/null.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
@@ -275,6 +275,7 @@ files:
 - test/sass/templates/bork2.sass
 - test/sass/templates/bork3.sass
 - test/sass/templates/bork4.sass
+- test/sass/templates/bork5.sass
 - test/sass/templates/compact.sass
 - test/sass/templates/complex.sass
 - test/sass/templates/compressed.sass
@@ -297,6 +298,7 @@ files:
 - test/sass/templates/nested_bork2.sass
 - test/sass/templates/nested_bork3.sass
 - test/sass/templates/nested_bork4.sass
+- test/sass/templates/nested_bork5.sass
 - test/sass/templates/nested_import.sass
 - test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/options.sass