sass 3.3.0.alpha.101 → 3.3.0.alpha.102

data/REVISION

@@ -1 +1 @@
-d412ca4d9bd9fca447d84e1fd960268a8419b9f3
+6ac9536a80c7f14e5aa3d478a36d40d5a7bbbb98

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.101
+3.3.0.alpha.102

data/VERSION_DATE

@@ -1 +1 @@
-27 February 2013 19:13:18 GMT
+07 March 2013 21:59:54 GMT

data/lib/sass/script/string.rb

@@ -33,7 +33,7 @@ module Sass::Script
     # @see Node#to_s
     def to_s(opts = {})
       if @type == :identifier
-        return @value.tr("\n", " ")
+        return @value.gsub(/\s+/, " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}

data/lib/sass/scss/rx.rb

@@ -124,11 +124,9 @@ module Sass
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
-      # Can't use IDENT here, because it seems to take exponential time on 1.8.
-      # We could use it for 1.9 only, but I don't want to introduce a cross-version
-      # behavior difference.
-      # In any case, almost all CSS idents will be matched by this.
-      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|#[a-f0-9]|[,%]|-?#{NUMBER}|\!important)+([;}])/i
+
+      STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
+      STATIC_VALUE = /#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*([;}])/i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){0,50}([{])/i
     end
   end

data/test/sass/scss/css_test.rb

@@ -425,7 +425,7 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: -0.5em;
-  b: 0.5em;
+  b: +0.5em;
   c: -foo(12px);
   d: +foo(12px); }
 CSS
@@ -1011,6 +1011,17 @@ SCSS
 
   ## Regressions
 
+  def test_very_long_number_with_important_doesnt_take_forever
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  width: 97.916666666666666666666666666667% !important; }
+CSS
+.foo {
+  width: 97.916666666666666666666666666667% !important;
+}
+SCSS
+  end
+
   def test_selector_without_closing_bracket
     assert_not_parses('"]"', "foo[bar <err>{a: b}")
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303047
+  hash: 592303041
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 101
-  version: 3.3.0.alpha.101
+  - 102
+  version: 3.3.0.alpha.102
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-27 00:00:00 -05:00
+date: 2013-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency