sass 3.4.20 → 3.4.21

data/lib/sass/selector/simple.rb

@@ -23,8 +23,10 @@ module Sass
 
       # Returns the selector string.
       #
+      # @param opts [Hash] rendering options.
+      # @option opts [Symbol] :style The css rendering style.
       # @return [String]
-      def to_s
+      def to_s(opts = {})
         Sass::Util.abstract(self)
       end
 

data/lib/sass/selector/simple_sequence.rb

@@ -158,7 +158,7 @@ module Sass
         seen_with_pseudo_selectors = seen.dup
 
         modified_original = false
-        members = Sass::Util.enum_with_index(self.members).map do |sel, i|
+        members = self.members.map do |sel|
           next sel unless sel.is_a?(Pseudo) && sel.selector
           next sel if seen.include?([sel])
           extended = sel.selector.do_extend(extends, parent_directives, replace, seen, !:original)
@@ -279,14 +279,14 @@ module Sass
           end
         end
 
-        our_spcs.all? do |name, pseudos|
+        our_spcs.all? do |_name, pseudos|
           pseudos.all? {|pseudo| pseudo.superselector?(their_sseq, parents)}
         end
       end
 
       # @see Simple#to_s
-      def to_s
-        res = @members.join
+      def to_s(opts = {})
+        res = @members.map {|m| m.to_s(opts)}.join
         res << '!' if subject?
         res
       end

data/lib/sass/tree/function_node.rb

@@ -36,9 +36,8 @@ module Sass
         @splat = splat
         super()
 
-        if %w[and or not].include?(name)
-          raise Sass::SyntaxError.new("Invalid function name \"#{name}\".")
-        end
+        return unless %w[and or not].include?(name)
+        raise Sass::SyntaxError.new("Invalid function name \"#{name}\".")
       end
     end
   end

data/lib/sass/tree/prop_node.rb

@@ -119,11 +119,10 @@ module Sass::Tree
     private
 
     def check!
-      if @options[:property_syntax] && @options[:property_syntax] != @prop_syntax
-        raise Sass::SyntaxError.new(
-          "Illegal property syntax: can't use #{@prop_syntax} syntax when " +
-          ":property_syntax => #{@options[:property_syntax].inspect} is set.")
-      end
+      return unless @options[:property_syntax] && @options[:property_syntax] != @prop_syntax
+      raise Sass::SyntaxError.new(
+        "Illegal property syntax: can't use #{@prop_syntax} syntax when " +
+        ":property_syntax => #{@options[:property_syntax].inspect} is set.")
     end
 
     class << self

data/lib/sass/tree/rule_node.rb

@@ -133,7 +133,7 @@ module Sass::Tree
 
     def try_to_parse_non_interpolated_rules
       @parsed_rules = nil
-      return unless @rule.all? {|t| t.kind_of?(String)}
+      return unless @rule.all? {|t| t.is_a?(String)}
 
       # 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.

data/lib/sass/tree/visitors/check_nesting.rb

@@ -90,9 +90,8 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
 
   VALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode, Sass::Tree::MixinNode]
   def invalid_extend_parent?(parent, child)
-    unless is_any_of?(parent, VALID_EXTEND_PARENTS)
-      return "Extend directives may only be used within rules."
-    end
+    return if is_any_of?(parent, VALID_EXTEND_PARENTS)
+    "Extend directives may only be used within rules."
   end
 
   INVALID_IMPORT_PARENTS = CONTROL_NODES +
@@ -110,15 +109,13 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def invalid_mixindef_parent?(parent, child)
-    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
-      return "Mixins may not be defined within control directives or other mixins."
-    end
+    return if (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+    "Mixins may not be defined within control directives or other mixins."
   end
 
   def invalid_function_parent?(parent, child)
-    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
-      return "Functions may not be defined within control directives or other mixins."
-    end
+    return if (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+    "Functions may not be defined within control directives or other mixins."
   end
 
   VALID_FUNCTION_CHILDREN = [
@@ -126,27 +123,24 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     Sass::Tree::VariableNode, Sass::Tree::WarnNode, Sass::Tree::ErrorNode
   ] + CONTROL_NODES
   def invalid_function_child?(parent, child)
-    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
-      "Functions can only contain variable declarations and control directives."
-    end
+    return if is_any_of?(child, VALID_FUNCTION_CHILDREN)
+    "Functions can only contain variable declarations and control directives."
   end
 
-  VALID_PROP_CHILDREN =  CONTROL_NODES + [Sass::Tree::CommentNode,
-                                          Sass::Tree::PropNode,
-                                          Sass::Tree::MixinNode]
+  VALID_PROP_CHILDREN = CONTROL_NODES + [Sass::Tree::CommentNode,
+                                         Sass::Tree::PropNode,
+                                         Sass::Tree::MixinNode]
   def invalid_prop_child?(parent, child)
-    unless is_any_of?(child, VALID_PROP_CHILDREN)
-      "Illegal nesting: Only properties may be nested beneath properties."
-    end
+    return if is_any_of?(child, VALID_PROP_CHILDREN)
+    "Illegal nesting: Only properties may be nested beneath properties."
   end
 
   VALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::KeyframeRuleNode, Sass::Tree::PropNode,
                         Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode, Sass::Tree::MixinNode]
   def invalid_prop_parent?(parent, child)
-    unless is_any_of?(parent, VALID_PROP_PARENTS)
-      "Properties are only allowed within rules, directives, mixin includes, or other properties." +
-        child.pseudo_class_selector_message
-    end
+    return if is_any_of?(parent, VALID_PROP_PARENTS)
+    "Properties are only allowed within rules, directives, mixin includes, or other properties." +
+      child.pseudo_class_selector_message
   end
 
   def invalid_return_parent?(parent, child)

data/lib/sass/tree/visitors/convert.rb

@@ -27,7 +27,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     res = visit_rule_level(parent.children)
 
     if @format == :sass
-      "\n"  + res.rstrip + "\n"
+      "\n" + res.rstrip + "\n"
     else
       " {\n" + res.rstrip + "\n#{ @tab_chars * (@tabs - 1)}}\n"
     end
@@ -340,7 +340,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def dasherize(s)
     if @options[:dasherize]
-      s.gsub('_', '-')
+      s.tr('_', '-')
     else
       s
     end

data/lib/sass/tree/visitors/extend.rb

@@ -44,25 +44,27 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
     node.resolved_rules = node.resolved_rules.do_extend(@extends, @parent_directives)
   end
 
-  private
+  class << self
+    private
 
-  def self.check_extends_fired!(extends)
-    extends.each_value do |ex|
-      next if ex.result == :succeeded || ex.node.optional?
-      message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
-      reason =
-        if ex.result == :not_found
-          "The selector \"#{ex.target.join}\" was not found."
-        else
-          "No selectors matching \"#{ex.target.join}\" could be unified with \"#{ex.extender}\"."
-        end
+    def check_extends_fired!(extends)
+      extends.each_value do |ex|
+        next if ex.result == :succeeded || ex.node.optional?
+        message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
+        reason =
+          if ex.result == :not_found
+            "The selector \"#{ex.target.join}\" was not found."
+          else
+            "No selectors matching \"#{ex.target.join}\" could be unified with \"#{ex.extender}\"."
+          end
 
-      # TODO(nweiz): this should use the Sass stack trace of the extend node.
-      raise Sass::SyntaxError.new(<<MESSAGE, :filename => ex.node.filename, :line => ex.node.line)
+        # TODO(nweiz): this should use the Sass stack trace of the extend node.
+        raise Sass::SyntaxError.new(<<MESSAGE, :filename => ex.node.filename, :line => ex.node.line)
 #{message}
 #{reason}
 Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
 MESSAGE
+      end
     end
   end
 end

data/lib/sass/tree/visitors/perform.rb

@@ -349,7 +349,7 @@ WARNING
       raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin
 
       if node.children.any? && !mixin.has_content
-        raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
+        raise Sass::SyntaxError.new(%{Mixin "#{node.name}" does not accept a content block.})
       end
 
       args = node.args.map {|a| a.perform(@environment)}

data/lib/sass/tree/visitors/set_options.rb

@@ -80,7 +80,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
 
   def visit_mixin(node)
     node.args.each {|a| a.options = @options}
-    node.keywords.each {|k, v| v.options = @options}
+    node.keywords.each {|_k, v| v.options = @options}
     node.splat.options = @options if node.splat
     node.kwarg_splat.options = @options if node.kwarg_splat
     yield

data/lib/sass/tree/visitors/to_css.rb

@@ -51,8 +51,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     @source_mapping.add(source_range, target_range)
   end
 
-  def ends_with?(str)
-    @result.end_with?(str)
+  def trailing_semicolon?
+   @result.end_with?(";") && !@result.end_with?('\;')
   end
 
   # Move the output cursor back `chars` characters.
@@ -128,7 +128,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       end
     end
     rstrip!
-    if node.style == :compressed && ends_with?(";")
+    if node.style == :compressed && trailing_semicolon?
       erase! 1
     end
     return "" if @result.empty?
@@ -163,7 +163,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
     content = node.resolved_value.split("\n").join("\n" + spaces)
     if node.type == :silent
-      content.gsub!(%r{^(\s*)//(.*)$}) {|md| "#{$1}/*#{$2} */"}
+      content.gsub!(%r{^(\s*)//(.*)$}) {"#{$1}/*#{$2} */"}
     end
     if (node.style == :compact || node.style == :compressed) && node.type != :loud
       content.gsub!(/\n +(\* *(?!\/))?/, ' ')
@@ -222,7 +222,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
         first = false
       elsif node.style == :compressed
         unless had_children
-          output(";") unless ends_with?(";")
+          output(";") unless trailing_semicolon?
         end
         with_tabs(0) {visit(child)}
         had_children = child.has_children
@@ -232,7 +232,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       end
     end
     rstrip!
-    if node.style == :compressed && ends_with?(";")
+    if node.style == :compressed && trailing_semicolon?
       erase! 1
     end
     if node.style == :expanded
@@ -295,10 +295,13 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
       joined_rules = node.resolved_rules.members.map do |seq|
         next if seq.has_placeholder?
-        rule_part = seq.to_s
+        rule_part = seq.to_s(:style => node.style)
         if node.style == :compressed
           rule_part.gsub!(/([^,])\s*\n\s*/m, '\1 ')
-          rule_part.gsub!(/\s*([-,+>])\s*/m, '\1')
+          rule_part.gsub!(/\s*([+>])\s*/m, '\1')
+          rule_part.gsub!(/nth([^( ]*)\(([^)]*)\)/m) do |match|
+            match.tr(" \t\n", "")
+          end
           rule_part.strip!
         end
         rule_part
@@ -337,7 +340,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
         end
       end
 
-      end_props, trailer, tabs  = '', '', 0
+      end_props, trailer, tabs = '', '', 0
       if node.style == :compact
         separator, end_props, bracket = ' ', ' ', ' { '
         trailer = "\n" if node.group_end
@@ -356,7 +359,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       with_tabs(tabs) do
         node.children.each_with_index do |child, i|
           if i > 0
-            if separator.start_with?(";") && ends_with?(";")
+            if separator.start_with?(";") && trailing_semicolon?
               erase! 1
             end
             output(separator)
@@ -364,7 +367,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
           visit(child)
         end
       end
-      if node.style == :compressed && ends_with?(";")
+      if node.style == :compressed && trailing_semicolon?
         erase! 1
       end
 
@@ -387,10 +390,10 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       rule = Sass::Tree::RuleNode.new([""])
       rule.resolved_rules = Sass::Selector::CommaSequence.new(
         [Sass::Selector::Sequence.new(
-            [Sass::Selector::SimpleSequence.new(
-                [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)],
-                false)
-            ])
+          [Sass::Selector::SimpleSequence.new(
+            [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)],
+            false)
+          ])
         ])
       prop = Sass::Tree::PropNode.new([""], Sass::Script::Value::String.new(''), :new)
       prop.resolved_name = "font-family"

data/lib/sass/util.rb

@@ -13,6 +13,8 @@ require 'sass/util/subset_map'
 
 module Sass
   # A module containing various useful functions.
+  # @comment
+  #   rubocop:disable ModuleLength
   module Util
     extend self
 
@@ -310,7 +312,7 @@ module Sass
     # @return [Array]
     def hash_to_a(hash)
       return hash.to_a unless ruby1_8? || defined?(Test::Unit)
-      hash.sort_by {|k, v| k}
+      hash.sort_by {|k, _v| k}
     end
 
     # Performs the equivalent of `enum.group_by.to_a`, but with a guaranteed
@@ -643,7 +645,7 @@ module Sass
     #
     # @param path [String]
     def glob(path)
-      path = path.gsub('\\', '/') if windows?
+      path = path.tr('\\', '/') if windows?
       if block_given?
         Dir.glob(path) {|f| yield(f)}
       else
@@ -1125,7 +1127,7 @@ module Sass
     VLQ_BASE_MASK = VLQ_BASE - 1
     VLQ_CONTINUATION_BIT = VLQ_BASE
 
-    BASE64_DIGITS = ('A'..'Z').to_a  + ('a'..'z').to_a + ('0'..'9').to_a  + ['+', '/']
+    BASE64_DIGITS = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a + ['+', '/']
     BASE64_DIGIT_MAP = begin
       map = {}
       Sass::Util.enum_with_index(BASE64_DIGITS).map do |digit, i|
@@ -1304,13 +1306,10 @@ module Sass
       return str, str.encoding
     end
 
-    # rubocop:disable LineLength
-
     # Calculates the memoization table for the Least Common Subsequence algorithm.
     # Algorithm from [Wikipedia](http://en.wikipedia.org/wiki/Longest_common_subsequence_problem#Computing_the_length_of_the_LCS)
     def lcs_table(x, y)
       # This method does not take a block as an explicit parameter for performance reasons.
-      # rubocop:enable LineLength
       c = Array.new(x.size) {[]}
       x.size.times {|i| c[i][0] = 0}
       y.size.times {|j| c[0][j] = 0}
@@ -1326,12 +1325,12 @@ module Sass
       end
       c
     end
-    # rubocop:disable ParameterLists, LineLength
+    # rubocop:disable ParameterLists
 
     # Computes a single longest common subsequence for arrays x and y.
     # Algorithm from [Wikipedia](http://en.wikipedia.org/wiki/Longest_common_subsequence_problem#Reading_out_an_LCS)
     def lcs_backtrace(c, x, y, i, j, &block)
-      # rubocop:enable ParameterList, LineLengths
+      # rubocop:enable ParameterList
       return [] if i == 0 || j == 0
       if (v = yield(x[i], y[j]))
         return lcs_backtrace(c, x, y, i - 1, j - 1, &block) << v

data/lib/sass/util/multibyte_string_scanner.rb

@@ -1,9 +1,7 @@
 require 'strscan'
 
 if Sass::Util.ruby1_8?
-  # rubocop:disable ConstantName
   Sass::Util::MultibyteStringScanner = StringScanner
-  # rubocop:enable ConstantName
 else
   if Sass::Util.rbx?
     # Rubinius's StringScanner class implements some of its methods in terms of

data/test/sass/engine_test.rb

@@ -2915,7 +2915,7 @@ SASS
       assert_equal <<CSS, render(<<SASS)
 div {
   maximum: 1.00000001;
-  too-much: 1.0; }
+  too-much: 1; }
 CSS
 div
   maximum : 1.00000001
@@ -3322,13 +3322,45 @@ CSS
 SASS
   end
 
+  def test_numeric_formatting_of_integers
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+a{near:3.00001;plus:3;minus:3;negative:-3}
+CSS
+a {
+  near: (3 + 0.00001);
+  plus: (3 + 0.0000001);
+  minus: (3 - 0.0000001);
+  negative: (-3 + 0.0000001);
+}
+SASS
+  end
+
+  def test_escaped_semicolons_are_not_compressed
+    assert_equal(<<'CSS', render(<<'SASS', :syntax => :scss, :style => :compressed))
+div{color:#f00000\9\0\;}
+CSS
+div {
+ color: #f00000\9\0\;
+}
+SASS
+  end
+
   def test_compressed_output_of_nth_selectors
     assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
-:nth-of-type(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1){color:red}:nth-of-type(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1){color:red}
+:nth-of-type(2n-1),:nth-child(2n-1),:nth(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1){color:red}:nth-of-type(2n+1),:nth-child(2n+1),:nth(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1){color:red}
 CSS
-:nth-of-type(2n-1), :nth-of-type(2n-  1), :nth-of-type(2n  -1), :nth-of-type(2n  -  1), :nth-of-type( 2n  -  1 ) {
+:nth-of-type(2n-1), :nth-child(2n-  1), :nth(2n  -1), :nth-of-type(2n  -  1), :nth-of-type( 2n  -  1 ) {
   color: red }
-:nth-of-type(2n+1), :nth-of-type(2n+  1), :nth-of-type(2n  +1), :nth-of-type(2n  +  1), :nth-of-type( 2n  +  1 ) {
+:nth-of-type(2n+1), :nth-child(2n+  1), :nth(2n  +1), :nth-of-type(2n  +  1), :nth-of-type( 2n  +  1 ) {
+  color: red }
+SASS
+  end
+
+  def test_descendant_selectors_with_leading_dash
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+a -b{color:red}
+CSS
+a -b {
   color: red }
 SASS
   end
@@ -3350,6 +3382,15 @@ CSS
 SASS
   end
 
+  def test_compressed_commas_in_attribute_selectors
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+.classname[a="1, 2, 3"],.another[b="4, 5, 6"]{color:red}
+CSS
+.classname[a="1, 2, 3"], .another[b="4, 5, 6"]
+  color: red
+SASS
+  end
+
   private
 
   def assert_hash_has(hash, expected)