haml-edge 2.1.4 → 2.1.5

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/lib/sass/css.rb

@@ -273,21 +273,25 @@ module Sass
     #       color: blue
     #
     def parent_ref_rules(root)
-      rules = OrderedHash.new
+      current_rule = nil
       root.children.select { |c| Tree::RuleNode === c }.each do |child|
         root.children.delete child
         first, rest = child.rules.first.scan(/^(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?$/).first
-        rules[first] ||= Tree::RuleNode.new(first, {})
+
+        if current_rule.nil? || current_rule.rules.first != first
+          current_rule = Tree::RuleNode.new(first, {})
+          root << current_rule
+        end
+
         if rest
           child.rules = ["&" + rest]
-          rules[first] << child
+          current_rule << child
         else
-          rules[first].children += child.children
+          current_rule.children += child.children
         end
       end
 
-      rules.values.each { |v| parent_ref_rules(v) }
-      root.children += rules.values
+      root.children.each { |v| parent_ref_rules(v) }
     end
 
     # Remove useless parent refs so that

data/lib/sass/tree/rule_node.rb

@@ -5,7 +5,7 @@ module Sass::Tree
     # The character used to include the parent selector
     PARENT = '&'
 
-    attr_accessor :rules
+    attr_accessor :rules, :parsed_rules
 
     def initialize(rule, options)
       @rules = [rule]
@@ -25,7 +25,7 @@ module Sass::Tree
     end
 
     def to_s(tabs, super_rules = nil)
-      resolve_parent_refs!(super_rules)
+      resolved_rules = resolve_parent_refs(super_rules)
 
       attributes = []
       sub_rules = []
@@ -35,7 +35,7 @@ module Sass::Tree
       rule_indent = '  ' * (tabs - 1)
       per_rule_indent, total_indent = [:nested, :expanded].include?(@style) ? [rule_indent, ''] : ['', rule_indent]
 
-      total_rule = total_indent + @rules.map do |line|
+      total_rule = total_indent + resolved_rules.map do |line|
         per_rule_indent + line.join(rule_separator)
       end.join(line_separator)
 
@@ -86,7 +86,7 @@ module Sass::Tree
 
       tabs += 1 unless attributes.empty? || @style != :nested
       sub_rules.each do |sub|
-        to_return << sub.to_s(tabs, @rules)
+        to_return << sub.to_s(tabs, resolved_rules)
       end
 
       to_return
@@ -94,28 +94,27 @@ module Sass::Tree
 
     protected
 
-    def resolve_parent_refs!(super_rules)
+    def resolve_parent_refs(super_rules)
       if super_rules.nil?
-        @rules.each do |line|
-          line.map! do |rule|
+        return @parsed_rules.map do |line|
+          line.map do |rule|
             if rule.include?(:parent)
               raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '#{PARENT}'.", self.line)
             end
 
             rule.join
-          end.compact!
+          end.compact
         end
-        return
       end
 
       new_rules = []
       super_rules.each do |super_line|
-        @rules.each do |line|
+        @parsed_rules.each do |line|
           new_rules << []
 
           super_line.each do |super_rule|
             line.each do |rule|
-              rule.unshift(:parent, " ") unless rule.include?(:parent)
+              rule = [:parent, " ", *rule] unless rule.include?(:parent)
 
               new_rules.last << rule.map do |segment|
                 next segment unless segment == :parent
@@ -125,11 +124,11 @@ module Sass::Tree
           end
         end
       end
-      @rules = new_rules
+      new_rules
     end
 
     def perform!(environment)
-      @rules = @rules.map {|r| parse_selector(interpolate(r, environment))}
+      @parsed_rules = @rules.map {|r| parse_selector(interpolate(r, environment))}
       super
     end
 

data/test/sass/css2sass_test.rb

@@ -51,6 +51,28 @@ li a:hover {
 CSS
   end
 
+  def test_no_nesting_around_rules
+    assert_equal(<<SASS, css2sass(<<CSS))
+div .warning
+  :color #d21a19
+
+
+span .debug
+  :cursor crosshair
+
+
+div .debug
+  :cursor default
+SASS
+div .warning {
+  color: #d21a19; }
+span .debug { 
+  cursor: crosshair;}
+div .debug {
+  cursor: default; }
+CSS
+  end
+
   def test_comments_multiline
     css = <<CSS
 /* comment */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - Nathan Weizenbaum