sass 3.3.0.alpha.16 → 3.3.0.alpha.50

data/REVISION

@@ -1 +1 @@
-83d6e352af4861f6c8fe852aaee38ca0097b1d9e
+c962fa1b7d90fdb2e9df72ae2527a48f1f770276

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.16
+3.3.0.alpha.50

data/VERSION_DATE

@@ -1 +1 @@
-10 November 2012 01:58:43 GMT
+29 November 2012 19:00:24 GMT

data/lib/sass/engine.rb

@@ -1,6 +1,9 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
+require 'sass/source/position'
+require 'sass/source/range'
+require 'sass/source/map'
 require 'sass/tree/node'
 require 'sass/tree/root_node'
 require 'sass/tree/rule_node'
@@ -259,9 +262,23 @@ module Sass
     #   cannot be converted to UTF-8
     # @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
     def render
-      return _render unless @options[:quiet]
-      Sass::Util.silence_sass_warnings {_render}
+      return encode_and_set_charset(_to_tree.render) unless @options[:quiet]
+      Sass::Util.silence_sass_warnings {encode_and_set_charset(_to_tree.render)}
     end
+
+    # Render the template to CSS and return the source map.
+    #
+    # @param sourcemap_uri [String] The sourcemap URI to use in the @sourceMappingURL comment
+    # @return [(String, Sass::Source::Map)] The rendered CSS and the associated source map
+    # @raise [Sass::SyntaxError] if there's an error in the document
+    # @raise [Encoding::UndefinedConversionError] if the source encoding
+    #   cannot be converted to UTF-8
+    # @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
+    def render_with_sourcemap(sourcemap_uri)
+      return _render_with_sourcemap(sourcemap_uri) unless @options[:quiet]
+      Sass::Util.silence_sass_warnings {_render_with_sourcemap(sourcemap_uri)}
+    end
+
     alias_method :to_css, :render
 
     # Parses the document into its parse tree. Memoized.
@@ -311,8 +328,19 @@ module Sass
 
     private
 
-    def _render
-      rendered = _to_tree.render
+    def _render_with_sourcemap(sourcemap_uri)
+      rendered, sourcemap = _to_tree.render_with_sourcemap
+      compressed = @options[:style] == :compressed
+      rendered << "\n" if rendered[-1] != ?\n
+      rendered << "\n" unless compressed
+      rendered << "/*@ sourceMappingURL="
+      rendered << URI.encode(sourcemap_uri)
+      rendered << " */"
+      rendered = encode_and_set_charset(rendered)
+      return rendered, sourcemap
+    end
+
+    def encode_and_set_charset(rendered)
       return rendered if ruby1_8?
       begin
         # Try to convert the result to the original encoding,
@@ -424,7 +452,7 @@ END
           raise SyntaxError.new(message, :line => index)
         end
 
-        lines << Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
+        lines << Line.new(line.strip, line_tabs, index, line_tab_str.size, @options[:filename], [])
       end
       lines
     end
@@ -468,6 +496,7 @@ MSG
 
     def build_tree(parent, line, root = false)
       @line = line.index
+      @offset = line.offset
       node_or_nodes = parse_line(parent, line, root)
 
       Array(node_or_nodes).each do |node|
@@ -553,10 +582,23 @@ WARNING
           # if we're using the new property syntax
           Tree::RuleNode.new(parse_interp(line.text))
         else
+          name_start_offset = line.offset + 1 # +1 for the leading ':'
           name, value = line.text.scan(PROPERTY_OLD)[0]
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
-          parse_property(name, parse_interp(name), value, :old, line)
+
+          value_start_offset = name_end_offset = name_start_offset + name.length
+          if !value.empty?
+            # +1 and -1 both compensate for the leading ':', which is part of line.text
+            value_start_offset = name_start_offset + line.text.index(value, name.length + 1) - 1
+          end
+
+          property = parse_property(name, parse_interp(name), value, :old, line, value_start_offset)
+          property.name_source_range = Sass::Source::Range.new(
+            Sass::Source::Position.new(@line, to_parser_offset(name_start_offset)),
+            Sass::Source::Position.new(@line, to_parser_offset(name_end_offset)),
+            @options[:filename])
+          property
         end
       when ?$
         parse_variable(line)
@@ -582,32 +624,50 @@ WARNING
     def parse_property_or_rule(line)
       scanner = Sass::Util::MultibyteStringScanner.new(line.text)
       hack_char = scanner.scan(/[:\*\.]|\#(?!\{)/)
-      parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
+      offset = line.offset
+      offset += hack_char.length if hack_char
+      parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line, to_parser_offset(offset))
 
       unless res = parser.parse_interp_ident
-        return Tree::RuleNode.new(parse_interp(line.text))
+        return Tree::RuleNode.new(parse_interp(line.text, line.offset))
       end
+
+      ident_range = Sass::Source::Range.new(
+        Sass::Source::Position.new(@line, to_parser_offset(offset)),
+        Sass::Source::Position.new(@line, parser.offset),
+        @options[:filename])
+      offset = parser.offset - 1
       res.unshift(hack_char) if hack_char
       if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
         res << comment
+        offset += comment.length
       end
 
       name = line.text[0...scanner.pos]
-      if scanner.scan(/\s*:(?:\s|$)/)
-        parse_property(name, res, scanner.rest, :new, line)
+      if scanned = scanner.scan(/\s*:(?:\s+|$)/)
+        offset += scanned.length
+        property = parse_property(name, res, scanner.rest, :new, line, offset)
+        property.name_source_range = ident_range
+        property
       else
         res.pop if comment
         Tree::RuleNode.new(res + parse_interp(scanner.rest))
       end
     end
 
-    def parse_property(name, parsed_name, value, prop, line)
+    def parse_property(name, parsed_name, value, prop, line, start_offset)
       if value.strip.empty?
         expr = Sass::Script::String.new("")
+        end_offset = start_offset
       else
-        expr = parse_script(value, :offset => line.offset + line.text.index(value))
+        expr = parse_script(value, :offset => to_parser_offset(start_offset))
+        end_offset = expr.source_range.end_pos.offset - 1
       end
       node = Tree::PropNode.new(parse_interp(name), expr, prop)
+      node.value_source_range = Sass::Source::Range.new(
+        Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
+        Sass::Source::Position.new(line.index, to_parser_offset(end_offset)),
+        @options[:filename])
       if value.strip.empty? && line.children.empty?
         raise SyntaxError.new(
           "Invalid property: \"#{node.declaration}\" (no value)." +
@@ -624,7 +684,12 @@ WARNING
       raise SyntaxError.new("Invalid variable: \"#{line.text}\".",
         :line => @line) unless name && value
 
-      expr = parse_script(value, :offset => line.offset + line.text.index(value))
+      # This workaround is needed for the case when the variable value is part of the identifier,
+      # otherwise we end up with the offset equal to the value index inside the name:
+      # $red_color: red;
+      var_lhs_length = 1 + name.length # 1 stands for '$'
+      index = line.text.index(value, line.offset + var_lhs_length) || 0
+      expr = parse_script(value, :offset => to_parser_offset(line.offset + index))
 
       Tree::VariableNode.new(name, expr, default)
     end
@@ -636,7 +701,8 @@ WARNING
         if silent
           value = [line.text]
         else
-          value = self.class.parse_interp(line.text, line.index, line.offset, :filename => @filename)
+          value = self.class.parse_interp(
+            line.text, line.index, to_parser_offset(line.offset), :filename => @filename)
           value[0].slice!(2) if loud # get rid of the "!"
         end
         value = with_extracted_values(value) do |str|
@@ -711,7 +777,7 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         Tree::CharsetNode.new(name)
       when 'media'
-        parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
+        parser = Sass::SCSS::Parser.new(value, @options[:filename], @line, to_parser_offset(@offset))
         Tree::MediaNode.new(parser.parse_media_query_list.to_a)
       else
         Tree::DirectiveNode.new(
@@ -802,29 +868,61 @@ WARNING
     def parse_import_arg(scanner, offset)
       return if scanner.eos?
 
-      if scanner.match?(/url\(/i)
-        script_parser = Sass::Script::Parser.new(scanner, @line, offset, @options)
+      if match_length = scanner.match?(/url\(/i)
+        script_parser = Sass::Script::Parser.new(scanner, @line, to_parser_offset(offset), @options)
         str = script_parser.parse_string
-        media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
-        media = media_parser.parse_media_query_list
-        return Tree::CssImportNode.new(str, media.to_a)
+
+        media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line, str.source_range.end_pos.offset)
+        if media = media_parser.parse_media_query_list
+          end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
+          node = Tree::CssImportNode.new(str, media.to_a)
+        else
+          end_pos = str.source_range.end_pos
+          node = Tree::CssImportNode.new(str)
+        end
+
+        node.source_range = Sass::Source::Range.new(str.source_range.start_pos, end_pos, @options[:filename])
+        return node
       end
 
       unless str = scanner.scan(Sass::SCSS::RX::STRING)
-        return Tree::ImportNode.new(scanner.scan(/[^,;]+/))
+        scanned = scanner.scan(/[^,;]+/)
+        node = Tree::ImportNode.new(scanned)
+        start_parser_offset = to_parser_offset(offset)
+        node.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, start_parser_offset),
+          Sass::Source::Position.new(@line, start_parser_offset + scanned.length),
+          @options[:filename])
+        return node
       end
 
+      start_offset = offset
+      offset += str.length
       val = scanner[1] || scanner[2]
-      scanner.scan(/\s*/)
+      scanned = scanner.scan(/\s*/)
       if !scanner.match?(/[,;]|$/)
-        media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
+        offset += scanned.length if scanned
+        media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line, offset)
         media = media_parser.parse_media_query_list
-        Tree::CssImportNode.new(str || uri, media.to_a)
+        node = Tree::CssImportNode.new(str || uri, media.to_a)
+        node.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
+          Sass::Source::Position.new(@line, media_parser.offset),
+          @options[:filename])
       elsif val =~ /^(https?:)?\/\//
-        Tree::CssImportNode.new("url(#{val})")
+        node = Tree::CssImportNode.new("url(#{val})")
+        node.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
+          Sass::Source::Position.new(@line, to_parser_offset(offset)),
+          @options[:filename])
       else
-        Tree::ImportNode.new(val)
+        node = Tree::ImportNode.new(val)
+        node.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
+          Sass::Source::Position.new(@line, to_parser_offset(offset)),
+          @options[:filename])
       end
+      node
     end
 
     MIXIN_DEF_RE = /^(?:=|@mixin)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
@@ -833,7 +931,7 @@ WARNING
       raise SyntaxError.new("Invalid mixin \"#{line.text[1..-1]}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args, splat = Script::Parser.new(arg_string.strip, @line, offset, @options).
+      args, splat = Script::Parser.new(arg_string.strip, @line, to_parser_offset(offset), @options).
         parse_mixin_definition_arglist
       Tree::MixinDefNode.new(name, args, splat)
     end
@@ -853,7 +951,7 @@ WARNING
       raise SyntaxError.new("Invalid mixin include \"#{line.text}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args, keywords, splat = Script::Parser.new(arg_string.strip, @line, offset, @options).
+      args, keywords, splat = Script::Parser.new(arg_string.strip, @line, to_parser_offset(offset), @options).
         parse_mixin_include_arglist
       Tree::MixinNode.new(name, args, keywords, splat)
     end
@@ -864,14 +962,14 @@ WARNING
       raise SyntaxError.new("Invalid function definition \"#{line.text}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args, splat = Script::Parser.new(arg_string.strip, @line, offset, @options).
+      args, splat = Script::Parser.new(arg_string.strip, @line, to_parser_offset(offset), @options).
         parse_function_definition_arglist
       Tree::FunctionNode.new(name, args, splat)
     end
 
     def parse_script(script, options = {})
       line = options[:line] || @line
-      offset = options[:offset] || 0
+      offset = options[:offset] || @offset + 1
       Script.parse(script, line, offset, @options)
     end
 
@@ -899,6 +997,11 @@ WARNING
       self.class.parse_interp(text, @line, offset, :filename => @filename)
     end
 
+    # Parser tracks 1-based line and offset, so our offset should be converted.
+    def to_parser_offset(offset)
+      offset + 1
+    end
+
     # It's important that this have strings (at least)
     # at the beginning, the end, and between each Script::Node.
     #
@@ -912,8 +1015,9 @@ WARNING
           res << "\\" * (escapes - 1) << '#{'
         else
           res << "\\" * [0, escapes - 1].max
+          # Add 1 to emulate to_parser_offset.
           res << Script::Parser.new(
-            scan, line, offset + scan.pos - scan.matched_size, options).
+            scan, line, offset + scan.pos - scan.matched_size + 1, options).
             parse_interpolated
         end
       end

data/lib/sass/exec.rb

@@ -95,6 +95,7 @@ module Sass
 
       # Processes the options set by the command-line arguments.
       # In particular, sets `@options[:input]` and `@options[:output]`
+      # (and `@options[:sourcemap]` if one has been specified)
       # to appropriate IO streams.
       #
       # This is meant to be overridden by subclasses
@@ -108,7 +109,13 @@ module Sass
             @options[:filename] = filename
             open_file(filename) || $stdin
           end
-        output ||= open_file(args.shift, 'w') || $stdout
+        @options[:output_filename] = args.shift
+        output ||= open_file(@options[:output_filename], 'w') || $stdout
+
+        if @options[:sourcemap] && @options[:output_filename]
+          @options[:sourcemap_filename] = Util::sourcemap_name(@options[:output_filename])
+          @options[:sourcemap] = open_file(@options[:sourcemap_filename], 'w')
+        end
 
         @options[:input], @options[:output] = input, output
       end
@@ -281,6 +288,9 @@ END
         opts.on('-C', '--no-cache', "Don't cache to sassc files.") do
           @options[:for_engine][:cache] = false
         end
+        opts.on('--sourcemap', 'Create sourcemap files next to the generated CSS files.') do
+          @options[:sourcemap] = true
+        end
 
         unless ::Sass::Util.ruby1_8?
           opts.on('-E encoding', 'Specify the default encoding for Sass files.') do |encoding|
@@ -311,6 +321,7 @@ END
         begin
           input = @options[:input]
           output = @options[:output]
+          sourcemap = @options[:sourcemap]
 
           @options[:for_engine][:syntax] ||= :scss if input.is_a?(File) && input.path =~ /\.scss$/
           @options[:for_engine][:syntax] ||= @default_syntax
@@ -326,11 +337,21 @@ END
 
           input.close() if input.is_a?(File)
 
-          output.write(engine.render)
-          output.close() if output.is_a? File
+          if sourcemap.is_a? File
+            relative_sourcemap_path = Pathname.new(@options[:sourcemap_filename]).
+              relative_path_from(Pathname.new(@options[:output_filename]).dirname)
+            rendered, mapping = engine.render_with_sourcemap(relative_sourcemap_path.to_s)
+            output.write(rendered)
+            sourcemap.puts(mapping.to_json(@options[:output_filename]))
+          else
+            output.write(engine.render)
+          end
         rescue ::Sass::SyntaxError => e
           raise e if @options[:trace]
           raise e.sass_backtrace_str("standard input")
+        ensure
+          output.close if output.is_a? File
+          sourcemap.close if sourcemap.is_a? File
         end
       end
 
@@ -363,6 +384,7 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
         ::Sass::Plugin.options[:poll] = @options[:poll]
+        ::Sass::Plugin.options[:sourcemap] = @options[:sourcemap]
 
         if @options[:force]
           raise "The --force flag may only be used with --update." unless @options[:update]
@@ -391,15 +413,22 @@ MSG
 
         dirs, files = @args.map {|name| split_colon_path(name)}.
           partition {|i, _| File.directory? i}
-        files.map! {|from, to| [from, to || from.gsub(/\.[^.]*?$/, '.css')]}
+        files.map! do |from, to|
+          to ||= from.gsub(/\.[^.]*?$/, '.css')
+          sourcemap = Util::sourcemap_name(to) if @options[:sourcemap]
+          [from, to, sourcemap]
+        end
         dirs.map! {|from, to| [from, to || from]}
         ::Sass::Plugin.options[:template_location] = dirs
 
-        ::Sass::Plugin.on_updated_stylesheet do |_, css|
-          if File.exists? css
-            puts_action :overwrite, :yellow, css
-          else
-            puts_action :create, :green, css
+        ::Sass::Plugin.on_updated_stylesheet do |_, css, sourcemap|
+          [css, sourcemap].each do |file|
+            next unless file
+            if File.exists? file
+              puts_action :overwrite, :yellow, file
+            else
+              puts_action :create, :green, file
+            end
           end
         end
 

data/lib/sass/plugin/compiler.rb

@@ -65,6 +65,8 @@ module Sass::Plugin
     #   The location of the Sass/SCSS file being updated.
     # @yieldparam css [String]
     #   The location of the CSS file being generated.
+    # @yieldparam sourcemap [String]
+    #   The location of the sourcemap being generated, if any.
     define_callback :updated_stylesheet
 
     # Register a callback to be run before a single stylesheet is updated.
@@ -81,6 +83,8 @@ module Sass::Plugin
     #   The location of the Sass/SCSS file being updated.
     # @yieldparam css [String]
     #   The location of the CSS file being generated.
+    # @yieldparam sourcemap [String]
+    #   The location of the sourcemap file being generated, if any.
     define_callback :updating_stylesheet
 
     def on_updating_stylesheet_with_deprecation_warning(&block)
@@ -192,17 +196,19 @@ module Sass::Plugin
           # Get the relative path to the file
           name = file.sub(template_location.to_s.sub(/\/*$/, '/'), "")
           css = css_filename(name, css_location)
-          individual_files << [file, css]
+          sourcemap = Util::sourcemap_name(css) if engine_options[:sourcemap]
+          individual_files << [file, css, sourcemap]
         end
       end
 
       run_updating_stylesheets individual_files
 
-      individual_files.each do |file, css|
+      individual_files.each do |file, css, sourcemap|
+        # TODO: Does staleness_checker need to check the sourcemap file as well?
         if options[:always_update] || staleness_checker.stylesheet_needs_update?(css, file)
-          update_stylesheet(file, css)
+          update_stylesheet(file, css, sourcemap)
         else
-          run_not_updating_stylesheet(file, css)
+          run_not_updating_stylesheet(file, css, sourcemap)
         end
       end
     end
@@ -328,7 +334,7 @@ module Sass::Plugin
 
     private
 
-    def update_stylesheet(filename, css)
+    def update_stylesheet(filename, css, sourcemap)
       dir = File.dirname(css)
       unless File.exists?(dir)
         run_creating_directory dir
@@ -338,23 +344,30 @@ module Sass::Plugin
       begin
         File.read(filename) unless File.readable?(filename) # triggers an error for handling
         engine_opts = engine_options(:css_filename => css, :filename => filename)
-        result = Sass::Engine.for_file(filename, engine_opts).render
+        mapping = nil
+        engine = Sass::Engine.for_file(filename, engine_opts)
+        if sourcemap
+          rendered, mapping = engine.render_with_sourcemap(File.basename(sourcemap))
+        else
+          rendered = engine.render
+        end
       rescue Exception => e
         compilation_error_occured = true
-        run_compilation_error e, filename, css
-        result = Sass::SyntaxError.exception_to_css(e, options)
+        run_compilation_error e, filename, css, sourcemap
+        rendered = Sass::SyntaxError.exception_to_css(e, options)
       else
-        run_updating_stylesheet filename, css
+        run_updating_stylesheet filename, css, sourcemap
       end
 
-      write_file(css, result)
-      run_updated_stylesheet(filename, css) unless compilation_error_occured
+      write_file(css, rendered)
+      write_file(sourcemap, mapping.to_json(css)) if mapping
+      run_updated_stylesheet(filename, css, sourcemap) unless compilation_error_occured
     end
 
-    def write_file(css, content)
+    def write_file(fileName, content)
       flag = 'w'
       flag = 'wb' if Sass::Util.windows? && options[:unix_newlines]
-      File.open(css, flag) do |file|
+      File.open(fileName, flag) do |file|
         file.set_encoding(content.encoding) unless Sass::Util.ruby1_8?
         file.print(content)
       end