scss_beautifier 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0617d3cf196fbecb1bc0cc9f6e77b26e057a4578
-  data.tar.gz: 363ab371cd16d07b6c4071aedd97e55bd4e4fe3a
+  metadata.gz: dfc62f9e86557db0032cb11266c1de36596272bf
+  data.tar.gz: 0257cd1dcb2b31494bd548e48a4ab0c31ecd899e
 SHA512:
-  metadata.gz: 1cf142b7dd2dab6d97a82d8dac1404144c549cb65437e9b91f96ab6d2cbdd416e1b6678b1cbf4c864e9d1231d854d4fdc310bf446c39711535b5b2525c579547
-  data.tar.gz: 8f9164c52ff0de7d035c95ce510d35fd3add511b7cbe264dfdfa7a063159a7a35441697a8fa7b79d028ffffcd8427f23001b579a4bb9816d53c97ffe3686cb4f
+  metadata.gz: 270265eaa20862d367a6f75e94e38cfc87261b567455c3ece4221d54069c06288cd12b648b12b4fae9b1095784cccf194c9b329b9675026a5f04ae910880cd54
+  data.tar.gz: 3bc50250f856ea030a0f50063563af059fc8b298eb4ef003d3c4ad235cf5b68926972949bc2943c034e67f3f4d921a7c7414e3630093abf9ee0fd4474cfa7641

data/.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
 pkg/*
-test.scss
+test*.scss
 *.css.map
 .sass-cache

data/Gemfile.lock

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

data/data/default_config.yml

@@ -1,4 +1,9 @@
-tab_style: "  "
+options:
+
+  indent: "  "
+
+  else_placement: "same_line"
+
 formatters:
 
   border_zero:
@@ -23,9 +28,6 @@ formatters:
     enabled: true
     sort_order: ["mixindef", "mixin", "prop", "rule", "extend"]
 
-  # else_placement:
-  #   enabled: true
-
   leading_zero:
     enabled: true
 

data/lib/scss_beautifier/cli.rb

@@ -1,23 +1,21 @@
 module SCSSBeautifier
   class CLI
-    DEFAULT = File.realpath(File.join(File.dirname(__FILE__), "..", "..", "data", "default_config.yml")).freeze
-    # Takes an array of arguments
-    # Returns exit code
+
     def run(args)
       options = Options.new.parse(args)
       generate_configuration and return if options[:generate_config]
 
-      contents = File.read(args.first)
+      contents = args.first.nil? ? $stdin.read : File.read(args.first)
       engine = Sass::Engine.new(contents, cache: false, syntax: :scss)
 
       tree = engine.to_tree
-      config = Config.new(options[:config] || DEFAULT)
+      config = Config.new(options[:config])
 
       config.formatters.each do |formatter|
         formatter.send(:visit, tree)
       end
 
-      output = SCSSBeautifier::Convert.visit(tree, {indent: config.tab_style}, :scss)
+      output = SCSSBeautifier::Convert.visit(tree, config.options, :scss)
       if options[:in_place]
         File.write(args.first, output)
       else
@@ -28,7 +26,7 @@ module SCSSBeautifier
     private
 
     def generate_configuration
-      File.write(".scss-beautifier", File.read(DEFAULT))
+      File.write(".scss-beautifier", File.read(Config::DEFAULT))
     end
 
   end

data/lib/scss_beautifier/config.rb

@@ -2,13 +2,15 @@ require "yaml"
 
 module SCSSBeautifier
   class Config
+    DEFAULT = File.realpath(File.join(File.dirname(__FILE__), "..", "..", "data", "default_config.yml")).freeze
 
     def initialize(config_location)
-      @config = parse_config(config_location)
+      @config = parse_config(config_location.to_s)
     end
 
     def parse_config(config_location)
-      YAML.load(File.read(config_location))
+      config_contents = read_config(config_location)
+      YAML.load(config_contents)
     end
 
     def formatters
@@ -22,8 +24,19 @@ module SCSSBeautifier
       enabled_formatters
     end
 
-    def tab_style
-      @config["tab_style"] || "  "
+    def options
+      options_with_key_symbols = {}
+      @config["options"].each do |k, v|
+        options_with_key_symbols[:"#{k}"] = v
+      end
+      options_with_key_symbols
+    end
+
+    private
+
+    def read_config(config_location)
+      location = File.exists?(config_location) ? config_location : DEFAULT
+      File.read(location)
     end
 
   end

data/lib/scss_beautifier/convert.rb

@@ -1,12 +1,13 @@
 class SCSSBeautifier::Convert < Sass::Tree::Visitors::Convert
   def visit_if(node, &block)
-    if true
+    if @options[:else_placement] == "same_line"
       visit_if_no_newline(node, &block)
     else
       super(node)
     end
   end
-  # ElsePlacement
+
+  # ElsePlacement on same_line
   def visit_if_no_newline(node)
     name =
       if !@is_else
@@ -65,7 +66,7 @@ class SCSSBeautifier::Convert < Sass::Tree::Visitors::Convert
 
   def visit_comment(node)
     value = super
-    node.scss_beautifier_options[:inline] ? ' ' + value.lstrip! : value
+    node.scss_beautifier_options[:inline] ? ' ' + value.lstrip.to_s : value
   end
 
   def inline_comment?(node, comment_node)

data/lib/scss_beautifier/formatters/property_sort_order.rb

@@ -15,7 +15,7 @@ class SCSSBeautifier::Formatters::PropertySortOrder < SCSSBeautifier::Formatters
       if hash_key == 'comment'
         seen_comments << child
         prev_grouping = prop_nodes.last
-        if prop_node_for(prev_grouping).line == child.line
+        if prev_grouping && prop_node_for(prev_grouping).line == child.line
           prev_grouping << child
         else
           comment_array << child

data/lib/scss_beautifier/version.rb

@@ -1,3 +1,3 @@
 module SCSSBeautifier
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/tmp/dump.txt

@@ -48,7 +48,7 @@ https://github.com/sasstools/sass-lint/blob/master/docs/rules/id-name-format.md
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/mixin-name-format.md
 
 https://github.com/sasstools/sass-lint/blob/master/docs/rules/no-warn.md
-how do maps look like? newlines separation?
+how do maps look like? newlines separation? (same with lists)
 parenthesis around if statements?
 
 

data/web/Gemfile.lock

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

data/web/app.rb

@@ -22,7 +22,7 @@ class ScssBeautifierApp < Sinatra::Base
       formatter.send(:visit, tree)
     end
 
-    output = SCSSBeautifier::Convert.visit(tree, {indent: config.tab_style}, :scss)
+    output = SCSSBeautifier::Convert.visit(tree, {indent: config.options}, :scss)
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_beautifier
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Ivan Tse
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass