sass 3.7.4 → 4.0.0.alpha.1

data/lib/sass/stack.rb

@@ -98,31 +98,11 @@ module Sass
       with_frame(filename, line, :mixin, name) {yield}
     end
 
-    # Pushes a function frame onto the stack.
-    #
-    # @param filename [String] See \{Frame#filename}.
-    # @param line [String] See \{Frame#line}.
-    # @param name [String] See \{Frame#name}.
-    # @yield [] A block in which the new frame is on the stack.
-    def with_function(filename, line, name)
-      with_frame(filename, line, :function, name) {yield}
-    end
-
-    # Pushes a function frame onto the stack.
-    #
-    # @param filename [String] See \{Frame#filename}.
-    # @param line [String] See \{Frame#line}.
-    # @param name [String] See \{Frame#name}.
-    # @yield [] A block in which the new frame is on the stack.
-    def with_directive(filename, line, name)
-      with_frame(filename, line, :directive, name) {yield}
-    end
-
     def to_s
-      (frames.reverse + [nil]).each_cons(2).each_with_index.
+      Sass::Util.enum_with_index(Sass::Util.enum_cons(frames.reverse + [nil], 2)).
           map do |(frame, caller), i|
-        "#{i == 0 ? 'on' : 'from'} line #{frame.line}" +
-          " of #{frame.filename || 'an unknown file'}" +
+        "#{i == 0 ? "on" : "from"} line #{frame.line}" +
+          " of #{frame.filename || "an unknown file"}" +
           (caller && caller.name ? ", in `#{caller.name}'" : "")
       end.join("\n")
     end

data/lib/sass/tree/charset_node.rb

@@ -16,7 +16,7 @@ module Sass::Tree
 
     # @see Node#invisible?
     def invisible?
-      true
+      !Sass::Util.ruby1_8?
     end
   end
 end

data/lib/sass/tree/comment_node.rb

@@ -59,7 +59,7 @@ module Sass::Tree
 
     # Returns the number of lines in the comment.
     #
-    # @return [Integer]
+    # @return [Fixnum]
     def lines
       @value.inject(0) do |s, e|
         next s + e.count("\n") if e.is_a?(String)

data/lib/sass/tree/function_node.rb

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

data/lib/sass/tree/node.rb

@@ -69,7 +69,7 @@ module Sass
 
       # The line of the document on which this node appeared.
       #
-      # @return [Integer]
+      # @return [Fixnum]
       attr_accessor :line
 
       # The source range in the document on which this node appeared.
@@ -83,15 +83,13 @@ module Sass
       attr_writer :filename
 
       # The options hash for the node.
-      # 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
 
       def initialize
         @children = []
-        @filename = nil
-        @options = nil
       end
 
       # Sets the options hash for the node and all its children.
@@ -151,7 +149,7 @@ module Sass
       # @return [Boolean]
       def invisible?; false; end
 
-      # The output style. See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
+      # The output style. See {file:SASS_REFERENCE.md#options the Sass options documentation}.
       #
       # @return [Symbol]
       def style

data/lib/sass/tree/prop_node.rb

@@ -20,11 +20,7 @@ module Sass::Tree
 
     # The value of the property.
     #
-    # For most properties, this will just contain a single Node. However, for
-    # CSS variables, it will contain multiple strings and nodes representing
-    # interpolation. Any adjacent strings will be merged together.
-    #
-    # @return [Array<String, Sass::Script::Tree::Node>]
+    # @return [Sass::Script::Tree::Node]
     attr_accessor :value
 
     # The value of the property
@@ -43,7 +39,7 @@ module Sass::Tree
     # * This is a child property of another property
     # * The parent property has a value, and thus will be rendered
     #
-    # @return [Integer]
+    # @return [Fixnum]
     attr_accessor :tabs
 
     # The source range in which the property name appears.
@@ -56,22 +52,14 @@ module Sass::Tree
     # @return [Sass::Source::Range]
     attr_accessor :value_source_range
 
-    # Whether this represents a CSS custom property.
-    #
-    # @return [Boolean]
-    def custom_property?
-      name.first.is_a?(String) && name.first.start_with?("--")
-    end
-
     # @param name [Array<String, Sass::Script::Tree::Node>] See \{#name}
-    # @param value [Array<String, Sass::Script::Tree::Node>] See \{#value}
+    # @param value [Sass::Script::Tree::Node] See \{#value}
     # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
     #   `:old` if it uses `:a b`-style syntax
     def initialize(name, value, prop_syntax)
       @name = Sass::Util.strip_string_array(
         Sass::Util.merge_adjacent_strings(name))
-      @value = Sass::Util.merge_adjacent_strings(value)
-      @value = Sass::Util.strip_string_array(@value) unless custom_property?
+      @value = value
       @tabs = 0
       @prop_syntax = prop_syntax
       super()
@@ -93,10 +81,9 @@ module Sass::Tree
     # @return [String] The message
     def pseudo_class_selector_message
       if @prop_syntax == :new ||
-          custom_property? ||
-          !value.first.is_a?(Sass::Script::Tree::Literal) ||
-          !value.first.value.is_a?(Sass::Script::Value::String) ||
-          !value.first.value.value.empty?
+          !value.is_a?(Sass::Script::Tree::Literal) ||
+          !value.value.is_a?(Sass::Script::Value::String) ||
+          !value.value.value.empty?
         return ""
       end
 
@@ -111,52 +98,74 @@ module Sass::Tree
     # @param fmt [Symbol] `:scss` or `:sass`.
     def declaration(opts = {:old => @prop_syntax == :old}, fmt = :sass)
       name = self.name.map {|n| n.is_a?(String) ? n : n.to_sass(opts)}.join
-      value = self.value.map {|n| n.is_a?(String) ? n : n.to_sass(opts)}.join
-      value = "(#{value})" if value_needs_parens?
-
       if name[0] == ?:
-        raise Sass::SyntaxError.new("The \"#{name}: #{value}\"" +
+        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\"" +
                                     " hack is not allowed in the Sass indented syntax")
       end
 
-      # The indented syntax doesn't support newlines in custom property values,
-      # but we can losslessly convert them to spaces instead.
-      value = value.tr("\n", " ") if fmt == :sass
-
       old = opts[:old] && fmt == :sass
-      "#{old ? ':' : ''}#{name}#{old ? '' : ':'}#{custom_property? ? '' : ' '}#{value}".rstrip
+      initial = old ? ':' : ''
+      mid = old ? '' : ':'
+      "#{initial}#{name}#{mid} #{self.class.val_to_sass(value, opts)}".rstrip
     end
 
     # A property node is invisible if its value is empty.
     #
     # @return [Boolean]
     def invisible?
-      !custom_property? && resolved_value.empty?
+      resolved_value.empty?
     end
 
     private
 
-    # Returns whether \{#value} neesd parentheses in order to be parsed
-    # properly as division.
-    def value_needs_parens?
-      return false if custom_property?
-
-      root = value.first
-      root.is_a?(Sass::Script::Tree::Operation) &&
-        root.operator == :div &&
-        root.operand1.is_a?(Sass::Script::Tree::Literal) &&
-        root.operand1.value.is_a?(Sass::Script::Value::Number) &&
-        root.operand1.value.original.nil? &&
-        root.operand2.is_a?(Sass::Script::Tree::Literal) &&
-        root.operand2.value.is_a?(Sass::Script::Value::Number) &&
-        root.operand2.value.original.nil?
+    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
     end
 
-    def check!
-      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.")
+    class << self
+      # @private
+      def val_to_sass(value, opts)
+        val_to_sass_comma(value, opts).to_sass(opts)
+      end
+
+      private
+
+      def val_to_sass_comma(node, opts)
+        return node unless node.is_a?(Sass::Script::Tree::Operation)
+        return val_to_sass_concat(node, opts) unless node.operator == :comma
+
+        Sass::Script::Tree::Operation.new(
+          val_to_sass_concat(node.operand1, opts),
+          val_to_sass_comma(node.operand2, opts),
+          node.operator)
+      end
+
+      def val_to_sass_concat(node, opts)
+        return node unless node.is_a?(Sass::Script::Tree::Operation)
+        return val_to_sass_div(node, opts) unless node.operator == :space
+
+        Sass::Script::Tree::Operation.new(
+          val_to_sass_div(node.operand1, opts),
+          val_to_sass_concat(node.operand2, opts),
+          node.operator)
+      end
+
+      def val_to_sass_div(node, opts)
+        unless node.is_a?(Sass::Script::Tree::Operation) && node.operator == :div &&
+            node.operand1.is_a?(Sass::Script::Tree::Literal) &&
+            node.operand1.value.is_a?(Sass::Script::Value::Number) &&
+            node.operand2.is_a?(Sass::Script::Tree::Literal) &&
+            node.operand2.value.is_a?(Sass::Script::Value::Number) &&
+            (!node.operand1.value.original || !node.operand2.value.original)
+          return node
+        end
+
+        Sass::Script::Value::String.new("(#{node.to_sass(opts)})")
+      end
     end
   end
 end

data/lib/sass/tree/rule_node.rb

@@ -40,7 +40,7 @@ module Sass::Tree
     # * This is a child rule of another rule
     # * The parent rule has properties, and thus will be rendered
     #
-    # @return [Integer]
+    # @return [Fixnum]
     attr_accessor :tabs
 
     # The entire selector source range for this rule.
@@ -120,34 +120,27 @@ module Sass::Tree
     #
     # @return [{#to_s => #to_s}]
     def debug_info
-      {:filename => filename &&
-         ("file://" + URI::DEFAULT_PARSER.escape(File.expand_path(filename))),
+      {:filename => filename && ("file://" + Sass::Util.escape_uri(File.expand_path(filename))),
        :line => line}
     end
 
     # A rule node is invisible if it has only placeholder selectors.
     def invisible?
-      resolved_rules.members.all? {|seq| seq.invisible?}
+      resolved_rules.members.all? {|seq| seq.has_placeholder?}
     end
 
     private
 
     def try_to_parse_non_interpolated_rules
       @parsed_rules = nil
-      return unless @rule.all? {|t| t.is_a?(String)}
+      return unless @rule.all? {|t| t.kind_of?(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.
-      parser = nil
-      warnings = Sass.logger.capture do
-        parser = Sass::SCSS::StaticParser.new(
-          Sass::Util.strip_except_escapes(@rule.join), nil, nil, 1)
-        @parsed_rules = parser.parse_selector rescue nil
-      end
-
-      # If parsing produces a warning, throw away the result so we can parse
-      # later with the real filename info.
-      @parsed_rules = nil unless warnings.empty?
+      parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
+      # rubocop:disable RescueModifier
+      @parsed_rules = parser.parse_selector rescue nil
+      # rubocop:enable RescueModifier
     end
   end
 end

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

@@ -4,8 +4,6 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
 
   def initialize
     @parents = []
-    @parent = nil
-    @current_mixin_def = nil
   end
 
   def visit(node)
@@ -31,7 +29,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     if parent.is_a?(Sass::Tree::AtRootNode) && parent.resolved_value
       old_parents = @parents
       @parents = @parents.reject {|p| parent.exclude_node?(p)}
-      @parent = @parents.reverse.each_with_index.
+      @parent = Sass::Util.enum_with_index(@parents.reverse).
         find {|p, i| !transparent_parent?(p, @parents[-i - 2])}.first
 
       begin
@@ -92,8 +90,9 @@ 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)
-    return if is_any_of?(parent, VALID_EXTEND_PARENTS)
-    "Extend directives may only be used within rules."
+    unless is_any_of?(parent, VALID_EXTEND_PARENTS)
+      return "Extend directives may only be used within rules."
+    end
   end
 
   INVALID_IMPORT_PARENTS = CONTROL_NODES +
@@ -111,13 +110,15 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def invalid_mixindef_parent?(parent, child)
-    return if (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
-    "Mixins may not be defined within control directives or other mixins."
+    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+      return "Mixins may not be defined within control directives or other mixins."
+    end
   end
 
   def invalid_function_parent?(parent, child)
-    return if (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
-    "Functions may not be defined within control directives or other mixins."
+    unless (@parents.map {|p| p.class} & INVALID_IMPORT_PARENTS).empty?
+      return "Functions may not be defined within control directives or other mixins."
+    end
   end
 
   VALID_FUNCTION_CHILDREN = [
@@ -125,24 +126,27 @@ 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)
-    return if is_any_of?(child, VALID_FUNCTION_CHILDREN)
-    "Functions can only contain variable declarations and control directives."
+    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
+      "Functions can only contain variable declarations and control directives."
+    end
   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)
-    return if is_any_of?(child, VALID_PROP_CHILDREN)
-    "Illegal nesting: Only properties may be nested beneath properties."
+    unless is_any_of?(child, VALID_PROP_CHILDREN)
+      "Illegal nesting: Only properties may be nested beneath properties."
+    end
   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)
-    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
+    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
   end
 
   def invalid_return_parent?(parent, child)

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

@@ -18,7 +18,6 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     @tabs = 0
     # 2 spaces by default
     @tab_chars = @options[:indent] || "  "
-    @is_else = false
   end
 
   def visit_children(parent)
@@ -28,9 +27,9 @@ 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"
+      " {\n" + res.rstrip + "\n#{ @tab_chars * (@tabs - 1)}}\n"
     end
   ensure
     @tabs -= 1
@@ -48,14 +47,14 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def visit_comment(node)
     value = interp_to_src(node.value)
     if @format == :sass
-      content = value.gsub(%r{\*/$}, '').rstrip
+      content = value.gsub(/\*\/$/, '').rstrip
       if content =~ /\A[ \t]/
         # Re-indent SCSS comments like this:
         #     /* foo
         #   bar
         #       baz */
         content.gsub!(/^/, '   ')
-        content.sub!(%r{\A([ \t]*)/\*}, '/*\1')
+        content.sub!(/\A([ \t]*)\/\*/, '/*\1')
       end
 
       if content.include?("\n")
@@ -69,13 +68,13 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
         end
       end
 
-      content.gsub!(%r{\A/\*}, '//') if node.type == :silent
+      content.gsub!(/\A\/\*/, '//') if node.type == :silent
       content.gsub!(/^/, tab_str)
       content = content.rstrip + "\n"
     else
       spaces = (@tab_chars * [@tabs - value[/^ */].size, 0].max)
       content = if node.type == :silent
-                  value.gsub(%r{^[/ ]\*}, '//').gsub(%r{ *\*/$}, '')
+                  value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
                 else
                   value
                 end.gsub(/^/, spaces) + "\n"
@@ -105,12 +104,12 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def visit_extend(node)
     "#{tab_str}@extend #{selector_to_src(node.selector).lstrip}" +
-      "#{' !optional' if node.optional?}#{semi}\n"
+      "#{" !optional" if node.optional?}#{semi}\n"
   end
 
   def visit_for(node)
     "#{tab_str}@for $#{dasherize(node.var)} from #{node.from.to_sass(@options)} " +
-      "#{node.exclusive ? 'to' : 'through'} #{node.to.to_sass(@options)}#{yield}"
+      "#{node.exclusive ? "to" : "through"} #{node.to.to_sass(@options)}#{yield}"
   end
 
   def visit_function(node)
@@ -203,7 +202,8 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
     unless node.args.empty? && node.keywords.empty? && node.splat.nil?
       args = node.args.map(&arg_to_sass)
-      keywords = node.keywords.as_stored.to_a.map {|k, v| "$#{dasherize(k)}: #{arg_to_sass[v]}"}
+      keywords = Sass::Util.hash_to_a(node.keywords.as_stored).
+        map {|k, v| "$#{dasherize(k)}: #{arg_to_sass[v]}"}
 
       if node.splat
         splat = "#{arg_to_sass[node.splat]}..."
@@ -280,7 +280,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   # Visit rule-level nodes and return their conversion with appropriate
   # whitespace added.
   def visit_rule_level(nodes)
-    (nodes + [nil]).each_cons(2).map do |child, nxt|
+    Sass::Util.enum_cons(nodes + [nil], 2).map do |child, nxt|
       visit(child) +
         if nxt &&
             (child.is_a?(Sass::Tree::CommentNode) && child.line + child.lines + 1 == nxt.line) ||
@@ -288,9 +288,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
               child.line + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
               child.line + 1 == nxt.line) ||
-            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode)) ||
-            (child.is_a?(Sass::Tree::MixinNode) && nxt.is_a?(Sass::Tree::MixinNode) &&
-              child.line + 1 == nxt.line)
+            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode))
           ""
         else
           "\n"
@@ -342,7 +340,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def dasherize(s)
     if @options[:dasherize]
-      s.tr('_', '-')
+      s.gsub('_', '-')
     else
       s
     end