sass 3.2.19 → 3.4.25

data/lib/sass/plugin/configuration.rb

@@ -1,11 +1,11 @@
-# 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.
-
 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.
+    #
+    # 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}.
       #
       # @return [{Symbol => Object}]
@@ -19,36 +19,27 @@ module Sass
         }.freeze
       end
 
-      # Resets the options and {Sass::Callbacks::InstanceMethods#clear_callbacks! clears all callbacks}.
+      # Resets the options and
+      # {Sass::Callbacks::InstanceMethods#clear_callbacks! clears all callbacks}.
       def reset!
         @options = nil
         clear_callbacks!
       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
         @options ||= default_options.dup
       end
 
-      # Sets the options hash.
-      # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
-      # See {Sass::Plugin::Configuration#reset!}
-      # @deprecated Instead, modify the options hash in-place.
-      # @param value [{Symbol => Object}] The options hash
-      def options=(value)
-        Sass::Util.sass_warn("Setting Sass::Plugin.options is deprecated " +
-                             "and will be removed in a future release.")
-        options.merge!(value)
-      end
-
       # Adds a new template-location/css-location mapping.
       # This means that Sass/SCSS files in `template_location`
       # will be compiled to CSS files in `css_location`.
       #
-      # This is preferred over manually manipulating the {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
+      # This is preferred over manually manipulating the
+      # {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
       # since the option can be in multiple formats.
       #
       # Note that this method will change `options[:template_location]`
@@ -68,7 +59,8 @@ module Sass
       # This means that Sass/SCSS files in `template_location`
       # will no longer be compiled to CSS files in `css_location`.
       #
-      # This is preferred over manually manipulating the {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
+      # This is preferred over manually manipulating the
+      # {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
       # since the option can be in multiple formats.
       #
       # Note that this method will change `options[:template_location]`
@@ -95,28 +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
-            options[:css_location] ?
-              [[File.join(options[:css_location], 'sass'), options[:css_location]]] : []
-          when String; [[options[:template_location], options[:css_location]]]
-          else; options[:template_location].to_a
+      # 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
+            []
           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,10 +2,10 @@ 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 }
+        version = Merb::VERSION.split('.').map {|n| n.to_i}
         if version[0] <= 0 && version[1] < 5
           root = MERB_ROOT
           env  = MERB_ENV
@@ -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,15 +39,15 @@ 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 checks
-        # (this instance of StalenessChecker was created for) is finished.
+        # 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)
       end
@@ -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.
@@ -156,7 +156,7 @@ module Sass
       end
 
       def dependency_updated?(css_mtime)
-        Proc.new do |uri, importer|
+        proc do |uri, importer|
           next true if @actively_checking.include?(uri)
           begin
             @actively_checking << uri

data/lib/sass/plugin.rb

@@ -11,7 +11,8 @@ module Sass
   # This module is used as the primary interface with 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}.
+  # The plugin is
+  # {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
@@ -32,7 +33,6 @@ module Sass
   #     #=> Compiling app/sass/ie.scss to public/stylesheets/ie.css
   # @see Sass::Plugin::Compiler
   module Plugin
-    include Sass::Util
     extend self
 
     @checked_for_updates = false
@@ -65,7 +65,8 @@ module Sass
 
     # Updates out-of-date stylesheets.
     #
-    # Checks each Sass/SCSS 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.
@@ -92,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)
@@ -119,13 +121,12 @@ module Sass
     def options
       compiler.options
     end
-
   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

data/lib/sass/repl.rb

@@ -18,7 +18,7 @@ module Sass
       @line = 0
       loop do
         @line += 1
-        unless text = Readline.readline('>> ')
+        unless (text = Readline.readline('>> '))
           puts
           return
         end
@@ -48,8 +48,8 @@ module Sass
     rescue Sass::SyntaxError => e
       puts "SyntaxError: #{e.message}"
       if @options[:trace]
-        e.backtrace.each do |e|
-          puts "\tfrom #{e}"
+        e.backtrace.each do |line|
+          puts "\tfrom #{line}"
         end
       end
     end

data/lib/sass/script/css_lexer.rb

@@ -12,16 +12,20 @@ module Sass
 
       def string(re, *args)
         if re == :uri
-          return unless uri = scan(URI)
-          return [:string, Script::String.new(uri)]
+          uri = scan(URI)
+          return unless uri
+          return [:string, Script::Value::String.new(uri)]
         end
 
         return unless scan(STRING)
-        [:string, Script::String.new((@scanner[1] || @scanner[2]).gsub(/\\(['"])/, '\1'), :string)]
+        string_value = Sass::Script::Value::String.value(@scanner[1] || @scanner[2])
+        value = Script::Value::String.new(string_value, :string)
+        [:string, value]
       end
 
       def important
-        return unless s = scan(IMPORTANT)
+        s = scan(IMPORTANT)
+        return unless s
         [:raw, s]
       end
     end

data/lib/sass/script/css_parser.rb

@@ -17,8 +17,10 @@ module Sass
       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
+        tok = try_tok(:string)
+        return number unless tok
+        return if @lexer.peek && @lexer.peek.type == :begin_interpolation
+        literal_node(tok.value, tok.source_range)
       end
 
       # Short-circuit all the SassScript-only productions

data/lib/sass/script/css_variable_warning.rb

@@ -0,0 +1,52 @@
+module Sass
+  module Script
+    # An object tracking whether a warning has been emitted for a given script
+    # tree.
+    #
+    # This is shared among all objects in a script tree. Whenever any of those
+    # objects encounters a situation in which it wouldn't produce semantically
+    # identical CSS to its input, it calls \{#warn!\}. The first time \{#warn!}
+    # is called for a given warning object, it prints a deprecation warning.
+    class CssVariableWarning
+      def initialize
+        @warned = false
+        @value = nil
+      end
+
+      # Sets the root of the script tree that this warning refers to.
+      #
+      # @param value [Sass::Script::Tree::Node]
+      def value=(value)
+        warn_called = @warned && !@value
+        @value = value
+        print_warning if warn_called
+      end
+
+      # The first time this is called, it prints a deprecation warning.
+      #
+      # This may be called before \{#value=}. If it is, the warning is emitted
+      # once the script tree is set.
+      def warn!
+        return if @warned
+        @warned = true
+        return unless @value
+
+        print_warning
+      end
+
+      private
+
+      # Prints this node's warning.
+      def print_warning
+        of_filename = " of #{@value.filename}" if @value.filename
+        Sass::Util.sass_warn(
+          "DEPRECATION WARNING on line #{@value.line}#{of_filename}:\n" +
+          "Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as\n" +
+          "normal properties, they will not allow any Sass-specific behavior other than \#{}.\n" +
+          "For forwards-compatibility, use \#{}:\n" +
+          "\n" +
+          "  --variable: \#{#{@value.to_sass}};")
+      end
+    end
+  end
+end