sass 3.3.0 → 3.4.25

data/lib/sass/plugin/compiler.rb

@@ -31,24 +31,36 @@ module Sass::Plugin
     # Creates a new compiler.
     #
     # @param opts [{Symbol => Object}]
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     def initialize(opts = {})
+      @watched_files = Set.new
       options.merge!(opts)
     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.
     #
-    # @yield [individual_files]
-    # @yieldparam individual_files [<(String, String)>]
-    #   Individual files to be updated, in addition to the directories
-    #   specified in the options.
+    # @yield [files]
+    # @yieldparam files [<(String, String, String)>]
+    #   Individual files to be updated. Files in directories specified are included in this list.
     #   The first element of each pair is the source file,
-    #   the second is the target CSS file.
+    #   the second is the target CSS file,
+    #   the third is the target sourcemap file.
     define_callback :updating_stylesheets
 
+    # Register a callback to be run after 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.
+    #
+    # @yield [updated_files]
+    # @yieldparam updated_files [<(String, String)>]
+    #   Individual files that were updated.
+    #   The first element of each pair is the source file, the second is the target CSS file.
+    define_callback :updated_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.
@@ -67,6 +79,21 @@ module Sass::Plugin
     #   The location of the sourcemap being generated, if any.
     define_callback :updated_stylesheet
 
+    # Register a callback to be run when compilation starts.
+    #
+    # In combination with on_updated_stylesheet, this could be used
+    # to collect compilation statistics like timing or to take a
+    # diff of the changes to the output file.
+    #
+    # @yield [template, css, sourcemap]
+    # @yieldparam template [String]
+    #   The location of the Sass/SCSS file being updated.
+    # @yieldparam css [String]
+    #   The location of the CSS file being generated.
+    # @yieldparam sourcemap [String]
+    #   The location of the sourcemap being generated, if any.
+    define_callback :compilation_starting
+
     # 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
@@ -139,7 +166,8 @@ module Sass::Plugin
     define_callback :template_deleted
 
     # Register a callback to be run when Sass deletes a CSS file.
-    # This happens when the corresponding Sass/SCSS file has been deleted.
+    # This happens when the corresponding Sass/SCSS file has been deleted
+    # and when the compiler cleans the output files.
     #
     # @yield [filename]
     # @yieldparam filename [String]
@@ -147,7 +175,8 @@ module Sass::Plugin
     define_callback :deleting_css
 
     # Register a callback to be run when Sass deletes a sourcemap file.
-    # This happens when the corresponding Sass/SCSS file has been deleted.
+    # This happens when the corresponding Sass/SCSS file has been deleted
+    # and when the compiler cleans the output files.
     #
     # @yield [filename]
     # @yieldparam filename [String]
@@ -162,35 +191,73 @@ module Sass::Plugin
     # in {file:SASS_REFERENCE.md#css_location-option `:css_location`}.
     # If it has, it updates the CSS file.
     #
-    # @param individual_files [Array<(String, String)>]
+    # @param individual_files [Array<(String, String[, String])>]
     #   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/SCSS file,
     #   the second is the location of the CSS file that it should be compiled to.
+    #   The third string, if provided, is the location of the Sourcemap file.
     def update_stylesheets(individual_files = [])
-      individual_files = individual_files.dup
       Sass::Plugin.checked_for_updates = true
       staleness_checker = StalenessChecker.new(engine_options)
 
-      template_location_array.each do |template_location, css_location|
-        Sass::Util.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)
-          sourcemap = Sass::Util.sourcemap_name(css) if engine_options[:sourcemap]
-          individual_files << [file, css, sourcemap]
-        end
-      end
+      files = file_list(individual_files)
+      run_updating_stylesheets(files)
 
-      individual_files.each do |file, css, sourcemap|
+      updated_stylesheets = []
+      files.each do |file, css, sourcemap|
         # TODO: Does staleness_checker need to check the sourcemap file as well?
         if options[:always_update] || staleness_checker.stylesheet_needs_update?(css, file)
+          # XXX For consistency, this should return the sourcemap too, but it would
+          # XXX be an API change.
+          updated_stylesheets << [file, css]
           update_stylesheet(file, css, sourcemap)
         else
           run_not_updating_stylesheet(file, css, sourcemap)
         end
       end
+      run_updated_stylesheets(updated_stylesheets)
+    end
+
+    # Construct a list of files that might need to be compiled
+    # from the provided individual_files and the template_locations.
+    #
+    # Note: this method does not cache the results as they can change
+    # across invocations when sass files are added or removed.
+    #
+    # @param individual_files [Array<(String, String[, String])>]
+    #   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/SCSS file,
+    #   the second is the location of the CSS file that it should be compiled to.
+    #   The third string, if provided, is the location of the Sourcemap file.
+    # @return [Array<(String, String, String)>]
+    #   A list of [sass_file, css_file, sourcemap_file] tuples similar
+    #   to what was passed in, but expanded to include the current state
+    #   of the directories being updated.
+    def file_list(individual_files = [])
+      files = individual_files.map do |tuple|
+        if engine_options[:sourcemap] == :none
+          tuple[0..1]
+        elsif tuple.size < 3
+          [tuple[0], tuple[1], Sass::Util.sourcemap_name(tuple[1])]
+        else
+          tuple.dup
+        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|
+          # Get the relative path to the file
+          name = Sass::Util.relative_path_from(file, template_location).to_s
+          css = css_filename(name, css_location)
+          sourcemap = Sass::Util.sourcemap_name(css) unless engine_options[:sourcemap] == :none
+          files << [file, css, sourcemap]
+        end
+      end
+      files
     end
 
     # Watches the template directory (or directories)
@@ -211,24 +278,45 @@ module Sass::Plugin
     # The version of Listen 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)>]
-    #   A list of files to watch for updates
+    # @param individual_files [Array<(String, String[, String])>]
+    #   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/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)
+    #   The third string, if provided, is the location of the Sourcemap file.
+    # @param options [Hash] The options that control how watching works.
+    # @option options [Boolean] :skip_initial_update
+    #   Don't do an initial update when starting the watcher when true
+    def watch(individual_files = [], options = {})
+      @inferred_directories = []
+      options, individual_files = individual_files, [] if individual_files.is_a?(Hash)
+      update_stylesheets(individual_files) unless options[:skip_initial_update]
 
       directories = watched_paths
       individual_files.each do |(source, _, _)|
-        directories << File.dirname(File.expand_path(source))
+        source = File.expand_path(source)
+        @watched_files << Sass::Util.realpath(source).to_s
+        @inferred_directories << File.dirname(source)
       end
+
+      directories += @inferred_directories
       directories = remove_redundant_directories(directories)
 
+      # A Listen version prior to 2.0 will write a test file to a directory to
+      # see if a watcher supports watching that directory. That breaks horribly
+      # on read-only directories, so we filter those out.
+      unless Sass::Util.listen_geq_2?
+        directories = directories.select {|d| File.directory?(d) && File.writable?(d)}
+      end
+
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
-      listener_args = directories + [{:relative_paths => false}]
+      # XXX The :additional_watch_paths option exists for Compass to use until
+      # a deprecated feature is removed. It may be removed without warning.
+      listener_args = directories +
+                      Array(options[:additional_watch_paths]) +
+                      [{:relative_paths => false}]
 
       # The native windows listener is much slower than the polling option, according to
       # https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e
@@ -240,49 +328,8 @@ module Sass::Plugin
       end
 
       listener = create_listener(*listener_args) do |modified, added, removed|
-        recompile_required = false
-
-        modified.uniq.each do |f|
-          next unless watched_file?(f)
-          recompile_required = true
-          run_template_modified(relative_to_pwd(f))
-        end
-
-        added.uniq.each do |f|
-          next unless watched_file?(f)
-          recompile_required = true
-          run_template_created(relative_to_pwd(f))
-        end
-
-        removed.uniq.each do |f|
-          if (files = individual_files.find {|(source, _, _)| File.expand_path(source) == f})
-            recompile_required = true
-            # This was a file we were watching explicitly and compiling to a particular location.
-            # Delete the corresponding file.
-            try_delete_css files[1]
-          else
-            next unless watched_file?(f)
-            recompile_required = true
-            # Look for the sass directory that contained the sass file
-            # And try to remove the css file that corresponds to it
-            template_location_array.each do |(sass_dir, css_dir)|
-              sass_dir = File.expand_path(sass_dir)
-              if child_of_directory?(sass_dir, f)
-                remainder = f[(sass_dir.size + 1)..-1]
-                try_delete_css(css_filename(remainder, css_dir))
-                break
-              end
-            end
-          end
-          run_template_deleted(relative_to_pwd(f))
-        end
-
-        if recompile_required
-          # In case a file we're watching is removed and then recreated we
-          # prune out the non-existant files here.
-          watched_files_remaining = individual_files.select {|(source, _, _)| File.exists?(source)}
-          update_stylesheets(watched_files_remaining)
-        end
+        on_file_changed(individual_files, modified, added, removed)
+        yield(modified, added, removed) if block_given?
       end
 
       if poll && !Sass::Util.listen_geq_2?
@@ -302,6 +349,8 @@ module Sass::Plugin
     def engine_options(additional_options = {})
       opts = options.merge(additional_options)
       opts[:load_paths] = load_paths(opts)
+      options[:sourcemap] = :auto if options[:sourcemap] == true
+      options[:sourcemap] = :none if options[:sourcemap] == false
       opts
     end
 
@@ -310,12 +359,42 @@ module Sass::Plugin
       StalenessChecker.stylesheet_needs_update?(css_file, template_file)
     end
 
+    # Remove all output files that would be created by calling update_stylesheets, if they exist.
+    #
+    # This method runs the deleting_css and deleting_sourcemap callbacks for
+    # the files that are deleted.
+    #
+    # @param individual_files [Array<(String, String[, String])>]
+    #   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/SCSS file,
+    #   the second is the location of the CSS file that it should be compiled to.
+    #   The third string, if provided, is the location of the Sourcemap file.
+    def clean(individual_files = [])
+      file_list(individual_files).each do |(_, css_file, sourcemap_file)|
+        if File.exist?(css_file)
+          run_deleting_css css_file
+          File.delete(css_file)
+        end
+        if sourcemap_file && File.exist?(sourcemap_file)
+          run_deleting_sourcemap sourcemap_file
+          File.delete(sourcemap_file)
+        end
+      end
+      nil
+    end
+
     private
 
     def create_listener(*args, &block)
-      require 'listen'
+      Sass::Util.load_listen!
       if Sass::Util.listen_geq_2?
-        Listen.to(*args, &block)
+        # Work around guard/listen#243.
+        options = args.pop if args.last.is_a?(Hash)
+        args.map do |dir|
+          Listen.to(dir, options, &block)
+        end
       else
         Listen::Listener.new(*args, &block)
       end
@@ -323,16 +402,13 @@ module Sass::Plugin
 
     def listen_to(listener)
       if Sass::Util.listen_geq_2?
-        listener.start
-        listener.thread.join
-        listener.stop # Partially work around guard/listen#146
+        listener.map {|l| l.start}
+        sleep
       else
-        begin
-          listener.start!
-        rescue Interrupt
-          # Squelch Interrupt for clean exit from Listen::Listener
-        end
+        listener.start!
       end
+    rescue Interrupt
+      # Squelch Interrupt for clean exit from Listen::Listener
     end
 
     def remove_redundant_directories(directories)
@@ -351,9 +427,55 @@ module Sass::Plugin
       dedupped
     end
 
+    def on_file_changed(individual_files, modified, added, removed)
+      recompile_required = false
+
+      modified.uniq.each do |f|
+        next unless watched_file?(f)
+        recompile_required = true
+        run_template_modified(relative_to_pwd(f))
+      end
+
+      added.uniq.each do |f|
+        next unless watched_file?(f)
+        recompile_required = true
+        run_template_created(relative_to_pwd(f))
+      end
+
+      removed.uniq.each do |f|
+        next unless watched_file?(f)
+        run_template_deleted(relative_to_pwd(f))
+        if (files = individual_files.find {|(source, _, _)| File.expand_path(source) == f})
+          recompile_required = true
+          # This was a file we were watching explicitly and compiling to a particular location.
+          # Delete the corresponding file.
+          try_delete_css files[1]
+        else
+          next unless watched_file?(f)
+          recompile_required = true
+          # Look for the sass directory that contained the sass file
+          # And try to remove the css file that corresponds to it
+          template_location_array.each do |(sass_dir, css_dir)|
+            sass_dir = File.expand_path(sass_dir)
+            next unless child_of_directory?(sass_dir, f)
+            remainder = f[(sass_dir.size + 1)..-1]
+            try_delete_css(css_filename(remainder, css_dir))
+            break
+          end
+        end
+      end
+
+      return unless recompile_required
+
+      # In case a file we're watching is removed and then recreated we
+      # prune out the non-existant files here.
+      watched_files_remaining = individual_files.select {|(source, _, _)| File.exist?(source)}
+      update_stylesheets(watched_files_remaining)
+    end
+
     def update_stylesheet(filename, css, sourcemap)
       dir = File.dirname(css)
-      unless File.exists?(dir)
+      unless File.exist?(dir)
         run_creating_directory dir
         FileUtils.mkdir_p dir
       end
@@ -364,6 +486,7 @@ module Sass::Plugin
                                      :filename => filename,
                                      :sourcemap_filename => sourcemap)
         mapping = nil
+        run_compilation_starting(filename, css, sourcemap)
         engine = Sass::Engine.for_file(filename, engine_opts)
         if sourcemap
           rendered, mapping = engine.render_with_sourcemap(File.basename(sourcemap))
@@ -373,12 +496,16 @@ module Sass::Plugin
       rescue StandardError => e
         compilation_error_occured = true
         run_compilation_error e, filename, css, sourcemap
-        rendered = Sass::SyntaxError.exception_to_css(e, options)
+        raise e unless options[:full_exception]
+        rendered = Sass::SyntaxError.exception_to_css(e, options[:line] || 1)
       end
 
       write_file(css, rendered)
       if mapping
-        write_file(sourcemap, mapping.to_json(:css_path => css, :sourcemap_path => sourcemap))
+        write_file(
+          sourcemap,
+          mapping.to_json(
+            :css_path => css, :sourcemap_path => sourcemap, :type => options[:sourcemap]))
       end
       run_updated_stylesheet(filename, css, sourcemap) unless compilation_error_occured
     end
@@ -393,19 +520,26 @@ module Sass::Plugin
     end
 
     def try_delete_css(css)
-      if File.exists?(css)
+      if File.exist?(css)
         run_deleting_css css
         File.delete css
       end
       map = Sass::Util.sourcemap_name(css)
-      if File.exists?(map)
-        run_deleting_sourcemap map
-        File.delete map
-      end
+
+      return unless File.exist?(map)
+
+      run_deleting_sourcemap map
+      File.delete map
     end
 
     def watched_file?(file)
-      normalized_load_paths.find {|lp| lp.watched_file?(file)}
+      @watched_files.include?(file) ||
+        normalized_load_paths.any? {|lp| lp.watched_file?(file)} ||
+        @inferred_directories.any? {|d| sass_file_in_directory?(d, file)}
+    end
+
+    def sass_file_in_directory?(directory, filename)
+      filename =~ /\.s[ac]ss$/ && filename.start_with?(directory + File::SEPARATOR)
     end
 
     def watched_paths
@@ -435,7 +569,7 @@ module Sass::Plugin
     end
 
     def relative_to_pwd(f)
-      Sass::Util.pathname(f).relative_path_from(Sass::Util.pathname(Dir.pwd)).to_s
+      Sass::Util.relative_path_from(f, Dir.pwd).to_s
     rescue ArgumentError # when a relative path cannot be computed
       f
     end

data/lib/sass/plugin/configuration.rb

@@ -1,8 +1,10 @@
 module Sass
   module Plugin
-    # We keep configuration in its own self-contained file
-    # so that we can load it independently in Rails 3,
-    # where the full plugin stuff is lazy-loaded.
+    # We keep configuration in its own self-contained file so that we can load
+    # it independently in Rails 3, where the full plugin stuff is lazy-loaded.
+    #
+    # Note that this is not guaranteed to be thread-safe. For guaranteed thread
+    # safety, use a separate {Sass::Plugin} for each thread.
     module Configuration
       # Returns the default options for a {Sass::Plugin::Compiler}.
       #
@@ -25,7 +27,7 @@ module Sass
       end
 
       # An options hash.
-      # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       #
       # @return [{Symbol => Object}]
       def options
@@ -85,33 +87,47 @@ module Sass
       # See the {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
       # for details.
       #
+      # Modifications to the returned array may not be persistent.  Use {#add_template_location}
+      # and {#remove_template_location} instead.
+      #
       # @return [Array<(String, String)>]
       #   An array of `[template_location, css_location]` pairs.
       def template_location_array
-        old_template_location = options[:template_location]
-        normalize_template_location!
-        options[:template_location]
-      ensure
-        options[:template_location] = old_template_location
+        convert_template_location(options[:template_location], options[:css_location])
       end
 
       private
 
-      def normalize_template_location!
-        return if options[:template_location].is_a?(Array)
-        options[:template_location] =
-          case options[:template_location]
-          when nil
-            if options[:css_location]
-              [[File.join(options[:css_location], 'sass'), options[:css_location]]]
-            else
-              []
-            end
-          when String
-            [[options[:template_location], options[:css_location]]]
+      # Returns the given template location, as an array. If it's already an array,
+      # it is returned unmodified. Otherwise, a new array is created and returned.
+      #
+      # @param template_location [String, Array<(String, String)>]
+      #   A single template location, or a pre-normalized array of template
+      #   locations and CSS locations.
+      # @param css_location [String?]
+      #   The location for compiled CSS files.
+      # @return [Array<(String, String)>]
+      #   An array of `[template_location, css_location]` pairs.
+      def convert_template_location(template_location, css_location)
+        return template_location if template_location.is_a?(Array)
+
+        case template_location
+        when nil
+          if css_location
+            [[File.join(css_location, 'sass'), css_location]]
           else
-            options[:template_location].to_a
+            []
           end
+        when String
+          [[template_location, css_location]]
+        else
+          template_location.to_a
+        end
+      end
+
+      def normalize_template_location!
+        options[:template_location] = convert_template_location(
+          options[:template_location], options[:css_location])
       end
     end
   end

data/lib/sass/plugin/merb.rb

@@ -2,7 +2,7 @@ unless defined?(Sass::MERB_LOADED)
   Sass::MERB_LOADED = true
 
   module Sass::Plugin::Configuration
-    # Different default options in a m envirionment.
+    # Different default options in a m environment.
     def default_options
       @default_options ||= begin
         version = Merb::VERSION.split('.').map {|n| n.to_i}
@@ -15,7 +15,7 @@ unless defined?(Sass::MERB_LOADED)
         end
 
         {
-          :always_update      => false,
+          :always_update     => false,
           :template_location => root + '/public/stylesheets/sass',
           :css_location      => root + '/public/stylesheets',
           :cache_location    => root + '/tmp/sass-cache',

data/lib/sass/plugin/rack.rb

@@ -9,19 +9,19 @@ module Sass
     #
     # ## Customize
     #
-    #     Sass::Plugin.options.merge(
+    #     Sass::Plugin.options.merge!(
     #       :cache_location => './tmp/sass-cache',
     #       :never_update => environment != :production,
     #       :full_exception => environment != :production)
     #
-    # {file:SASS_REFERENCE.md#options See the Reference for more options}.
+    # {file:SASS_REFERENCE.md#Options See the Reference for more options}.
     #
     # ## Use
     #
     # Put your Sass files in `public/stylesheets/sass`.
     # Your CSS will be generated in `public/stylesheets`,
     # and regenerated every request if necessary.
-    # The locations and frequency {file:SASS_REFERENCE.md#options can be customized}.
+    # The locations and frequency {file:SASS_REFERENCE.md#Options can be customized}.
     # That's all there is to it!
     class Rack
       # The delay, in seconds, between update checks.

data/lib/sass/plugin/rails.rb

@@ -2,7 +2,7 @@ unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
 
   module Sass::Plugin::Configuration
-    # Different default options in a rails envirionment.
+    # Different default options in a rails environment.
     def default_options
       return @default_options if @default_options
       opts = {

data/lib/sass/plugin/staleness_checker.rb

@@ -39,14 +39,14 @@ module Sass
       # for checking the staleness of several stylesheets at once.
       #
       # @param options [{Symbol => Object}]
-      #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       def initialize(options)
         # URIs that are being actively checked for staleness. Protects against
         # import loops.
         @actively_checking = Set.new
 
         # Entries in the following instance-level caches are never explicitly expired.
-        # Instead they are supposed to automaticaly go out of scope when a series of staleness
+        # Instead they are supposed to automatically go out of scope when a series of staleness
         # checks (this instance of StalenessChecker was created for) is finished.
         @mtimes, @dependencies_stale, @parse_trees = {}, {}, {}
         @options = Sass::Engine.normalize_options(options)
@@ -72,7 +72,7 @@ module Sass
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Fixnum] The modification time to check against.
+      # @param mtime [Time] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.
@@ -103,7 +103,7 @@ module Sass
       # so it's better to use when checking multiple stylesheets at once.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Fixnum] The modification time to check against.
+      # @param mtime [Time] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.

data/lib/sass/plugin.rb

@@ -12,7 +12,7 @@ module Sass
   # when it's used as a plugin for various frameworks.
   # All Rack-enabled frameworks are supported out of the box.
   # The plugin is
-  # {file:SASS_REFERENCE.md#rails_merb_plugin automatically activated for Rails and Merb}.
+  # {file:SASS_REFERENCE.md#Rack_Rails_Merb_Plugin automatically activated for Rails and Merb}.
   # Other frameworks must enable it explicitly; see {Sass::Plugin::Rack}.
   #
   # This module has a large set of callbacks available
@@ -93,7 +93,8 @@ 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(
+      Compiler.new(
+        options.dup.merge(
           :never_update => false,
           :always_update => true,
           :cache => false)).update_stylesheets(individual_files)
@@ -123,9 +124,9 @@ module Sass
   end
 end
 
-# On Rails 3+ the rails plugin is loaded at the right time in railtie.rb
-if defined?(ActionController) && !Sass::Util.ap_geq_3?
-  require 'sass/plugin/rails'
+if defined?(ActionController)
+  # On Rails 3+ the rails plugin is loaded at the right time in railtie.rb
+  require 'sass/plugin/rails' unless Sass::Util.ap_geq_3?
 elsif defined?(Merb::Plugins)
   require 'sass/plugin/merb'
 else