0
@@ -39,14 +39,16 @@ module Sass
0
     # The character used to denote a compiler directive.
0
     DIRECTIVE_CHAR = ?@
0
 
0
-    # The regex that matches attributes of the form <tt>:name attr</tt>.
0
-    ATTRIBUTE = /:([^\s=:]+)\s*(=?)(?:\s+|$)(.*)/
0
+    # The regex that matches and extracts data from
0
+    # attributes of the form <tt>:name attr</tt>.
0
+    ATTRIBUTE = /^:([^\s=:]+)\s*(=?)(?:\s+|$)(.*)/
0
 
0
     # The regex that matches attributes of the form <tt>name: attr</tt>.
0
-    ALTERNATE_ATTRIBUTE_SELECTOR = /^[^\s:]+:(\s+|$)/
0
+    ATTRIBUTE_ALTERNATE_MATCHER = /^[^\s:]+\s*[=:](\s|$)/
0
 
0
-    # The regex that extracts data from attributes of the form <tt>name: attr</tt>.
0
-    ATTRIBUTE_ALTERNATE = /([^\s=]+):\s*(=?)\s*(.*)/
0
+    # The regex that matches and extracts data from
0
+    # attributes of the form <tt>name: attr</tt>.
0
+    ATTRIBUTE_ALTERNATE = /^([^\s=:]+)(\s*=|:)(?:\s+|$)(.*)/
0
 
0
     # Creates a new instace of Sass::Engine that will compile the given
0
     # template string when <tt>render</tt> is called.
0
@@ -217,18 +219,18 @@ module Sass
0
     end
0
 
0
     def parse_line(line)
0
-      if line[0] == ATTRIBUTE_CHAR
0
+      case line[0]
0
+      when ATTRIBUTE_CHAR
0
         parse_attribute(line, ATTRIBUTE)
0
-      elsif line.match(ALTERNATE_ATTRIBUTE_SELECTOR)
0
-        parse_attribute(line, ATTRIBUTE_ALTERNATE)
0
+      when Constant::CONSTANT_CHAR
0
+        parse_constant(line)
0
+      when COMMENT_CHAR
0
+        parse_comment(line)
0
+      when DIRECTIVE_CHAR
0
+        parse_directive(line)
0
       else
0
-        case line[0]
0
-        when Constant::CONSTANT_CHAR
0
-          parse_constant(line)
0
-        when COMMENT_CHAR
0
-          parse_comment(line)
0
-        when DIRECTIVE_CHAR
0
-          parse_directive(line)
0
+        if line =~ ATTRIBUTE_ALTERNATE_MATCHER
0
+          parse_attribute(line, ATTRIBUTE_ALTERNATE)
0
         else
0
           Tree::RuleNode.new(line, @options[:style])
0
         end
0
@@ -242,7 +244,7 @@ module Sass
0
         raise SyntaxError.new("Invalid attribute: \"#{line}\"", @line)
0
       end
0
 
0
-      if eq[0] == SCRIPT_CHAR
0
+      if eq.strip[0] == SCRIPT_CHAR
0
         value = Sass::Constant.parse(value, @constants, @line).to_s
0
       end
0
 

0
@@ -22,7 +22,11 @@ class SassEngineTest < Test::Unit::TestCase
0
     ":= a" => 'Invalid attribute: ":= a"',
0
     "a\n  :b" => 'Invalid attribute: ":b "',
0
     "a\n  :b: c" => 'Invalid attribute: ":b: c"',
0
+    "a\n  :b:c d" => 'Invalid attribute: ":b:c d"',
0
+    "a\n  :b=c d" => 'Invalid attribute: ":b=c d"',
0
     "a\n  :b c;" => 'Invalid attribute: ":b c;" (This isn\'t CSS!)',
0
+    "a\n  b : c" => 'Invalid attribute: "b : c"',
0
+    "a\n  b=c: d" => 'Invalid attribute: "b=c: d"',
0
     ":a" => 'Attributes aren\'t allowed at the root of a document.',
0
     "!" => 'Invalid constant: "!"',
0
     "!a" => 'Invalid constant: "!a"',
0
@@ -61,7 +65,7 @@ class SassEngineTest < Test::Unit::TestCase
0
         assert(err.sass_line, "Line: #{key}")
0
         assert_match(/\(sass\):[0-9]+/, err.backtrace[0], "Line: #{key}")
0
       else
0
-        assert(false, "Exception not raised for '#{key}'!")
0
+        assert(false, "Exception not raised for\n#{key}")
0
       end
0
     end
0
   end

0
@@ -26,7 +26,7 @@ class SassPluginTest < Test::Unit::TestCase
0
   end
0
   
0
   def teardown
0
-    FileUtils.rm_r  File.dirname(__FILE__) + '/tmp'
0
+    FileUtils.rm_r File.dirname(__FILE__) + '/tmp'
0
   end
0
 
0
   def test_templates_should_render_correctly

0
@@ -1,3 +1,4 @@
0
 h1 { float: left; width: 274px; height: 75px; margin: 0; background-repeat: no-repeat; background-image: none; }
0
 h1 a:hover, h1 a:visited { color: green; }
0
 h1 b:hover { color: red; background-color: green; }
0
+h1 const { nosp: 3; sp: 3; }

0
@@ -11,3 +11,6 @@ h1
0
   b:hover
0
     color: red
0
     :background-color green
0
+  const
0
+    nosp= 1 + 2
0
+    sp = 1 + 2