sass 3.4.21 → 3.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d1f34ed3be5533eff693b26e97e7ff371a075b
-  data.tar.gz: b37b28619e83950329b0c7421ba1dac2610e0e71
+  metadata.gz: 414603b66564f231de620f9baff16563174a4b72
+  data.tar.gz: 4f09c7d1af56afa99f42b2c5922144774befd481
 SHA512:
-  metadata.gz: 974eaab5ff1c88be44d765065daf43bb56d5fc74be054332bbbbba3396ba8ba1605a90a994d7815f31ec3eafaebfb7c30a03f960beb9b14295bc44328d750a7b
-  data.tar.gz: f84b2caf06a1e0d42e78297d73f1441b9e9e796d6370f916acd2446893fa3a00335fc454dd7e1437bf16baa3f65bedb8d1d581da6cbeac6cec97316b68c51651
+  metadata.gz: 40de104dabb794e5fd4fb20bdfcf0c2d57444d4b2f283312d4698482c3117fc5093b7e65daaacbae1b4ccd93989d0e6c3a3c0f3548a3c5710de74563d9ee6b96
+  data.tar.gz: 738319bc6f7d3b10e4ec16e0e5c5b9ed7b7c21f6c09d7bc244cbd5d0fab785778ccf4b2270ba86eb68597a8b1eb4836ef4f7460c7063381a7cfa2c9017b73c15

data/CONTRIBUTING.md

@@ -1,3 +1,125 @@
 Contributions are welcomed. Please see the following site for guidelines:
 
 [http://sass-lang.com/community#Contribute](http://sass-lang.com/community#Contribute)
+
+* [Branches](#main-development-branches)
+  * [Feature Branches](#feature-branches)
+  * [Experimental Branches](#experimental-branches)
+  * [Old Stable Branches](#old-stable-branches)
+* [Versioning](#versioning)
+  * [Making Breaking Changes](#making-breaking-changes)
+  * [Exceptional Breakages](#exceptional-breakages)
+
+## Branches
+
+The Sass repository has three primary development branches, each of which tracks
+a different line of releases (see [versioning](#versioning) below). Each branch
+is regularly merged into the one below: `stable` into `next`, `next` into
+`master`.
+
+* The `stable` branch is the default—it's what GitHub shows if you go to
+  [sass/sass](https://github.com/sass/sass), and it's the default place for pull
+  requests to go. This branch is where we work on the next patch release. Bug
+  fixes and documentation improvements belong here, but not new features.
+
+* The `next` branch is where we work on the next minor release. It's where most
+  new features go, as long as they're not breaking changes. Very occasionally
+  breaking changes will go here as well—see
+  [exceptional breakages](#exceptional-breakages) below for details.
+
+* The `master` branch is where we work on the next major release. It's where
+  breaking changes go. We also occasionally decide that a non-breaking feature
+  is big enough to warrant saving until the next major release, in which case it
+  will also be developed here.
+
+Ideally, pull requests would be made against the appropriate
+branch, but don't worry about it too much; if you make a request against the
+wrong branch, the maintainer will take responsibility for rebasing it before
+merging.
+
+### Feature Branches
+
+Sometimes it won't be possible to merge a new feature into `next` or `master`
+immediately. It may require longer-term work before it's complete, or we may not
+want to release it as part of any alpha releases of the branch in question.
+Branches like this are labeled `feature.#{name}` and stay on GitHub until
+they're ready to be merged.
+
+### Experimental Branches
+
+Not all features pan out, and not all code is a good fit for merging into the
+main codebase. Usually when this happens the code is just discarded, but every
+so often it's interesting or promising enough that it's worth keeping around.
+This is what experimental branches (labeled `experimental.#{name}`) are for.
+While they're not currently in use, they contain code that might be useful in
+the future.
+
+### Old Stable Branches
+
+Usually Sass doesn't have the development time to do long-term maintenance of
+old release. But occasionally, very rarely, it becomes necessary. In cases like
+that, a branch named `stable_#{version}` will be created, starting from the last
+tag in that version series.
+
+## Versioning
+
+Starting with version 3.5.0, Sass uses [semantic versioning](http://semver.org/)
+to indicate the evolution of its language semantics as much as possible. This
+means that patch releases (such as 3.5.3) contain only bug fixes, minor releases
+(such as 3.6.0) contain backwards-compatible features, and only major releases
+(such as 4.0.0) are allowed to have backwards-incompatible behavior. There are
+[exceptions](#exceptional-breakages), but we try to follow this rule as closely
+as possible.
+
+Note, however, that the semantic versioning applies only to the language's
+semantics, not to the Ruby APIs. Although we try hard to keep widely-used APIs
+like [`Sass::Engine`][Sass::Engine] stable, we don't have a strong distinction
+between public and private APIs and we need to be able to freely refactor our
+code.
+
+[Sass::Engine]: http://sass-lang.com/documentation/Sass/Engine.html
+
+### Making Breaking Changes
+
+Sometimes the old way of doing something just isn't going to work anymore, and
+the new way just can't be made backwards-compatible. In that case, a breaking
+change is necessary. These changes are rarely pleasant, but they contribute to
+making the language better in the long term.
+
+Our breaking change process tries to make such changes as clear to users and as
+easy to adapt to as possible. We want to ensure that there's a clear path
+forward for users using functionality that will no longer exist, and that they
+are able to understand what's changing and what they need to do. We've developed
+the following process for this:
+
+1. Deprecate the old behavior [in `stable`](#branches). At minimum, deprecating
+   some behavior involves printing a warning when that behavior is used
+   explaining that it's going to go away in the future. Ideally, this message
+   will also include code that will do the same thing in a non-deprecated way.
+   If there's a thorough prose explanation of the change available online, the
+   message should link to that as well.
+
+2. If possible, make `sass-convert` (also in `stable`) convert the deprecated
+   behavior into a non-deprecated form. This allows users to run `sass-convert
+   -R -i` to automatically update their stylesheets.
+
+3. Implement the new behavior in `master`. The sooner this happens, the better:
+   it may be unclear exactly what needs to be deprecated until the new
+   implementation exists.
+
+4. Release an alpha version of `master` that includes the new behavior. This
+   allows users who are dissatisfied with the workaround to use the new
+   behavior early. Normally a maintainer will take care of this.
+
+### Exceptional Breakages
+
+Because Sass's syntax and semantics are closely tied to those of CSS, there are
+occasionally times when CSS syntax is introduced that overlaps with
+previously-valid Sass. In this case in particular, we may introduce a breaking
+change in a minor version to get back to CSS compatibility as soon as possible.
+
+Exceptional breakages still require the full deprecation process; the only
+change is that the new behavior is implemented in `next` rather than `master`.
+Because there are no minor releases between the deprecation and the removal of
+the old behavior, the deprecation warning should be introduced soon as it
+becomes clear that an exceptional breakage is necessary.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2015 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2016 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -206,16 +206,22 @@ documentation, implementing new features, and getting Hampton coffee (a fitting
 task for a girl genius). Natalie lives in Seattle, Washington and works on
 [Dart](http://dartlang.org) application libraries at Google.
 
-[Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
-Sass and the creator of Compass, the first Sass-based framework. Chris focuses
+[Chris Eppstein](http://twitter.com/chriseppstein) is a core contributor to
+Sass and the creator of [Compass](http://compass-style.org/), the first Sass-based framework, and
+[Eyeglass](http://github.com/sass-eyeglass/eyeglass), a node-sass plugin ecosystem for NPM. Chris focuses
 on making Sass more powerful, easy to use, and on ways to speed its adoption
 through the web development community. Chris lives in San Jose, California with
-his wife and daughter. He is an Engineer for
-[LinkedIn.com](http://linkedin.com), where one of his responsibilities is to
-maintain Sass & Compass.
+his wife and two children. He is an Engineer for
+[LinkedIn.com](http://linkedin.com), where his primary responsibility is to
+maintain Sass and many other Sass-related open source projects.
 
-If you use this software, you must pay Hampton a compliment. And buy Natalie
-some candy. Maybe pet a kitten. Yeah. Pet that kitty.
+If you use this software, we'd be truly honored if you'd make a
+tax-deductible donation to a non-profit organization and then
+[let us know on twitter](http://twitter.com/SassCSS), so that we can
+thank you. Here's a few that we endorse:
 
-Beyond that, the implementation is licensed under the MIT License.
-Okay, fine, I guess that means compliments aren't __required__.
+* [Trans Justice Funding Project](http://www.transjusticefundingproject.org/)
+* [United Mitochondrial Disease Foundation](http://umdf.org/compass)
+* [Girl Develop It](https://www.girldevelopit.com/donate)
+
+Sass is licensed under the MIT License.

data/Rakefile

@@ -12,38 +12,92 @@ task :default => :test
 
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  test_files = FileList[scope('test/**/*_test.rb')]
-  test_files.exclude(scope('test/rails/*'))
-  test_files.exclude(scope('test/plugins/*'))
-  t.test_files = test_files
-  t.verbose = true
+desc "Run all tests"
+task :test => ["test:ruby", "test:spec"]
+
+namespace :test do
+  desc "Run the ruby tests (without sass-spec)"
+  Rake::TestTask.new("ruby") do |t|
+    t.libs << 'test'
+    test_files = FileList[scope('test/**/*_test.rb')]
+    test_files.exclude(scope('test/rails/*'))
+    test_files.exclude(scope('test/plugins/*'))
+    t.test_files = test_files
+    t.warning = true
+    t.verbose = true
+  end
+
+  desc "Run sass-spec tests against the local code."
+  task :spec do
+    require "yaml"
+    sass_spec_options = YAML.load_file(scope("test/sass-spec.yml"))
+    enabled = sass_spec_options.delete(:enabled)
+    unless enabled
+      puts "SassSpec tests are disabled."
+      next
+    end
+    if ruby_version_at_least?("1.9.2")
+      old_load_path = $:.dup
+      begin
+        $:.unshift(File.join(File.dirname(__FILE__), "lib"))
+        begin
+          require 'sass_spec'
+        rescue LoadError
+          puts "You probably forgot to run: bundle exec rake"
+          raise
+        end
+        default_options = {
+          :spec_directory => SassSpec::SPEC_DIR,
+          :engine_adapter => SassEngineAdapter.new("sass"),
+          :generate => [],
+          :tap => false,
+          :skip => false,
+          :verbose => false,
+          :filter => "",
+          :limit => -1,
+          :unexpected_pass => false,
+          :nuke => false,
+
+          # Constants
+          :output_styles => ["nested"],
+          :input_files => ["input.scss", "input.sass"],
+          :nested_output_file => 'expected_output',
+          :compressed_output_file => 'expected.compressed',
+          :expanded_output_file => 'expected.expanded',
+          :compact_output_file => 'expected.compact'
+        }
+        SassSpec::Runner.new(default_options.merge(sass_spec_options)).run || exit(1)
+      ensure
+        $:.replace(old_load_path)
+      end
+    else
+      "Skipping sass-spec on ruby versions less than 1.9.2"
+    end
+  end
 end
 
 # ----- Code Style Enforcement -----
 
-version = RUBY_VERSION.split(".").map {|n| n.to_i}
+def ruby_version_at_least?(version_string)
+  ruby_version = Gem::Version.new(RUBY_VERSION.dup)
+  version = Gem::Version.new(version_string)
+  ruby_version >= version
+end
 
-# TODO: Run Rubocop on Ruby 2.2+ when it's supported. See
-# https://github.com/sass/sass/pull/1805.
-if (version[0] > 1 || (version[0] == 1 && version[1] > 8)) &&
-    (version[0] < 2 || (version[0] == 2 && version[1] < 2)) &&
+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.options = ['-c', '.rubocop_0.18.0.yml'] if RUBY_VERSION < '1.9.3'
     t.patterns = FileList["lib/**/*"]
   end
 else
   task :rubocop do
     puts "Skipping rubocop style check."
-    if !ENV.has_key?("RUBOCOP")
-      puts "Passing this check is required in order for your patch to be accepted."
-      puts "Use ruby 1.9 or greater and then run the style check with: rake rubocop"
-    end
+    next if ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] != "true"
+    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"
   end
 end
 
@@ -113,7 +167,6 @@ end
 
 desc "Release a new Sass package to RubyGems.org."
 task :release => [:check_release, :package] do
-  name = File.read(scope("VERSION_NAME")).strip
   version = File.read(scope("VERSION")).strip
   sh %{gem push pkg/sass-#{version}.gem}
 end

data/VERSION

@@ -1 +1 @@
-3.4.21
+3.4.22

data/VERSION_DATE

@@ -1 +1 @@
-12 January 2016 01:03:01 UTC
+28 March 2016 23:31:39 UTC

data/lib/sass.rb

@@ -100,3 +100,10 @@ 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/callbacks.rb

@@ -51,12 +51,12 @@ module Sass
     def define_callback(name)
       class_eval <<RUBY, __FILE__, __LINE__ + 1
 def on_#{name}(&block)
-  @_sass_callbacks ||= {}
+  @_sass_callbacks = {} unless defined? @_sass_callbacks
   (@_sass_callbacks[#{name.inspect}] ||= []) << block
 end
 
 def run_#{name}(*args)
-  return unless @_sass_callbacks
+  return unless defined? @_sass_callbacks
   return unless @_sass_callbacks[#{name.inspect}]
   @_sass_callbacks[#{name.inspect}].each {|c| c[*args]}
 end

data/lib/sass/css.rb

@@ -35,6 +35,7 @@ module Sass
       # Backwards compatibility
       @options[:old] = true if @options[:alternate] == false
       @template = template
+      @checked_encoding = false
     end
 
     # Converts the CSS template into Sass or SCSS code.
@@ -75,14 +76,14 @@ module Sass
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
       root = Sass::SCSS::CssParser.new(@template, @options[:filename], nil).parse
-      parse_selectors    root
-      expand_commas      root
-      nest_seqs          root
-      parent_ref_rules   root
-      flatten_rules      root
-      bubble_subject     root
-      fold_commas        root
-      dump_selectors     root
+      parse_selectors(root)
+      expand_commas(root)
+      nest_seqs(root)
+      parent_ref_rules(root)
+      flatten_rules(root)
+      bubble_subject(root)
+      fold_commas(root)
+      dump_selectors(root)
       root
     end
 

data/lib/sass/engine.rb

@@ -265,6 +265,9 @@ module Sass
     def initialize(template, options = {})
       @options = self.class.normalize_options(options)
       @template = template
+      @checked_encoding = false
+      @filename = nil
+      @line = nil
     end
 
     # Render the template to CSS.
@@ -572,8 +575,8 @@ MSG
           if continued_comment &&
               child.line == continued_comment.line +
               continued_comment.lines + 1
-            continued_comment.value.last.sub!(/ \*\/\Z/, '')
-            child.value.first.gsub!(/\A\/\*/, ' *')
+            continued_comment.value.last.sub!(%r{ \*/\Z}, '')
+            child.value.first.gsub!(%r{\A/\*}, ' *')
             continued_comment.value += ["\n"] + child.value
             next
           end
@@ -715,9 +718,12 @@ WARNING
         expr = 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))
+        expr = parse_script(value,
+          :offset => to_parser_offset(start_offset),
+          :css_variable => name.start_with?("--"))
         end_offset = expr.source_range.end_pos.offset - 1
       end
+
       node = Tree::PropNode.new(parse_interp(name), expr, prop)
       node.value_source_range = Sass::Source::Range.new(
         Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
@@ -1140,9 +1146,9 @@ WARNING
     end
 
     def parse_script(script, options = {})
-      line = options[:line] || @line
-      offset = options[:offset] || @offset + 1
-      Script.parse(script, line, offset, @options)
+      line = options.delete(:line) || @line
+      offset = options.delete(:offset) || @offset + 1
+      Script.parse(script, line, offset, @options.merge(options))
     end
 
     def format_comment_text(text, silent)
@@ -1154,7 +1160,7 @@ WARNING
       end
 
       return "/* */" if content.empty?
-      content.last.gsub!(/ ?\*\/ *$/, '')
+      content.last.gsub!(%r{ ?\*/ *$}, '')
       first = content.shift unless removed_first
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
       content.unshift first unless removed_first
@@ -1196,7 +1202,7 @@ WARNING
         else
           res << "\\" * [0, escapes - 1].max
           if scan[1].include?("\n")
-            line = line + scan[1].count("\n")
+            line += scan[1].count("\n")
             offset = scan.matched_size - scan[1].rindex("\n")
           else
             offset += scan.matched_size

data/lib/sass/environment.rb

@@ -86,7 +86,14 @@ module Sass
     def initialize(parent = nil, options = nil)
       @parent = parent
       @options = options || (parent && parent.options) || {}
-      @stack = Sass::Stack.new if @parent.nil?
+      @stack = @parent.nil? ? Sass::Stack.new : nil
+      @caller = nil
+      @content = nil
+      @filename = nil
+      @functions = nil
+      @mixins = nil
+      @selector = nil
+      @vars = nil
     end
 
     # Returns whether this is the global environment.

data/lib/sass/error.rb

@@ -127,7 +127,7 @@ module Sass
       return nil if super.nil?
       return super if sass_backtrace.all? {|h| h.empty?}
       sass_backtrace.map do |h|
-        "#{h[:filename] || "(sass)"}:#{h[:line]}" +
+        "#{h[:filename] || '(sass)'}:#{h[:line]}" +
           (h[:mixin] ? ":in `#{h[:mixin]}'" : "")
       end + super
     end
@@ -143,7 +143,7 @@ module Sass
         map {|l| "\n" + (" " * "Error: ".size) + l}.join
       "Error: #{msg}" +
         Sass::Util.enum_with_index(sass_backtrace).map do |entry, i|
-          "\n        #{i == 0 ? "on" : "from"} line #{entry[:line]}" +
+          "\n        #{i == 0 ? 'on' : 'from'} line #{entry[:line]}" +
             " of #{entry[:filename] || default_filename}" +
             (entry[:mixin] ? ", in `#{entry[:mixin]}'" : "")
         end.join
@@ -163,9 +163,9 @@ module Sass
 
         <<END
 /*
-#{header.gsub("*/", "*\\/")}
+#{header.gsub('*/', '*\\/')}
 
-Backtrace:\n#{e.backtrace.join("\n").gsub("*/", "*\\/")}
+Backtrace:\n#{e.backtrace.join("\n").gsub('*/', '*\\/')}
 */
 body:before {
   white-space: pre;
@@ -183,7 +183,7 @@ END
 
         line_num = e.sass_line + 1 - line_offset
         min = [line_num - 6, 0].max
-        section = e.sass_template.rstrip.split("\n")[min ... line_num + 5]
+        section = e.sass_template.rstrip.split("\n")[min...line_num + 5]
         return e.sass_backtrace_str if section.nil? || section.empty?
 
         e.sass_backtrace_str + "\n\n" + Sass::Util.enum_with_index(section).