sass 3.4.25 → 3.5.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b2d6c079c8e8aec59e0dd45294419919f88239
-  data.tar.gz: 5e31ebbe100aa0b066d414ee32e3f29d792907f6
+  metadata.gz: 4c783fad5337d350de6a05eb9157e74ea987103f
+  data.tar.gz: 20fb9514c3b8f7cbfd6fb72f1a0cc021e38b0993
 SHA512:
-  metadata.gz: 1782f895c1aaeef19491dfb41434ca10a60d28395f53a3ec19f8a65ec21c97625db3325732007fbc3155821c53adf9bcd00ced70e9fe3c1c935295b34f3dfdaf
-  data.tar.gz: 39578a844dd4d6e381cb10ced82d5c6782ddd042c79cc5c4c9cc6a69163badbf1ce368526987447b955d44a3d20470ea5e4eae481ea9359d63eea09cab94ca70
+  metadata.gz: 89716ff7357b7a3ba527b5b8fd2e6da59b2b501f58930a6ee612611f34a26272fb5c13047aa1c06491da53ac7f9bf924710ca2478e9c04f354c07eb46d2f3841
+  data.tar.gz: 8b24c606daa11c7a38a557bf4efcb7e7d2b72411d8f8f0338af40bff915e80c048f0aaf9db93f0abb4202384599564a972388aa0789198e257fb2c95a2994baa

data/.yardopts

@@ -1,6 +1,6 @@
 --readme          README.md
 --markup          markdown
---markup-provider redcarpet
+--markup-provider maruku
 --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.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 [![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 makes CSS fun again**. Sass is an extension of CSS,
 adding nested rules, variables, mixins, selector inheritance, and more.

data/Rakefile

@@ -12,42 +12,8 @@ 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 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
+task :test => ["test:ruby", "test:spec"]
 
 namespace :test do
   desc "Run the ruby tests (without sass-spec)"
@@ -82,7 +48,7 @@ namespace :test do
         end
         default_options = {
           :spec_directory => SassSpec::SPEC_DIR,
-          :engine_adapter => SassEngineAdapter.new,
+          :engine_adapter => SassEngineAdapter.new("sass"),
           :generate => false,
           :tap => false,
           :skip => false,
@@ -110,26 +76,31 @@ def ruby_version_at_least?(version_string)
   ruby_version >= version
 end
 
-begin
+if ruby_version_at_least?("2.2.0") &&
+    (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" ||
+      !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
   require 'rubocop/rake_task'
   RuboCop = Rubocop unless defined?(RuboCop)
   RuboCop::RakeTask.new do |t|
     t.patterns = FileList["lib/**/*"]
   end
-rescue LoadError
+else
   task :rubocop do
-    puts "Rubocop is disabled."
+    puts "Skipping rubocop style check."
+    next if ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] != "true"
     puts "Passing this check is required in order for your patch to be accepted."
-    puts "Install Rubocop and then run the style check with: rake rubocop."
+    puts "Use Ruby 2.2 or greater 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
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:revision_file, :date_file, :submodules, :permissions] do
+task :package => [:revision_file, :date_file, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
@@ -222,49 +193,10 @@ def changed_since?(rev, *files)
   return !$?.success?
 end
 
-task :submodules do
-  if File.exist?(File.dirname(__FILE__) + "/.git")
-    sh %{git submodule sync}
-    sh %{git submodule update --init}
-  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/listen/lib")
-    warn <<WARN
-WARNING: vendor/listen doesn't exist, and this isn't a git repository so
-I can't get it automatically!
-WARN
-  end
-end
-
-task :release_edge do
-  ensure_git_cleanup do
-    puts "#{'=' * 50} Running rake release_edge"
-
-    sh %{git checkout master}
-    sh %{git reset --hard origin/master}
-    sh %{rake package}
-    version = get_version
-    if version.include?('.rc.')
-      puts "#{'=' * 20} Not releasing edge gem for RC version"
-      next
-    end
-
-    sh %{gem push pkg/sass-#{version}.gem}
-  end
-end
-
 # Get the version string. If this is being installed from Git,
 # this includes the proper prerelease version.
 def get_version
-  written_version = File.read(scope('VERSION').strip)
-  return written_version unless File.exist?(scope('.git'))
-
-  # Get the current master branch version
-  version = written_version.split('.')
-  version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
-  return written_version unless version.size == 5 && version[3] == "alpha" # prerelease
-
-  return written_version if (commit_count = `git log --pretty=oneline HEAD ^stable | wc -l`).empty?
-  version[4] = commit_count.strip
-  version.join('.')
+  File.read(scope('VERSION').strip)
 end
 
 task :watch_for_update do
@@ -336,27 +268,6 @@ rescue LoadError
   task :yard => :rdoc
 end
 
-task :pages do
-  ensure_git_cleanup do
-    puts "#{'=' * 50} Running rake pages"
-    sh %{git checkout sass-pages}
-    sh %{git reset --hard origin/sass-pages}
-
-    Dir.chdir("/var/www/sass-pages") do
-      sh %{git fetch origin}
-
-      sh %{git checkout stable}
-      sh %{git reset --hard origin/stable}
-
-      sh %{git checkout sass-pages}
-      sh %{git reset --hard origin/sass-pages}
-      sh %{rake build --trace}
-      sh %{mkdir -p tmp}
-      sh %{touch tmp/restart.txt}
-    end
-  end
-end
-
 # ----- Coverage -----
 
 begin
@@ -396,58 +307,3 @@ END
     RubyProf.const_get("#{(ENV['OUTPUT'] || 'Flat').capitalize}Printer").new(result).print
   end
 rescue LoadError; end
-
-# ----- Handling Updates -----
-
-def email_on_error
-  yield
-rescue Exception => e
-  IO.popen("sendmail nex342@gmail.com", "w") do |sm|
-    sm << "From: nex3@nex-3.com\n" <<
-      "To: nex342@gmail.com\n" <<
-      "Subject: Exception when running rake #{Rake.application.top_level_tasks.join(', ')}\n" <<
-      e.message << "\n\n" <<
-      e.backtrace.join("\n")
-  end
-ensure
-  raise e if e
-end
-
-def ensure_git_cleanup
-  email_on_error {yield}
-ensure
-  sh %{git reset --hard HEAD}
-  sh %{git clean -xdf}
-  sh %{git checkout master}
-end
-
-task :handle_update do
-  email_on_error do
-    unless ENV["REF"] =~ %r{^refs/heads/(master|stable|sass-pages)$}
-      puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
-      next
-    end
-    branch = $1
-
-    puts
-    puts
-    puts '=' * 150
-    puts "Running rake handle_update REF=#{ENV["REF"].inspect}"
-
-    sh %{git fetch origin}
-    sh %{git checkout stable}
-    sh %{git reset --hard origin/stable}
-    sh %{git checkout master}
-    sh %{git reset --hard origin/master}
-
-    case branch
-    when "master"
-      sh %{rake release_edge --trace}
-    when "stable", "sass-pages"
-      sh %{rake pages --trace}
-    end
-
-    puts 'Done running handle_update'
-    puts '=' * 150
-  end
-end

data/VERSION

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

data/VERSION_DATE

@@ -1 +1 @@
-07 July 2017 22:00:34 UTC
+30 August 2016 22:11:04 UTC

data/VERSION_NAME

@@ -1 +1 @@
-Selective Steve
+Bleeding Edge

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 : {}
@@ -100,10 +100,3 @@ require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)
 require 'sass/railtie'
 require 'sass/features'
-
-if Sass::Util.ruby1?
-  Sass::Util.sass_warn(
-    "DEPRECATION WARNING:\n" +
-    "Sass 3.5 will no longer support Ruby #{RUBY_VERSION}.\n" +
-    "Please upgrade to Ruby 2.0.0 or greater as soon as possible.\n")
-end

data/lib/sass/cache_stores/filesystem.rb

@@ -52,7 +52,7 @@ module Sass
       # @param key [String]
       # @return [String] The path to the cache file.
       def path_to(key)
-        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % (Sass::Util.ord(c))}
+        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % c.ord}
         File.join(cache_location, key)
       end
     end

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`).
@@ -51,8 +51,7 @@ module Sass
       raise err
     end
 
-    # Returns the original encoding of the document,
-    # or `nil` under Ruby 1.8.
+    # Returns the original encoding of the document.
     #
     # @return [Encoding, nil]
     # @raise [Encoding::UndefinedConversionError] if the source encoding

data/lib/sass/engine.rb

@@ -1,7 +1,6 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
-require 'sass/deprecation'
 require 'sass/source/position'
 require 'sass/source/range'
 require 'sass/source/map'
@@ -80,7 +79,13 @@ module Sass
   #
   # `type`: `String`
   # : The user-friendly name of the type of the callable.
-  Callable = Struct.new(:name, :args, :splat, :environment, :tree, :has_content, :type)
+  #
+  # `origin`: `Symbol`
+  # : From whence comes the callable: `:stylesheet`, `:builtin`, `:css`
+  #   A callable with an origin of `:stylesheet` was defined in the stylesheet itself.
+  #   A callable with an origin of `:builtin` was defined in ruby.
+  #   A callable (function) with an origin of `:css` returns a function call with arguments to CSS.
+  Callable = Struct.new(:name, :args, :splat, :environment, :tree, :has_content, :type, :origin)
 
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
@@ -90,20 +95,18 @@ 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`: `Integer`
+    # `tabs`: `Fixnum`
     # : The level of indentation of the line.
     #
-    # `index`: `Integer`
+    # `index`: `Fixnum`
     # : The line number in the original document.
     #
-    # `offset`: `Integer`
+    # `offset`: `Fixnum`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #
@@ -171,7 +174,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)
@@ -225,7 +228,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)
@@ -243,7 +246,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
@@ -260,9 +263,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 = {})
@@ -316,8 +319,7 @@ module Sass
                 end
     end
 
-    # Returns the original encoding of the document,
-    # or `nil` under Ruby 1.8.
+    # Returns the original encoding of the document.
     #
     # @return [Encoding, nil]
     # @raise [Encoding::UndefinedConversionError] if the source encoding
@@ -386,7 +388,7 @@ ERR
       rendered << "\n" if rendered[-1] != ?\n
       rendered << "\n" unless compressed
       rendered << "/*# sourceMappingURL="
-      rendered << Sass::Util.escape_uri(sourcemap_uri)
+      rendered << URI::DEFAULT_PARSER.escape(sourcemap_uri)
       rendered << " */\n"
       return rendered, sourcemap
     end
@@ -628,11 +630,6 @@ 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
@@ -695,7 +692,14 @@ WARNING
       end
 
       name = line.text[0...scanner.pos]
-      if (scanned = scanner.scan(/\s*:(?:\s+|$)/)) # test for a property
+      could_be_property =
+        if name.start_with?('--')
+          (scanned = scanner.scan(/\s*:/))
+        else
+          (scanned = scanner.scan(/\s*:(?:\s+|$)/))
+        end
+
+      if could_be_property # test for a property
         offset += scanned.length
         property = parse_property(name, res, scanner.rest, :new, line, offset)
         property.name_source_range = ident_range
@@ -722,22 +726,32 @@ WARNING
     #   rubocop:disable ParameterLists
     def parse_property(name, parsed_name, value, prop, line, start_offset)
       # rubocop:enable ParameterLists
-      if value.strip.empty?
-        expr = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
+
+      if name.start_with?('--')
+        unless line.children.empty?
+          raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath custom properties.",
+            :line => @line + 1)
+        end
+
+        parser = Sass::SCSS::Parser.new(value,
+          @options[:filename], @options[:importer],
+          @line, to_parser_offset(@offset))
+        parsed_value = parser.parse_declaration_value
+        end_offset = start_offset + value.length
+      elsif value.strip.empty?
+        parsed_value = [Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))]
         end_offset = start_offset
       else
-        expr = parse_script(value,
-          :offset => to_parser_offset(start_offset),
-          :css_variable => name.start_with?("--"))
+        expr = parse_script(value, :offset => to_parser_offset(start_offset))
         end_offset = expr.source_range.end_pos.offset - 1
+        parsed_value = [expr]
       end
-
-      node = Tree::PropNode.new(parse_interp(name), expr, prop)
+      node = Tree::PropNode.new(parse_interp(name), parsed_value, prop)
       node.value_source_range = Sass::Source::Range.new(
         Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
         Sass::Source::Position.new(line.index, to_parser_offset(end_offset)),
         @options[:filename], @options[:importer])
-      if value.strip.empty? && line.children.empty?
+      if !node.custom_property? && value.strip.empty? && line.children.empty?
         raise SyntaxError.new(
           "Invalid property: \"#{node.declaration}\" (no value)." +
           node.pseudo_class_selector_message)
@@ -1154,9 +1168,9 @@ WARNING
     end
 
     def parse_script(script, options = {})
-      line = options.delete(:line) || @line
-      offset = options.delete(:offset) || @offset + 1
-      Script.parse(script, line, offset, @options.merge(options))
+      line = options[:line] || @line
+      offset = options[:offset] || @offset + 1
+      Script.parse(script, line, offset, @options)
     end
 
     def format_comment_text(text, silent)