haml 3.1.8 → 3.2.0.alpha.2

data/vendor/sass/lib/sass/engine.rb

@@ -28,8 +28,6 @@ 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'
@@ -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 = ?*
@@ -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
@@ -567,7 +558,7 @@ WARNING
     def parse_property_or_rule(line)
       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))
@@ -590,9 +581,15 @@ WARNING
       if value.strip.empty?
         expr = Sass::Script::String.new("")
       else
+        important = false
+        if value =~ Sass::SCSS::RX::IMPORTANT
+          important = true
+          value = value.gsub(Sass::SCSS::RX::IMPORTANT,"")
+        end
         expr = parse_script(value, :offset => line.offset + line.text.index(value))
+
       end
-      Tree::PropNode.new(parse_interp(name), expr, prop)
+      Tree::PropNode.new(parse_interp(name), expr, important, prop)
     end
 
     def parse_variable(line)
@@ -608,19 +605,11 @@ 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))
       end
@@ -761,11 +750,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,12 +757,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}")

data/vendor/sass/lib/sass/environment.rb

@@ -93,17 +93,6 @@ 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/vendor/sass/lib/sass/exec.rb

@@ -229,10 +229,6 @@ 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
@@ -242,10 +238,6 @@ 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
@@ -358,11 +350,6 @@ 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
@@ -385,7 +372,7 @@ 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! {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}
         dirs.map! {|from, to| [from, to || from]}
         ::Sass::Plugin.options[:template_location] = dirs
 

data/vendor/sass/lib/sass/importers/base.rb

@@ -72,8 +72,7 @@ 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. `:syntax` should be set appropriately,
-      # `:filename` should be set to `uri`,
+      # with a few modifications. `:filename` and `:syntax` should be set appropriately,
       # and `:importer` should be set to this importer.
       #
       # @param uri [String] The URI to import.

data/vendor/sass/lib/sass/importers/filesystem.rb

@@ -13,7 +13,7 @@ module Sass
       # @param root [String] The root path.
       #   This importer will import files relative to this path.
       def initialize(root)
-        @root = File.expand_path(root)
+        @root = root
       end
 
       # @see Base#find_relative
@@ -45,21 +45,14 @@ module Sass
         @root
       end
 
-      def hash
-        @root.hash
-      end
-
-      def eql?(other)
-        root.eql?(other.root)
-      end
-
       protected
 
       # If a full uri is passed, this removes the root from it
       # otherwise returns the name unchanged
       def remove_root(name)
-        if name.index(@root + "/") == 0
-          name[(@root.length + 1)..-1]
+        root = @root.end_with?('/') ? @root : @root + '/'
+        if name.index(root) == 0
+          name[root.length..-1]
         else
           name
         end
@@ -84,7 +77,6 @@ module Sass
       #   The first element of each pair is a filename to look for;
       #   the second element is the syntax that file would be in (`:sass` or `:scss`).
       def possible_files(name)
-        name = escape_glob_characters(name)
         dirname, basename, extname = split(name)
         sorted_exts = extensions.sort
         syntax = extensions[extname]
@@ -93,11 +85,6 @@ module Sass
         sorted_exts.map {|ext, syn| ["#{dirname}/{_,}#{basename}.#{ext}", syn]}
       end
 
-      def escape_glob_characters(name)
-        name.gsub(/[\*\[\]\{\}\?]/) do |char|
-          "\\#{char}"
-        end
-      end
 
       REDUNDANT_DIRECTORY = %r{#{Regexp.escape(File::SEPARATOR)}\.#{Regexp.escape(File::SEPARATOR)}}
       # Given a base directory and an `@import`ed name,
@@ -108,7 +95,7 @@ module Sass
       # @return [(String, Symbol)] A filename-syntax pair.
       def find_real_file(dir, name)
         for (f,s) in possible_files(remove_root(name))
-          path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{dir}/#{f}"
+          path = (dir == ".") ? f : "#{dir}/#{f}"
           if full_path = Dir[path].first
             full_path.gsub!(REDUNDANT_DIRECTORY,File::SEPARATOR)
             return full_path, s
@@ -129,6 +116,14 @@ module Sass
         [dirname, basename, extension]
       end
 
+      def hash
+        @root.hash
+      end
+
+      def eql?(other)
+        root.eql?(other.root)
+      end
+
       private
 
       def _find(dir, name, options)

data/vendor/sass/lib/sass/less.rb

@@ -31,7 +31,7 @@ module Less
 WARNING: Sass doesn't support mixing in selector sequences.
 Replacing "#{sel}" with "@extend #{base}"
 WARNING
-              env << Node::SassNode.new(Sass::Tree::CommentNode.new(["// #{sel};"], true, false))
+              env << Node::SassNode.new(Sass::Tree::CommentNode.new("// #{sel};", true))
               env << Node::SassNode.new(Sass::Tree::ExtendNode.new([base]))
             end
           end
@@ -225,7 +225,7 @@ WARNING
     class Property
       def to_sass_tree
         return if hide_in_sass
-        Sass::Tree::PropNode.new([self], @value.to_sass_tree, :new)
+        Sass::Tree::PropNode.new([self], @value.to_sass_tree, false, :new)
       end
     end
 

data/vendor/sass/lib/sass/plugin.rb

@@ -92,10 +92,14 @@ module Sass
     #   the second is the location of the CSS file that it should be compiled to.
     # @see #update_stylesheets
     def force_update_stylesheets(individual_files = [])
-      Compiler.new(options.dup.merge(
-          :never_update => false,
-          :always_update => true,
-          :cache => false)).update_stylesheets(individual_files)
+      old_options = options
+      self.options = options.dup
+      options[:never_update] = false
+      options[:always_update] = true
+      options[:cache] = false
+      update_stylesheets(individual_files)
+    ensure
+      self.options = old_options
     end
 
     # All other method invocations are proxied to the \{#compiler}.

data/vendor/sass/lib/sass/plugin/compiler.rb

@@ -38,7 +38,7 @@ module Sass::Plugin
       self.options.merge!(options)
     end
 
-    # Register a callback to be run after stylesheets are mass-updated.
+    # Register a callback to be run before stylesheets are mass-updated.
     # This is run whenever \{#update\_stylesheets} is called,
     # unless the \{file:SASS_REFERENCE.md#never_update-option `:never_update` option}
     # is enabled.
@@ -51,22 +51,6 @@ module Sass::Plugin
     #   the second is the target CSS file.
     define_callback :updating_stylesheets
 
-    # Register a callback to be run after a single stylesheet is updated.
-    # The callback is only run if the stylesheet is really updated;
-    # if the CSS file is fresh, this won't be run.
-    #
-    # Even if the \{file:SASS_REFERENCE.md#full_exception-option `:full_exception` option}
-    # is enabled, this callback won't be run
-    # when an exception CSS file is being written.
-    # To run an action for those files, use \{#on\_compilation\_error}.
-    #
-    # @yield [template, css]
-    # @yieldparam template [String]
-    #   The location of the Sass/SCSS file being updated.
-    # @yieldparam css [String]
-    #   The location of the CSS file being generated.
-    define_callback :updated_stylesheet
-
     # Register a callback to be run before a single stylesheet is updated.
     # The callback is only run if the stylesheet is guaranteed to be updated;
     # if the CSS file is fresh, this won't be run.
@@ -83,13 +67,6 @@ module Sass::Plugin
     #   The location of the CSS file being generated.
     define_callback :updating_stylesheet
 
-    def on_updating_stylesheet_with_deprecation_warning(&block)
-      Sass::Util.sass_warn("Sass::Compiler#on_updating_stylesheet callback is deprecated and will be removed in a future release. Use Sass::Compiler#on_updated_stylesheet instead, which is run after stylesheet compilation.")
-      on_updating_stylesheet_without_deprecation_warning(&block)
-    end
-    alias_method :on_updating_stylesheet_without_deprecation_warning, :on_updating_stylesheet
-    alias_method :on_updating_stylesheet, :on_updating_stylesheet_with_deprecation_warning
-
     # Register a callback to be run when Sass decides not to update a stylesheet.
     # In particular, the callback is run when Sass finds that
     # the template file and none of its dependencies
@@ -183,25 +160,28 @@ module Sass::Plugin
     #   The first string in each pair is the location of the Sass/SCSS file,
     #   the second is the location of the CSS file that it should be compiled to.
     def update_stylesheets(individual_files = [])
+      run_updating_stylesheets individual_files
       Sass::Plugin.checked_for_updates = true
       staleness_checker = StalenessChecker.new(engine_options)
 
+      individual_files.each do |t, c|
+        if options[:always_update] || staleness_checker.stylesheet_needs_update?(c, t)
+          update_stylesheet(t, c)
+        end
+      end
+
       template_location_array.each do |template_location, css_location|
+
         Dir.glob(File.join(template_location, "**", "[^_]*.s[ca]ss")).sort.each do |file|
           # 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]
-        end
-      end
-
-      run_updating_stylesheets individual_files
 
-      individual_files.each do |file, css|
-        if options[:always_update] || staleness_checker.stylesheet_needs_update?(css, file)
-          update_stylesheet(file, css)
-        else
-          run_not_updating_stylesheet(file, css)
+          if options[:always_update] || staleness_checker.stylesheet_needs_update?(css, file)
+            update_stylesheet file, css
+          else
+            run_not_updating_stylesheet file, css
+          end
         end
       end
     end
@@ -338,23 +318,18 @@ module Sass::Plugin
         engine_opts = engine_options(:css_filename => css, :filename => filename)
         result = Sass::Engine.for_file(filename, engine_opts).render
       rescue Exception => e
-        compilation_error_occured = true
         run_compilation_error e, filename, css
         result = Sass::SyntaxError.exception_to_css(e, options)
       else
         run_updating_stylesheet filename, css
       end
 
-      write_file(css, result)
-      run_updated_stylesheet(filename, css) unless compilation_error_occured
-    end
-
-    def write_file(css, content)
+      # Finally, write the file
       flag = 'w'
       flag = 'wb' if Sass::Util.windows? && options[:unix_newlines]
       File.open(css, flag) do |file|
-        file.set_encoding(content.encoding) unless Sass::Util.ruby1_8?
-        file.print(content)
+        file.set_encoding(result.encoding) unless Sass::Util.ruby1_8?
+        file.print(result)
       end
     end