oreorenasass 3.4.4 → 3.4.5

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

@@ -15,28 +15,18 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
     super
   end
 
-  def visit_comment(node)
-    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
-    yield
-  end
-
   def visit_debug(node)
     node.expr.options = @options
     yield
   end
 
-  def visit_error(node)
-    node.expr.options = @options
-    yield
-  end
-
   def visit_each(node)
     node.list.options = @options
     yield
   end
 
   def visit_extend(node)
-    node.selector.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
+    node.selector.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
     yield
   end
 
@@ -51,7 +41,6 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
       k.options = @options
       v.options = @options if v
     end
-    node.splat.options = @options if node.splat
     yield
   end
 
@@ -74,20 +63,17 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
       k.options = @options
       v.options = @options if v
     end
-    node.splat.options = @options if node.splat
     yield
   end
 
   def visit_mixin(node)
     node.args.each {|a| a.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
   end
 
   def visit_prop(node)
-    node.name.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
+    node.name.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
     node.value.options = @options
     yield
   end
@@ -98,7 +84,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_rule(node)
-    node.rule.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
+    node.rule.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
     yield
   end
 
@@ -118,17 +104,17 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_directive(node)
-    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
+    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
     yield
   end
 
   def visit_media(node)
-    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
+    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
     yield
   end
 
   def visit_cssimport(node)
-    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)} if node.query
+    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)} if node.query
     yield
   end
 

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

@@ -1,25 +1,11 @@
 # A visitor for converting a Sass tree into CSS.
 class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
-  # The source mapping for the generated CSS file. This is only set if
-  # `build_source_mapping` is passed to the constructor and \{Sass::Engine#render} has been
-  # run.
-  attr_reader :source_mapping
+  protected
 
-  # @param build_source_mapping [Boolean] Whether to build a
-  #   \{Sass::Source::Map} while creating the CSS output. The mapping will
-  #   be available from \{#source\_mapping} after the visitor has completed.
-  def initialize(build_source_mapping = false)
+  def initialize
     @tabs = 0
-    @line = 1
-    @offset = 1
-    @result = ""
-    @source_mapping = Sass::Source::Map.new if build_source_mapping
   end
 
-  # Runs the visitor on `node`.
-  #
-  # @param node [Sass::Tree::Node] The root node of the tree to convert to CSS>
-  # @return [String] The CSS output.
   def visit(node)
     super
   rescue Sass::SyntaxError => e
@@ -27,8 +13,6 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     raise e
   end
 
-  protected
-
   def with_tabs(tabs)
     old_tabs, @tabs = @tabs, tabs
     yield
@@ -36,203 +20,97 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     @tabs = old_tabs
   end
 
-  # Associate all output produced in a block with a given node. Used for source
-  # mapping.
-  def for_node(node, attr_prefix = nil)
-    return yield unless @source_mapping
-    start_pos = Sass::Source::Position.new(@line, @offset)
-    yield
-
-    range_attr = attr_prefix ? :"#{attr_prefix}_source_range" : :source_range
-    return if node.invisible? || !node.send(range_attr)
-    source_range = node.send(range_attr)
-    target_end_pos = Sass::Source::Position.new(@line, @offset)
-    target_range = Sass::Source::Range.new(start_pos, target_end_pos, nil)
-    @source_mapping.add(source_range, target_range)
-  end
-
-  # Move the output cursor back `chars` characters.
-  def erase!(chars)
-    return if chars == 0
-    str = @result.slice!(-chars..-1)
-    newlines = str.count("\n")
-    if newlines > 0
-      @line -= newlines
-      @offset = @result[@result.rindex("\n") || 0..-1].size
-    else
-      @offset -= chars
-    end
-  end
-
-  # Avoid allocating lots of new strings for `#output`. This is important
-  # because `#output` is called all the time.
-  NEWLINE = "\n"
-
-  # Add `s` to the output string and update the line and offset information
-  # accordingly.
-  def output(s)
-    if @lstrip
-      s = s.gsub(/\A\s+/, "")
-      @lstrip = false
-    end
-
-    newlines = s.count(NEWLINE)
-    if newlines > 0
-      @line += newlines
-      @offset = s[s.rindex(NEWLINE)..-1].size
-    else
-      @offset += s.size
-    end
-
-    @result << s
-  end
-
-  # Strip all trailing whitespace from the output string.
-  def rstrip!
-    erase! @result.length - 1 - (@result.rindex(/[^\s]/) || -1)
-  end
-
-  # lstrip the first output in the given block.
-  def lstrip
-    old_lstrip = @lstrip
-    @lstrip = true
-    yield
-  ensure
-    @lstrip = @lstrip && old_lstrip
-  end
-
-  # Prepend `prefix` to the output string.
-  def prepend!(prefix)
-    @result.insert 0, prefix
-    return unless @source_mapping
-
-    line_delta = prefix.count("\n")
-    offset_delta = prefix.gsub(/.*\n/, '').size
-    @source_mapping.shift_output_offsets(offset_delta)
-    @source_mapping.shift_output_lines(line_delta)
-  end
-
   def visit_root(node)
+    result = String.new
     node.children.each do |child|
       next if child.invisible?
-      visit(child)
-      unless node.style == :compressed
-        output "\n"
-        if child.is_a?(Sass::Tree::DirectiveNode) && child.has_children && !child.bubbles?
-          output "\n"
+      child_str = visit(child)
+      result << child_str + (node.style == :compressed ? '' : "\n")
+    end
+    result.rstrip!
+    return "" if result.empty?
+    result << "\n"
+    unless Sass::Util.ruby1_8? || result.ascii_only?
+      if node.children.first.is_a?(Sass::Tree::CharsetNode)
+        begin
+          encoding = node.children.first.name
+          # Default to big-endian encoding, because we have to decide somehow
+          encoding << 'BE' if encoding =~ /\Autf-(16|32)\Z/i
+          result = result.encode(Encoding.find(encoding))
+        rescue EncodingError
         end
       end
-    end
-    rstrip!
-    return "" if @result.empty?
 
-    output "\n"
-
-    unless Sass::Util.ruby1_8? || @result.ascii_only?
-      if node.style == :compressed
-        # A byte order mark is sufficient to tell browsers that this
-        # file is UTF-8 encoded, and will override any other detection
-        # methods as per http://encoding.spec.whatwg.org/#decode-and-encode.
-        prepend! "\uFEFF"
-      else
-        prepend! "@charset \"UTF-8\";\n"
-      end
+      result = "@charset \"#{result.encoding.name}\";#{
+        node.style == :compressed ? '' : "\n"
+      }".encode(result.encoding) + result
     end
-
-    @result
+    result
   rescue Sass::SyntaxError => e
     e.sass_template ||= node.template
     raise e
   end
 
   def visit_charset(node)
-    for_node(node) {output("@charset \"#{node.name}\";")}
-  end
+    "@charset \"#{node.name}\";"
+  end 
 
   def visit_comment(node)
     return if node.invisible?
     spaces = ('  ' * [@tabs - node.resolved_value[/^ */].size, 0].max)
 
     content = node.resolved_value.gsub(/^/, spaces)
-    if node.type == :silent
-      content.gsub!(%r{^(\s*)//(.*)$}) {|md| "#{$1}/*#{$2} */"}
-    end
-    if (node.style == :compact || node.style == :compressed) && node.type != :loud
-      content.gsub!(/\n +(\* *(?!\/))?/, ' ')
-    end
-    for_node(node) {output(content)}
+    content.gsub!(%r{^(\s*)//(.*)$}) {|md| "#{$1}/*#{$2} */"} if node.type == :silent
+    content.gsub!(/\n +(\* *(?!\/))?/, ' ') if (node.style == :compact || node.style == :compressed) && node.type != :loud
+    content
   end
 
-  # @comment
-  #   rubocop:disable MethodLength
   def visit_directive(node)
     was_in_directive = @in_directive
     tab_str = '  ' * @tabs
-    if !node.has_children || node.children.empty?
-      output(tab_str)
-      for_node(node) {output(node.resolved_value)}
-      output(!node.has_children ? ";" : " {}")
-      return
-    end
-
+    return tab_str + node.resolved_value + ";" unless node.has_children
+    return tab_str + node.resolved_value + " {}" if node.children.empty?
     @in_directive = @in_directive || !node.is_a?(Sass::Tree::MediaNode)
-    output(tab_str) if node.style != :compressed
-    for_node(node) {output(node.resolved_value)}
-    output(node.style == :compressed ? "{" : " {")
-    output(node.style == :compact ? ' ' : "\n") if node.style != :compressed
-
+    result = if node.style == :compressed
+               "#{node.resolved_value}{"
+             else
+               "#{tab_str}#{node.resolved_value} {" + (node.style == :compact ? ' ' : "\n")
+             end
     was_prop = false
     first = true
     node.children.each do |child|
       next if child.invisible?
       if node.style == :compact
         if child.is_a?(Sass::Tree::PropNode)
-          with_tabs(first || was_prop ? 0 : @tabs + 1) do
-            visit(child)
-            output(' ')
-          end
+          with_tabs(first || was_prop ? 0 : @tabs + 1) {result << visit(child) << ' '}
         else
-          if was_prop
-            erase! 1
-            output "\n"
-          end
-
-          if first
-            lstrip {with_tabs(@tabs + 1) {visit(child)}}
-          else
-            with_tabs(@tabs + 1) {visit(child)}
-          end
-
-          rstrip!
-          output "\n"
+          result[-1] = "\n" if was_prop
+          rendered = with_tabs(@tabs + 1) {visit(child).dup}
+          rendered = rendered.lstrip if first
+          result << rendered.rstrip + "\n"
         end
         was_prop = child.is_a?(Sass::Tree::PropNode)
         first = false
       elsif node.style == :compressed
-        output(was_prop ? ";" : "")
-        with_tabs(0) {visit(child)}
+        result << (was_prop ? ";" : "") << with_tabs(0) {visit(child)}
         was_prop = child.is_a?(Sass::Tree::PropNode)
       else
-        with_tabs(@tabs + 1) {visit(child)}
-        output "\n"
+        result << with_tabs(@tabs + 1) {visit(child)} + "\n"
       end
     end
-    rstrip!
-    if node.style == :expanded
-      output("\n#{tab_str}")
-    elsif node.style != :compressed
-      output(" ")
-    end
-    output("}")
+    result.rstrip + if node.style == :compressed
+                      "}"
+                    else
+                      (node.style == :expanded ? "\n" : " ") + "}\n"
+                    end
   ensure
     @in_directive = was_in_directive
   end
-  # @comment
-  #   rubocop:enable MethodLength
 
   def visit_media(node)
-    with_tabs(@tabs + node.tabs) {visit_directive(node)}
-    output("\n") if node.style != :compressed && node.group_end
+    str = with_tabs(@tabs + node.tabs) {visit_directive(node)}
+    str.gsub!(/\n\Z/, '') unless node.style == :compressed || node.group_end
+    str
   end
 
   def visit_supports(node)
@@ -246,39 +124,28 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   def visit_prop(node)
     return if node.resolved_value.empty?
     tab_str = '  ' * (@tabs + node.tabs)
-    output(tab_str)
-    for_node(node, :name) {output(node.resolved_name)}
     if node.style == :compressed
-      output(":")
-      for_node(node, :value) {output(node.resolved_value)}
+      "#{tab_str}#{node.resolved_name}:#{node.resolved_value}"
     else
-      output(": ")
-      for_node(node, :value) {output(node.resolved_value)}
-      output(";")
+      "#{tab_str}#{node.resolved_name}: #{node.resolved_value};"
     end
   end
 
-  # @comment
-  #   rubocop:disable MethodLength
   def visit_rule(node)
     with_tabs(@tabs + node.tabs) do
       rule_separator = node.style == :compressed ? ',' : ', '
       line_separator =
         case node.style
-        when :nested, :expanded; "\n"
-        when :compressed; ""
-        else; " "
+          when :nested, :expanded; "\n"
+          when :compressed; ""
+          else; " "
         end
       rule_indent = '  ' * @tabs
-      per_rule_indent, total_indent = if [:nested, :expanded].include?(node.style)
-                                        [rule_indent, '']
-                                      else
-                                        ['', rule_indent]
-                                      end
+      per_rule_indent, total_indent = [:nested, :expanded].include?(node.style) ? [rule_indent, ''] : ['', rule_indent]
 
       joined_rules = node.resolved_rules.members.map do |seq|
         next if seq.has_placeholder?
-        rule_part = seq.to_s
+        rule_part = seq.to_a.join
         if node.style == :compressed
           rule_part.gsub!(/([^,])\s*\n\s*/m, '\1 ')
           rule_part.gsub!(/\s*([,+>])\s*/m, '\1')
@@ -287,72 +154,54 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
         rule_part
       end.compact.join(rule_separator)
 
-      joined_rules.lstrip!
+      joined_rules.sub!(/\A\s*/, per_rule_indent)
       joined_rules.gsub!(/\s*\n\s*/, "#{line_separator}#{per_rule_indent}")
+      total_rule = total_indent << joined_rules
 
+      to_return = ''
       old_spaces = '  ' * @tabs
       if node.style != :compressed
         if node.options[:debug_info] && !@in_directive
-          visit(debug_info_rule(node.debug_info, node.options))
-          output "\n"
+          to_return << visit(debug_info_rule(node.debug_info, node.options)) << "\n"
         elsif node.options[:trace_selectors]
-          output("#{old_spaces}/* ")
-          output(node.stack_trace.gsub("\n", "\n   #{old_spaces}"))
-          output(" */\n")
+          to_return << "#{old_spaces}/* "
+          to_return << node.stack_trace.join("\n   #{old_spaces}")
+          to_return << " */\n"
         elsif node.options[:line_comments]
-          output("#{old_spaces}/* line #{node.line}")
+          to_return << "#{old_spaces}/* line #{node.line}"
 
           if node.filename
-            relative_filename =
-              if node.options[:css_filename]
-                begin
-                  Sass::Util.pathname(node.filename).relative_path_from(
-                    Sass::Util.pathname(File.dirname(node.options[:css_filename]))).to_s
-                rescue ArgumentError
-                  nil
-                end
+            relative_filename = if node.options[:css_filename]
+              begin
+                Pathname.new(node.filename).relative_path_from(
+                  Pathname.new(File.dirname(node.options[:css_filename]))).to_s
+              rescue ArgumentError
+                nil
               end
+            end
             relative_filename ||= node.filename
-            output(", #{relative_filename}")
+            to_return << ", #{relative_filename}"
           end
 
-          output(" */\n")
+          to_return << " */\n"
         end
       end
 
-      end_props, trailer, tabs  = '', '', 0
       if node.style == :compact
-        separator, end_props, bracket = ' ', ' ', ' { '
-        trailer = "\n" if node.group_end
+        properties = with_tabs(0) {node.children.map {|a| visit(a)}.join(' ')}
+        to_return << "#{total_rule} { #{properties} }#{"\n" if node.group_end}"
       elsif node.style == :compressed
-        separator, bracket = ';', '{'
+        properties = with_tabs(0) {node.children.map {|a| visit(a)}.join(';')}
+        to_return << "#{total_rule}{#{properties}}"
       else
-        tabs = @tabs + 1
-        separator, bracket = "\n", " {\n"
-        trailer = "\n" if node.group_end
+        properties = with_tabs(@tabs + 1) {node.children.map {|a| visit(a)}.join("\n")}
         end_props = (node.style == :expanded ? "\n" + old_spaces : ' ')
+        to_return << "#{total_rule} {\n#{properties}#{end_props}}#{"\n" if node.group_end}"
       end
-      output(total_indent + per_rule_indent)
-      for_node(node, :selector) {output(joined_rules)}
-      output(bracket)
 
-      with_tabs(tabs) do
-        node.children.each_with_index do |child, i|
-          output(separator) if i > 0
-          visit(child)
-        end
-      end
-
-      output(end_props)
-      output("}" + trailer)
+      to_return
     end
   end
-  # @comment
-  #   rubocop:enable MethodLength
-
-  def visit_keyframerule(node)
-    visit_directive(node)
-  end
 
   private
 
@@ -367,15 +216,13 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
                 false)
             ])
         ])
-      prop = Sass::Tree::PropNode.new([""], Sass::Script::Value::String.new(''), :new)
+      prop = Sass::Tree::PropNode.new([""], Sass::Script::String.new(''), :new)
       prop.resolved_name = "font-family"
       prop.resolved_value = Sass::SCSS::RX.escape_ident(v.to_s)
       rule << prop
       node << rule
     end
-    node.options = options.merge(:debug_info => false,
-                                 :line_comments => false,
-                                 :style => :compressed)
+    node.options = options.merge(:debug_info => false, :line_comments => false, :style => :compressed)
     node
   end
 end