Allow interpolation in CSS-based imports. Closes sassGH-49.

brandondrew · Apr 19, 2011 · a84b376 · a84b376
1 parent 6946406
commit a84b376
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/lib/sass/tree/visitors/perform.rb b/lib/sass/tree/visitors/perform.rb
@@ -265,6 +265,14 @@ def visit_while(node)
     children.flatten
   end
 
+  def visit_directive(node)
+    if node.value['#{']
+      node.value = run_interp(Sass::Engine.parse_interp(node.value, node.line, 0, node.options))
+    end
+    yield
+    node
+  end
+
   private
 
   def run_interp(text)

diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
@@ -552,6 +552,13 @@ def test_http_import
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
   end
 
+  def test_http_import_with_interpolation
+    assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
+      render("$family: unquote(\"Droid+Sans\")\n@import \"http://fonts.googleapis.com/css?family=\#{$family}\"\n"))
+    assert_equal("@import url(\"http://fonts.googleapis.com/css?family=Droid+Sans\");\n",
+      render("$family: unquote(\"Droid+Sans\")\n@import url(\"http://fonts.googleapis.com/css?family=\#{$family}\")\n"))
+  end
+
   def test_url_import
     assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass)"))
   end