sass 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9a7e7eaf523795eb1a4d5b7975591340f6ee4f
-  data.tar.gz: 1ed58578bc0436fc6fec5388d26d6494aee867df
+  metadata.gz: 3d6db5ce098f0328d6c4bbdc436d7cf4e94c9096
+  data.tar.gz: b74613eccfd8ab1e55c14459cc200612e279c159
 SHA512:
-  metadata.gz: 2ea7239c454041a2370b7927f1d86face3e1cbabf6ad30a51afb1d3546e2c405ecd5bab125c0d4d90890f799bee2c89da6865f32ce931fc26a78cc6103396302
-  data.tar.gz: 6adf204bdf107345eca19827602b4749e9bcf02656206aafb825f70db012c49934ac881e43eab2b0af250d46310b6d21b271e5d886a0abd071a3d031e1b69820
+  metadata.gz: 307d709f4c989a5648693d75844d18baad5b87d866b411c290b1a8d78752e40f4843f915c2d0b674d5774eb8610cfa33c52b81fbf7ab9a9159e011108c24d2dd
+  data.tar.gz: a867777fc30aadbf4ca30166deedb359ebae82f41594d5884cd33609ca4ec121b53a33d4c60b47eb0e4cd53da94e63f552d69b178d840d3499a4c2265f2ba61a

data/Rakefile

@@ -264,6 +264,46 @@ begin
 OPTS
       Rake::Task['yard'].execute
     end
+
+    # Add IDs to the reference to match the old IDs generated by Maruku. This
+    # ensures that old anchored links continue to work.
+    task :add_ids do
+      require 'nokogiri'
+
+      doc = Nokogiri::HTML(File.read('doc/file.SASS_REFERENCE.html'))
+
+      doc.css("#filecontents").css("h1, h2, h3, h4, h5, h6").each do |h|
+        next if h.inner_text.empty?
+        h['id'] =
+          case h.inner_text
+          when "Referencing Parent Selectors: &"; "parent-selector"
+          when /^Comments:/; "comments"
+          when "Strings"; "sass-script-strings"
+          when "Division and /"; "division-and-slash"
+          when /^Subtraction,/; "subtraction"
+          when "& in SassScript"; "parent-script"
+          when "@-Rules and Directives"; "directives"
+          when "@extend-Only Selectors"; "placeholders"
+          when "@extend-Only Selectors"; "placeholders"
+          when "@each"; "each-directive"
+          when "Multiple Assignment"; "each-multi-assign"
+          when "Mixin Directives"; "mixins"
+          when /^Defining a Mixin:/; "defining_a_mixin"
+          when /^Including a Mixin:/; "including_a_mixin"
+          when "Arguments"; "mixin-arguments"
+          when "Passing Content Blocks to a Mixin"; "mixin-content"
+          else
+            h.inner_text.downcase.gsub(/[^a-z _-]/, '').gsub(' ', '_')
+          end
+      end
+
+      # Give each option an anchor.
+      doc.css("#filecontents li p strong code").each do |c|
+        c['id'] = c.inner_text.gsub(/:/, '') + '-option'
+      end
+
+      File.write('doc/file.SASS_REFERENCE.html', doc.to_html)
+    end
   end
 
   YARD::Rake::YardocTask.new do |t|
@@ -289,8 +329,8 @@ OPTS
   Rake::Task['yard'].instance_variable_set('@comment', nil)
 
   desc "Generate Documentation"
-  task :doc => :yard
-  task :redoc => :yard
+  task :doc => [:yard, 'doc:add_ids']
+  task :redoc => [:yard, 'doc:add_ids']
 rescue LoadError
   desc "Generate Documentation"
   task :doc => :rdoc

data/VERSION

@@ -1 +1 @@
-3.5.3
+3.5.4

data/VERSION_DATE

@@ -1 +1 @@
-27 October 2017 00:52:01 UTC
+15 December 2017 23:15:58 UTC

data/lib/sass/engine.rb

@@ -375,7 +375,7 @@ Error generating source map: couldn't determine public URL for "#{filename}".
   Without a public URL, there's nothing for the source map to link to.
   An importer was not set for this file.
 ERR
-      elsif Sass::Util.silence_warnings do
+      elsif Sass::Util.silence_sass_warnings do
               sourcemap_dir = nil if @options[:sourcemap] == :file
               importer.public_url(filename, sourcemap_dir).nil?
             end

data/lib/sass/logger/base.rb

@@ -22,6 +22,17 @@ class Sass::Logger::Base
     !disabled && self.class.log_level?(level, log_level)
   end
 
+  # Captures all logger messages emitted during a block and returns them as a
+  # string.
+  def capture
+    old_io = io
+    self.io = StringIO.new
+    yield
+    io.to_s
+  ensure
+    self.io = old_io
+  end
+
   def log(level, message)
     _log(level, message) if logging_level?(level)
   end

data/lib/sass/tree/rule_node.rb

@@ -139,13 +139,11 @@ module Sass::Tree
       # We don't use real filename/line info because we don't have it yet.
       # When we get it, we'll set it on the parsed rules if possible.
       parser = nil
-      warnings = Sass::Util.silence_warnings do
+      warnings = Sass.logger.capture do
         parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
         # rubocop:disable RescueModifier
         @parsed_rules = parser.parse_selector rescue nil
         # rubocop:enable RescueModifier
-
-        $stderr.string
       end
 
       # If parsing produces a warning, throw away the result so we can parse

data/lib/sass/util.rb

@@ -137,8 +137,13 @@ module Sass
     def round(value)
       # If the number is within epsilon of X.5, round up (or down for negative
       # numbers).
-      return value.round if (value % 1) - 0.5 <= -1 * Script::Value::Number.epsilon
-      value > 0 ? value.ceil : value.floor
+      mod = value % 1
+      mod_is_half = (mod - 0.5).abs < Script::Value::Number.epsilon
+      if value > 0
+        !mod_is_half && mod < 0.5 ? value.floor : value.ceil
+      else
+        mod_is_half || mod < 0.5 ? value.floor : value.ceil
+      end
     end
 
     # Concatenates all strings that are adjacent in an array,
@@ -451,16 +456,6 @@ module Sass
       Sass::Util.sass_warn full_message
     end
 
-    # Silence all output to STDERR within a block.
-    #
-    # @yield A block in which no output will be printed to STDERR
-    def silence_warnings
-      the_real_stderr, $stderr = $stderr, StringIO.new
-      yield
-    ensure
-      $stderr = the_real_stderr
-    end
-
     # Silences all Sass warnings within a block.
     #
     # @yield A block in which no Sass warnings will be printed

data/test/sass/script_test.rb

@@ -994,7 +994,7 @@ SCSS
 
   def test_ids
     assert_equal "#foo", resolve("#foo")
-    assert_equal "#abcd", resolve("#abcd")
+    silence_warnings {assert_equal "#abcd", resolve("#abcd")}
     assert_equal "#abc-def", resolve("#abc-def")
     assert_equal "#abc_def", resolve("#abc_def")
     assert_equal "#uvw-xyz", resolve("#uvw-xyz")

data/test/sass/util_test.rb

@@ -139,16 +139,6 @@ class UtilTest < MiniTest::Test
     assert(!subsequence?([1, 2, 3], [3, 2, 1]))
   end
 
-  def test_silence_warnings
-    old_stderr, $stderr = $stderr, StringIO.new
-    warn "Out"
-    assert_equal("Out\n", $stderr.string)
-    silence_warnings {warn "In"}
-    assert_equal("Out\n", $stderr.string)
-  ensure
-    $stderr = old_stderr
-  end
-
   def test_sass_warn
     assert_warning("Foo!") {sass_warn "Foo!"}
   end

data/test/test_helper.rb

@@ -74,7 +74,7 @@ class MiniTest::Test
   end
 
   def silence_warnings(&block)
-    Sass::Util.silence_warnings(&block)
+    Sass::Util.silence_sass_warnings(&block)
   end
 
   def assert_raise_message(klass, message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,62 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7.6
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5'
 description: |2
@@ -81,7 +95,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
+- .yardopts
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - MIT-LICENSE
@@ -362,12 +376,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []