haml 3.0.0.beta.2 → 3.0.0.beta.3

data/VERSION

@@ -1 +1 @@
-3.0.0.beta.2
+3.0.0.beta.3

data/lib/sass/engine.rb

@@ -234,7 +234,7 @@ module Sass
         end
 
         comment_tab_str ||= line_tab_str
-        if try_comment(line, lines.last, tab_str * (lines.last.tabs + 1), comment_tab_str, index)
+        if try_comment(line, lines.last, tab_str * lines.last.tabs, comment_tab_str, index)
           next
         else
           comment_tab_str = nil
@@ -256,7 +256,9 @@ END
 
     def try_comment(line, last, tab_str, comment_tab_str, index)
       return unless last && last.comment?
-      return unless line =~ /^#{tab_str}/
+      # Nested comment stuff must be at least one whitespace char deeper
+      # than the normal indentation
+      return unless line =~ /^#{tab_str}\s/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
         raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
 Inconsistent indentation:
@@ -467,9 +469,13 @@ WARNING
 
       # If value begins with url( or ",
       # it's a CSS @import rule and we don't want to touch it.
-      if directive == "import" && value !~ /^(url\(|["'])/
+      if directive == "import"
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
           :line => @line + 1) unless line.children.empty?
+        if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
+            !match.post_match.strip.empty? && match.post_match.strip[0] != ?,
+          return Tree::DirectiveNode.new("@import #{value}")
+        end
         value.split(/,\s*/).map do |f|
           f = $1 || $2 || $3 if f =~ Sass::SCSS::RX::STRING || f =~ Sass::SCSS::RX::URI
           Tree::ImportNode.new(f)

data/lib/sass/tree/comment_node.rb

@@ -67,8 +67,8 @@ module Sass::Tree
           end
         end
 
-      content.gsub!(/^/, '  ' * tabs)
       content.gsub!(/\A\/\*/, '//') if silent
+      content.gsub!(/^/, '  ' * tabs)
       content.rstrip + "\n"
     end
 

data/test/sass/conversion_test.rb

@@ -286,6 +286,50 @@ foo bar
 SASS
   end
 
+  def test_nested_silent_comments
+    assert_renders <<SASS, <<SCSS
+foo
+  bar: baz
+  // bip bop
+  // beep boop
+  bang: bizz
+  // bubble bubble
+  // toil trouble
+SASS
+foo {
+  bar: baz;
+  // bip bop
+  // beep boop
+  bang: bizz;
+  // bubble bubble
+  // toil trouble
+}
+SCSS
+
+    assert_sass_to_scss <<SCSS, <<SASS
+foo {
+  bar: baz;
+  // bip bop
+  // beep boop
+  //   bap blimp
+  bang: bizz;
+  // bubble bubble
+  // toil trouble
+  //    gorp
+}
+SCSS
+foo
+  bar: baz
+  // bip bop
+     beep boop
+       bap blimp
+  bang: bizz
+  // bubble bubble
+    toil trouble
+       gorp
+SASS
+  end
+
   def test_loud_comments
     assert_renders <<SASS, <<SCSS
 /* foo
@@ -354,6 +398,48 @@ foo bar {
 SCSS
   end
 
+  def test_nested_loud_comments
+    assert_renders <<SASS, <<SCSS
+foo
+  bar: baz
+  /* bip bop
+   * beep boop
+  bang: bizz
+  /* bubble bubble
+   * toil trouble
+SASS
+foo {
+  bar: baz;
+  /* bip bop
+   * beep boop */
+  bang: bizz;
+  /* bubble bubble
+   * toil trouble */ }
+SCSS
+
+    assert_sass_to_scss <<SCSS, <<SASS
+foo {
+  bar: baz;
+  /* bip bop
+   * beep boop
+   *   bap blimp */
+  bang: bizz;
+  /* bubble bubble
+   * toil trouble
+   *    gorp */ }
+SCSS
+foo
+  bar: baz
+  /* bip bop
+     beep boop
+       bap blimp
+  bang: bizz
+  /* bubble bubble
+    toil trouble
+       gorp
+SASS
+  end
+
   def test_loud_comments_with_weird_indentation
     assert_scss_to_sass <<SASS, <<SCSS
 foo
@@ -595,8 +681,8 @@ SCSS
   end
 
   def test_import_as_directive_in_sass
-    assert_sass_to_sass '@import "foo.css"'
-    assert_sass_to_sass '@import url(foo.css)'
+    assert_equal "@import foo.css\n", to_sass('@import "foo.css"')
+    assert_equal "@import foo.css\n", to_sass('@import url(foo.css)')
   end
 
   def test_import_as_directive_in_scss

data/test/sass/templates/import.sass

@@ -3,7 +3,8 @@ $preconst: hello
 =premixin
   pre-mixin: here
 
-@import importee.sass, scss_importee, "basic.sass", basic.css, ../results/complex.css, url(partial.sass)
+@import importee.sass, scss_importee, "basic.sass", basic.css, ../results/complex.css
+@import url(partial.sass)
 
 nonimported
   :myconst $preconst

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 2
-  version: 3.0.0.beta.2
+  - 3
+  version: 3.0.0.beta.3
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency