haml-edge 2.3.179 → 2.3.180

data/lib/sass/files.rb

@@ -11,7 +11,7 @@ module Sass
     # Returns the {Sass::Tree} for the given file,
     # reading it from the Sass cache if possible.
     #
-    # @param filename [String] The path to the Sass file
+    # @param filename [String] The path to the Sass or SCSS file
     # @param options [{Symbol => Object}] The options hash.
     #   Only the {file:SASS_REFERENCE.md#cache-option `:cache_location`} option is used
     # @raise [Sass::SyntaxError] if there's an error in the document.
@@ -30,50 +30,59 @@ module Sass
         end
       end
 
-      engine = Sass::Engine.new(text, options.merge(:filename => filename))
+      options = options.merge(:filename => filename)
+      if filename =~ /\.scss$/
+        options = options.merge(:syntax => :scss)
+      elsif filename =~ /\.sass$/
+        options = options.merge(:syntax => :sass)
+      end
+
+      engine = Sass::Engine.new(text, options)
 
       root = engine.to_tree
       try_to_write_sassc(root, compiled_filename, sha, options) if options[:cache]
       root
     end
 
-    # Find the full filename of a Sass or CSS file to import.
+    # Find the full filename of a Sass, SCSS, or CSS file to import.
     # This follows Sass's import rules:
-    # if the filename given ends in `".sass"` or `".css"`,
+    # if the filename given ends in `".sass"`, `".scss"`, or `".css"`,
     # it will try to find that type of file;
-    # otherwise, it will try to find the corresponding Sass file
+    # otherwise, it will try to find the corresponding Sass/SCSS file
     # and fall back on CSS if it's not available.
     #
-    # Any Sass filename returned will correspond to
-    # an actual Sass file on the filesystem.
+    # Any Sass/SCSS filename returned will correspond to
+    # an actual file of the corresponding type on the filesystem.
     # CSS filenames, however, may not;
     # they're expected to be put through directly to the stylesheet
     # as CSS `@import` statements.
     #
     # @param filename [String] The filename to search for
     # @param load_paths [Array<String>] The set of filesystem paths
-    #   to search for Sass files.
+    #   to search for Sass/SCSS files.
     # @return [String] The filename of the imported file.
-    #   This is an absolute path if the file is a `".sass"` file.
-    # @raise [Sass::SyntaxError] if `filename` ends in ``".sass"``
-    #   and no corresponding Sass file could be found.
+    #   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/SCSS file could be found.
     def find_file_to_import(filename, load_paths)
-      was_sass = false
+      was_sass = was_scss = false
       original_filename = filename
 
-      if filename[-5..-1] == ".sass"
+      if [".sass", ".scss"].include?(filename[-5..-1])
+        was_sass = filename[-5..-1] == ".sass"
+        was_scss = filename[-5..-1] == ".scss"
         filename = filename[0...-5]
-        was_sass = true
       elsif filename[-4..-1] == ".css"
         return filename
       end
 
-      new_filename = find_full_path("#{filename}.sass", load_paths)
+      new_filename   = find_full_path("#{filename}.sass", load_paths) unless was_scss
+      new_filename ||= find_full_path("#{filename}.scss", load_paths) unless was_sass
 
       return new_filename if new_filename
-      unless was_sass
-        warn <<END
-WARNING: #{filename}.sass not found. Using #{filename}.css instead.
+      unless was_sass || was_scss
+        Haml::Util.haml_warn <<END
+WARNING: Neither #{filename}.sass nor .scss found. Using #{filename}.css instead.
 This behavior is deprecated and will be removed in a future version.
 If you really need #{filename}.css, import it explicitly.
 END
@@ -107,7 +116,7 @@ END
         return Marshal.load(f.read)
       end
     rescue EOFError, TypeError, ArgumentError => e
-      warn "Warning. Error encountered while reading cache #{compiled_filename}: #{e}"
+      Haml::Util.haml_warn "Warning. Error encountered while reading cache #{compiled_filename}: #{e}"
     end
 
     def try_to_write_sassc(root, compiled_filename, sha, options)

data/lib/sass/plugin.rb

@@ -5,7 +5,7 @@ require 'sass'
 require 'sass/callbacks'
 
 module Sass
-  # This module handles the compilation of Sass files.
+  # This module handles the compilation of Sass/SCSS files.
   # It provides global options and checks whether CSS files
   # need to be updated.
   #
@@ -25,9 +25,9 @@ module Sass
   #   puts "Compiling #{template} to #{css}"
   # end
   # Sass::Plugin.update_stylesheets
-  #   #=> Compiling app/sass/screen.sass to public/stylesheets/screen.css
-  #   #=> Compiling app/sass/print.sass to public/stylesheets/print.css
-  #   #=> Compiling app/sass/ie.sass to public/stylesheets/ie.css
+  #   #=> Compiling app/sass/screen.scss to public/stylesheets/screen.css
+  #   #=> Compiling app/sass/print.scss to public/stylesheets/print.css
+  #   #=> Compiling app/sass/ie.scss to public/stylesheets/ie.css
   module Plugin
     include Haml::Util
     include Sass::Callbacks
@@ -65,7 +65,7 @@ module Sass
     #
     # @yield [template, css]
     # @yieldparam template [String]
-    #   The location of the Sass file being updated.
+    #   The location of the Sass/SCSS file being updated.
     # @yieldparam css [String]
     #   The location of the CSS file being generated.
     define_callback :updating_stylesheet
@@ -81,7 +81,7 @@ module Sass
     #
     # @yield [template, css]
     # @yieldparam template [String]
-    #   The location of the Sass file not being updated.
+    #   The location of the Sass/SCSS file not being updated.
     # @yieldparam css [String]
     #   The location of the CSS file not being generated.
     define_callback :not_updating_stylesheet
@@ -94,7 +94,7 @@ module Sass
     # @yield [error, template, css]
     # @yieldparam error [Exception] The exception that was raised.
     # @yieldparam template [String]
-    #   The location of the Sass file being updated.
+    #   The location of the Sass/SCSS file being updated.
     # @yieldparam css [String]
     #   The location of the CSS file being generated.
     define_callback :compilation_error
@@ -142,7 +142,7 @@ module Sass
     define_callback :template_deleted
 
     # Register a callback to be run when Sass deletes a CSS file.
-    # This happens when the corresponding Sass file has been deleted.
+    # This happens when the corresponding Sass/SCSS file has been deleted.
     #
     # @yield [filename]
     # @yieldparam filename [String]
@@ -192,7 +192,7 @@ module Sass
 
     # Updates out-of-date stylesheets.
     #
-    # Checks each Sass file in {file:SASS_REFERENCE.md#template_location-option `:template_location`}
+    # Checks each Sass/SCSS 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`}.
     # If it has, it updates the CSS file.
@@ -201,7 +201,7 @@ module Sass
     #   A list of files to check for updates
     #   **in addition to those specified by the
     #   {file:SASS_REFERENCE.md#template_location-option `:template_location` option}.**
-    #   The first string in each pair is the location of the Sass file,
+    #   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 = [])
       return if options[:never_update]
@@ -213,32 +213,30 @@ module Sass
       @checked_for_updates = true
       template_locations.zip(css_locations).each do |template_location, css_location|
 
-        Dir.glob(File.join(template_location, "**", "*.sass")).each do |file|
-          # Get the relative path to the file with no extension
-          name = file.sub(template_location.sub(/\/*$/, '/'), "")[0...-5]
+        Dir.glob(File.join(template_location, "**", "*.s[ca]ss")).each do |file|
+          # Get the relative path to the file
+          name = file.sub(template_location.sub(/\/*$/, '/'), "")
+          css = css_filename(name, css_location)
 
           next if forbid_update?(name)
-
-          filename = template_filename(name, template_location)
-          css = css_filename(name, css_location)
-          if options[:always_update] || stylesheet_needs_update?(name, template_location, css_location)
-            update_stylesheet filename, css
+          if options[:always_update] || stylesheet_needs_update?(css, file)
+            update_stylesheet file, css
           else
-            run_not_updating_stylesheet filename, css
+            run_not_updating_stylesheet file, css
           end
         end
       end
     end
 
     # Watches the template directory (or directories)
-    # and updates the CSS files whenever the related Sass files change.
+    # and updates the CSS files whenever the related Sass/SCSS files change.
     # `watch` never returns.
     #
-    # Whenever a change is detected to a Sass file in
+    # Whenever a change is detected to a Sass/SCSS file in
     # {file:SASS_REFERENCE.md#template_location-option `:template_location`},
     # the corresponding CSS file in {file:SASS_REFERENCE.md#css_location-option `:css_location`}
     # will be recompiled.
-    # The CSS files of any Sass files that import the changed file will also be recompiled.
+    # The CSS files of any Sass/SCSS files that import the changed file will also be recompiled.
     #
     # Before the watching starts in earnest, `watch` calls \{#update\_stylesheets}.
     #
@@ -252,7 +250,7 @@ module Sass
     #   A list of files to watch for updates
     #   **in addition to those specified by the
     #   {file:SASS_REFERENCE.md#template_location-option `:template_location` option}.**
-    #   The first string in each pair is the location of the Sass file,
+    #   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 watch(individual_files = [])
       update_stylesheets(individual_files)
@@ -274,7 +272,7 @@ module Sass
       FSSM.monitor do |mon|
         template_locations.zip(css_locations).each do |template_location, css_location|
           mon.path template_location do |path|
-            path.glob '**/*.sass'
+            path.glob '**/*.s[ac]ss'
 
             path.update do |base, relative|
               run_template_modified File.join(base, relative)
@@ -288,7 +286,7 @@ module Sass
 
             path.delete do |base, relative|
               run_template_deleted File.join(base, relative)
-              css = File.join(css_location, relative.gsub(/\.sass$/, '.css'))
+              css = File.join(css_location, relative.gsub(/\.s[ac]ss$/, '.css'))
               try_delete_css css
               update_stylesheets(individual_files)
             end
@@ -368,26 +366,16 @@ module Sass
       end
     end
 
-    def template_filename(name, path)
-      "#{path}/#{name}.sass"
-    end
-
     def css_filename(name, path)
-      "#{path}/#{name}.css"
+      "#{path}/#{name}".gsub(/\.s[ac]ss$/, '.css')
     end
 
     def forbid_update?(name)
       name.sub(/^.*\//, '')[0] == ?_
     end
 
-    def stylesheet_needs_update?(name, template_path, css_path)
-      css_file = css_filename(name, css_path)
-      template_file = template_filename(name, template_path)
-      exact_stylesheet_needs_update?(css_file, template_file)
-    end
-
-    def exact_stylesheet_needs_update?(css_file, template_file)
-      return true unless File.exists?(css_file)
+    def stylesheet_needs_update?(css_file, template_file)
+      return true unless File.exists?(css_file) && File.exists?(template_file)
 
       css_mtime = File.mtime(css_file)
       File.mtime(template_file) > css_mtime ||
@@ -407,11 +395,12 @@ module Sass
     end
 
     def dependencies(filename)
-      File.readlines(filename).grep(/^@import /).map do |line|
-        line[8..-1].split(',').map do |inc|
-          Sass::Files.find_file_to_import(inc.strip, [File.dirname(filename)] + load_paths)
-        end
-      end.flatten.grep(/\.sass$/)
+      Files.tree_for(filename, engine_options).select {|n| n.is_a?(Tree::ImportNode)}.map do |n|
+        next if n.full_filename =~ /\.css$/
+        n.full_filename
+      end.compact
+    rescue Sass::SyntaxError => e
+      [] # If the file has an error, we assume it has no dependencies
     end
   end
 end

data/lib/sass/repl.rb

@@ -35,7 +35,7 @@ module Sass
       case text
       when Script::MATCH
         name = $1
-        guarded = $2 == '||='
+        guarded = $3 == '||=' || $4
         val = Script::Parser.parse($3, @line, text.size - $3.size)
 
         unless guarded && environment.var(name)

data/lib/sass/script.rb

@@ -12,17 +12,13 @@ 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*(.+)/
+    MATCH = /^[!\$](#{Sass::SCSS::RX::IDENT})\s*((?:\|\|)?=|:)\s*(.+?)(!(?i:default))?$/
 
     # The regular expression used to validate variables without matching.
     # @private
-    VALIDATE = /^![a-zA-Z_-][\w-]*$/
+    VALIDATE = /^[!\$]#{Sass::SCSS::RX::IDENT}$/
 
     # Parses a string of SassScript
     #
@@ -41,5 +37,28 @@ module Sass
       e.modify_backtrace(:line => line, :filename => options[:filename])
       raise e
     end
+
+    # @private
+    def self.var_warning(varname, line, offset, filename)
+      Haml::Util.haml_warn <<MESSAGE
+DEPRECATION WARNING:
+On line #{line}, character #{offset}#{" of '#{filename}'" if filename}
+Variables with ! have been deprecated and will be removed in version 3.2.
+Use \"$#{varname}\" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+MESSAGE
+    end
+
+    def self.equals_warning(types, name, val, guarded, line, offset, filename)
+      Haml::Util.haml_warn <<MESSAGE
+DEPRECATION WARNING:
+On line #{line}#{", character #{offset}" if offset}#{" of '#{filename}'" if filename}
+Setting #{types} with #{"||" if guarded}= has been deprecated and will be removed in version 3.2.
+Use "#{name}: #{val}#{" !default" if guarded}" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+MESSAGE
+    end
   end
 end

data/lib/sass/script/bool.rb

@@ -13,5 +13,6 @@ module Sass::Script
     def to_s
       @value.to_s
     end
+    alias_method :to_sass, :to_s
   end
 end

data/lib/sass/script/color.rb

@@ -184,7 +184,7 @@ module Sass::Script
     # @deprecated This will be removed in version 3.2.
     # @see #rgb
     def value
-      warn <<END
+      Haml::Util.haml_warn <<END
 DEPRECATION WARNING:
 The Sass::Script::Color #value attribute is deprecated and will be
 removed in version 3.2. Use the #rgb attribute instead.
@@ -381,7 +381,7 @@ END
       return HTML4_COLORS_REVERSE[rgb] if HTML4_COLORS_REVERSE[rgb]
       hex_str
     end
-    alias_method :inspect, :to_s
+    alias_method :to_sass, :to_s
 
     # Returns a string representation of the color.
     #

data/lib/sass/script/css_lexer.rb

@@ -0,0 +1,22 @@
+module Sass
+  module Script
+    class CssLexer < Lexer
+      def token
+        important || super
+      end
+
+      def string(*args)
+        return unless scan(STRING)
+        str = (@scanner[1] || @scanner[2]).
+          gsub(/\\([^0-9a-f])/, '\1').
+          gsub(/\\([0-9a-f]{1,4})/, "\\\\\\1")
+        [:string, Script::String.new(str, :string)]
+      end
+
+      def important
+        return unless s = scan(IMPORTANT)
+        [:raw, s]
+      end
+    end
+  end
+end

data/lib/sass/script/css_parser.rb

@@ -0,0 +1,28 @@
+require 'sass/script'
+require 'sass/script/css_lexer'
+
+module Sass
+  module Script
+    class CssParser < Parser
+      private
+
+      # @private
+      def lexer_class; CssLexer; end
+
+      # We need a production that only does /,
+      # since * and % aren't allowed in plain CSS
+      production :div, :unary_plus, :div
+
+      def string
+        return number unless tok = try_tok(:string)
+        return tok.value unless @lexer.peek && @lexer.peek.type == :begin_interpolation
+      end
+
+      # Short-circuit all the SassScript-only productions
+      alias_method :interpolation, :concat
+      alias_method :or_expr, :div
+      alias_method :unary_div, :funcall
+      alias_method :paren, :string
+    end
+  end
+end

data/lib/sass/script/funcall.rb

@@ -22,6 +22,7 @@ module Sass
       def initialize(name, args)
         @name = name
         @args = args
+        super()
       end
 
       # @return [String] A string representation of the function call
@@ -29,12 +30,27 @@ module Sass
         "#{name}(#{args.map {|a| a.inspect}.join(', ')})"
       end
 
+      # @see Node#to_sass
+      def to_sass
+        "#{name}(#{args.map {|a| a.to_sass}.join(', ')})"
+      end
+
+      # Returns the arguments to the function.
+      #
+      # @return [Array<Node>]
+      # @see Node#children
+      def children
+        @args
+      end
+
+      protected
+
       # Evaluates the function call.
       #
       # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
       # @return [Literal] The SassScript object that is the value of the function call
       # @raise [Sass::SyntaxError] if the function call raises an ArgumentError
-      def perform(environment)
+      def _perform(environment)
         args = self.args.map {|a| a.perform(environment)}
         ruby_name = name.gsub('-', '_')
         unless Haml::Util.has?(:public_instance_method, Functions, ruby_name) && ruby_name !~ /^__/
@@ -48,14 +64,6 @@ module Sass
         raise e unless e.backtrace.any? {|t| t =~ /:in `(block in )?(#{name}|perform)'$/}
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
-
-      # Returns the arguments to the function.
-      #
-      # @return [Array<Node>]
-      # @see Node#children
-      def children
-        @args
-      end
     end
   end
 end