sass 3.1.21 → 3.2.0.alpha.3

data/lib/sass/environment.rb

@@ -26,7 +26,7 @@ module Sass
       unless parent
         @stack = []
         @mixins_in_use = Set.new
-        @files_in_use = Set.new
+        set_var("important", Script::String.new("!important"))
       end
     end
 
@@ -59,8 +59,7 @@ module Sass
       else
         stack.push(top_of_stack = frame_info)
       end
-      mixins_in_use << top_of_stack[:mixin] if top_of_stack[:mixin]
-      files_in_use << top_of_stack[:filename] if top_of_stack[:filename]
+      mixins_in_use << top_of_stack[:mixin] if top_of_stack[:mixin] && !top_of_stack[:prepared]
     end
 
     # Like \{#push\_frame}, but next time a stack frame is pushed,
@@ -73,8 +72,9 @@ module Sass
 
     # Pop a stack frame from the mixin/include stack.
     def pop_frame
-      pop_and_unuse if stack.last && stack.last[:prepared]
-      pop_and_unuse
+      stack.pop if stack.last && stack.last[:prepared]
+      popped = stack.pop
+      mixins_in_use.delete(popped[:mixin]) if popped && popped[:mixin]
     end
 
     # A list of stack frames in the mixin/include stack.
@@ -93,33 +93,8 @@ module Sass
       @mixins_in_use ||= @parent.mixins_in_use
     end
 
-    # A set of names of files currently present in the stack.
-    #
-    # @return [Set<String>] The filenames.
-    def files_in_use
-      @files_in_use ||= @parent.files_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 pop_and_unuse
-      popped = stack.pop
-      mixins_in_use.delete(popped[:mixin]) if popped && popped[:mixin]
-      files_in_use.delete(popped[:filename]) if popped && popped[:filename]
-      popped
-    end
-
     def parent_options
       @parent_options ||= @parent && @parent.options
     end

data/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,11 +372,11 @@ 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
 
-        ::Sass::Plugin.on_updated_stylesheet do |_, css|
+        ::Sass::Plugin.on_updating_stylesheet do |_, css|
           if File.exists? css
             puts_action :overwrite, :yellow, css
           else
@@ -404,7 +391,6 @@ MSG
           raise error unless error.is_a?(::Sass::SyntaxError) && !@options[:stop_on_error]
           had_error = true
           puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"
-          STDOUT.flush
         end
 
         if @options[:update]
@@ -415,18 +401,9 @@ MSG
 
         puts ">>> Sass is watching for changes. Press Ctrl-C to stop."
 
-        ::Sass::Plugin.on_template_modified do |template|
-          puts ">>> Change detected to: #{template}"
-          STDOUT.flush
-        end
-        ::Sass::Plugin.on_template_created do |template|
-          puts ">>> New template detected: #{template}"
-          STDOUT.flush
-        end
-        ::Sass::Plugin.on_template_deleted do |template|
-          puts ">>> Deleted template detected: #{template}"
-          STDOUT.flush
-        end
+        ::Sass::Plugin.on_template_modified {|template| puts ">>> Change detected to: #{template}"}
+        ::Sass::Plugin.on_template_created {|template| puts ">>> New template detected: #{template}"}
+        ::Sass::Plugin.on_template_deleted {|template| puts ">>> Deleted template detected: #{template}"}
 
         ::Sass::Plugin.watch(files)
       end
@@ -452,7 +429,7 @@ MSG
       def probably_dest_dir?(path)
         return false unless path
         return false if colon_path?(path)
-        return ::Sass::Util.glob(File.join(path, "*.s[ca]ss")).empty?
+        return Dir.glob(File.join(path, "*.s[ca]ss")).empty?
       end
     end
 
@@ -584,7 +561,7 @@ END
         end
 
         ext = @options[:from]
-        ::Sass::Util.glob("#{@options[:input]}/**/*.#{ext}") do |f|
+        Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|
           output =
             if @options[:in_place]
               f

data/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/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/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

data/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/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|
-        Sass::Util.glob(File.join(template_location, "**", "[^_]*.s[ca]ss")).sort.each do |file|
+
+        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
@@ -218,10 +198,10 @@ module Sass::Plugin
     #
     # Before the watching starts in earnest, `watch` calls \{#update\_stylesheets}.
     #
-    # Note that `watch` uses the [Listen](http://github.com/guard/listen) library
+    # Note that `watch` uses the [FSSM](http://github.com/ttilley/fssm) library
     # to monitor the filesystem for changes.
-    # Listen isn't loaded until `watch` is run.
-    # The version of Listen distributed with Sass is loaded by default,
+    # FSSM isn't loaded until `watch` is run.
+    # The version of FSSM distributed with Sass is loaded by default,
     # but if another version has already been loaded that will be used instead.
     #
     # @param individual_files [Array<(String, String)>]
@@ -234,15 +214,15 @@ module Sass::Plugin
       update_stylesheets(individual_files)
 
       begin
-        require 'listen'
+        require 'fssm'
       rescue LoadError => e
-        dir = Sass::Util.scope("vendor/listen/lib")
+        dir = Sass::Util.scope("vendor/fssm/lib")
         if $LOAD_PATH.include?(dir)
           e.message << "\n" <<
             if File.exists?(scope(".git"))
               'Run "git submodule update --init" to get the recommended version.'
             else
-              'Run "gem install listen" to get it.'
+              'Run "gem install fssm" to get it.'
             end
           raise e
         else
@@ -251,61 +231,60 @@ module Sass::Plugin
         end
       end
 
-      template_paths = template_locations # cache the locations
-      individual_files_hash = individual_files.inject({}) do |h, files|
-        parent = File.dirname(files.first)
-        (h[parent] ||= []) << files unless template_paths.include?(parent)
-        h
+      unless individual_files.empty? && FSSM::Backends::Default.name == "FSSM::Backends::FSEvents"
+        # As of FSSM 0.1.4, it doesn't support FSevents on individual files,
+        # but it also isn't smart enough to switch to polling itself.
+        require 'fssm/backends/polling'
+        Sass::Util.silence_warnings do
+          FSSM::Backends.const_set(:Default, FSSM::Backends::Polling)
+        end
       end
-      directories = template_paths + individual_files_hash.keys +
-        [{:relative_paths => true}]
 
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
-      listener = Listen::MultiListener.new(*directories) do |modified, added, removed|
-        modified.each do |f|
-          parent = File.dirname(f)
-          if files = individual_files_hash[parent]
-            next unless files.first == f
-          else
-            next unless f =~ /\.s[ac]ss$/
-          end
-          run_template_modified(f)
-        end
+      FSSM.monitor do |mon|
+        template_location_array.each do |template_location, css_location|
+          mon.path template_location do |path|
+            path.glob '**/*.s[ac]ss'
+
+            path.update do |base, relative|
+              run_template_modified File.join(base, relative)
+              update_stylesheets(individual_files)
+            end
 
-        added.each do |f|
-          parent = File.dirname(f)
-          if files = individual_files_hash[parent]
-            next unless files.first == f
-          else
-            next unless f =~ /\.s[ac]ss$/
-          end
-          run_template_created(f)
-        end
+            path.create do |base, relative|
+              run_template_created File.join(base, relative)
+              update_stylesheets(individual_files)
+            end
 
-        removed.each do |f|
-          parent = File.dirname(f)
-          if files = individual_files_hash[parent]
-            next unless files.first == f
-            try_delete_css files[1]
-          else
-            next unless f =~ /\.s[ac]ss$/
-            try_delete_css f.gsub(/\.s[ac]ss$/, '.css')
+            path.delete do |base, relative|
+              run_template_deleted File.join(base, relative)
+              css = File.join(css_location, relative.gsub(/\.s[ac]ss$/, '.css'))
+              try_delete_css css
+              update_stylesheets(individual_files)
+            end
           end
-          run_template_deleted(f)
         end
 
-        update_stylesheets(individual_files)
-      end
+        individual_files.each do |template, css|
+          mon.file template do |path|
+            path.update do
+              run_template_modified template
+              update_stylesheets(individual_files)
+            end
 
-      # The native windows listener is much slower than the polling
-      # option, according to https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e#commitcomment-1295118
-      listener.force_polling(true) if Sass::Util.windows?
+            path.create do
+              run_template_created template
+              update_stylesheets(individual_files)
+            end
 
-      begin
-        listener.start
-      rescue Exception => e
-        raise e unless e.is_a?(Interrupt)
+            path.delete do
+              run_template_deleted template
+              try_delete_css css
+              update_stylesheets(individual_files)
+            end
+          end
+        end
       end
     end
 
@@ -339,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