sass 3.1.21 → 3.2.0.alpha.3

data/README.md

@@ -175,15 +175,16 @@ See `sass-convert --help` for further information and options.
 
 Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
 However, Hampton doesn't even know his way around the code anymore and now
-occasionally consults on the language issues. Hampton lives in Cambridge, UK and
-is the owner of [Catlin Software](http://www.catlinsoftware.com/).
+occasionally consults on the language issues. Hampton lives in Jacksonville,
+Florida and is the lead mobile developer for Wikimedia.
 
 [Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
 Sass. His hard work has kept the project alive by endlessly answering forum
 posts, fixing bugs, refactoring, finding speed improvements, writing
 documentation, implementing new features, and getting Hampton coffee (a fitting
-task for a boy-genius). Nathan lives in Seattle, Washington and works on
-[Dart](http://dartlang.org) application libraries at Google.
+task for a boy-genius). Nathan lives in Seattle, Washington and while not being
+a student at the University of Washington or working at an internship, he
+consults for Unspace Interactive.
 
 [Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
 Sass and the creator of Compass, the first Sass-based framework. Chris focuses

data/REVISION

@@ -1 +1 @@
-(release)
+d30f40911d3707add3c20a224719b9a6bd20ee8e

data/Rakefile

@@ -24,7 +24,7 @@ end
 # Don't use Rake::GemPackageTast because we want prerequisites to run
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:revision_file, :date_file, :submodules, :permissions] do
+task :package => [:revision_file, :submodules, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
@@ -51,7 +51,7 @@ task :permissions do
 end
 
 task :revision_file do
-  require scope('lib/sass')
+  require 'lib/sass'
 
   release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
   if Sass.version[:rev] && !release
@@ -63,17 +63,8 @@ task :revision_file do
   end
 end
 
-task :date_file do
-  File.open(scope('VERSION_DATE'), 'w') do |f|
-    f.puts Time.now.utc.strftime('%d %B %Y %T %Z')
-  end
-end
-
 # We also need to get rid of this file after packaging.
-at_exit do
-  File.delete(scope('REVISION')) rescue nil
-  File.delete(scope('VERSION_DATE')) rescue nil
-end
+at_exit { File.delete(scope('REVISION')) rescue nil }
 
 desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do
@@ -124,9 +115,9 @@ task :submodules do
   if File.exist?(File.dirname(__FILE__) + "/.git")
     sh %{git submodule sync}
     sh %{git submodule update --init}
-  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/listen/lib")
+  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/fssm/lib")
     warn <<WARN
-WARNING: vendor/listen doesn't exist, and this isn't a git repository so
+WARNING: vendor/fssm doesn't exist, and this isn't a git repository so
 I can't get it automatically!
 WARN
   end
@@ -156,7 +147,7 @@ def get_version
   version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
   return written_version unless version.size == 5 && version[3] == "alpha" # prerelease
 
-  return written_version if (commit_count = `git log --pretty=oneline HEAD ^stable | wc -l`).empty?
+  return written_version if (commit_count = `git log --pretty=oneline --first-parent stable.. | wc -l`).empty?
   version[4] = commit_count.strip
   version.join('.')
 end

data/VERSION

@@ -1 +1 @@
-3.1.21
+3.2.0.alpha.3

data/VERSION_NAME

@@ -1 +1 @@
-Brainy Betty
+Bleeding Edge

data/lib/sass.rb

@@ -65,7 +65,6 @@ module Sass
   end
 end
 
-require 'sass/logger'
 require 'sass/util'
 
 require 'sass/engine'

data/lib/sass/cache_stores/base.rb

@@ -49,8 +49,6 @@ module Sass
       # @param obj [Object] The object to cache.
       def store(key, sha, root)
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
-      rescue TypeError, LoadError => e
-        Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -61,7 +59,7 @@ module Sass
       def retrieve(key, sha)
         contents = _retrieve(key, Sass::VERSION, sha)
         Marshal.load(contents) if contents
-      rescue EOFError, TypeError, ArgumentError, LoadError => e
+      rescue EOFError, TypeError, ArgumentError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
       end
 

data/lib/sass/cache_stores/filesystem.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Sass
   module CacheStores
     # A backend for the Sass cache using the filesystem.
@@ -53,7 +51,6 @@ module Sass
       # @param key [String]
       # @return [String] The path to the cache file.
       def path_to(key)
-        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % Sass::Util.ord(c)}
         File.join(cache_location, key)
       end
     end

data/lib/sass/css.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../sass'
 require 'sass/tree/node'
 require 'sass/scss/css_parser'
+require 'strscan'
 
 module Sass
   # This class converts CSS documents into Sass or SCSS templates.
@@ -74,30 +75,15 @@ module Sass
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Sass::SCSS::CssParser.new(@template, @options[:filename]).parse
-      parse_selectors    root
+      root = Sass::SCSS::CssParser.new(@template).parse
       expand_commas      root
-      nest_seqs          root
       parent_ref_rules   root
+      remove_parent_refs root
       flatten_rules      root
       fold_commas        root
-      dump_selectors     root
       root
     end
 
-    # Parse all the selectors in the document and assign them to
-    # {Sass::Tree::RuleNode#parsed_rules}.
-    #
-    # @param root [Tree::Node] The parent node
-    def parse_selectors(root)
-      root.children.each do |child|
-        next parse_selectors(child) if child.is_a?(Tree::DirectiveNode)
-        next unless child.is_a?(Tree::RuleNode)
-        parser = Sass::SCSS::CssParser.new(child.rule.first, child.filename, child.line)
-        child.parsed_rules = parser.parse_selector
-      end
-    end
-
     # Transform
     #
     #     foo, bar, baz
@@ -115,14 +101,12 @@ module Sass
     # @param root [Tree::Node] The parent node
     def expand_commas(root)
       root.children.map! do |child|
-        # child.parsed_rules.members.size > 1 iff the rule contains a comma
-        unless child.is_a?(Tree::RuleNode) && child.parsed_rules.members.size > 1
+        unless child.is_a?(Tree::RuleNode) && child.rule.first.include?(',')
           expand_commas(child) if child.is_a?(Tree::DirectiveNode)
           next child
         end
-        child.parsed_rules.members.map do |seq|
-          node = Tree::RuleNode.new([])
-          node.parsed_rules = make_cseq(seq)
+        child.rule.first.split(',').map do |rule|
+          node = Tree::RuleNode.new([rule.strip])
           node.children = child.children
           node
         end
@@ -130,7 +114,22 @@ module Sass
       root.children.flatten!
     end
 
-    # Make rules use nesting so that
+    # Make rules use parent refs so that
+    #
+    #     foo
+    #       color: green
+    #     foo.bar
+    #       color: blue
+    #
+    # becomes
+    #
+    #     foo
+    #       color: green
+    #       &.bar
+    #         color: blue
+    #
+    # This has the side effect of nesting rules,
+    # so that
     #
     #     foo
     #       color: green
@@ -143,31 +142,28 @@ module Sass
     #
     #     foo
     #       color: green
-    #       bar
+    #       & bar
     #         color: red
-    #       baz
+    #       & baz
     #         color: blue
     #
     # @param root [Tree::Node] The parent node
-    def nest_seqs(root)
+    def parent_ref_rules(root)
       current_rule = nil
       root.children.map! do |child|
         unless child.is_a?(Tree::RuleNode)
-          nest_seqs(child) if child.is_a?(Tree::DirectiveNode)
+          parent_ref_rules(child) if child.is_a?(Tree::DirectiveNode)
           next child
         end
 
-        seq = first_seq(child)
-        seq.members.reject! {|sseq| sseq == "\n"}
-        first, rest = seq.members.first, seq.members[1..-1]
+        first, rest = child.rule.first.scan(/\A(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?\Z/m).first
 
-        if current_rule.nil? || first_sseq(current_rule) != first
-          current_rule = Tree::RuleNode.new([])
-          current_rule.parsed_rules = make_seq(first)
+        if current_rule.nil? || current_rule.rule.first != first
+          current_rule = Tree::RuleNode.new([first])
         end
 
-        unless rest.empty?
-          child.parsed_rules = make_seq(*rest)
+        if rest
+          child.rule = ["&" + rest]
           current_rule << child
         else
           current_rule.children += child.children
@@ -178,57 +174,32 @@ module Sass
       root.children.compact!
       root.children.uniq!
 
-      root.children.each {|v| nest_seqs(v)}
+      root.children.each { |v| parent_ref_rules(v) }
     end
 
-    # Make rules use parent refs so that
+    # Remove useless parent refs so that
     #
     #     foo
-    #       color: green
-    #     foo.bar
-    #       color: blue
+    #       & bar
+    #         color: blue
     #
     # becomes
     #
     #     foo
-    #       color: green
-    #       &.bar
+    #       bar
     #         color: blue
     #
     # @param root [Tree::Node] The parent node
-    def parent_ref_rules(root)
-      current_rule = nil
-      root.children.map! do |child|
-        unless child.is_a?(Tree::RuleNode)
-          parent_ref_rules(child) if child.is_a?(Tree::DirectiveNode)
-          next child
-        end
-
-        sseq = first_sseq(child)
-        next child unless sseq.is_a?(Sass::Selector::SimpleSequence)
-
-        firsts, rest = [sseq.members.first], sseq.members[1..-1]
-        firsts.push rest.shift if firsts.first.is_a?(Sass::Selector::Parent)
-
-        if current_rule.nil? || first_sseq(current_rule).members != firsts
-          current_rule = Tree::RuleNode.new([])
-          current_rule.parsed_rules = make_sseq(*firsts)
-        end
-
-        unless rest.empty?
-          rest.unshift Sass::Selector::Parent.new
-          child.parsed_rules = make_sseq(*rest)
-          current_rule << child
-        else
-          current_rule.children += child.children
+    def remove_parent_refs(root)
+      root.children.each do |child|
+        case child
+        when Tree::RuleNode
+          child.rule.first.gsub! /^& +/, ''
+          remove_parent_refs child
+        when Tree::DirectiveNode
+          remove_parent_refs child
         end
-
-        current_rule
       end
-      root.children.compact!
-      root.children.uniq!
-
-      root.children.each {|v| parent_ref_rules(v)}
     end
 
     # Flatten rules so that
@@ -265,7 +236,7 @@ module Sass
       end
     end
 
-    # Flattens a single rule.
+    # Flattens a single rule
     #
     # @param rule [Tree::RuleNode] The candidate for flattening
     # @see #flatten_rules
@@ -273,10 +244,10 @@ module Sass
       while rule.children.size == 1 && rule.children.first.is_a?(Tree::RuleNode)
         child = rule.children.first
 
-        if first_simple_sel(child).is_a?(Sass::Selector::Parent)
-          rule.parsed_rules = child.parsed_rules.resolve_parent_refs(rule.parsed_rules)
+        if child.rule.first[0] == ?&
+          rule.rule = [child.rule.first.gsub(/^&/, rule.rule.first)]
         else
-          rule.parsed_rules = make_seq(first_sseq(rule), *first_seq(child).members)
+          rule.rule = ["#{rule.rule.first} #{child.rule.first}"]
         end
 
         rule.children = child.children
@@ -309,7 +280,7 @@ module Sass
         end
 
         if prev_rule && prev_rule.children == child.children
-          prev_rule.parsed_rules.members << first_seq(child)
+          prev_rule.rule.first << ", #{child.rule.first}"
           next nil
         end
 
@@ -319,72 +290,5 @@ module Sass
       end
       root.children.compact!
     end
-
-    # Dump all the parsed {Sass::Tree::RuleNode} selectors to strings.
-    #
-    # @param root [Tree::Node] The parent node
-    def dump_selectors(root)
-      root.children.each do |child|
-        next dump_selectors(child) if child.is_a?(Tree::DirectiveNode)
-        next unless child.is_a?(Tree::RuleNode)
-        child.rule = [child.parsed_rules.to_s]
-        dump_selectors(child)
-      end
-    end
-
-    # Create a {Sass::Selector::CommaSequence}.
-    #
-    # @param seqs [Array<Sass::Selector::Sequence>]
-    # @return [Sass::Selector::CommaSequence]
-    def make_cseq(*seqs)
-      Sass::Selector::CommaSequence.new(seqs)
-    end
-
-    # Create a {Sass::Selector::CommaSequence} containing only a single
-    # {Sass::Selector::Sequence}.
-    #
-    # @param sseqs [Array<Sass::Selector::Sequence, String>]
-    # @return [Sass::Selector::CommaSequence]
-    def make_seq(*sseqs)
-      make_cseq(Sass::Selector::Sequence.new(sseqs))
-    end
-
-    # Create a {Sass::Selector::CommaSequence} containing only a single
-    # {Sass::Selector::Sequence} which in turn contains only a single
-    # {Sass::Selector::SimpleSequence}.
-    #
-    # @param sseqs [Array<Sass::Selector::Sequence, String>]
-    # @return [Sass::Selector::CommaSequence]
-    def make_sseq(*sseqs)
-      make_seq(Sass::Selector::SimpleSequence.new(sseqs))
-    end
-
-    # Return the first {Sass::Selector::Sequence} in a {Sass::Tree::RuleNode}.
-    #
-    # @param rule [Sass::Tree::RuleNode]
-    # @return [Sass::Selector::Sequence]
-    def first_seq(rule)
-      rule.parsed_rules.members.first
-    end
-
-    # Return the first {Sass::Selector::SimpleSequence} in a
-    # {Sass::Tree::RuleNode}.
-    #
-    # @param rule [Sass::Tree::RuleNode]
-    # @return [Sass::Selector::SimpleSequence, String]
-    def first_sseq(rule)
-      first_seq(rule).members.first
-    end
-
-    # Return the first {Sass::Selector::Simple} in a {Sass::Tree::RuleNode},
-    # unless the rule begins with a combinator.
-    #
-    # @param rule [Sass::Tree::RuleNode]
-    # @return [Sass::Selector::Simple?]
-    def first_simple_sel(rule)
-      sseq = first_sseq(rule)
-      return unless sseq.is_a?(Sass::Selector::SimpleSequence)
-      sseq.members.first
-    end
   end
 end

data/lib/sass/engine.rb

@@ -1,3 +1,4 @@
+require 'strscan'
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
@@ -25,11 +26,8 @@ require 'sass/tree/charset_node'
 require 'sass/tree/visitors/base'
 require 'sass/tree/visitors/perform'
 require 'sass/tree/visitors/cssize'
-require 'sass/tree/visitors/extend'
 require 'sass/tree/visitors/convert'
 require 'sass/tree/visitors/to_css'
-require 'sass/tree/visitors/deep_copy'
-require 'sass/tree/visitors/set_options'
 require 'sass/tree/visitors/check_nesting'
 require 'sass/selector'
 require 'sass/environment'
@@ -90,10 +88,7 @@ module Sass
     #
     # `children`: `Array<Line>`
     # : The lines nested below this one.
-    #
-    # `comment_tab_str`: `String?`
-    # : The prefix indentation for this comment, if it is a comment.
-    class Line < Struct.new(:text, :tabs, :index, :offset, :filename, :children, :comment_tab_str)
+    class Line < Struct.new(:text, :tabs, :index, :offset, :filename, :children)
       def comment?
         text[0] == COMMENT_CHAR && (text[1] == SASS_COMMENT_CHAR || text[1] == CSS_COMMENT_CHAR)
       end
@@ -110,10 +105,6 @@ module Sass
     # which is not output as a CSS comment.
     SASS_COMMENT_CHAR = ?/
 
-    # The character that indicates that a comment allows interpolation
-    # and should be preserved even in `:compressed` mode.
-    SASS_LOUD_COMMENT_CHAR = ?!
-
     # The character that follows the general COMMENT_CHAR and designates a CSS comment,
     # which is embedded in the CSS document.
     CSS_COMMENT_CHAR = ?*
@@ -219,7 +210,7 @@ module Sass
     # If you're compiling a single Sass file from the filesystem,
     # use \{Sass::Engine.for\_file}.
     # If you're compiling multiple files from the filesystem,
-    # use {Sass::Plugin}.
+    # use {Sass::Plugin.
     #
     # @param template [String] The Sass template.
     #   This template can be encoded using any encoding
@@ -316,6 +307,7 @@ module Sass
         sha = Digest::SHA1.hexdigest(@template)
 
         if root = @options[:cache_store].retrieve(key, sha)
+          @options = root.options.merge(@options)
           root.options = @options
           return root
         end
@@ -324,7 +316,7 @@ module Sass
       check_encoding!
 
       if @options[:syntax] == :scss
-        root = Sass::SCSS::Parser.new(@template, @options[:filename]).parse
+        root = Sass::SCSS::Parser.new(@template).parse
       else
         root = Tree::RootNode.new(@template)
         append_children(root, tree(tabulate(@template)).first, true)
@@ -334,7 +326,7 @@ module Sass
       if @options[:cache] && key && sha
         begin
           old_options = root.options
-          root.options = {}
+          root.options = {:importer => root.options[:importer]}
           @options[:cache_store].store(key, sha, root)
         ensure
           root.options = old_options
@@ -427,8 +419,7 @@ but this line was indented by #{Sass::Shared.human_indentation line[/^\s*/]}.
 MSG
       end
 
-      last.comment_tab_str ||= comment_tab_str
-      last.text << "\n" << line
+      last.text << "\n" << $1
       true
     end
 
@@ -494,8 +485,8 @@ MSG
         if child.is_a?(Tree::CommentNode) && child.silent
           if continued_comment &&
               child.line == continued_comment.line +
-              continued_comment.lines + 1
-            continued_comment.value += ["\n"] + child.value
+              continued_comment.value.count("\n") + 1
+            continued_comment.value << "\n" << child.value
             next
           end
 
@@ -546,7 +537,7 @@ WARNING
       when ?$
         parse_variable(line)
       when COMMENT_CHAR
-        parse_comment(line)
+        parse_comment(line.text)
       when DIRECTIVE_CHAR
         parse_directive(parent, line, root)
       when ESCAPE_CHAR
@@ -565,9 +556,9 @@ WARNING
     end
 
     def parse_property_or_rule(line)
-      scanner = Sass::Util::MultibyteStringScanner.new(line.text)
+      scanner = StringScanner.new(line.text)
       hack_char = scanner.scan(/[:\*\.]|\#(?!\{)/)
-      parser = Sass::SCSS::SassParser.new(scanner, @options[:filename], @line)
+      parser = Sass::SCSS::SassParser.new(scanner, @line)
 
       unless res = parser.parse_interp_ident
         return Tree::RuleNode.new(parse_interp(line.text))
@@ -608,21 +599,13 @@ WARNING
     end
 
     def parse_comment(line)
-      if line.text[1] == CSS_COMMENT_CHAR || line.text[1] == SASS_COMMENT_CHAR
-        silent = line.text[1] == SASS_COMMENT_CHAR
-        if loud = line.text[2] == SASS_LOUD_COMMENT_CHAR
-          value = self.class.parse_interp(line.text, line.index, line.offset, :filename => @filename)
-          value[0].slice!(2) # get rid of the "!"
-        else
-          value = [line.text]
-        end
-        value = with_extracted_values(value) do |str|
-          str = str.gsub(/^#{line.comment_tab_str}/m, '')[2..-1] # get rid of // or /*
-          format_comment_text(str, silent)
-        end
-        Tree::CommentNode.new(value, silent, loud)
+      if line[1] == CSS_COMMENT_CHAR || line[1] == SASS_COMMENT_CHAR
+        silent = line[1] == SASS_COMMENT_CHAR
+        Tree::CommentNode.new(
+          format_comment_text(line[2..-1], silent),
+          silent)
       else
-        Tree::RuleNode.new(parse_interp(line.text))
+        Tree::RuleNode.new(parse_interp(line))
       end
     end
 
@@ -683,7 +666,7 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         Tree::CharsetNode.new(name)
       elsif directive == "media"
-        Tree::MediaNode.new(value.split(',').map {|s| s.strip})
+        Tree::MediaNode.new(value)
       else
         Tree::DirectiveNode.new(line.text)
       end
@@ -749,7 +732,7 @@ WARNING
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
         :line => @line + 1) unless line.children.empty?
 
-      scanner = Sass::Util::MultibyteStringScanner.new(value)
+      scanner = StringScanner.new(value)
       values = []
 
       loop do
@@ -761,11 +744,6 @@ WARNING
         break unless scanner.scan(/,\s*/)
       end
 
-      if scanner.scan(/;/)
-        raise SyntaxError.new("Invalid @import: expected end of line, was \";\".",
-          :line => @line)
-      end
-
       return values
     end
 
@@ -773,19 +751,17 @@ WARNING
       return if scanner.eos?
       unless (str = scanner.scan(Sass::SCSS::RX::STRING)) ||
           (uri = scanner.scan(Sass::SCSS::RX::URI))
-        return Tree::ImportNode.new(scanner.scan(/[^,;]+/))
+        return Tree::ImportNode.new(scanner.scan(/[^,]+/))
       end
 
       val = scanner[1] || scanner[2]
       scanner.scan(/\s*/)
-      if media = scanner.scan(/[a-zA-Z].*/)
+      if media = scanner.scan(/[^,].*/)
         Tree::DirectiveNode.new("@import #{str || uri} #{media}")
-      elsif !scanner.match?(/[,;]|$/)
-        raise SyntaxError.new("Invalid @import: \"#{str || uri} #{scanner.rest}\"")
       elsif uri
         Tree::DirectiveNode.new("@import #{uri}")
       elsif val =~ /^http:\/\//
-        Tree::DirectiveNode.new("@import #{str}")
+        Tree::DirectiveNode.new("@import url(#{val})")
       else
         Tree::ImportNode.new(val)
       end