sass 3.1.11 → 3.1.12

data/VERSION

@@ -1 +1 @@
-3.1.11
+3.1.12

data/lib/sass/engine.rb

@@ -683,7 +683,7 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         Tree::CharsetNode.new(name)
       elsif directive == "media"
-        Tree::MediaNode.new(value)
+        Tree::MediaNode.new(value.split(',').map {|s| s.strip})
       else
         Tree::DirectiveNode.new(line.text)
       end

data/lib/sass/environment.rb

@@ -26,7 +26,7 @@ module Sass
       unless parent
         @stack = []
         @mixins_in_use = Set.new
-        set_var("important", Script::String.new("!important"))
+        @files_in_use = Set.new
       end
     end
 
@@ -59,7 +59,8 @@ module Sass
       else
         stack.push(top_of_stack = frame_info)
       end
-      mixins_in_use << top_of_stack[:mixin] if top_of_stack[:mixin] && !top_of_stack[:prepared]
+      mixins_in_use << top_of_stack[:mixin] if top_of_stack[:mixin]
+      files_in_use << top_of_stack[:filename] if top_of_stack[:filename]
     end
 
     # Like \{#push\_frame}, but next time a stack frame is pushed,
@@ -72,9 +73,8 @@ module Sass
 
     # Pop a stack frame from the mixin/include stack.
     def pop_frame
-      stack.pop if stack.last && stack.last[:prepared]
-      popped = stack.pop
-      mixins_in_use.delete(popped[:mixin]) if popped && popped[:mixin]
+      pop_and_unuse if stack.last && stack.last[:prepared]
+      pop_and_unuse
     end
 
     # A list of stack frames in the mixin/include stack.
@@ -93,6 +93,13 @@ module Sass
       @mixins_in_use ||= @parent.mixins_in_use
     end
 
+    # A set of names of files currently present in the stack.
+    #
+    # @return [Set<String>] The filenames.
+    def files_in_use
+      @files_in_use ||= @parent.files_in_use
+    end
+
     def stack_trace
       trace = []
       stack.reverse.each_with_index do |entry, i|
@@ -106,6 +113,13 @@ module Sass
 
     private
 
+    def pop_and_unuse
+      popped = stack.pop
+      mixins_in_use.delete(popped[:mixin]) if popped && popped[:mixin]
+      files_in_use.delete(popped[:filename]) if popped && popped[:filename]
+      popped
+    end
+
     def parent_options
       @parent_options ||= @parent && @parent.options
     end

data/lib/sass/exec.rb

@@ -389,7 +389,7 @@ MSG
         dirs.map! {|from, to| [from, to || from]}
         ::Sass::Plugin.options[:template_location] = dirs
 
-        ::Sass::Plugin.on_updating_stylesheet do |_, css|
+        ::Sass::Plugin.on_updated_stylesheet do |_, css|
           if File.exists? css
             puts_action :overwrite, :yellow, css
           else

data/lib/sass/repl.rb

@@ -15,7 +15,6 @@ module Sass
     # Starts the read-eval-print loop.
     def run
       environment = Environment.new
-      environment.set_var('important', Script::String.new('!important'))
       @line = 0
       loop do
         @line += 1

data/lib/sass/script/functions.rb

@@ -968,7 +968,7 @@ module Sass::Script
       #
       # Finally, the weight of color1 is renormalized to be within [0, 1]
       # and the weight of color2 is given by 1 minus the weight of color1.
-      p = weight.value/100.0
+      p = (weight.value/100.0).to_f
       w = p*2 - 1
       a = color1.alpha - color2.alpha
 

data/lib/sass/script/number.rb

@@ -360,7 +360,7 @@ module Sass::Script
       elsif num % 1 == 0.0
         num.to_i
       else
-        (num * self.precision_factor).round / self.precision_factor
+        ((num * self.precision_factor).round / self.precision_factor).to_f
       end
     end
 

data/lib/sass/script/variable.rb

@@ -21,7 +21,6 @@ module Sass
 
       # @return [String] A string representation of the variable
       def inspect(opts = {})
-        return "!important" if name == "important"
         "$#{dasherize(name, opts)}"
       end
       alias_method :to_sass, :inspect

data/lib/sass/scss/parser.rb

@@ -287,20 +287,23 @@ module Sass
       def use_css_import?; false; end
 
       def media_directive
-        val = str {media_query_list}.strip
-        block(node(Sass::Tree::MediaNode.new(val)), :directive)
+        block(node(Sass::Tree::MediaNode.new(media_query_list)), :directive)
       end
 
       # http://www.w3.org/TR/css3-mediaqueries/#syntax
       def media_query_list
-        return unless media_query
+        has_q = false
+        q = str {has_q = media_query}
+
+        return unless has_q
+        queries = [q.strip]
 
         ss
         while tok(/,/)
-          ss; expr!(:media_query); ss
+          ss; queries << str {expr!(:media_query)}.strip; ss
         end
 
-        true
+        queries
       end
 
       def media_query
@@ -437,7 +440,7 @@ module Sass
       end
 
       def selector_sequence
-        if sel = tok(STATIC_SELECTOR)
+        if sel = tok(STATIC_SELECTOR, true)
           return [sel]
         end
 
@@ -681,7 +684,7 @@ MESSAGE
         # we don't parse it at all, and instead return a plain old string
         # containing the value.
         # This results in a dramatic speed increase.
-        if val = tok(STATIC_VALUE)
+        if val = tok(STATIC_VALUE, true)
           return space, Sass::Script::String.new(val.strip)
         end
         return space, sass_script(:parse)
@@ -770,7 +773,7 @@ MESSAGE
       end
 
       def interp_ident(start = IDENT)
-        return unless val = tok(start) || interpolation || tok(IDENT_HYPHEN_INTERP)
+        return unless val = tok(start) || interpolation || tok(IDENT_HYPHEN_INTERP, true)
         res = [val]
         while val = tok(NAME) || interpolation
           res << val
@@ -944,9 +947,20 @@ MESSAGE
       # This is important because `#tok` is called all the time.
       NEWLINE = "\n"
 
-      def tok(rx)
+      def tok(rx, last_group_lookahead = false)
         res = @scanner.scan(rx)
         if res
+          # This fixes https://github.com/nex3/sass/issues/104, which affects
+          # Ruby 1.8.7 and REE. This fix is to replace the ?= zero-width
+          # positive lookahead operator in the Regexp (which matches without
+          # consuming the matched group), with a match that does consume the
+          # group, but then rewinds the scanner and removes the group from the
+          # end of the matched string. This fix makes the assumption that the
+          # matched group will always occur at the end of the match.
+          if last_group_lookahead && @scanner[-1]
+            @scanner.pos -= @scanner[-1].length
+            res.slice!(-@scanner[-1].length..-1)
+          end
           @line += res.count(NEWLINE)
           @expected = nil
           if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT

data/lib/sass/scss/rx.rb

@@ -112,7 +112,7 @@ module Sass
       INTERP_START = /#\{/
       MOZ_ANY = quote(":-moz-any(", Regexp::IGNORECASE)
 
-      IDENT_HYPHEN_INTERP = /-(?=#\{)/
+      IDENT_HYPHEN_INTERP = /-(#\{)/
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
@@ -120,9 +120,13 @@ module Sass
       # 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}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
-
-      STATIC_SELECTOR = /(#{NMCHAR}|\s|[,>+*]|[:#.]#{NMSTART})+(?=[{])/i
+      #
+      # We explicitly avoid parsing newlines or values/selectors longer than
+      # about 50 characters. This mitigates the problem of exponential parsing
+      # time when a value has a long string of valid, parsable content followed
+      # by something invalid.
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|[ \t](?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important){0,50}([;}])/i
+      STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){0,50}([{])/i
     end
   end
 end

data/lib/sass/tree/media_node.rb

@@ -6,9 +6,9 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class MediaNode < DirectiveNode
-    # The media query (e.g. `print` or `screen`).
+    # The media query. A list of comma-separated queries (e.g. `print` or `screen`).
     #
-    # @return [String]
+    # @return [Array<String>]
     attr_accessor :query
 
     # @see RuleNode#tabs
@@ -17,7 +17,7 @@ module Sass::Tree
     # @see RuleNode#group_end
     attr_accessor :group_end
 
-    # @param query [String] See \{#query}
+    # @param query [Array<String>] See \{#query}
     def initialize(query)
       @query = query
       @tabs = 0
@@ -26,7 +26,7 @@ module Sass::Tree
 
     # @see DirectiveNode#value
     def value
-      "@media #{query}"
+      "@media #{query.join(', ')}"
     end
   end
 end

data/lib/sass/tree/visitors/convert.rb

@@ -154,7 +154,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_media(node)
-    "#{tab_str}@media #{node.query}#{yield}"
+    "#{tab_str}@media #{node.query.join(', ')}#{yield}"
   end
 
   def visit_mixindef(node)
@@ -230,7 +230,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def selector_to_sass(sel)
     sel.map do |r|
       if r.is_a?(String)
-        r.gsub(/(,[ \t]*)?\n\s*/) {$1 ? $1 + "\n" : " "}
+        r.gsub(/(,)?([ \t]*)\n\s*/) {$1 ? "#{$1}#{$2}\n" : " "}
       else
         "\#{#{r.to_sass(@options)}}"
       end
@@ -239,7 +239,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def selector_to_scss(sel)
     sel.map {|r| r.is_a?(String) ? r : "\#{#{r.to_sass(@options)}}"}.
-      join.gsub(/^[ \t]*/, tab_str)
+      join.gsub(/^[ \t]*/, tab_str).gsub(/[ \t]*$/, '')
   end
 
   def semi

data/lib/sass/tree/visitors/cssize.rb

@@ -117,7 +117,9 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
 
     media = node.children.select {|c| c.is_a?(Sass::Tree::MediaNode)}
     node.children.reject! {|c| c.is_a?(Sass::Tree::MediaNode)}
-    media.each {|n| n.query = "#{node.query} and #{n.query}"}
+    media.each do |n|
+      n.query = node.query.map {|pq| n.query.map {|cq| "#{pq} and #{cq}"}}.flatten
+    end
     (node.children.empty? ? [] : [node]) + media
   end
 

data/lib/sass/tree/visitors/perform.rb

@@ -137,9 +137,11 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     if path = node.css_import?
       return Sass::Tree::DirectiveNode.new("@import url(#{path})")
     end
+    file = node.imported_file
+    handle_import_loop!(node) if @environment.files_in_use.include?(file.options[:filename])
 
     @environment.push_frame(:filename => node.filename, :line => node.line)
-    root = node.imported_file.to_tree
+    root = file.to_tree
     Sass::Tree::Visitors::CheckNesting.visit(root)
     node.children = root.children.map {|c| visit(c)}.flatten
     node
@@ -293,9 +295,7 @@ END
   def handle_include_loop!(node)
     msg = "An @include loop has been found:"
     mixins = @environment.stack.map {|s| s[:mixin]}.compact
-    if mixins.size == 2 && mixins[0] == mixins[1]
-      raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself")
-    end
+    raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
 
     mixins << node.name
     msg << "\n" << Sass::Util.enum_cons(mixins, 2).map do |m1, m2|
@@ -304,6 +304,18 @@ END
     raise Sass::SyntaxError.new(msg)
   end
 
+  def handle_import_loop!(node)
+    msg = "An @import loop has been found:"
+    files = @environment.stack.map {|s| s[:filename]}.compact
+    raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself") if files.size == 1
+
+    files << node.filename << node.imported_file.options[:filename]
+    msg << "\n" << Sass::Util.enum_cons(files, 2).map do |m1, m2|
+      "    #{m1} imports #{m2}"
+    end.join("\n")
+    raise Sass::SyntaxError.new(msg)
+  end
+
   def check_for_loud_silent_comment(node)
     return unless node.loud && node.silent
     Sass::Util.sass_warn <<MESSAGE

data/test/sass/conversion_test.rb

@@ -180,7 +180,7 @@ SCSS
   def test_multiline_properties
     assert_scss_to_sass <<SASS, <<SCSS
 foo bar
-  baz: bip   bam         boon
+  baz: bip bam boon
 SASS
 foo bar {
   baz:
@@ -191,7 +191,7 @@ SCSS
 
     assert_scss_to_scss <<OUT, <<IN
 foo bar {
-  baz: bip   bam         boon; }
+  baz: bip bam boon; }
 OUT
 foo bar {
   baz:

data/test/sass/engine_test.rb

@@ -470,6 +470,53 @@ MESSAGE
     assert_hash_has(err.sass_backtrace[2], :mixin => "foo", :line => 2)
   end
 
+  def test_basic_import_loop_exception
+    import = filename_for_test
+    importer = MockImporter.new
+    importer.add_import(import, "@import '#{import}'")
+
+    engine = Sass::Engine.new("@import '#{import}'", :filename => import,
+      :load_paths => [importer])
+
+    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
+An @import loop has been found: #{import} imports itself
+ERR
+  end
+
+  def test_double_import_loop_exception
+    importer = MockImporter.new
+    importer.add_import("foo", "@import 'bar'")
+    importer.add_import("bar", "@import 'foo'")
+
+    engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
+      :load_paths => [importer])
+
+    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
+An @import loop has been found:
+    #{filename_for_test} imports foo
+    foo imports bar
+    bar imports foo
+ERR
+  end
+
+  def test_deep_import_loop_exception
+    importer = MockImporter.new
+    importer.add_import("foo", "@import 'bar'")
+    importer.add_import("bar", "@import 'baz'")
+    importer.add_import("baz", "@import 'foo'")
+
+    engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
+      :load_paths => [importer])
+
+    assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
+An @import loop has been found:
+    #{filename_for_test} imports foo
+    foo imports bar
+    bar imports baz
+    baz imports foo
+ERR
+  end
+
   def test_exception_css_with_offset
     opts = {:full_exception => true, :line => 362}
     render(("a\n  b: c\n" * 10) + "d\n  e:\n" + ("f\n  g: h\n" * 10), opts)
@@ -1979,6 +2026,19 @@ CSS
 SASS
   end
 
+  def test_double_media_bubbling_with_commas
+    assert_equal <<CSS, render(<<SASS)
+@media foo and baz, foo and bang, bar and baz, bar and bang {
+  .foo {
+    c: d; } }
+CSS
+@media foo, bar
+  @media baz, bang
+    .foo
+      c: d
+SASS
+  end
+
   def test_rule_media_rule_bubbling
     assert_equal <<CSS, render(<<SASS)
 @media bar {
@@ -2041,6 +2101,24 @@ CSS
 
   # Regression tests
 
+  def test_tricky_mixin_loop_exception
+    render <<SASS
+@mixin foo($a)
+  @if $a
+    @include foo(false)
+    @include foo(true)
+  @else
+    a: b
+
+a
+  @include foo(true)
+SASS
+    assert(false, "Exception not raised")
+  rescue Sass::SyntaxError => err
+    assert_equal("An @include loop has been found: foo includes itself", err.message)
+    assert_hash_has(err.sass_backtrace[0], :mixin => "foo", :line => 3)
+  end
+
   def test_interpolated_comment_in_mixin
     assert_equal <<CSS, render(<<SASS)
 /* color: red */

data/test/sass/scss/scss_test.rb

@@ -1270,4 +1270,29 @@ CSS
 foo {color: darken(black, 10%)}
 SCSS
   end
+
+  # ref: https://github.com/nex3/sass/issues/104
+  def test_no_buffer_overflow
+    template = render <<SCSS
+.aaa {
+  background-color: white;
+}
+.aaa .aaa .aaa {
+  background-color: black;
+}   
+.bbb {
+  @extend .aaa;
+} 
+.xxx {
+  @extend .bbb;
+}
+.yyy {
+  @extend .bbb;
+}
+.zzz {
+  @extend .bbb;
+}
+SCSS
+    Sass::SCSS::Parser.new(template, "test.scss").parse
+  end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'sass'
+require 'mathn' if ENV['MATHN'] == 'true'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 3
   - 1
-  - 11
-  version: 3.1.11
+  - 12
+  version: 3.1.12
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 -08:00
+date: 2011-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency