haml 2.2.24 → 3.0.0.beta.1

data/lib/sass/scss/rx.rb

@@ -0,0 +1,112 @@
+module Sass
+  module SCSS
+    # A module containing regular expressions used
+    # for lexing tokens in an SCSS document.
+    # Most of these are taken from [the CSS3 spec](http://www.w3.org/TR/css3-syntax/#lexical),
+    # although some have been modified for various reasons.
+    module RX
+      # Takes a string and returns a CSS identifier
+      # that will have the value of the given string.
+      #
+      # @param str [String] The string to escape
+      # @return [String] The escaped string
+      def self.escape_ident(str)
+        return "" if str.empty?
+        return "\\#{str}" if str == '-' || str == '_'
+        out = ""
+        value = str.dup
+        out << value.slice!(0...1) if value =~ /^[-_]/
+        if value[0...1] =~ NMSTART
+          out << value.slice!(0...1)
+        else
+          out << escape_char(value.slice!(0...1))
+        end
+        out << value.gsub(/[^a-zA-Z0-9_-]/) {|c| escape_char c}
+        return out
+      end
+
+      # Escapes a single character for a CSS identifier.
+      #
+      # @param c [String] The character to escape. Should have length 1
+      # @return [String] The escaped character
+      # @private
+      def self.escape_char(c)
+        return "\\%06x" % Haml::Util.ord(c) unless c =~ /[ -\/:-~]/
+        return "\\#{c}"
+      end
+
+      # Creates a Regexp from a plain text string,
+      # escaping all significant characters.
+      #
+      # @param str [String] The text of the regexp
+      # @param flags [Fixnum] Flags for the created regular expression
+      # @return [Regexp]
+      # @private
+      def self.quote(str, flags = 0)
+        Regexp.new(Regexp.quote(str), flags)
+      end
+
+      H        = /[0-9a-fA-F]/
+      NL       = /\n|\r\n|\r|\f/
+      UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
+      s = if Haml::Util.ruby1_8?
+            '\200-\377'
+          else
+            '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
+          end
+      NONASCII = /[#{s}]/
+      ESCAPE   = /#{UNICODE}|\\[ -~#{s}]/
+      NMSTART  = /[a-zA-Z]|#{NONASCII}|#{ESCAPE}/
+      NMCHAR   = /[a-zA-Z0-9_-]|#{NONASCII}|#{ESCAPE}/
+      STRING1  = /\"((?:[^\n\r\f\\"]|\\#{NL}|#{ESCAPE})*)\"/
+      STRING2  = /\'((?:[^\n\r\f\\']|\\#{NL}|#{ESCAPE})*)\'/
+
+      IDENT    = /[-_]?#{NMSTART}#{NMCHAR}*/
+      NAME     = /#{NMCHAR}+/
+      NUM      = /[0-9]+|[0-9]*.[0-9]+/
+      STRING   = /#{STRING1}|#{STRING2}/
+      URL      = /((?:[!#%$&*-~]|#{NONASCII}|#{ESCAPE})*)/
+      W        = /[ \t\r\n\f]*/
+
+      # This is more liberal than the spec's definition,
+      # but that definition didn't work well with the greediness rules
+      RANGE    = /(?:#{H}|\?){1,6}/
+
+      ##
+
+      S = /[ \t\r\n\f]+/
+
+      COMMENT = /\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\//
+      SINGLE_LINE_COMMENT = /\/\/.*(\n[ \t]*\/\/.*)*/
+
+      CDO            = quote("<!--")
+      CDC            = quote("-->")
+      INCLUDES       = quote("~=")
+      DASHMATCH      = quote("|=")
+      PREFIXMATCH    = quote("^=")
+      SUFFIXMATCH    = quote("$=")
+      SUBSTRINGMATCH = quote("*=")
+
+      HASH = /##{NAME}/
+
+      IMPORTANT = /!#{W}important/i
+      DEFAULT = /!#{W}default/i
+
+      NUMBER = /#{NUM}(?:#{IDENT}|%)?/
+
+      URI = /url\(#{W}(?:#{STRING}|#{URL})#{W}\)/i
+      FUNCTION = /#{IDENT}\(/
+
+      UNICODERANGE = /u\+(?:#{H}{1,6}-#{H}{1,6}|#{RANGE})/i
+
+      # Defined in http://www.w3.org/TR/css3-selectors/#lex
+      PLUS = /#{W}\+/
+      GREATER = /#{W}>/
+      TILDE = /#{W}~/
+      NOT = quote(":not(", Regexp::IGNORECASE)
+
+      # Custom
+      HEXCOLOR = /\#[0-9a-fA-F]{3}(?:[0-9a-fA-F]{3})?/
+    end
+  end
+end

data/lib/sass/scss/script_lexer.rb

@@ -0,0 +1,13 @@
+module Sass
+  module SCSS
+    # A mixin for subclasses of {Sass::Script::Lexer}
+    # that makes them usable by {SCSS::Parser} to parse SassScript.
+    # In particular, the lexer doesn't support `!` for a variable prefix.
+    module ScriptLexer
+      def variable
+        return [:raw, "!important"] if scan(Sass::SCSS::RX::IMPORTANT)
+        _variable(/(\$)(#{Sass::SCSS::RX::IDENT})/)
+      end
+    end
+  end
+end

data/lib/sass/scss/script_parser.rb

@@ -0,0 +1,25 @@
+module Sass
+  module SCSS
+    # A mixin for subclasses of {Sass::Script::Parser}
+    # that makes them usable by {SCSS::Parser} to parse SassScript.
+    # In particular, the parser won't raise an error
+    # when there's more content in the lexer once lexing is done.
+    # In addition, the parser doesn't support `!` for a variable prefix.
+    module ScriptParser
+      private
+
+      # @private
+      def lexer_class
+        klass = Class.new(super)
+        klass.send(:include, ScriptLexer)
+        klass
+      end
+
+      # Instead of raising an error when the parser is done,
+      # rewind the StringScanner so that it hasn't consumed the final token.
+      def assert_done
+        @lexer.unpeek!
+      end
+    end
+  end
+end

data/lib/sass/tree/comment_node.rb

@@ -5,12 +5,7 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class CommentNode < Node
-    # The lines of text nested beneath the comment.
-    #
-    # @return [Array<Sass::Engine::Line>]
-    attr_accessor :lines
-
-    # The text on the same line as the comment starter.
+    # The text of the comment, not including `/*` and `*/`.
     #
     # @return [String]
     attr_accessor :value
@@ -24,7 +19,7 @@ module Sass::Tree
     # @param silent [Boolean] See \{#silent}
     def initialize(value, silent)
       @lines = []
-      @value = value[2..-1].strip
+      @value = normalize_indentation value
       @silent = silent
       super()
     end
@@ -35,9 +30,58 @@ module Sass::Tree
     # @return [Boolean] Whether or not this node and the other object
     #   are the same
     def ==(other)
-      self.class == other.class && value == other.value && silent == other.silent && lines == other.lines
+      self.class == other.class && value == other.value && silent == other.silent
+    end
+
+    # Returns `true` if this is a silent comment
+    # or the current style doesn't render comments.
+    #
+    # @return [Boolean]
+    def invisible?
+      style == :compressed || @silent
+    end
+
+    # @see Node#to_sass
+    def to_sass(tabs, opts = {})
+      content = value.gsub(/\*\/$/, '').rstrip
+      if content =~ /\A[ \t]/
+        # Re-indent SCSS comments like this:
+        #     /* foo
+        #   bar
+        #       baz */
+        content.gsub!(/^/, '   ')
+        content.sub!(/\A([ \t]*)\/\*/, '/*\1')
+      end
+
+      content =
+        unless content.include?("\n")
+          content
+        else
+          content.gsub!(/\n( \*|\/\/)/, "\n  ")
+          spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
+          if spaces >= 2
+            content
+          else
+            content.gsub(/\n#{' ' * spaces}/, "\n  ")
+          end
+        end
+
+      content.gsub!(/^/, '  ' * tabs)
+      content.gsub!(/\A\/\*/, '//') if silent
+      content.rstrip + "\n"
+    end
+
+    def to_scss(tabs, opts = {})
+      spaces = ('  ' * [tabs - value[/^ */].size, 0].max)
+      if silent
+        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
+      else
+        value
+      end.gsub(/^/, spaces) + "\n"
     end
 
+    protected
+
     # Computes the CSS for the comment.
     #
     # Returns `nil` if this is a silent comment
@@ -47,29 +91,15 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String, nil] The resulting CSS
     # @see #invisible?
-    def to_s(tabs = 0, _ = nil)
+    def _to_s(tabs = 0, _ = nil)
       return if invisible?
-      spaces = '  ' * (tabs - 1)
-
-      content = (value.split("\n") + lines.map {|l| l.text})
-      return spaces + "/* */" if content.empty?
-      content.map! {|l| (l.empty? ? "" : " ") + l}
-      content.first.gsub!(/^ /, '')
-      content.last.gsub!(%r{ ?\*/ *$}, '')
-
-      spaces + "/* " + content.join(style == :compact ? '' : "\n#{spaces} *") + " */"
-    end
+      spaces = ('  ' * [tabs - 1 - value[/^ */].size, 0].max)
 
-    # Returns `true` if this is a silent comment
-    # or the current style doesn't render comments.
-    #
-    # @return [Boolean]
-    def invisible?
-      style == :compressed || @silent
+      content = value.gsub(/^/, spaces)
+      content.gsub!(/\n +(\* *)?/, ' ') if style == :compact
+      content
     end
 
-    protected
-
     # Removes this node from the tree if it's a silent comment.
     #
     # @param environment [Sass::Environment] The lexical environment containing
@@ -80,5 +110,17 @@ module Sass::Tree
       return [] if @silent
       self
     end
+
+    private
+
+    def normalize_indentation(str)
+      pre = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
+        line[/^[ \t]*/].split("").zip(pre).inject([]) do |arr, (a, b)|
+          break arr if a != b
+          arr + [a]
+        end
+      end.join
+      str.gsub(/^#{pre}/, '')
+    end
   end
 end

data/lib/sass/tree/debug_node.rb

@@ -12,16 +12,21 @@ module Sass
 
       protected
 
+      def to_src(tabs, opts, fmt)
+        "#{'  ' * tabs}@debug #{@expr.to_sass}#{semi fmt}\n"
+      end
+
       # Prints the expression to STDERR.
       #
       # @param environment [Sass::Environment] The lexical environment containing
       #   variable and mixin values
       def _perform(environment)
         res = @expr.perform(environment)
+        res = res.value if res.is_a?(Sass::Script::String)
         if filename
-          STDERR.puts "#{filename}:#{line} DEBUG: #{res}"
+          $stderr.puts "#{filename}:#{line} DEBUG: #{res}"
         else
-          STDERR.puts "Line #{line} DEBUG: #{res}"
+          $stderr.puts "Line #{line} DEBUG: #{res}"
         end
         []
       end

data/lib/sass/tree/directive_node.rb

@@ -20,49 +20,55 @@ module Sass::Tree
       super()
     end
 
+    protected
+
+    def to_src(tabs, opts, fmt)
+      res = "#{'  ' * tabs}#{value}"
+      return res + "#{semi fmt}\n" if children.empty?
+      res + children_to_src(tabs, opts, fmt) + "\n"
+    end
+
     # Computes the CSS for the directive.
     #
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String] The resulting CSS
-    def to_s(tabs)
-      if children.empty?
-        value + ";"
-      else
-        result = if style == :compressed
-                   "#{value}{"
-                 else
-                   "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
-                 end
-        was_prop = false
-        first = true
-        children.each do |child|
-          next if child.invisible?
-          if style == :compact
-            if child.is_a?(PropNode)
-              result << "#{child.to_s(first || was_prop ? 1 : tabs + 1)} "
-            else
-              if was_prop
-                result[-1] = "\n"
-              end
-              rendered = child.to_s(tabs + 1)
-              rendered.lstrip! if first
-              result << rendered
-            end
-            was_prop = child.is_a?(PropNode)
-            first = false
-          elsif style == :compressed
-            result << (was_prop ? ";#{child.to_s(1)}" : child.to_s(1))
-            was_prop = child.is_a?(PropNode)
+    def _to_s(tabs)
+      return value + ";" unless has_children
+      return value + " {}" if children.empty?
+      result = if style == :compressed
+                 "#{value}{"
+               else
+                 "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
+               end
+      was_prop = false
+      first = true
+      children.each do |child|
+        next if child.invisible?
+        if style == :compact
+          if child.is_a?(PropNode)
+            result << "#{child.to_s(first || was_prop ? 1 : tabs + 1)} "
           else
-            result << child.to_s(tabs + 1) + "\n"
+            if was_prop
+              result[-1] = "\n"
+            end
+            rendered = child.to_s(tabs + 1).dup
+            rendered = rendered.lstrip if first
+            result << rendered.rstrip + "\n"
           end
+          was_prop = child.is_a?(PropNode)
+          first = false
+        elsif style == :compressed
+          result << (was_prop ? ";#{child.to_s(1)}" : child.to_s(1))
+          was_prop = child.is_a?(PropNode)
+        else
+          result << child.to_s(tabs + 1) + "\n"
         end
-        result.rstrip + if style == :compressed
-                          "}"
-                        else
-                          (style == :expanded ? "\n" : " ") + "}\n"
-                        end
       end
+      result.rstrip + if style == :compressed
+                        "}"
+                      else
+                        (style == :expanded ? "\n" : " ") + "}\n"
+                      end
     end
   end
 end

data/lib/sass/tree/for_node.rb

@@ -20,6 +20,12 @@ module Sass::Tree
 
     protected
 
+    def to_src(tabs, opts, fmt)
+      to = @exclusive ? "to" : "through"
+      "#{'  ' * tabs}@for $#{@var} from #{@from.to_sass} #{to} #{@to.to_sass}" +
+        children_to_src(tabs, opts, fmt)
+    end
+
     # Runs the child nodes once for each time through the loop,
     # varying the variable each time.
     #

data/lib/sass/tree/if_node.rb

@@ -30,7 +30,6 @@ module Sass::Tree
       @last_else = node
     end
 
-    # @see Node#options=
     def options=(options)
       super
       self.else.options = options if self.else
@@ -38,6 +37,19 @@ module Sass::Tree
 
     protected
 
+    def to_src(tabs, opts, fmt, is_else = false)
+      name =
+        if !is_else; "if"
+        elsif @expr; "else if"
+        else; "else"
+        end
+      str = "#{'  ' * tabs}@#{name}"
+      str << " #{@expr.to_sass}" if @expr
+      str << children_to_src(tabs, opts, fmt)
+      str << @else.send(:to_src, tabs, opts, fmt, true) if @else
+      str
+    end
+
     # Runs the child nodes if the conditional expression is true;
     # otherwise, tries the \{#else} nodes.
     #

data/lib/sass/tree/import_node.rb

@@ -3,38 +3,72 @@ module Sass
     # A static node that wraps the {Sass::Tree} for an `@import`ed file.
     # It doesn't have a functional purpose other than to add the `@import`ed file
     # to the backtrace if an error occurs.
-    class ImportNode < Node
+    class ImportNode < RootNode
+      # The name of the imported file as it appears in the Sass document.
+      #
+      # @return [String]
+      attr_reader :imported_filename
+
       # @param imported_filename [String] The name of the imported file
       def initialize(imported_filename)
         @imported_filename = imported_filename
-        super()
+        super(nil)
       end
 
-      # Computes the CSS for the imported file.
+      def invisible?; to_s.empty?; end
+
+      # Returns the resolved name of the imported file,
+      # as returned by \{Sass::Files#find\_file\_to\_import}.
       #
-      # @param args [Array] Ignored
-      def to_s(*args)
-        @to_s ||= (style == :compressed ? super().strip : super())
-      rescue Sass::SyntaxError => e
-        e.add_backtrace_entry(@filename)
-        raise e
+      # @return [String] The filename of the imported file.
+      #   This is an absolute path if the file is a `".sass"` or `".scss"` file.
+      # @raise [Sass::SyntaxError] if `filename` ends in `".sass"` or `".scss"`
+      #   and no corresponding Sass file could be found.
+      def full_filename
+        @full_filename ||= import
       end
 
-      def invisible?; to_s.empty?; end
+      def to_sass(tabs = 0, opts = {})
+        "#{'  ' * tabs}@import #{@imported_filename}\n"
+      end
+
+      def to_scss(tabs = 0, opts = {})
+        "#{'  ' * tabs}@import \"#{@imported_filename}\";\n"
+      end
 
       protected
 
-      # Parses the imported file
-      # and runs the dynamic Sass for it.
+      # @see Node#_cssize
+      def _cssize(*args)
+        super.children
+      rescue Sass::SyntaxError => e
+        e.modify_backtrace(:filename => children.first.filename)
+        e.add_backtrace(:filename => @filename, :line => @line)
+        raise e
+      end
+
+      # Returns a static DirectiveNode if this is importing a CSS file,
+      # or parses and includes the imported Sass file.
+      #
+      # @param environment [Sass::Environment] The lexical environment containing
+      #   variable and mixin values
+      def _perform(environment)
+        return DirectiveNode.new("@import url(#{full_filename})") if full_filename =~ /\.css$/
+        super
+      end
+
+      # Parses the imported file and runs the dynamic Sass for it.
       #
       # @param environment [Sass::Environment] The lexical environment containing
       #   variable and mixin values
       def perform!(environment)
-        return unless full_filename = import
-        self.children = Sass::Files.tree_for(full_filename, @options).children
+        root = Sass::Files.tree_for(full_filename, @options)
+        @template = root.template
+        self.children = root.children
         self.children = perform_children(environment)
       rescue Sass::SyntaxError => e
-        e.add_backtrace_entry(@filename)
+        e.modify_backtrace(:filename => full_filename)
+        e.add_backtrace(:filename => @filename, :line => @line)
         raise e
       end
 
@@ -47,18 +81,9 @@ module Sass
       end
 
       def import
-        begin
-          full_filename = Sass::Files.find_file_to_import(@imported_filename, import_paths)
-        rescue Exception => e
-          raise SyntaxError.new(e.message, self.line)
-        end
-
-        if full_filename =~ /\.css$/
-          @to_s = "@import url(#{full_filename});"
-          return false
-        end
-
-        return full_filename
+        Sass::Files.find_file_to_import(@imported_filename, import_paths)
+      rescue Exception => e
+        raise SyntaxError.new(e.message, :line => self.line, :filename => @filename)
       end
     end
   end