haml 3.0.1 → 3.0.2

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/haml/exec.rb

@@ -205,7 +205,7 @@ END
             puts("haml --rails isn't needed for Rails 3 or greater.",
               "Add 'gem \"haml\"' to your Gemfile instead.", "",
               "haml --rails will no longer work in the next version of #{@name}.", "")
-          elsif File.exists?(env) && File.open(f) {|f| f.grep(/config\.gem/)}
+          elsif File.exists?(env) && File.open(env) {|env| env.grep(/config\.gem/)}
             puts("haml --rails isn't needed for Rails 2.1 or greater.",
               "Add 'gem \"haml\"' to config/environment.rb instead.", "",
               "haml --rails will no longer work in the next version of #{@name}.", "")

data/lib/sass/plugin/merb.rb

@@ -25,5 +25,6 @@ unless defined?(Sass::MERB_LOADED)
   Sass::Plugin.options.merge!(config)
 
   require 'sass/plugin/rack'
-  Merb::Config[:app].use Sass::Plugin::Rack
+  # Merb::Config is used in Merb >= 1.1.0
+  (Merb::Config[:app] || Merb::Config).use Sass::Plugin::Rack
 end

data/lib/sass/scss/rx.rb

@@ -56,12 +56,12 @@ module Sass
           end
       NONASCII = /[#{s}]/
       ESCAPE   = /#{UNICODE}|\\[ -~#{s}]/
-      NMSTART  = /[a-zA-Z]|#{NONASCII}|#{ESCAPE}/
+      NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
       NMCHAR   = /[a-zA-Z0-9_-]|#{NONASCII}|#{ESCAPE}/
       STRING1  = /\"((?:[^\n\r\f\\"]|\\#{NL}|#{ESCAPE})*)\"/
       STRING2  = /\'((?:[^\n\r\f\\']|\\#{NL}|#{ESCAPE})*)\'/
 
-      IDENT    = /[-_]?#{NMSTART}#{NMCHAR}*/
+      IDENT    = /-?#{NMSTART}#{NMCHAR}*/
       NAME     = /#{NMCHAR}+/
       NUM      = /[0-9]+|[0-9]*.[0-9]+/
       STRING   = /#{STRING1}|#{STRING2}/

data/test/sass/scss/rx_test.rb

@@ -49,6 +49,10 @@ class ScssRxTest < Test::Unit::TestCase
   def test_underscores_in_identifiers
     assert_match IDENT, "foo_bar"
     assert_match IDENT, "_\xC3\xBFfoo"
+    assert_match IDENT, "__foo"
+    assert_match IDENT, "_1foo"
+    assert_match IDENT, "-_foo"
+    assert_match IDENT, "_-foo"
   end
 
   def test_invalid_identifiers
@@ -56,9 +60,6 @@ class ScssRxTest < Test::Unit::TestCase
     assert_no_match IDENT, "1foo"
     assert_no_match IDENT, "-1foo"
     assert_no_match IDENT, "--foo"
-    assert_no_match IDENT, "_1foo"
-    assert_no_match IDENT, "-_foo"
-    assert_no_match IDENT, "_-foo"
     assert_no_match IDENT, "foo bar"
     assert_no_match IDENT, "foo~bar"
 

metadata

@@ -5,17 +5,18 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Nathan Weizenbaum
+- Chris Eppstein
 - Hampton Catlin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency