sass 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81425a4314bf7725f3105352c3183b0a343cfab3
-  data.tar.gz: f710dbd2f261a531615cf1f0c481facf6b09a3c6
+  metadata.gz: 8ebb0ff4acc7bb742ad25e99839228582145f498
+  data.tar.gz: 9cbece862e1858dfccb32123986e2866951ee2ca
 SHA512:
-  metadata.gz: 2ed089312445cd14de0ae19217c49fca73c76d84c9ffb83a82afb0cd3eea23c8386559968406d37bf241763523ebca199f1761a8821a40d25cc7d78c89d85498
-  data.tar.gz: 341822fc88d07d4c5e43eca03286bf84546c5988fdc47bacd5e844563f2feaa8f3b8973717302001c423bd3319b8d4c88623195c299fbe2d2302611505d81a5e
+  metadata.gz: 11bf00f275bb42c48f4c1a1bed1066f025bf613e4f07d90065cb59c5879734e6cdd759232b01e810a4180c9d81ed4a093aa687b72fa8fdb5259d30b867ad47b7
+  data.tar.gz: e45333b121ba8f5c042d8fbdc27fe1ec564ec89b9b0e30f414220b93f357b697460abec18b471c8b13f6b0d442b52890861beeda68b888bfa9108ba24fe894e8

data/VERSION

@@ -1 +1 @@
-3.3.5
+3.3.6

data/VERSION_DATE

@@ -1 +1 @@
-15 April 2014 02:38:11 UTC
+26 April 2014 01:17:48 UTC

data/lib/sass/script/value/number.rb

@@ -271,6 +271,8 @@ module Sass::Script::Value
     #
     # @return [String] The representation
     def inspect(opts = {})
+      return original if original
+
       value = self.class.round(self.value)
       str = value.to_s
 

data/lib/sass/scss/parser.rb

@@ -155,10 +155,15 @@ module Sass
         else
           value = Sass::Engine.parse_interp(
             text, line, @scanner.pos - text.size, :filename => @filename)
-          value.unshift(@scanner.
-            string[0...@scanner.pos].
-            reverse[/.*?\*\/(.*?)($|\Z)/, 1].
-            reverse.gsub(/[^\s]/, ' '))
+          string_before_comment = @scanner.string[0...@scanner.pos - text.length]
+          newline_before_comment = string_before_comment.rindex("\n")
+          last_line_before_comment =
+            if newline_before_comment
+              string_before_comment[newline_before_comment + 1..-1]
+            else
+              string_before_comment
+            end
+          value.unshift(last_line_before_comment.gsub(/[^\s]/, ' '))
         end
 
         type = if silent
@@ -1230,8 +1235,9 @@ MESSAGE
 
         unless name
           # Display basic regexps as plain old strings
+          source = rx.source.gsub(%r{\\/}, '/')
           string = rx.source.gsub(/\\(.)/, '\1')
-          name = rx.source == Regexp.escape(string) ? string.inspect : rx.inspect
+          name = source == Regexp.escape(string) ? string.inspect : rx.inspect
         end
 
         expected(name)

data/lib/sass/scss/rx.rb

@@ -80,7 +80,7 @@ module Sass
 
       S = /[ \t\r\n\f]+/
 
-      COMMENT = %r{/\*[^*]*\*+(?:[^/][^*]*\*+)*/}
+      COMMENT = %r{/\*([^*]|\*+[^/*])*\**\*/}
       SINGLE_LINE_COMMENT = %r{//.*(\n[ \t]*//.*)*}
 
       CDO            = quote("<!--")

data/test/sass/script_test.rb

@@ -690,6 +690,11 @@ SCSS
 
   # Regression Tests
 
+  def test_inspect_divided_numbers
+    assert_equal "1px/2px", resolve("inspect(1px/2px)")
+    assert_equal "0.5", resolve("inspect((1px/2px))")
+  end
+
   def test_minus_without_whitespace
     assert_equal "5px", resolve("15px-10px")
   end

data/test/sass/scss/css_test.rb

@@ -1016,6 +1016,27 @@ SCSS
 
   ## Regressions
 
+  def test_very_long_comment_doesnt_take_forever
+    string = 'asdf' * (100000)
+    assert_equal(<<CSS, render(<<SCSS))
+/*
+  #{string}
+*/
+CSS
+/*
+  #{string}
+*/
+SCSS
+  end
+
+  def test_long_unclosed_comment_doesnt_take_forever
+    assert_raise_message(Sass::SyntaxError,
+      'Invalid CSS after "/*": expected "/", was "//*************..."') {render(<<SCSS)}
+/*
+//**************************************************************************
+SCSS
+  end
+
   def test_double_space_string
     assert_equal(<<CSS, render(<<SCSS))
 .a {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard