oreorenasass 3.4.4 → 3.4.5

data/lib/sass/tree/prop_node.rb

@@ -1,14 +1,14 @@
 module Sass::Tree
-  # A static node representing a CSS property.
+  # A static node reprenting a CSS property.
   #
   # @see Sass::Tree
   class PropNode < Node
     # The name of the property,
-    # interspersed with {Sass::Script::Tree::Node}s
+    # interspersed with {Sass::Script::Node}s
     # representing `#{}`-interpolation.
     # Any adjacent strings will be merged together.
     #
-    # @return [Array<String, Sass::Script::Tree::Node>]
+    # @return [Array<String, Sass::Script::Node>]
     attr_accessor :name
 
     # The name of the property
@@ -20,7 +20,7 @@ module Sass::Tree
 
     # The value of the property.
     #
-    # @return [Sass::Script::Tree::Node]
+    # @return [Sass::Script::Node]
     attr_accessor :value
 
     # The value of the property
@@ -42,18 +42,8 @@ module Sass::Tree
     # @return [Fixnum]
     attr_accessor :tabs
 
-    # The source range in which the property name appears.
-    #
-    # @return [Sass::Source::Range]
-    attr_accessor :name_source_range
-
-    # The source range in which the property value appears.
-    #
-    # @return [Sass::Source::Range]
-    attr_accessor :value_source_range
-
-    # @param name [Array<String, Sass::Script::Tree::Node>] See \{#name}
-    # @param value [Sass::Script::Tree::Node] See \{#value}
+    # @param name [Array<String, Sass::Script::Node>] See \{#name}
+    # @param value [Sass::Script::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)
@@ -80,13 +70,7 @@ module Sass::Tree
     #
     # @return [String] The message
     def pseudo_class_selector_message
-      if @prop_syntax == :new ||
-          !value.is_a?(Sass::Script::Tree::Literal) ||
-          !value.value.is_a?(Sass::Script::Value::String) ||
-          !value.value.value.empty?
-        return ""
-      end
-
+      return "" if @prop_syntax == :new || !value.is_a?(Sass::Script::String) || !value.value.empty?
       "\nIf #{declaration.dump} should be a selector, use \"\\#{declaration}\" instead."
     end
 
@@ -97,10 +81,9 @@ module Sass::Tree
     # @param opts [{Symbol => Object}] The options hash for the 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
+      name = self.name.map {|n| n.is_a?(String) ? n : "\#{#{n.to_sass(opts)}}"}.join
       if name[0] == ?:
-        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\"" +
-                                    " hack is not allowed in the Sass indented syntax")
+        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\" hack is not allowed in the Sass indented syntax")
       end
 
       old = opts[:old] && fmt == :sass
@@ -121,8 +104,7 @@ module Sass::Tree
     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.")
+          "Illegal property syntax: can't use #{@prop_syntax} syntax when :property_syntax => #{@options[:property_syntax].inspect} is set.")
       end
     end
 
@@ -135,37 +117,36 @@ module Sass::Tree
       private
 
       def val_to_sass_comma(node, opts)
-        return node unless node.is_a?(Sass::Script::Tree::Operation)
+        return node unless node.is_a?(Sass::Script::Operation)
         return val_to_sass_concat(node, opts) unless node.operator == :comma
 
-        Sass::Script::Tree::Operation.new(
+        Sass::Script::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 node unless node.is_a?(Sass::Script::Operation)
         return val_to_sass_div(node, opts) unless node.operator == :space
 
-        Sass::Script::Tree::Operation.new(
+        Sass::Script::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)
+        unless node.is_a?(Sass::Script::Operation) && node.operator == :div &&
+            node.operand1.is_a?(Sass::Script::Number) &&
+            node.operand2.is_a?(Sass::Script::Number) &&
+            (!node.operand1.original || !node.operand2.original)
           return node
         end
 
-        Sass::Script::Value::String.new("(#{node.to_sass(opts)})")
+        Sass::Script::String.new("(#{node.to_sass(opts)})")
       end
+
     end
   end
 end

data/lib/sass/tree/return_node.rb

@@ -5,11 +5,10 @@ module Sass
     # @see Sass::Tree
     class ReturnNode < Node
       # The expression to return.
-      #
-      # @return [Script::Tree::Node]
+      # @type [Script::Node]
       attr_accessor :expr
 
-      # @param expr [Script::Tree::Node] The expression to return
+      # @param expr [Script::Node] The expression to return
       def initialize(expr)
         @expr = expr
         super()

data/lib/sass/tree/root_node.rb

@@ -13,31 +13,15 @@ module Sass
         @template = template
       end
 
-      # Runs the dynamic Sass code and computes the CSS for the tree.
-      #
-      # @return [String] The compiled CSS.
+      # Runs the dynamic Sass code *and* computes the CSS for the tree.
+      # @see #to_s
       def render
-        css_tree.css
-      end
-
-      # Runs the dynamic Sass code and computes the CSS for the tree, along with
-      # the sourcemap.
-      #
-      # @return [(String, Sass::Source::Map)] The compiled CSS, as well as
-      #   the source map. @see #render
-      def render_with_sourcemap
-        css_tree.css_with_sourcemap
-      end
-
-      private
-
-      def css_tree
         Visitors::CheckNesting.visit(self)
         result = Visitors::Perform.visit(self)
         Visitors::CheckNesting.visit(result) # Check again to validate mixins
         result, extends = Visitors::Cssize.visit(result)
         Visitors::Extend.visit(result, extends)
-        result
+        result.to_s
       end
     end
   end

data/lib/sass/tree/rule_node.rb

@@ -1,7 +1,8 @@
 require 'pathname'
+require 'uri'
 
 module Sass::Tree
-  # A static node representing a CSS rule.
+  # A static node reprenting a CSS rule.
   #
   # @see Sass::Tree
   class RuleNode < Node
@@ -9,24 +10,24 @@ module Sass::Tree
     PARENT = '&'
 
     # The CSS selector for this rule,
-    # interspersed with {Sass::Script::Tree::Node}s
+    # interspersed with {Sass::Script::Node}s
     # representing `#{}`-interpolation.
     # Any adjacent strings will be merged together.
     #
-    # @return [Array<String, Sass::Script::Tree::Node>]
+    # @return [Array<String, Sass::Script::Node>]
     attr_accessor :rule
 
-    # The CSS selector for this rule, without any unresolved
-    # interpolation but with parent references still intact. It's only
-    # guaranteed to be set once {Tree::Visitors::Perform} has been
-    # run, but it may be set before then for optimization reasons.
+    # The CSS selector for this rule,
+    # without any unresolved interpolation
+    # but with parent references still intact.
+    # It's only set once {Tree::Node#perform} has been called.
     #
     # @return [Selector::CommaSequence]
     attr_accessor :parsed_rules
 
-    # The CSS selector for this rule, without any unresolved
-    # interpolation or parent references. It's only set once
-    # {Tree::Visitors::Perform} has been run.
+    # The CSS selector for this rule,
+    # without any unresolved interpolation or parent references.
+    # It's only set once {Tree::Visitors::Cssize} has been run.
     #
     # @return [Selector::CommaSequence]
     attr_accessor :resolved_rules
@@ -43,10 +44,6 @@ module Sass::Tree
     # @return [Fixnum]
     attr_accessor :tabs
 
-    # The entire selector source range for this rule.
-    # @return [Sass::Source::Range]
-    attr_accessor :selector_source_range
-
     # Whether or not this rule is the last rule in a nested group.
     # This is only set in a CSS tree.
     #
@@ -57,23 +54,16 @@ module Sass::Tree
     # This is only readable in a CSS tree as it is written during the perform step
     # and only when the :trace_selectors option is set.
     #
-    # @return [String]
+    # @return [Array<String>]
     attr_accessor :stack_trace
 
-    # @param rule [Array<String, Sass::Script::Tree::Node>, Sass::Selector::CommaSequence]
-    #   The CSS rule, either unparsed or parsed.
-    # @param selector_source_range [Sass::Source::Range]
-    def initialize(rule, selector_source_range = nil)
-      if rule.is_a?(Sass::Selector::CommaSequence)
-        @rule = [rule.to_s]
-        @parsed_rules = rule
-      else
-        merged = Sass::Util.merge_adjacent_strings(rule)
-        @rule = Sass::Util.strip_string_array(merged)
-        try_to_parse_non_interpolated_rules
-      end
-      @selector_source_range = selector_source_range
+    # @param rule [Array<String, Sass::Script::Node>]
+    #   The CSS rule. See \{#rule}
+    def initialize(rule)
+      merged = Sass::Util.merge_adjacent_strings(rule)
+      @rule = Sass::Util.strip_string_array(merged)
       @tabs = 0
+      try_to_parse_non_interpolated_rules
       super()
     end
 
@@ -115,13 +105,12 @@ module Sass::Tree
 
     # A hash that will be associated with this rule in the CSS document
     # if the {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option} is enabled.
-    # This data is used by e.g. [the FireSass Firebug
-    # extension](https://addons.mozilla.org/en-US/firefox/addon/103988).
+    # This data is used by e.g. [the FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988).
     #
     # @return [{#to_s => #to_s}]
     def debug_info
-      {:filename => filename && ("file://" + Sass::Util.escape_uri(File.expand_path(filename))),
-       :line => line}
+      {:filename => filename && ("file://" + URI.escape(File.expand_path(filename))),
+       :line => self.line}
     end
 
     # A rule node is invisible if it has only placeholder selectors.
@@ -135,10 +124,8 @@ module Sass::Tree
       if @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 = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
-        # rubocop:disable RescueModifier
+        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, '', 1)
         @parsed_rules = parser.parse_selector rescue nil
-        # rubocop:enable RescueModifier
       end
     end
   end

data/lib/sass/tree/supports_node.rb

@@ -1,5 +1,8 @@
 module Sass::Tree
   # A static node representing a `@supports` rule.
+  # `@supports` rules behave differently from other directives
+  # in that when they're nested within rules,
+  # they bubble up to top-level.
   #
   # @see Sass::Tree
   class SupportsNode < DirectiveNode
@@ -13,10 +16,17 @@ module Sass::Tree
     # @return [Sass::Supports::Condition]
     attr_accessor :condition
 
+    # @see RuleNode#tabs
+    attr_accessor :tabs
+
+    # @see RuleNode#group_end
+    attr_accessor :group_end
+
     # @param condition [Sass::Supports::Condition] See \{#condition}
     def initialize(name, condition)
       @name = name
       @condition = condition
+      @tabs = 0
       super('')
     end
 
@@ -34,5 +44,8 @@ module Sass::Tree
     def invisible?
       children.all? {|c| c.invisible?}
     end
+
+    # @see Node#bubbles?
+    def bubbles?; true; end
   end
 end

data/lib/sass/tree/trace_node.rb

@@ -7,7 +7,6 @@ module Sass::Tree
   # @see Sass::Tree
   class TraceNode < Node
     # The name of the trace entry to add.
-    #
     # @return [String]
     attr_reader :name
 
@@ -20,7 +19,7 @@ module Sass::Tree
 
     # Initializes this node from an existing node.
     # @param name [String] The name of the trace entry to add.
-    # @param node [Node] The node to copy information from.
+    # @param mixin [Node] The node to copy information from.
     # @return [TraceNode]
     def self.from_node(name, node)
       trace = new(name)

data/lib/sass/tree/variable_node.rb

@@ -9,26 +9,20 @@ module Sass
       attr_reader :name
 
       # The parse tree for the variable value.
-      # @return [Script::Tree::Node]
+      # @return [Script::Node]
       attr_accessor :expr
 
       # Whether this is a guarded variable assignment (`!default`).
       # @return [Boolean]
       attr_reader :guarded
 
-      # Whether this is a global variable assignment (`!global`).
-      # @return [Boolean]
-      attr_reader :global
-
       # @param name [String] The name of the variable
-      # @param expr [Script::Tree::Node] See \{#expr}
+      # @param expr [Script::Node] See \{#expr}
       # @param guarded [Boolean] See \{#guarded}
-      # @param global [Boolean] See \{#global}
-      def initialize(name, expr, guarded, global)
+      def initialize(name, expr, guarded)
         @name = name
         @expr = expr
         @guarded = guarded
-        @global = global
         super()
       end
     end

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

@@ -32,8 +32,9 @@ module Sass::Tree::Visitors
     # @param node [Tree::Node] The node to visit.
     # @return [Object] The return value of the `visit_*` method for this node.
     def visit(node)
-      if respond_to?(node.class.visit_method, true)
-        send(node.class.visit_method, node) {visit_children(node)}
+      method = "visit_#{node_name node}"
+      if self.respond_to?(method, true)
+        self.send(method, node) {visit_children(node)}
       else
         visit_children(node)
       end
@@ -52,13 +53,15 @@ module Sass::Tree::Visitors
       parent.children.map {|c| visit(c)}
     end
 
+    NODE_NAME_RE = /.*::(.*?)Node$/
+
     # Returns the name of a node as used in the `visit_*` method.
     #
     # @param [Tree::Node] node The node.
     # @return [String] The name.
-    def self.node_name(node)
-      Sass::Util.deprecated(self, "Call node.class.node_name instead.")
-      node.class.node_name
+    def node_name(node)
+      @@node_names ||= {}
+      @@node_names[node.class.name] ||= node.class.name.gsub(NODE_NAME_RE, '\\1').downcase
     end
 
     # `yield`s, then runs the visitor on the `@else` clause if the node has one.

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

@@ -7,9 +7,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def visit(node)
-    if (error = @parent && (
-        try_send(@parent.class.invalid_child_method_name, @parent, node) ||
-        try_send(node.class.invalid_parent_method_name, @parent, node)))
+    if error = @parent && (
+        try_send("invalid_#{node_name @parent}_child?", @parent, node) ||
+        try_send("invalid_#{node_name node}_parent?", @parent, node))
       raise Sass::SyntaxError.new(error)
     end
     super
@@ -19,38 +19,17 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   CONTROL_NODES = [Sass::Tree::EachNode, Sass::Tree::ForNode, Sass::Tree::IfNode,
-                   Sass::Tree::WhileNode, Sass::Tree::TraceNode]
+    Sass::Tree::WhileNode, Sass::Tree::TraceNode]
   SCRIPT_NODES = [Sass::Tree::ImportNode] + CONTROL_NODES
   def visit_children(parent)
     old_parent = @parent
-
-    # When checking a static tree, resolve at-roots to be sure they won't send
-    # nodes where they don't belong.
-    if parent.is_a?(Sass::Tree::AtRootNode) && parent.resolved_value
-      old_parents = @parents
-      @parents = @parents.reject {|p| parent.exclude_node?(p)}
-      @parent = Sass::Util.enum_with_index(@parents.reverse).
-        find {|p, i| !transparent_parent?(p, @parents[-i - 2])}.first
-
-      begin
-        return super
-      ensure
-        @parents = old_parents
-        @parent = old_parent
-      end
-    end
-
-    unless transparent_parent?(parent, old_parent)
-      @parent = parent
-    end
-
+    @parent = parent unless is_any_of?(parent, SCRIPT_NODES) ||
+      (parent.bubbles? && !old_parent.is_a?(Sass::Tree::RootNode))
     @parents.push parent
-    begin
-      super
-    ensure
-      @parent = old_parent
-      @parents.pop
-    end
+    super
+  ensure
+    @parent = old_parent
+    @parents.pop
   end
 
   def visit_root(node)
@@ -123,7 +102,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
 
   VALID_FUNCTION_CHILDREN = [
     Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::ReturnNode,
-    Sass::Tree::VariableNode, Sass::Tree::WarnNode, Sass::Tree::ErrorNode
+    Sass::Tree::VariableNode, Sass::Tree::WarnNode
   ] + CONTROL_NODES
   def invalid_function_child?(parent, child)
     unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
@@ -131,21 +110,19 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     end
   end
 
-  VALID_PROP_CHILDREN =  CONTROL_NODES + [Sass::Tree::CommentNode,
-                                          Sass::Tree::PropNode,
-                                          Sass::Tree::MixinNode]
+  VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode, Sass::Tree::MixinNode] + CONTROL_NODES
   def invalid_prop_child?(parent, child)
     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]
+  VALID_PROP_PARENTS = [Sass::Tree::RuleNode, 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
+      "Properties are only allowed within rules, directives, mixin includes, or other properties." + child.pseudo_class_selector_message
     end
   end
 
@@ -155,19 +132,11 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
 
   private
 
-  # Whether `parent` should be assigned to `@parent`.
-  def transparent_parent?(parent, grandparent)
-    is_any_of?(parent, SCRIPT_NODES) ||
-      (parent.bubbles? &&
-       !grandparent.is_a?(Sass::Tree::RootNode) &&
-       !grandparent.is_a?(Sass::Tree::AtRootNode))
-  end
-
   def is_any_of?(val, classes)
-    classes.each do |c|
+    for c in classes
       return true if val.is_a?(c)
     end
-    false
+    return false
   end
 
   def try_send(method, *args)
@@ -175,3 +144,4 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     send(method, *args)
   end
 end
+