scss_beautifier 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73fc34d46f5c23ba992bd5811f31e9700fca0cb
-  data.tar.gz: 1367fe11e2d4a23778a2a337dcbbea70ab0078e2
+  metadata.gz: a9d5f273367280c4e6eab6f3531573de63b1cb7c
+  data.tar.gz: 74cd0b8adc662dd488297016c5528ec3a9363e0e
 SHA512:
-  metadata.gz: 63b72aa241ee07e6f7c83c32c4bfc366d4635c3dbb6b7313b225930070d267df6be7cb77c31afcb21fe87411340892fdd7fc33236d8eed14ee611ae836cebc83
-  data.tar.gz: dc2058530a0b6ed413950482ca60fef4ce4f883e8c312eb67059800a37c3717cb59fe0d18565b0fe163261cabb5826dc51428259a6ca4d25c83d886b37ac1e27
+  metadata.gz: aa37cb636e1b66f8def9c94cfea9fde573588005ae28aee6156779be16fd7dd627933da63ab7141191244d481ea8c07ec61fcd4004b86ed44f3ae5e8edc45e24
+  data.tar.gz: e51be58ffbe4dc6ef1e727938f6b4dc46de1e17fc00f92164bb2fcf8d7adc5f710f93ec8639ddab2f7d23451def959b9a211f177902472233e73c49287521b13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scss_beautifier (0.1.16)
+    scss_beautifier (0.1.17)
       sass (~> 3.4)
 
 GEM

data/lib/scss_beautifier.rb

@@ -34,3 +34,12 @@ require "scss_beautifier/formatters/selector"
 require "scss_beautifier/formatters/shorthand"
 require "scss_beautifier/formatters/string_quotes"
 require "scss_beautifier/formatters/trailing_zero"
+
+class Sass::Tree::Node
+  attr_accessor :scss_beautifier_options
+
+  def scss_beautifier_options
+    @scss_beautifier_options ||= {}
+  end
+
+end

data/lib/scss_beautifier/convert.rb

@@ -32,8 +32,8 @@ class SCSSBeautifier::Convert < Sass::Tree::Visitors::Convert
   # whitespace added.
   def visit_rule_level(nodes)
     Sass::Util.enum_cons(nodes + [nil], 2).map do |child, nxt|
-      visit(child) +
-        if nxt &&
+      child_value = visit(child)
+      spacing = if nxt &&
             (child.is_a?(Sass::Tree::CommentNode) && child.line + child.lines + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::ImportNode) && nxt.is_a?(Sass::Tree::ImportNode) &&
               child.line + 1 == nxt.line) ||
@@ -52,7 +52,24 @@ class SCSSBeautifier::Convert < Sass::Tree::Visitors::Convert
             "\n"
           end
         end
+      if inline_comment?(child, nxt)
+        child_value.rstrip!
+        spacing = ""
+        nxt.scss_beautifier_options[:inline] = true
+      elsif child.scss_beautifier_options[:inline]
+        spacing = ""
+      end
+      child_value + spacing
     end.join.rstrip + "\n"
   end
 
+  def visit_comment(node)
+    value = super
+    node.scss_beautifier_options[:inline] ? ' ' + value.lstrip! : value
+  end
+
+  def inline_comment?(node, comment_node)
+    comment_node.is_a?(Sass::Tree::CommentNode) && node.line == comment_node.line
+  end
+
 end

data/lib/scss_beautifier/formatters/property_sort_order.rb

@@ -4,6 +4,8 @@ class SCSSBeautifier::Formatters::PropertySortOrder < SCSSBeautifier::Formatters
     visit_children(node)
   end
 
+  private
+
   def order_children(node)
     prop_nodes = []
     comment_array = []
@@ -12,7 +14,12 @@ class SCSSBeautifier::Formatters::PropertySortOrder < SCSSBeautifier::Formatters
       hash_key = child.class.node_name.to_s
       if hash_key == 'comment'
         seen_comments << child
-        comment_array << child
+        prev_grouping = prop_nodes.last
+        if prop_node_for(prev_grouping).line == child.line
+          prev_grouping << child
+        else
+          comment_array << child
+        end
       elsif hash_key == 'prop'
         prop_nodes << comment_array.push(child)
         comment_array = []
@@ -22,7 +29,7 @@ class SCSSBeautifier::Formatters::PropertySortOrder < SCSSBeautifier::Formatters
     # account for remaining comments
     seen_comments -= comment_array
 
-    prop_nodes.sort! { |x,y| x.last.name[0] <=> y.last.name[0] }
+    prop_nodes.sort! { |x,y| prop_node_for(x).name[0] <=> prop_node_for(y).name[0] }
     # Replace children being respective of other types of props/funcs/etc
     children = []
     node.children.each do |child|
@@ -35,4 +42,9 @@ class SCSSBeautifier::Formatters::PropertySortOrder < SCSSBeautifier::Formatters
     end
     node.children = children
   end
+
+  # In an Array of nodes, get the prop node
+  def prop_node_for(grouping)
+    grouping.find { |node| node.class.node_name == :prop }
+  end
 end

data/lib/scss_beautifier/version.rb

@@ -1,3 +1,3 @@
 module SCSSBeautifier
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/tmp/dump.txt

@@ -49,6 +49,7 @@ https://github.com/sasstools/sass-lint/blob/master/docs/rules/mixin-name-format.
 
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/no-warn.md
 how do maps look like? newlines separation?
+parenthesis around if statements?
 
 
 These are spacing rules that come out of the box:

data/web/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     rack-protection (1.5.3)
       rack
     sass (3.4.22)
-    scss_beautifier (0.1.14)
+    scss_beautifier (0.1.16)
       sass (~> 3.4)
     sinatra (1.4.7)
       rack (~> 1.5)

data/web/Procfile

@@ -0,0 +1 @@
+web: bundle exec rackup config.ru -p $PORT

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_beautifier
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Ivan Tse
@@ -129,6 +129,7 @@ files:
 - tmp/dump.txt
 - web/Gemfile
 - web/Gemfile.lock
+- web/Procfile
 - web/app.rb
 - web/config.ru
 - web/public/imgs/gh.png