haml-edge 2.3.206 → 2.3.207

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.206
+2.3.207

data/VERSION

@@ -1 +1 @@
-2.3.206
+2.3.207

data/lib/sass/engine.rb

@@ -467,9 +467,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/test/sass/conversion_test.rb

@@ -595,8 +595,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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.206
+  version: 2.3.207
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -04:00
+date: 2010-04-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency