sass 3.3.0.alpha.61 → 3.3.0.alpha.64

data/REVISION

@@ -1 +1 @@
-0c20f2ff8c4f36a29092ac5eb3e844ac1019ce63
+62e36b0efe872f1be55de2a82b01d88f2b08d9b1

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.61
+3.3.0.alpha.64

data/VERSION_DATE

@@ -1 +1 @@
-22 December 2012 02:37:28 GMT
+27 December 2012 22:38:55 GMT

data/lib/sass/css.rb

@@ -76,7 +76,7 @@ module Sass
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Sass::SCSS::CssParser.new(@template, @options[:filename]).parse
+      root = Sass::SCSS::CssParser.new(@template, @options[:filename], nil).parse
       parse_selectors    root
       expand_commas      root
       nest_seqs          root
@@ -96,7 +96,7 @@ module Sass
       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)
+        parser = Sass::SCSS::CssParser.new(child.rule.first, child.filename, nil, child.line)
         child.parsed_rules = parser.parse_selector
       end
     end

data/lib/sass/engine.rb

@@ -269,9 +269,10 @@ module Sass
     # Render the template to CSS and return the source map.
     #
     # @param sourcemap_uri [String] The sourcemap URI to use in the
-    #   @sourceMappingURL comment. This should be relative to the location of
-    #   the CSS file.
-    # @return [(String, Sass::Source::Map)] The rendered CSS and the associated source map
+    #   `@sourceMappingURL` comment. If this is relative, it should be relative
+    #   to the location of the CSS file.
+    # @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
@@ -369,7 +370,7 @@ module Sass
       check_encoding!
 
       if @options[:syntax] == :scss
-        root = Sass::SCSS::Parser.new(@template, @options[:filename]).parse
+        root = Sass::SCSS::Parser.new(@template, @options[:filename], @options[:importer]).parse
       else
         root = Tree::RootNode.new(@template)
         append_children(root, tree(tabulate(@template)).first, true)
@@ -599,7 +600,7 @@ WARNING
           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])
+            @options[:filename], @options[:importer])
           property
         end
       when ?$
@@ -628,7 +629,9 @@ WARNING
       hack_char = scanner.scan(/[:\*\.]|\#(?!\{)/)
       offset = line.offset
       offset += hack_char.length if hack_char
-      parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line, to_parser_offset(offset))
+      parser = Sass::SCSS::Parser.new(scanner,
+        @options[:filename], @options[:importer],
+        @line, to_parser_offset(offset))
 
       unless res = parser.parse_interp_ident
         return Tree::RuleNode.new(parse_interp(line.text, line.offset))
@@ -637,7 +640,7 @@ WARNING
       ident_range = Sass::Source::Range.new(
         Sass::Source::Position.new(@line, to_parser_offset(offset)),
         Sass::Source::Position.new(@line, parser.offset),
-        @options[:filename])
+        @options[:filename], @options[:importer])
       offset = parser.offset - 1
       res.unshift(hack_char) if hack_char
       if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
@@ -669,7 +672,7 @@ WARNING
       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])
+        @options[:filename], @options[:importer])
       if value.strip.empty? && line.children.empty?
         raise SyntaxError.new(
           "Invalid property: \"#{node.declaration}\" (no value)." +
@@ -779,7 +782,9 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         Tree::CharsetNode.new(name)
       when 'media'
-        parser = Sass::SCSS::Parser.new(value, @options[:filename], @line, to_parser_offset(@offset))
+        parser = Sass::SCSS::Parser.new(value,
+          @options[:filename], @options[:importer],
+          @line, to_parser_offset(@offset))
         Tree::MediaNode.new(parser.parse_media_query_list.to_a)
       else
         Tree::DirectiveNode.new(
@@ -874,7 +879,9 @@ WARNING
         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, str.source_range.end_pos.offset)
+        media_parser = Sass::SCSS::Parser.new(scanner,
+          @options[:filename], @options[:importer],
+          @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)
@@ -883,7 +890,9 @@ WARNING
           node = Tree::CssImportNode.new(str)
         end
 
-        node.source_range = Sass::Source::Range.new(str.source_range.start_pos, end_pos, @options[:filename])
+        node.source_range = Sass::Source::Range.new(
+          str.source_range.start_pos, end_pos,
+          @options[:filename], @options[:importer])
         return node
       end
 
@@ -894,7 +903,7 @@ WARNING
         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])
+          @options[:filename], @options[:importer])
         return node
       end
 
@@ -904,25 +913,26 @@ WARNING
       scanned = scanner.scan(/\s*/)
       if !scanner.match?(/[,;]|$/)
         offset += scanned.length if scanned
-        media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line, offset)
+        media_parser = Sass::SCSS::Parser.new(scanner,
+          @options[:filename], @options[:importer], @line, offset)
         media = media_parser.parse_media_query_list
         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])
+          @options[:filename], @options[:importer])
       elsif val =~ /^(https?:)?\/\//
         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])
+          @options[:filename], @options[:importer])
       else
         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])
+          @options[:filename], @options[:importer])
       end
       node
     end

data/lib/sass/exec.rb

@@ -342,7 +342,9 @@ END
               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]))
+            sourcemap.puts(mapping.to_json(
+                :css_path => @options[:output_filename],
+                :sourcemap_path => @options[:sourcemap_filename]))
           else
             output.write(engine.render)
           end

data/lib/sass/importers/base.rb

@@ -122,6 +122,18 @@ module Sass
         Sass::Util.abstract(self)
       end
 
+      # Get the publicly-visible URL for an imported file. This URL is used by
+      # source maps to link to the source stylesheet. This may return `nil` to
+      # indicate that no public URL is available; however, this will cause
+      # sourcemap generation to fail if any CSS is generated from files imported
+      # from this importer.
+      #
+      # @param uri [String] A URI known to be valid for this importer.
+      # @return [String?] The publicly-visible URL for this file.
+      def public_url(uri)
+        nil
+      end
+
       # A string representation of the importer.
       # Should be overridden by subclasses.
       #

data/lib/sass/script/lexer.rb

@@ -361,7 +361,7 @@ MESSAGE
       end
 
       def range(start_pos, end_pos = source_position)
-        Sass::Source::Range.new(start_pos, end_pos, @options[:filename])
+        Sass::Source::Range.new(start_pos, end_pos, @options[:filename], @options[:importer])
       end
 
       def source_position

data/lib/sass/script/parser.rb

@@ -259,7 +259,7 @@ RUBY
       end
 
       def range(start_pos, end_pos=source_position)
-        Sass::Source::Range.new(start_pos, end_pos, @options[:filename])
+        Sass::Source::Range.new(start_pos, end_pos, @options[:filename], @options[:importer])
       end
 
       # @private

data/lib/sass/scss/parser.rb

@@ -12,15 +12,19 @@ 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 filename [String] The name of the file being parsed. Used for
+      #   warnings and source maps.
+      # @param importer [Sass::Importers::Base] The importer used to import the
+      #   file being parsed. Used for source maps.
       # @param line [Fixnum] The 1-based line on which the source string appeared,
       #   if it's part of another document.
       # @param offset [Fixnum] The 1-based character (not byte) offset in the line on
       #   which the source string starts. Used for error reporting and sourcemap
       #   building.
-      def initialize(str, filename, line = 1, offset = 1)
+      def initialize(str, filename, importer, line = 1, offset = 1)
         @template = str
         @filename = filename
+        @importer = importer
         @line = line
         @offset = offset
         @strs = []
@@ -69,7 +73,7 @@ module Sass
       end
 
       def range(start_pos, end_pos=source_position)
-        Sass::Source::Range.new(start_pos, end_pos, @filename)
+        Sass::Source::Range.new(start_pos, end_pos, @filename, @importer)
       end
 
       def init_scanner!

data/lib/sass/source/map.rb

@@ -64,16 +64,49 @@ module Sass::Source
 
     # Returns the standard JSON representation of the source map.
     #
-    # @param target_filename [String] The filename of the output file; that is,
-    #   the target of the mapping. This should be relative to the working
-    #   directory.
+    # If the `:css_uri` option isn't specified, the `:css_path` and
+    # `:sourcemap_path` options must both be specified. Any options may also be
+    # specified alongside the `:css_uri` option. If `:css_uri` isn't specified,
+    # it will be inferred from `:css_path` and `:sourcemap_path` using the
+    # assumption that the local file system has the same layout as the server.
+    #
+    # If any source stylesheets use the default filesystem importer, sourcemap
+    # generation will fail unless the ``:sourcemap_path` option is specified.
+    # The layout of the local file system is assumed to be the same as the
+    # layout of the server for the purposes of linking to source stylesheets
+    # that use the filesystem importer.
+    #
+    # Regardless of which options are passed to this method, sourcemap
+    # generation will fail if the source stylesheet contains any import that
+    # uses a non-default importer that doesn't implement
+    # \{Sass::Importers::Base#public\_url\}.
+    #
+    # @option options :css_uri [String]
+    #   The publicly-visible URI of the CSS output file.
+    # @option options :css_path [String]
+    #   The local path of the CSS output file.
+    # @option options :sourcemap_path [String]
+    #   The (eventual) local path of the sourcemap file.
     # @return [String] The JSON string.
-    def to_json(target_filename)
+    # @raise [ArgumentError] If neither `:css_uri` nor `:css_path` are
+    #   specified.
+    # @raise [Sass::SyntaxError] If the public URL of a stylesheet cannot be
+    #   determined.
+    def to_json(options)
+      css_uri, css_path, sourcemap_path = [:css_uri, :css_path, :sourcemap_path].map {|o| options[o]}
+      unless css_uri || (css_path && sourcemap_path)
+        raise ArgumentError.new("Sass::Source::Map#to_json requires either " +
+          "the :css_uri option or both the :css_path and :soucemap_path options.")
+      end
+      css_path &&= Pathname.pwd.join(Pathname.new(css_path)).cleanpath
+      sourcemap_path &&= Pathname.pwd.join(Pathname.new(sourcemap_path)).cleanpath
+      css_uri ||= css_path.relative_path_from(sourcemap_path.dirname).to_s
+
       result = "{\n"
       write_json_field(result, "version", "3", true)
 
-      source_pathname_to_id = {}
-      id_to_source_pathname = {}
+      source_uri_to_id = {}
+      id_to_source_uri = {}
       next_source_id = 0
       line_data = []
       segment_data_for_line = []
@@ -85,17 +118,26 @@ module Sass::Source
       previous_source_offset = 1
       previous_source_id = 0
 
-      target_pathname = Pathname.pwd.join(Pathname.new(target_filename)).cleanpath
       @data.each do |m|
-        source_pathname = Pathname.pwd.join(Pathname.new(m.input.file)).cleanpath
-        source_pathname = source_pathname.relative_path_from(target_pathname.dirname)
-        current_source_id = source_pathname_to_id[source_pathname]
+        file, importer = m.input.file, m.input.importer
+        unless source_uri = importer && importer.public_url(file)
+          if importer.is_a?(Sass::Importers::Filesystem) && sourcemap_path
+            file_path = Pathname.new(importer.root).join(file)
+            source_uri = file_path.relative_path_from(sourcemap_path.dirname).to_s
+          else
+            raise Sass::SyntaxError.new(<<ERR)
+Error generating source map: couldn't determine public URL for "#{file}".
+ERR
+          end
+        end
+
+        current_source_id = source_uri_to_id[source_uri]
         unless current_source_id
           current_source_id = next_source_id
           next_source_id += 1
 
-          source_pathname_to_id[source_pathname] = current_source_id
-          id_to_source_pathname[current_source_id] = source_pathname
+          source_uri_to_id[source_uri] = current_source_id
+          id_to_source_uri[current_source_id] = source_uri
         end
 
         [
@@ -138,9 +180,9 @@ module Sass::Source
       write_json_field(result, "mappings", line_data.join(";"))
 
       source_names = []
-      (0...next_source_id).each {|id| source_names.push(id_to_source_pathname[id].to_s)}
+      (0...next_source_id).each {|id| source_names.push(id_to_source_uri[id].to_s)}
       write_json_field(result, "sources", source_names)
-      write_json_field(result, "file", target_pathname.basename.to_s)
+      write_json_field(result, "file", css_uri)
 
       result << "\n}"
       result

data/lib/sass/source/range.rb

@@ -16,13 +16,21 @@ module Sass::Source
     # @return [String]
     attr_accessor :file
 
+    # The importer that imported the file in which this source range appears.
+    # This is nil for target ranges.
+    #
+    # @return [Sass::Importers::Base]
+    attr_accessor :importer
+
     # @param start_pos [Sass::Source::Position] See \{#start_pos}
     # @param end_pos [Sass::Source::Position] See \{#end_pos}
     # @param file [String] See \{#file}
-    def initialize(start_pos, end_pos, file)
+    # @param importer [Sass::Importers::Base] See \{#importer}
+    def initialize(start_pos, end_pos, file, importer=nil)
       @start_pos = start_pos
       @end_pos = end_pos
       @file = file
+      @importer = importer
     end
 
     # @return [String] A string representation of the source range.

data/lib/sass/tree/rule_node.rb

@@ -124,7 +124,7 @@ module Sass::Tree
       if @rule.all? {|t| t.kind_of?(String)}
         # We don't use real filename/line info because we don't have it yet.
         # When we get it, we'll set it on the parsed rules if possible.
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, '', 1)
+        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, '', nil, 1)
         @parsed_rules = parser.parse_selector rescue nil
       end
     end

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

@@ -164,7 +164,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_extend(node)
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.selector), node.filename, node.line)
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.selector),
+      node.filename, node.options[:importer], node.line)
     node.resolved_selector = parser.parse_selector
     node
   end
@@ -311,7 +312,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_rule(node)
     rule = node.rule
     rule = rule.map {|e| e.is_a?(String) && e != ' ' ? e.strip : e} if node.style == :compressed
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.rule), node.filename, node.line)
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.rule),
+      node.filename, node.options[:importer], node.line)
     node.parsed_rules ||= parser.parse_selector
     if node.options[:trace_selectors]
       @stack.push(:filename => node.filename, :line => node.line)
@@ -363,7 +365,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   end
 
   def visit_media(node)
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.query), node.filename, node.line)
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.query),
+      node.filename, node.options[:importer], node.line)
     node.resolved_query ||= parser.parse_media_query_list
     yield
   end
@@ -377,7 +380,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_cssimport(node)
     node.resolved_uri = run_interp([node.uri])
     if node.query
-      parser = Sass::SCSS::StaticParser.new(run_interp(node.query), node.filename, node.line)
+      parser = Sass::SCSS::StaticParser.new(run_interp(node.query),
+        node.filename, node.options[:importer], node.line)
       node.resolved_query ||= parser.parse_media_query_list
     end
     yield

data/lib/sass/util.rb

@@ -803,12 +803,12 @@ MSG
     # @param s [String] The string to be escaped
     # @return [String] The escaped string
     def json_escape_string(s)
-      return s if s !~ /["\\\/\b\f\n\r\t]/
+      return s if s !~ /["\\\b\f\n\r\t]/
 
       result = ""
       s.split("").each do |c|
         case c
-        when '"', "\\", "/"
+        when '"', "\\"
           result << "\\" << c
         when "\n" then result << "\\n"
         when "\t" then result << "\\t"

data/test/sass/importer_test.rb

@@ -8,29 +8,37 @@ class ImporterTest < Test::Unit::TestCase
   
   class FruitImporter < Sass::Importers::Base
     def find(name, context = nil)
-      if name =~ %r{fruits/(\w+)(\.s[ac]ss)?}
-        fruit = $1
-        color = case $1
-        when "apple"
-          "red"
-        when "orange"
-          "orange"
-        else
-          "blue"
-        end
-        contents = %Q{
-          $#{fruit}-color: #{color} !default;
-          @mixin #{fruit} {
-            color: $#{fruit}-color;
-          }
-        }
-        Sass::Engine.new(contents, :filename => name, :syntax => :scss, :importer => self)
+      return unless fruit = parse(name)
+      color = case fruit
+      when "apple"
+        "red"
+      when "orange"
+        "orange"
+      else
+        "blue"
       end
+      contents = %Q{
+        $#{fruit}-color: #{color} !default;
+        @mixin #{fruit} {
+          color: $#{fruit}-color;
+        }
+      }
+      Sass::Engine.new(contents, :filename => name, :syntax => :scss, :importer => self)
     end
 
     def key(name, context)
       [self.class.name, name]
     end
+
+    def public_url(name)
+      "http://#{parse(name)}.example.com/style.scss"
+    end
+
+    private
+
+    def parse(name)
+      name[%r{fruits/(\w+)(\.s[ac]ss)?}, 1]
+    end
   end
 
   # This class proves that you can override the extension scheme for importers
@@ -177,6 +185,123 @@ CSS
     )
   end
 
+  def test_source_map_with_only_css_uri_supports_public_url_imports
+    fruit_importer = FruitImporter.new
+
+    options = {
+      :filename => 'fruits/orange',
+      :importer => fruit_importer,
+      :syntax => :scss
+    }
+
+    engine = Sass::Engine.new(<<SCSS, options)
+.orchard {
+  color: blue;
+}
+SCSS
+
+    rendered, sourcemap = engine.render_with_sourcemap('sourcemap_uri')
+    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri')
+{
+"version": "3",
+"mappings": ";EACE,KAAK,EAAE,IAAI",
+"sources": ["http://orange.example.com/style.scss"],
+"file": "css_uri"
+}
+JSON
+  end
+
+  def test_source_map_with_only_css_uri_doesnt_support_filesystem_importer
+    file_system_importer = Sass::Importers::Filesystem.new('.')
+    options = {
+      :filename => filename_for_test(:scss),
+      :importer => file_system_importer,
+      :syntax => :scss
+    }
+
+    engine = Sass::Engine.new(<<SCSS, options)
+.foo {a: b}
+SCSS
+
+    rendered, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
+
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {sourcemap.to_json(:css_uri => 'css_uri')}
+Error generating source map: couldn't determine public URL for "#{filename_for_test(:scss)}".
+MESSAGE
+  end
+
+  def test_source_map_with_css_uri_and_css_path_doesnt_support_filesystem_importer
+    file_system_importer = Sass::Importers::Filesystem.new('.')
+    options = {
+      :filename => filename_for_test(:scss),
+      :importer => file_system_importer,
+      :syntax => :scss
+    }
+
+    engine = Sass::Engine.new(<<SCSS, options)
+.foo {a: b}
+SCSS
+
+    rendered, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
+
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')}
+Error generating source map: couldn't determine public URL for "#{filename_for_test(:scss)}".
+MESSAGE
+  end
+
+  def test_source_map_with_css_uri_and_sourcemap_path_supports_filesystem_importer
+    file_system_importer = Sass::Importers::Filesystem.new('.')
+    options = {
+      :filename => 'sass/style.scss',
+      :importer => file_system_importer,
+      :syntax => :scss
+    }
+
+    engine = Sass::Engine.new(<<SCSS, options)
+.foo {a: b}
+SCSS
+
+    rendered, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
+
+
+    rendered, sourcemap = engine.render_with_sourcemap('http://map.example.com/map/style.map')
+    css_uri = 'css_uri'
+    sourcemap_path = 'map/style.map'
+    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => css_uri, :sourcemap_path => sourcemap_path)
+{
+"version": "3",
+"mappings": ";EAAM,CAAC,EAAE,CAAC",
+"sources": ["../sass/style.scss"],
+"file": "css_uri"
+}
+JSON
+  end
+
+  def test_source_map_with_css_path_and_sourcemap_path_supports_file_system_importer
+    file_system_importer = Sass::Importers::Filesystem.new('.')
+    options = {
+      :filename => 'sass/style.scss',
+      :importer => file_system_importer,
+      :syntax => :scss
+    }
+
+    engine = Sass::Engine.new(<<SCSS, options)
+.foo {a: b}
+SCSS
+
+    rendered, sourcemap = engine.render_with_sourcemap('http://map.example.com/map/style.map')
+    css_path = 'static/style.css'
+    sourcemap_path = 'map/style.map'
+    assert_equal <<JSON.strip, sourcemap.to_json(:css_path => css_path, :sourcemap_path => sourcemap_path)
+{
+"version": "3",
+"mappings": ";EAAM,CAAC,EAAE,CAAC",
+"sources": ["../sass/style.scss"],
+"file": "../static/style.css"
+}
+JSON
+  end
+
   def fixture_dir
     File.join(File.dirname(__FILE__), "fixtures")
   end

data/test/sass/scss/css_test.rb

@@ -1064,7 +1064,7 @@ SCSS
   end
 
   def render(scss, options = {})
-    tree = Sass::SCSS::CssParser.new(scss, options[:filename]).parse
+    tree = Sass::SCSS::CssParser.new(scss, options[:filename], nil).parse
     tree.options = Sass::Engine::DEFAULT_OPTIONS.merge(options)
     tree.render
   end

data/test/sass/scss/scss_test.rb

@@ -2010,7 +2010,7 @@ SCSS
   @extend .bbb;
 }
 SCSS
-    Sass::SCSS::Parser.new(template, "test.scss").parse
+    Sass::SCSS::Parser.new(template, "test.scss", nil).parse
   end
 
   def test_extend_in_media_in_rule

data/test/sass/source_map_test.rb

@@ -4,6 +4,13 @@ require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 
 class SourcemapTest < Test::Unit::TestCase
+  def test_to_json_requires_args
+    rendered, sourcemap = render_with_sourcemap('')
+    assert_raise(ArgumentError) {sourcemap.to_json({})}
+    assert_raise(ArgumentError) {sourcemap.to_json({:css_path => 'foo'})}
+    assert_raise(ArgumentError) {sourcemap.to_json({:sourcemap_path => 'foo'})}
+  end
+
   def test_simple_mapping_scss
     assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON
 a {
@@ -70,7 +77,7 @@ CSS
 {
 "version": "3",
 "mappings": ";EACE,GAAG,EAAE,GAAG;;EAER,SAAS,EAAE,IAAI",
-"sources": ["..\\/scss\\/style.scss"],
+"sources": ["../scss/style.scss"],
 "file": "style.css"
 }
 JSON
@@ -94,7 +101,7 @@ CSS
 {
 "version": "3",
 "mappings": ";EACE,GAAG,EAAE,GAAG;;EAEP,SAAS,EAAC,IAAI",
-"sources": ["..\\/sass\\/style.sass"],
+"sources": ["../sass/style.sass"],
 "file": "style.css"
 }
 JSON
@@ -725,7 +732,9 @@ CSS
         assert(!closing || start_positions[name], "Closing annotation #{name} found before opening one.")
         position = Sass::Source::Position.new(line, offset)
         if closing
-          ranges[name] << Sass::Source::Range.new(start_positions[name], position, file_name)
+          ranges[name] << Sass::Source::Range.new(
+            start_positions[name], position, file_name,
+            Sass::Importers::Filesystem.new('.'))
           start_positions.delete name
         else
           assert(!start_positions[name], "Overlapping range annotation #{name} encountered on line #{line}")
@@ -795,8 +804,12 @@ MESSAGE
 
   def assert_parses_with_sourcemap(source, css, sourcemap_json, options={})
     rendered, sourcemap = render_with_sourcemap(source, options)
+    css_path = options[:output] || "test.css"
+    sourcemap_path = Sass::Util.sourcemap_name(css_path)
+    rendered_json = sourcemap.to_json(:css_path => css_path, :sourcemap_path => sourcemap_path)
+
     assert_equal css.rstrip, rendered.rstrip
-    assert_equal sourcemap_json.rstrip, sourcemap.to_json(options[:output] || "test.css")
+    assert_equal sourcemap_json.rstrip, rendered_json
   end
 
   def render_with_sourcemap(source, options={})

data/test/sass/util_test.rb

@@ -314,7 +314,7 @@ class UtilTest < Test::Unit::TestCase
     assert_json_string "", ""
     alphanum = (("0".."9").to_a).concat(("a".."z").to_a).concat(("A".."Z").to_a).join
     assert_json_string alphanum, alphanum
-    assert_json_string "'\"\\/'", "'\\\"\\\\\\/'"
+    assert_json_string "'\"\\'", "'\\\"\\\\'"
     assert_json_string "\b\f\n\r\t", "\\b\\f\\n\\r\\t"
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302967
+  hash: 592302989
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 61
-  version: 3.3.0.alpha.61
+  - 64
+  version: 3.3.0.alpha.64
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-21 00:00:00 -05:00
+date: 2012-12-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency