sass 3.5.0.pre.rc.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c783fad5337d350de6a05eb9157e74ea987103f
-  data.tar.gz: 20fb9514c3b8f7cbfd6fb72f1a0cc021e38b0993
+  metadata.gz: 62b8871bca68353a37c0dc60b2cfeb65ee14eb8d
+  data.tar.gz: 901579162ee8f9f1490124807d81b8a79e9955b3
 SHA512:
-  metadata.gz: 89716ff7357b7a3ba527b5b8fd2e6da59b2b501f58930a6ee612611f34a26272fb5c13047aa1c06491da53ac7f9bf924710ca2478e9c04f354c07eb46d2f3841
-  data.tar.gz: 8b24c606daa11c7a38a557bf4efcb7e7d2b72411d8f8f0338af40bff915e80c048f0aaf9db93f0abb4202384599564a972388aa0789198e257fb2c95a2994baa
+  metadata.gz: f0c07e35a2c6f913e2a5041439b7886ba02d071af3da200e0eca1cc8a8a2c2b38edf4f9ffb2cd7b45757b2d611fdbec4189820cd3368f25adc782da4c7479b24
+  data.tar.gz: 5f2967d0a40103afdf2209af7c8fac2eccf065fccb536f864ad89369547f87db5c1b204ffd37da03e8a9bc7bad994abb77a3d1d42890a25c1ba111a39a18bf4c

data/.yardopts

@@ -1,6 +1,6 @@
 --readme          README.md
 --markup          markdown
---markup-provider maruku
+--markup-provider redcarpet
 --default-return  ""
 --title           "Sass Documentation"
 --query           'object.type != :classvariable'

data/README.md

@@ -1,4 +1,4 @@
-# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
+# Sass [![Travis Build Status](https://travis-ci.org/sass/sass.svg?branch=next)](https://travis-ci.org/sass/sass) [![Gem Version](https://badge.fury.io/rb/sass.svg)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS,
 adding nested rules, variables, mixins, selector inheritance, and more.

data/Rakefile

@@ -12,8 +12,42 @@ task :default => :test
 
 require 'rake/testtask'
 
+LINE_SIZE = 80
+DECORATION_CHAR = '#'
+
+def print_header(string)
+  length = string.length
+  puts DECORATION_CHAR * LINE_SIZE
+  puts string.center(length + 2, ' ').center(LINE_SIZE, DECORATION_CHAR)
+  puts DECORATION_CHAR * LINE_SIZE
+end
+
 desc "Run all tests"
-task :test => ["test:ruby", "test:spec"]
+task :test do
+  test_cases = [
+    {
+      'env'   => {'MATHN' => 'true'},
+      'tasks' => ['test:ruby', 'test:spec', :rubocop]
+    },
+    {
+      'env'   => {'MATHN' => 'false'},
+      'tasks' => ['test:ruby']
+    }
+  ]
+
+  test_cases.each do |test_case|
+    env = test_case['env']
+    tasks = test_case['tasks']
+
+    env.each do |key, value|
+      ENV[key] = value
+    end
+    tasks.each do |task|
+      print_header("Running task: #{task}, env: #{env}")
+      Rake::Task[task].execute
+    end
+  end
+end
 
 namespace :test do
   desc "Run the ruby tests (without sass-spec)"
@@ -48,7 +82,7 @@ namespace :test do
         end
         default_options = {
           :spec_directory => SassSpec::SPEC_DIR,
-          :engine_adapter => SassEngineAdapter.new("sass"),
+          :engine_adapter => SassEngineAdapter.new,
           :generate => false,
           :tap => false,
           :skip => false,
@@ -76,25 +110,20 @@ def ruby_version_at_least?(version_string)
   ruby_version >= version
 end
 
-if ruby_version_at_least?("2.2.0") &&
-    (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" ||
-      !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
+begin
   require 'rubocop/rake_task'
   RuboCop = Rubocop unless defined?(RuboCop)
   RuboCop::RakeTask.new do |t|
     t.patterns = FileList["lib/**/*"]
   end
-else
+rescue LoadError
   task :rubocop do
-    puts "Skipping rubocop style check."
-    next if ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] != "true"
+    puts "Rubocop is disabled."
     puts "Passing this check is required in order for your patch to be accepted."
-    puts "Use Ruby 2.2 or greater and then run the style check with: rake rubocop"
+    puts "Install Rubocop and then run the style check with: rake rubocop."
   end
 end
 
-task :test => :rubocop
-
 # ----- Packaging -----
 
 # Don't use Rake::GemPackageTast because we want prerequisites to run

data/VERSION

@@ -1 +1 @@
-3.5.0-rc.1
+3.5.0

data/VERSION_DATE

@@ -1 +1 @@
-30 August 2016 22:11:04 UTC
+12 July 2017 23:31:42 UTC

data/extra/sass-spec-ref.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -e
+# Copyright 2016 Google Inc. Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
+# Echoes the sass-spec Git ref that should be checked out for the current Travis
+# run. If we're running specs for a pull request which refers to a sass-spec
+# pull request, we'll run against the latter rather than sass-spec master.
+
+default=master
+
+if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  >&2 echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST."
+  >&2 echo "Ref: $default."
+  echo "$default"
+  exit 0
+fi
+
+>&2 echo "Fetching pull request $TRAVIS_PULL_REQUEST..."
+
+JSON=$(curl -L -sS https://api.github.com/repos/sass/sass/pulls/$TRAVIS_PULL_REQUEST)
+
+RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
+
+if [[ $JSON =~ $RE_SPEC_PR ]]; then
+  ref="pull/${BASH_REMATCH[2]}/head"
+  >&2 echo "Ref: $ref."
+  echo "$ref"
+else
+  >&2 echo "Ref: $default."
+  echo "$default"
+fi

data/lib/sass.rb

@@ -47,7 +47,7 @@ module Sass
   #
   # @param contents [String] The contents of the Sass file.
   # @param options [{Symbol => Object}] An options hash;
-  #   see {file:SASS_REFERENCE.md#options the Sass options documentation}
+  #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
   # @raise [Sass::SyntaxError] if there's an error in the document
   # @raise [Encoding::UndefinedConversionError] if the source encoding
   #   cannot be converted to UTF-8
@@ -69,7 +69,7 @@ module Sass
   #
   #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
   #   @param options [{Symbol => Object}] An options hash;
-  #     see {file:SASS_REFERENCE.md#options the Sass options documentation}
+  #     see {file:SASS_REFERENCE.md#Options the Sass options documentation}
   #   @return [String] The compiled CSS.
   #
   # @overload compile_file(filename, css_filename, options = {})
@@ -77,7 +77,7 @@ module Sass
   #
   #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
   #   @param options [{Symbol => Object}] An options hash;
-  #     see {file:SASS_REFERENCE.md#options the Sass options documentation}
+  #     see {file:SASS_REFERENCE.md#Options the Sass options documentation}
   #   @param css_filename [String] The location to which to write the compiled CSS.
   def self.compile_file(filename, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}

data/lib/sass/css.rb

@@ -18,7 +18,7 @@ module Sass
     #   that can be converted to Unicode.
     #   If the stylesheet contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @option options :old [Boolean] (false)
     #     Whether or not to output old property syntax
     #     (`:color blue` as opposed to `color: blue`).

data/lib/sass/deprecation.rb

@@ -0,0 +1,55 @@
+module Sass
+  # A deprecation warning that should only be printed once for a given line in a
+  # given file.
+  #
+  # A global Deprecation instance should be created for each type of deprecation
+  # warning, and `warn` should be called each time a warning is needed.
+  class Deprecation
+    @@allow_double_warnings = false
+
+    # Runs a block in which double deprecation warnings for the same location
+    # are allowed.
+    def self.allow_double_warnings
+      old_allow_double_warnings = @@allow_double_warnings
+      @@allow_double_warnings = true
+      yield
+    ensure
+      @@allow_double_warnings = old_allow_double_warnings
+    end
+
+    def initialize
+      # A set of filename, line pairs for which warnings have been emitted.
+      @seen = Set.new
+    end
+
+    # Prints `message` as a deprecation warning associated with `filename`,
+    # `line`, and optionally `column`.
+    #
+    # This ensures that only one message will be printed for each line of a
+    # given file.
+    #
+    # @overload warn(filename, line, message)
+    #   @param filename [String, nil]
+    #   @param line [Number]
+    #   @param message [String]
+    # @overload warn(filename, line, column, message)
+    #   @param filename [String, nil]
+    #   @param line [Number]
+    #   @param column [Number]
+    #   @param message [String]
+    def warn(filename, line, column_or_message, message = nil)
+      return if !@@allow_double_warnings && @seen.add?([filename, line]).nil?
+      if message
+        column = column_or_message
+      else
+        message = column_or_message
+      end
+
+      location = "line #{line}"
+      location << ", column #{column}" if column
+      location << " of #{filename}" if filename
+
+      Sass::Util.sass_warn("DEPRECATION WARNING on #{location}:\n#{message}")
+    end
+  end
+end

data/lib/sass/engine.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
+require 'sass/deprecation'
 require 'sass/source/position'
 require 'sass/source/range'
 require 'sass/source/map'
@@ -95,18 +96,20 @@ module Sass
   #     output = sass_engine.render
   #     puts output
   class Engine
+    @@old_property_deprecation = Deprecation.new
+
     # A line of Sass code.
     #
     # `text`: `String`
     # : The text in the line, without any whitespace at the beginning or end.
     #
-    # `tabs`: `Fixnum`
+    # `tabs`: `Integer`
     # : The level of indentation of the line.
     #
-    # `index`: `Fixnum`
+    # `index`: `Integer`
     # : The line number in the original document.
     #
-    # `offset`: `Fixnum`
+    # `offset`: `Integer`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #
@@ -174,7 +177,7 @@ module Sass
     # default values and resolving aliases.
     #
     # @param options [{Symbol => Object}] The options hash;
-    #   see {file:SASS_REFERENCE.md#options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
     # @return [{Symbol => Object}] The normalized options hash.
     # @private
     def self.normalize_options(options)
@@ -228,7 +231,7 @@ module Sass
     #
     # @param filename [String] The path to the Sass or SCSS file
     # @param options [{Symbol => Object}] The options hash;
-    #   See {file:SASS_REFERENCE.md#options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @return [Sass::Engine] The Engine for the given Sass or SCSS file.
     # @raise [Sass::SyntaxError] if there's an error in the document.
     def self.for_file(filename, options)
@@ -246,7 +249,7 @@ module Sass
     end
 
     # The options for the Sass engine.
-    # See {file:SASS_REFERENCE.md#options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     #
     # @return [{Symbol => Object}]
     attr_reader :options
@@ -263,9 +266,9 @@ module Sass
     #   that can be converted to Unicode.
     #   If the template contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @param options [{Symbol => Object}] An options hash.
-    #   See {file:SASS_REFERENCE.md#options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @see {Sass::Engine.for_file}
     # @see {Sass::Plugin}
     def initialize(template, options = {})
@@ -522,10 +525,6 @@ MSG
       nodes = []
       while (line = arr[i]) && line.tabs >= base
         if line.tabs > base
-          raise SyntaxError.new(
-            "The line was indented #{line.tabs - base} levels deeper than the previous line.",
-            :line => line.index) if line.tabs > base + 1
-
           nodes.last.children, i = tree(arr, i)
         else
           nodes << line
@@ -630,6 +629,11 @@ WARNING
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
 
+          @@old_property_deprecation.warn(@options[:filename], @line, <<WARNING)
+Old-style properties like "#{line.text}" are deprecated and will be an error in future versions of Sass.
+Use "#{name}: #{value}" instead.
+WARNING
+
           value_start_offset = name_end_offset = name_start_offset + name.length
           unless value.empty?
             # +1 and -1 both compensate for the leading ':', which is part of line.text

data/lib/sass/environment.rb

@@ -81,7 +81,7 @@ module Sass
     inherited_hash_reader :function
 
     # @param options [{Symbol => Object}] The options hash. See
-    #   {file:SASS_REFERENCE.md#options the Sass options documentation}.
+    #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil, options = nil)
       @parent = parent

data/lib/sass/error.rb

@@ -69,14 +69,14 @@ module Sass
     # The name of the mixin in which the error occurred.
     # This could be `nil` if the error occurred outside a mixin.
     #
-    # @return [Fixnum]
+    # @return [String]
     def sass_mixin
       sass_backtrace.first[:mixin]
     end
 
     # The line of the Sass template on which the error occurred.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def sass_line
       sass_backtrace.first[:line]
     end
@@ -153,7 +153,7 @@ module Sass
       # Returns an error report for an exception in CSS format.
       #
       # @param e [Exception]
-      # @param line_offset [Fixnum] The number of the first line of the Sass template.
+      # @param line_offset [Integer] The number of the first line of the Sass template.
       # @return [String] The error report
       # @raise [Exception] `e`, if the
       #   {file:SASS_REFERENCE.md#full_exception-option `:full_exception`} option

data/lib/sass/exec/base.rb

@@ -23,7 +23,7 @@ module Sass::Exec
         # at_exit is a bit of a hack, but it allows us to rethrow when --trace
         # is active and get both the built-in exception formatting and the
         # correct exit code.
-        at_exit {exit 65} if e.is_a?(Sass::SyntaxError)
+        at_exit {exit Sass::Util.windows? ? 13 : 65} if e.is_a?(Sass::SyntaxError)
 
         raise e if @options[:trace] || e.is_a?(SystemExit)
 

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

data/lib/sass/plugin/compiler.rb

@@ -31,7 +31,7 @@ module Sass::Plugin
     # Creates a new compiler.
     #
     # @param opts [{Symbol => Object}]
-    #   See {file:SASS_REFERENCE.md#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)

data/lib/sass/plugin/configuration.rb

@@ -26,8 +26,8 @@ module Sass
         clear_callbacks!
       end
 
-      # An options hash.
-      # See {file:SASS_REFERENCE.md#options the Sass options documentation}.
+      # An options hash. See {file:SASS_REFERENCE.md#Options the Sass options
+      # documentation}.
       #
       # @return [{Symbol => Object}]
       def options

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/staleness_checker.rb

@@ -39,7 +39,7 @@ module Sass
       # for checking the staleness of several stylesheets at once.
       #
       # @param options [{Symbol => Object}]
-      #   See {file:SASS_REFERENCE.md#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.
@@ -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.