haml-edge 2.3.190 → 2.3.191

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.190
+2.3.191

data/VERSION

@@ -1 +1 @@
-2.3.190
+2.3.191

data/lib/haml/exec.rb

@@ -602,7 +602,7 @@ END
         end
 
         opts.on('--dasherize', 'Convert underscores to dashes') do
-          @options[:dasherize] = true
+          @options[:for_tree][:dasherize] = true
         end
 
         opts.on('--old', 'Output the old-style ":prop val" property syntax.',

data/lib/sass/script/operation.rb

@@ -84,7 +84,7 @@ module Sass::Script
     private
 
     def operand_to_sass(pred, op, opts = {})
-      return "(#{op.to_sass})" if op.is_a?(Operation) &&
+      return "(#{op.to_sass(opts)})" if op.is_a?(Operation) &&
         Sass::Script::Parser.precedence_of(op.operator) < pred
       op.to_sass(opts)
     end

data/lib/sass/scss/parser.rb

@@ -259,18 +259,6 @@ module Sass
         tok(/[+-]/)
       end
 
-      def property
-        return unless e = (tok(IDENT) || interpolation)
-        res = [e, str{ss}]
-
-        while e = (interpolation || tok(IDENT))
-          res << e
-        end
-
-        ss
-        res
-      end
-
       def ruleset
         rules = []
         return unless v = selector
@@ -395,10 +383,10 @@ module Sass
       end
 
       def element_name
-        return unless name = tok(IDENT) || tok(/\*/) || tok?(/\|/)
+        return unless name = interp_ident || tok(/\*/) || tok?(/\|/)
         if tok(/\|/)
           @expected = "element name or *"
-          name << "|" << (tok(IDENT) || tok!(/\*/))
+          name << "|" << (interp_ident || tok!(/\*/))
         end
         name
       end
@@ -468,10 +456,12 @@ module Sass
         # This allows the "*prop: val", ":prop: val", and ".prop: val" hacks
         if s = tok(/[:\*\.]/)
           @use_property_exception = s != '.'
-          name = [s, str{ss}] + expr!(:property)
+          name = [s, str{ss}, *expr!(:interp_ident)]
         else
-          return unless name = property
+          return unless name = interp_ident
+          name = [name] if name.is_a?(String)
         end
+        ss
 
         @expected = expected_property_separator
         space, value = expr!(:value)
@@ -576,10 +566,10 @@ MESSAGE
         res
       end
 
-      def interp_ident(ident = IDENT)
-        return unless val = tok(ident) || interpolation
+      def interp_ident(start = IDENT)
+        return unless val = tok(start) || interpolation
         res = [val]
-        while val = tok(ident) || interpolation
+        while val = tok(NAME) || interpolation
           res << val
         end
         res

data/test/sass/scss/scss_test.rb

@@ -671,6 +671,17 @@ $zzz: zzz;
 SCSS
   end
 
+  def test_selector_interpolation_at_dashes
+    assert_equal <<CSS, render(<<SCSS)
+div {
+  -foo-a-b-foo: foo; }
+CSS
+$a : a;
+$b : b;
+div { -foo-\#{$a}-\#{$b}-foo: foo }
+SCSS
+  end
+
   def test_basic_prop_val_interpolation
     assert_equal <<CSS, render(<<SCSS)
 foo {

metadata

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