sass 3.2.0.alpha.11 → 3.2.0.alpha.21

data/REVISION

@@ -1 +1 @@
-bf9eafb0036f01dc23350e0dc1db29b7e5ddf463
+4ddfd6971c9a04129f3a184c15868ecacf46120f

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.11
+3.2.0.alpha.21

data/lib/sass/cache_stores/base.rb

@@ -42,20 +42,15 @@ module Sass
         raise "#{self.class} must implement #_retrieve."
       end
 
-      # Store an object to the Sass Cache.
+      # Store a {Sass::Tree::RootNode}.
       #
       # @param key [String] The key to store it under.
       # @param sha [String] The checksum for the contents that are being stored.
       # @param obj [Object] The object to cache.
-      def store(key, sha, obj)
-        temp = obj.before_sass_cache_store if obj.respond_to?(:before_sass_cache_store)
-        begin
-          _store(key, Sass::VERSION, sha, Marshal.dump(obj))
-        ensure
-          obj.after_sass_cache_store(temp) if obj.respond_to?(:after_sass_cache_store)
-        end
+      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 a #{obj.class.name} to cache #{path_to(key)}: #{e}"
+        Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
       end
 
       # Retrieve a {Sass::Tree::RootNode}.

data/lib/sass/cache_stores/filesystem.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Sass
   module CacheStores
     # A backend for the Sass cache using the filesystem.

data/lib/sass/css.rb

@@ -75,7 +75,7 @@ module Sass
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Sass::SCSS::CssParser.new(@template).parse
+      root = Sass::SCSS::CssParser.new(@template, @options[:filename]).parse
       expand_commas      root
       parent_ref_rules   root
       remove_parent_refs root
@@ -106,6 +106,7 @@ module Sass
           next child
         end
         child.rule.first.split(',').map do |rule|
+          next if rule.strip.empty?
           node = Tree::RuleNode.new([rule.strip])
           node.children = child.children
           node

data/lib/sass/engine.rb

@@ -12,6 +12,8 @@ require 'sass/tree/media_node'
 require 'sass/tree/variable_node'
 require 'sass/tree/mixin_def_node'
 require 'sass/tree/mixin_node'
+require 'sass/tree/trace_node'
+require 'sass/tree/content_node'
 require 'sass/tree/function_node'
 require 'sass/tree/return_node'
 require 'sass/tree/extend_node'
@@ -28,6 +30,8 @@ require 'sass/tree/visitors/perform'
 require 'sass/tree/visitors/cssize'
 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'
@@ -56,7 +60,10 @@ module Sass
   #
   # `tree`: `Array<Tree::Node>`
   # : The parse tree for the mixin/function.
-  Callable = Struct.new(:name, :args, :environment, :tree)
+  #
+  # `has_content`: `Boolean`
+  # : Whether the callable accepts a content block.
+  Callable = Struct.new(:name, :args, :environment, :tree, :has_content)
 
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
@@ -307,7 +314,6 @@ 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
@@ -316,7 +322,7 @@ module Sass
       check_encoding!
 
       if @options[:syntax] == :scss
-        root = Sass::SCSS::Parser.new(@template).parse
+        root = Sass::SCSS::Parser.new(@template, @options[:filename]).parse
       else
         root = Tree::RootNode.new(@template)
         append_children(root, tree(tabulate(@template)).first, true)
@@ -558,7 +564,7 @@ WARNING
     def parse_property_or_rule(line)
       scanner = StringScanner.new(line.text)
       hack_char = scanner.scan(/[:\*\.]|\#(?!\{)/)
-      parser = Sass::SCSS::SassParser.new(scanner, @line)
+      parser = Sass::SCSS::SassParser.new(scanner, @options[:filename], @line)
 
       unless res = parser.parse_interp_ident
         return Tree::RuleNode.new(parse_interp(line.text))
@@ -619,6 +625,8 @@ WARNING
         parse_import(line, value)
       elsif directive == "mixin"
         parse_mixin_definition(line)
+      elsif directive == "content"
+        parse_content_directive(line)
       elsif directive == "include"
         parse_mixin_include(line, root)
       elsif directive == "function"
@@ -744,6 +752,11 @@ 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
 
@@ -751,12 +764,12 @@ 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(/[^,].*/)
+      if media = scanner.scan(/[^,;].*/)
         Tree::DirectiveNode.new("@import #{str || uri} #{media}")
       elsif uri
         Tree::DirectiveNode.new("@import #{uri}")
@@ -778,6 +791,15 @@ WARNING
       Tree::MixinDefNode.new(name, args)
     end
 
+    CONTENT_RE = /^@content\s*(.+)?$/
+    def parse_content_directive(line)
+      trailing = line.text.scan(CONTENT_RE).first.first
+      raise SyntaxError.new("Invalid content directive. Trailing characters found: \"#{trailing}\".") unless trailing.nil?
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath @content directives.",
+        :line => line.index + 1) unless line.children.empty?
+      Tree::ContentNode.new
+    end
+
     MIXIN_INCLUDE_RE = /^(?:\+|@include)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_include(line, root)
       name, arg_string = line.text.scan(MIXIN_INCLUDE_RE).first
@@ -786,8 +808,6 @@ WARNING
       offset = line.offset + line.text.size - arg_string.size
       args, keywords = Script::Parser.new(arg_string.strip, @line, offset, @options).
         parse_mixin_include_arglist
-      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath mixin directives.",
-        :line => @line + 1) unless line.children.empty?
       Tree::MixinNode.new(name, args, keywords)
     end
 

data/lib/sass/environment.rb

@@ -19,6 +19,8 @@ module Sass
     # @return [Environment]
     attr_reader :parent
     attr_writer :options
+    attr_writer :caller
+    attr_writer :content
 
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil)
@@ -30,6 +32,19 @@ module Sass
       end
     end
 
+    # The environment of the caller of this environment's mixin or function.
+    # @return {Environment?}
+    def caller
+      @caller || (@parent && @parent.caller)
+    end
+
+    # The content passed to this environmnet. This is naturally only set
+    # for mixin body environments with content passed in.
+    # @return {Environment?}
+    def content
+      @content || (@parent && @parent.content)
+    end
+
     # The options hash.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     #
@@ -93,6 +108,17 @@ module Sass
       @mixins_in_use ||= @parent.mixins_in_use
     end
 
+    def stack_trace
+      trace = []
+      stack.reverse.each_with_index do |entry, i|
+        msg = "#{i == 0 ? "on" : "from"} line #{entry[:line]}"
+        msg << " of #{entry[:filename] || "an unknown file"}"
+        msg << ", in `#{entry[:mixin]}'" if entry[:mixin]
+        trace << msg
+      end
+      trace
+    end
+
     private
 
     def parent_options

data/lib/sass/exec.rb

@@ -229,6 +229,10 @@ END
                                    'Only meaningful for --watch and --update.') do
           @options[:stop_on_error] = true
         end
+        opts.on('-f', '--force', 'Recompile all Sass files, even if the CSS file is newer.',
+                                 'Only meaningful for --update.') do
+          @options[:force] = true
+        end
         opts.on('-c', '--check', "Just check syntax, don't evaluate.") do
           require 'stringio'
           @options[:check_syntax] = true
@@ -238,6 +242,10 @@ END
                 'Output style. Can be nested (default), compact, compressed, or expanded.') do |name|
           @options[:for_engine][:style] = name.to_sym
         end
+        opts.on('--precision NUMBER_OF_DIGITS', Integer,
+                'How many digits of precision to use when outputting decimal numbers. Defaults to 3.') do |precision|
+          ::Sass::Script::Number.precision = precision
+        end
         opts.on('-q', '--quiet', 'Silence warnings and status messages during compilation.') do
           @options[:for_engine][:quiet] = true
         end
@@ -350,6 +358,11 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
 
+        if @options[:force]
+          raise "The --force flag may only be used with --update." unless @options[:update]
+          ::Sass::Plugin.options[:always_update] = true
+        end
+
         raise <<MSG if @args.empty?
 What files should I watch? Did you mean something like:
     #{@default_syntax} --watch input.#{@default_syntax}:output.css

data/lib/sass/importers/base.rb

@@ -72,7 +72,8 @@ module Sass
       # If no such files exist, it should return nil.
       #
       # The {Sass::Engine} to be returned should be passed `options`,
-      # with a few modifications. `:filename` and `:syntax` should be set appropriately,
+      # with a few modifications. `:syntax` should be set appropriately,
+      # `:filename` should be set to `uri`,
       # and `:importer` should be set to this importer.
       #
       # @param uri [String] The URI to import.

data/lib/sass/script/funcall.rb

@@ -57,6 +57,14 @@ module Sass
         @args + @keywords.values
       end
 
+      # @see Node#deep_copy
+      def deep_copy
+        node = dup
+        node.instance_variable_set('@args', args.map {|a| a.deep_copy})
+        node.instance_variable_set('@keywords', Hash[keywords.map {|k, v| [k, v.deep_copy]}])
+        node
+      end
+
       protected
 
       # Evaluates the function call.

data/lib/sass/script/interpolation.rb

@@ -50,6 +50,15 @@ module Sass::Script
       [@before, @mid, @after].compact
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@before', @before.deep_copy) if @before
+      node.instance_variable_set('@mid', @mid.deep_copy)
+      node.instance_variable_set('@after', @after.deep_copy) if @after
+      node
+    end
+
     protected
 
     # Evaluates the interpolation.

data/lib/sass/script/list.rb

@@ -24,6 +24,13 @@ module Sass::Script
       @separator = separator
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@value', value.map {|c| c.deep_copy})
+      node
+    end
+
     # @see Node#eq
     def eq(other)
       Sass::Script::Bool.new(

data/lib/sass/script/literal.rb

@@ -33,6 +33,11 @@ module Sass::Script
       []
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      dup
+    end
+
     # Returns the options hash for this node.
     #
     # @return [{Symbol => Object}]

data/lib/sass/script/node.rb

@@ -57,6 +57,14 @@ module Sass::Script
       Sass::Util.abstract(self)
     end
 
+    # Returns a deep clone of this node.
+    # The child nodes are cloned, but options are not.
+    #
+    # @return [Node]
+    def deep_copy
+      Sass::Util.abstract(self)
+    end
+
     protected
 
     # Converts underscores to dashes if the :dasherize option is set.

data/lib/sass/script/number.rb

@@ -35,11 +35,34 @@ module Sass::Script
     # @return [Boolean, nil]
     attr_accessor :original
 
-    # The precision with which numbers will be printed to CSS files.
-    # For example, if this is `1000.0`,
+    def self.precision
+      @precision ||= 3
+    end
+
+    # Sets the number of digits of precision
+    # For example, if this is `3`,
     # `3.1415926` will be printed as `3.142`.
-    # @api public
-    PRECISION = 1000.0
+    def self.precision=(digits)
+      @precision = digits.round
+      @precision_factor = 10.0**@precision
+    end
+
+    # the precision factor used in numeric output
+    # it is derived from the `precision` method.
+    def self.precision_factor
+      @precision_factor ||= 10.0**precision
+    end
+
+    # Handles the deprecation warning for the PRECISION constant
+    # This can be removed in 3.2.
+    def self.const_missing(const)
+      if const == :PRECISION
+        Sass::Util.sass_warn("Sass::Script::Number::PRECISION is deprecated and will be removed in a future release. Use Sass::Script::Number.precision_factor instead.")
+        const_set(:PRECISION, self.precision_factor)
+      else
+        super
+      end
+    end
 
     # Used so we don't allocate two new arrays for each new number.
     NO_UNITS  = []
@@ -337,7 +360,7 @@ module Sass::Script
       elsif num % 1 == 0.0
         num.to_i
       else
-        (num * PRECISION).round / PRECISION
+        (num * self.precision_factor).round / self.precision_factor
       end
     end
 

data/lib/sass/script/operation.rb

@@ -55,6 +55,14 @@ module Sass::Script
       [@operand1, @operand2]
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@operand1', @operand1.deep_copy)
+      node.instance_variable_set('@operand2', @operand2.deep_copy)
+      node
+    end
+
     protected
 
     # Evaluates the operation.

data/lib/sass/script/string_interpolation.rb

@@ -60,6 +60,15 @@ module Sass::Script
       [@before, @mid, @after].compact
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@before', @before.deep_copy) if @before
+      node.instance_variable_set('@mid', @mid.deep_copy)
+      node.instance_variable_set('@after', @after.deep_copy) if @after
+      node
+    end
+
     protected
 
     # Evaluates the interpolation.

data/lib/sass/script/unary_operation.rb

@@ -38,6 +38,13 @@ module Sass::Script
       [@operand]
     end
 
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@operand', @operand.deep_copy)
+      node
+    end
+
     protected
 
     # Evaluates the operation.

data/lib/sass/script/variable.rb

@@ -34,6 +34,11 @@ module Sass
         []
       end
 
+      # @see Node#deep_copy
+      def deep_copy
+        dup
+      end
+
       protected
 
       # Evaluates the variable.

data/lib/sass/scss/parser.rb

@@ -9,10 +9,12 @@ module Sass
       # @param str [String, StringScanner] The source document to parse.
       #   Note that `Parser` *won't* raise a nice error message if this isn't properly parsed;
       #   for that, you should use the higher-level {Sass::Engine} or {Sass::CSS}.
+      # @param filename [String] The name of the file being parsed. Used for warnings.
       # @param line [Fixnum] The line on which the source string appeared,
-      #   if it's part of another document
-      def initialize(str, line = 1)
+      #   if it's part of another document.
+      def initialize(str, filename, line = 1)
         @template = str
+        @filename = filename
         @line = line
         @strs = []
       end
@@ -99,7 +101,7 @@ module Sass
       end
 
       DIRECTIVES = Set[:mixin, :include, :function, :return, :debug, :warn, :for,
-        :each, :while, :if, :else, :extend, :import, :media, :charset]
+        :each, :while, :if, :else, :extend, :import, :media, :charset, :content]
 
       def directive
         return unless tok(/@/)
@@ -141,7 +143,18 @@ module Sass
         name = tok! IDENT
         args, keywords = sass_script(:parse_mixin_include_arglist)
         ss
-        node(Sass::Tree::MixinNode.new(name, args, keywords))
+        include_node = node(Sass::Tree::MixinNode.new(name, args, keywords))
+        if tok?(/\{/)
+          include_node.has_children = true
+          block(include_node, :directive)
+        else
+          include_node
+        end
+      end
+
+      def content_directive
+        ss
+        node(Sass::Tree::ContentNode.new)
       end
 
       def function_directive
@@ -487,20 +500,20 @@ module Sass
         res = [e]
 
         # The tok(/\*/) allows the "E*" hack
-        while v = element_name || id_selector || class_selector ||
-            attrib || negation || pseudo || interpolation_selector ||
-            (tok(/\*/) && Selector::Universal.new(nil))
+        while v = id_selector || class_selector || attrib || negation || pseudo ||
+            interpolation_selector || (tok(/\*/) && Selector::Universal.new(nil))
           res << v
         end
 
-        if tok?(/&/)
+        pos = @scanner.pos
+        line = @line
+        if sel = str? {simple_selector_sequence}
+          @scanner.pos = pos
+          @line = line
           begin
             expected('"{"')
           rescue Sass::SyntaxError => e
-            e.message << "\n\n" << <<MESSAGE
-In Sass 3, the parent selector & can only be used where element names are valid,
-since it could potentially be replaced by an element name.
-MESSAGE
+            e.message << "\n\n\"#{sel}\" may only be used at the beginning of a selector."
             raise e
           end
         end
@@ -613,7 +626,7 @@ MESSAGE
       end
 
       def negation
-        return unless name = tok(NOT) || tok(MOZ_ANY)
+        return unless name = tok(NOT) || tok(ANY)
         ss
         @expected = "selector"
         sel = selector_comma_sequence