haml 2.2.17 → 2.2.18

data/lib/haml/precompiler.rb

@@ -8,46 +8,60 @@ module Haml
     include Haml::Util
 
     # Designates an XHTML/XML element.
+    # @private
     ELEMENT         = ?%
 
     # Designates a `<div>` element with the given class.
+    # @private
     DIV_CLASS       = ?.
 
     # Designates a `<div>` element with the given id.
+    # @private
     DIV_ID          = ?#
 
     # Designates an XHTML/XML comment.
+    # @private
     COMMENT         = ?/
 
     # Designates an XHTML doctype or script that is never HTML-escaped.
+    # @private
     DOCTYPE         = ?!
 
     # Designates script, the result of which is output.
+    # @private
     SCRIPT          = ?=
 
     # Designates script that is always HTML-escaped.
+    # @private
     SANITIZE        = ?&
 
     # Designates script, the result of which is flattened and output.
+    # @private
     FLAT_SCRIPT     = ?~
 
     # Designates script which is run but not output.
+    # @private
     SILENT_SCRIPT   = ?-
 
     # When following SILENT_SCRIPT, designates a comment that is not output.
+    # @private
     SILENT_COMMENT  = ?#
 
     # Designates a non-parsed line.
+    # @private
     ESCAPE          = ?\\
 
     # Designates a block of filtered text.
+    # @private
     FILTER          = ?:
 
     # Designates a non-parsed line. Not actually a character.
+    # @private
     PLAIN_TEXT      = -1
 
     # Keeps track of the ASCII values of the characters that begin a
     # specially-interpreted line.
+    # @private
     SPECIAL_CHARACTERS   = [
       ELEMENT,
       DIV_CLASS,
@@ -64,6 +78,7 @@ module Haml
 
     # The value of the character that designates that a line is part
     # of a multiline string.
+    # @private
     MULTILINE_CHAR_VALUE = ?|
 
     # Regex to match keywords that appear in the middle of a Ruby block
@@ -79,12 +94,15 @@ module Haml
     #
     # The block is ended after `%p no!`, because `else`
     # is a member of this array.
+    # @private
     MID_BLOCK_KEYWORD_REGEX = /^-\s*(#{%w[else elsif rescue ensure when end].join('|')})\b/
 
     # The Regex that matches a Doctype command.
+    # @private
     DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)/i
 
     # The Regex that matches a literal string or symbol value
+    # @private
     LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?![\\#]|\2).|\\.)*\2/
 
     private
@@ -124,6 +142,7 @@ END
       end.join(';') + ';'
     end
 
+    # @private
     class Line < Struct.new(:text, :unstripped, :full, :index, :precompiler, :eod)
       alias_method :eod?, :eod
 
@@ -654,7 +673,7 @@ END
         return name, [:dynamic, var]
       end
 
-      re = /((?:\\.|\#[^{]|[^#{quote}\\#])*#?)(#{quote}|#\{)/
+      re = /((?:\\.|\#(?!\{)|[^#{quote}\\#])*)(#{quote}|#\{)/
       content = []
       loop do
         return false unless scanner.scan(re)

data/lib/haml/template.rb

@@ -28,7 +28,7 @@ module Haml
 
       Haml::Precompiler.module_eval do
         def precompiled_method_return_value_with_haml_xss
-          "(#{precompiled_method_return_value_without_haml_xss}).html_safe!"
+          "::Haml::Util.html_safe(#{precompiled_method_return_value_without_haml_xss})"
         end
         alias_method :precompiled_method_return_value_without_haml_xss, :precompiled_method_return_value
         alias_method :precompiled_method_return_value, :precompiled_method_return_value_with_haml_xss
@@ -39,7 +39,7 @@ module Haml
   end
 end
 
-if defined?(RAILS_ENV) && RAILS_ENV == "production"
+if Haml::Util.rails_env == "production"
   Haml::Template.options[:ugly] = true
 end
 

data/lib/haml/util.rb

@@ -146,6 +146,17 @@ module Haml
       return nil
     end
 
+    # Returns the environment of the Rails application,
+    # if this is running in a Rails context.
+    # Returns `nil` if no such environment is defined.
+    #
+    # @return [String, nil]
+    def rails_env
+      return Rails.env.to_s if defined?(Rails.root)
+      return RAILS_ENV.to_s if defined?(RAILS_ENV)
+      return nil
+    end
+
     # Returns an ActionView::Template* class.
     # In pre-3.0 versions of Rails, most of these classes
     # were of the form `ActionView::TemplateFoo`,
@@ -170,6 +181,17 @@ module Haml
       false
     end
 
+    # Returns the given text, marked as being HTML-safe.
+    # With older versions of the Rails XSS-safety mechanism,
+    # this destructively modifies the HTML-safety of `text`.
+    #
+    # @param text [String]
+    # @return [String] `text`, marked as HTML-safe
+    def html_safe(text)
+      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
+      text.html_safe!
+    end
+
     # Assert that a given object (usually a String) is HTML safe
     # according to Rails' XSS handling, if it's loaded.
     #
@@ -179,6 +201,11 @@ module Haml
       raise Haml::Error.new("Expected #{text.inspect} to be HTML-safe.")
     end
 
+    def rails_safe_buffer_class
+      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
+      ActiveSupport::SafeBuffer
+    end
+
     ## Cross-Ruby-Version Compatibility
 
     # Whether or not this is running under Ruby 1.8 or lower.

data/lib/sass/engine.rb

@@ -76,45 +76,57 @@ module Sass
     end
 
     # The character that begins a CSS property.
+    # @private
     PROPERTY_CHAR  = ?:
 
     # The character that designates that
     # a property should be assigned to a SassScript expression.
+    # @private
     SCRIPT_CHAR     = ?=
 
     # The character that designates the beginning of a comment,
     # either Sass or CSS.
+    # @private
     COMMENT_CHAR = ?/
 
     # The character that follows the general COMMENT_CHAR and designates a Sass comment,
     # which is not output as a CSS comment.
+    # @private
     SASS_COMMENT_CHAR = ?/
 
     # The character that follows the general COMMENT_CHAR and designates a CSS comment,
     # which is embedded in the CSS document.
+    # @private
     CSS_COMMENT_CHAR = ?*
 
     # The character used to denote a compiler directive.
+    # @private
     DIRECTIVE_CHAR = ?@
 
     # Designates a non-parsed rule.
+    # @private
     ESCAPE_CHAR    = ?\\
 
     # Designates block as mixin definition rather than CSS rules to output
+    # @private
     MIXIN_DEFINITION_CHAR = ?=
 
     # Includes named mixin declared using MIXIN_DEFINITION_CHAR
+    # @private
     MIXIN_INCLUDE_CHAR    = ?+
 
     # The regex that matches properties of the form `name: prop`.
+    # @private
     PROPERTY_NEW_MATCHER = /^[^\s:"\[]+\s*[=:](\s|$)/
 
     # The regex that matches and extracts data from
     # properties of the form `name: prop`.
+    # @private
     PROPERTY_NEW = /^([^\s=:"]+)(\s*=|:)(?:\s+|$)(.*)/
 
     # The regex that matches and extracts data from
     # properties of the form `:name prop`.
+    # @private
     PROPERTY_OLD = /^:([^\s=:"]+)\s*(=?)(?:\s+|$)(.*)/
 
     # The default options for Sass::Engine.
@@ -132,6 +144,10 @@ module Sass
       @options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
       @template = template
 
+      # Support both, because the docs said one and the other actually worked
+      # for quite a long time.
+      @options[:line_comments] ||= @options[:line_numbers]
+
       # Backwards compatibility
       @options[:property_syntax] ||= @options[:attribute_syntax]
       case @options[:property_syntax]
@@ -166,6 +182,7 @@ module Sass
 
     def tabulate(string)
       tab_str = nil
+      comment_tab_str = nil
       first = true
       lines = []
       string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/).each_with_index do |line, index|
@@ -177,6 +194,12 @@ module Sass
 
         line_tab_str = line[/^\s*/]
         unless line_tab_str.empty?
+          if tab_str.nil?
+            comment_tab_str ||= line_tab_str
+            next if try_comment(line, lines.last, "", comment_tab_str, index)
+            comment_tab_str = nil
+          end
+
           tab_str ||= line_tab_str
 
           raise SyntaxError.new("Indenting at the beginning of the document is illegal.", index) if first
@@ -190,9 +213,11 @@ module Sass
           next
         end
 
-        if lines.last && lines.last.comment? && line =~ /^(?:#{tab_str}){#{lines.last.tabs + 1}}(.*)$/
-          lines.last.text << "\n" << $1
+        comment_tab_str ||= line_tab_str
+        if try_comment(line, lines.last, tab_str * (lines.last.tabs + 1), comment_tab_str, index)
           next
+        else
+          comment_tab_str = nil
         end
 
         line_tabs = line_tab_str.scan(tab_str).size
@@ -205,6 +230,21 @@ END
       lines
     end
 
+    def try_comment(line, last, tab_str, comment_tab_str, index)
+      return unless last && last.comment?
+      return unless line =~ /^#{tab_str}/
+      unless line =~ /^(?:#{comment_tab_str})(.*)$/
+        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), index)
+Inconsistent indentation:
+previous line was indented by #{Haml::Shared.human_indentation comment_tab_str},
+but this line was indented by #{Haml::Shared.human_indentation line[/^\s*/]}.
+MSG
+      end
+
+      last.text << "\n" << $1
+      true
+    end
+
     def tree(arr, i = 0)
       return [], i if arr[i].nil?
 

data/lib/sass/plugin.rb

@@ -1,4 +1,5 @@
 require 'sass'
+require 'rbconfig'
 
 module Sass
   # This module handles the compilation of Sass files.
@@ -66,7 +67,7 @@ module Sass
     #
     # Checks each Sass file in {file:SASS_REFERENCE.md#template_location-option `:template_location`}
     # to see if it's been modified more recently than the corresponding CSS file
-    # in {file:SASS_REFERENCE.md#css_location-option} `:css_location`}.
+    # in {file:SASS_REFERENCE.md#css_location-option `:css_location`}.
     # If it has, it updates the CSS file.
     def update_stylesheets
       return if options[:never_update]
@@ -103,9 +104,9 @@ module Sass
       mkpath(css_location, name)
 
       # Finally, write the file
-      File.open(css, 'w') do |file|
-        file.print(result)
-      end
+      flag = 'w'
+      flag = 'wb' if RbConfig::CONFIG['host_os'] =~ /mswin|windows/i && options[:unix_newlines]
+      File.open(css, flag) {|file| file.print(result)}
     end
     
     # Create any successive directories required to be able to write a file to: File.join(base,name)

data/lib/sass/plugin/rails.rb

@@ -4,8 +4,8 @@ unless defined?(Sass::RAILS_LOADED)
   Sass::Plugin.options.merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
                               :css_location      => Haml::Util.rails_root + '/public/stylesheets',
                               :cache_location    => Haml::Util.rails_root + '/tmp/sass-cache',
-                              :always_check      => RAILS_ENV != "production",
-                              :full_exception    => RAILS_ENV != "production")
+                              :always_check      => Haml::Util.rails_env != "production",
+                              :full_exception    => Haml::Util.rails_env != "production")
 
   if defined?(ActionDispatch::Callbacks.to_prepare)
     # Rails >= 3.0.0

data/lib/sass/script.rb

@@ -13,12 +13,15 @@ module Sass
   # This module contains code that handles the parsing and evaluation of SassScript.
   module Script
     # The character that begins a variable.
+    # @private
     VARIABLE_CHAR = ?!
 
     # The regular expression used to parse variables.
+    # @private
     MATCH = /^!([a-zA-Z_]\w*)\s*((?:\|\|)?=)\s*(.+)/
 
     # The regular expression used to validate variables without matching.
+    # @private
     VALIDATE = /^![a-zA-Z_]\w*$/
 
     # Parses and evaluates a string of SassScript.

data/lib/sass/script/color.rb

@@ -6,6 +6,7 @@ module Sass::Script
     class << self; include Haml::Util; end
 
     # A hash from color names to `[red, green, blue]` value arrays.
+    # @private
     HTML4_COLORS = map_vals({
         'black'   => 0x000000,
         'silver'  => 0xc0c0c0,
@@ -25,6 +26,7 @@ module Sass::Script
         'aqua'    => 0x00ffff
       }) {|color| (0..2).map {|n| color >> (n << 3) & 0xff}.reverse}
     # A hash from `[red, green, blue]` value arrays to color names.
+    # @private
     HTML4_COLORS_REVERSE = map_hash(HTML4_COLORS) {|k, v| [v, k]}
 
     # Creates a new color from RGB components.
@@ -41,13 +43,13 @@ module Sass::Script
       super(rgb.freeze)
     end
 
-    # @deprecated This will be removed in version 2.6.
+    # @deprecated This will be removed in version 3.2.
     # @see #rgb
     def value
       warn <<END
 DEPRECATION WARNING:
 The Sass::Script::Color #value attribute is deprecated and will be
-removed in version 2.6. Use the #rgb attribute instead.
+removed in version 3.2. Use the #rgb attribute instead.
 END
       rgb
     end

data/lib/sass/script/lexer.rb

@@ -8,20 +8,21 @@ module Sass
     class Lexer
       # A struct containing information about an individual token.
       #
-      # `type`: \[{Symbol}\]
+      # `type`: \[`Symbol`\]
       # : The type of token.
       #
-      # `value`: \[{Object}\]
+      # `value`: \[`Object`\]
       # : The Ruby object corresponding to the value of the token.
       #
-      # `line`: \[{Fixnum}\]
+      # `line`: \[`Fixnum`\]
       # : The line of the source file on which the token appears.
       #
-      # `offset`: \[{Fixnum}\]
+      # `offset`: \[`Fixnum`\]
       # : The number of bytes into the line the SassScript token appeared.
       Token = Struct.new(:type, :value, :line, :offset)
 
       # A hash from operator strings to the corresponding token types.
+      # @private
       OPERATORS = {
         '+' => :plus,
         '-' => :minus,
@@ -47,9 +48,11 @@ module Sass
 
       # A list of operator strings ordered with longer names first
       # so that `>` and `<` don't clobber `>=` and `<=`.
+      # @private
       OP_NAMES = OPERATORS.keys.sort_by {|o| -o.size}
 
       # A hash of regular expressions that are used for tokenizing.
+      # @private
       REGULAR_EXPRESSIONS = {
         :whitespace => /\s*/,
         :variable => /!(\w+)/,
@@ -167,7 +170,7 @@ module Sass
           warn(<<END)
 DEPRECATION WARNING:
 On line #{@line}, character #{last_match_position}#{" of '#{@filename}'" if @filename}
-- will be allowed as part of variable names in version 2.4.
+- will be allowed as part of variable names in version 3.0.
 Please add whitespace to separate it from the previous token.
 END
         end

data/lib/sass/script/number.rb

@@ -351,7 +351,9 @@ module Sass::Script
     end
 
     # A hash of unit names to their index in the conversion table
+    # @private
     CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4}
+    # @private
     CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        ], # in
                         [ nil,              1,            2.36220473,   10,          28.3464567], # cm
                         [ nil,              nil,          1,            4.23333333,  12        ], # pc

data/lib/sass/script/parser.rb

@@ -141,7 +141,7 @@ RUBY
           warn(<<END)
 DEPRECATION WARNING:
 On line #{name.line}, character #{name.offset}#{" of '#{@filename}'" if @filename}
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 '#{name.value}' was not quoted. Please add double quotes (e.g. "#{name.value}").
 END
           Script::String.new(name.value)

data/lib/sass/tree/rule_node.rb

@@ -6,6 +6,7 @@ module Sass::Tree
   # @see Sass::Tree
   class RuleNode < Node
     # The character used to include the parent selector
+    # @private
     PARENT = '&'
 
     # The CSS selectors for this rule.