scss_lint 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39b3c7b31dc17e24974910dfff9637038a5b773
-  data.tar.gz: ed9774687c334aa87bbc4586c03ad93570c5bba7
+  metadata.gz: 0d1f5b2c584f66d7148053a525c0323e872fa08a
+  data.tar.gz: 8abdb50bcfff6c9b23fe3b01dacb66d602f565d2
 SHA512:
-  metadata.gz: eb91473219f23fd58ceb69363b5b1f081bbc7bd04baaea668f60666a2ac2bdcfabeb24c50aacdfad823b374b873a2008652343a1518d1a85c4db561ac6ac70a7
-  data.tar.gz: a05b44b216ee1060a788ebbcf44dd5cd5184d02286b292d357cb18ef1d7cac36f6072e71d198bae06b7e52fb3055ae49fd344251c2764ae93f6061fb0c630856
+  metadata.gz: 30822ae6faef50aa2d253cb88c2c7afce9e0e45fcaba3a9a4d5e4d3edbdaa5618c9f2d997121a61c96a280330f9bfb51918f14da0c53bff36dc400373f8a2015
+  data.tar.gz: 26fefc161597ed2f735e3315475c2cf70b3c780b2593ad6294ddbcee0fcad9834c2cb4e53897a0884926ffe4f756660b2fc6b1d043c7bef076a25de20dfc6603

data/data/properties.txt

@@ -445,6 +445,7 @@ text-combine
 text-decoration
 text-decoration-color
 text-decoration-line
+text-decoration-skip
 text-decoration-style
 text-decorations-in-effect
 text-emphasis

data/data/property-sort-orders/smacss.txt

@@ -20,6 +20,31 @@ left
 
 box-sizing
 
+grid
+grid-after
+grid-area
+grid-auto-columns
+grid-auto-flow
+grid-auto-rows
+grid-before
+grid-column
+grid-column-end
+grid-column-gap
+grid-column-start
+grid-columns
+grid-end
+grid-gap
+grid-row
+grid-row-end
+grid-row-gap
+grid-row-start
+grid-rows
+grid-start
+grid-template
+grid-template-areas
+grid-template-columns
+grid-template-rows
+
 flex
 flex-basis
 flex-direction

data/data/pseudo-elements.txt

@@ -47,6 +47,7 @@
 -webkit-calendar-picker-indicator
 -webkit-color-swatch
 -webkit-color-swatch-wrapper
+-webkit-contacts-auto-fill-button
 -webkit-datetime-edit
 -webkit-datetime-edit-day-field
 -webkit-datetime-edit-fields-wrapper

data/lib/scss_lint/linter/color_variable.rb

@@ -55,11 +55,13 @@ module SCSSLint
     def in_variable_declaration?(node)
       parent = node.node_parent
       parent.is_a?(Sass::Script::Tree::Literal) &&
-        parent.node_parent.is_a?(Sass::Tree::VariableNode)
+        (parent.node_parent.is_a?(Sass::Tree::VariableNode) ||
+         parent.node_parent.node_parent.is_a?(Sass::Tree::VariableNode))
     end
 
     def function_in_variable_declaration?(node)
-      node.node_parent.is_a?(Sass::Tree::VariableNode)
+      node.node_parent.is_a?(Sass::Tree::VariableNode) ||
+        node.node_parent.node_parent.is_a?(Sass::Tree::VariableNode)
     end
 
     def in_rgba_function_call?(node)

data/lib/scss_lint/linter/private_naming_convention.rb

@@ -24,7 +24,7 @@ module SCSSLint
 
     def visit_root(node)
       # Register all top-level function, mixin, and variable definitions.
-      node.children.each_with_object([]) do |child_node|
+      node.children.each do |child_node|
         if DEFINITIONS.key?(child_node.class)
           register_node child_node
         end
@@ -97,7 +97,7 @@ module SCSSLint
     def node_defined_earlier_in_branch?(node_to_look_in, looking_for)
       # Look at all of the children of this node and return true if we find a
       # defining node that matches in name and type.
-      node_to_look_in.children.each_with_object([]) do |child_node|
+      node_to_look_in.children.each do |child_node|
         break unless before?(child_node, looking_for[:location])
         next unless child_node.class == looking_for[:defined_by]
         next unless child_node.name == looking_for[:node].name

data/lib/scss_lint/linter/property_sort_order.rb

@@ -36,9 +36,7 @@ module SCSSLint
     alias visit_media check_order
     alias visit_mixin check_order
     alias visit_rule check_order
-    alias visit_prop check_order
 
-    # rubocop:disable Lint/DuplicateMethods (FALSE POSITIVE v0.50.0)
     def visit_prop(node, &block)
       # Handle nested properties by appending the parent property they are
       # nested under to the name
@@ -46,7 +44,6 @@ module SCSSLint
       check_order(node, &block)
       @nested_under = nil
     end
-    # rubocop:enable Lint/DuplicateMethods
 
     def visit_if(node, &block)
       check_order(node, &block)

data/lib/scss_lint/linter/shorthand.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Metrics/CyclomaticComplexity
 module SCSSLint
   # Checks for the use of the shortest form for properties that can be written
   # in shorthand.
@@ -119,7 +118,7 @@ module SCSSLint
     # @param bottom [String]
     # @param left [String]
     # @return [Boolean]
-    def condense_to_one_value?(top, right, bottom, left)
+    def condense_to_one_value?(top, right, bottom, left) # rubocop:disable Metrics/CyclomaticComplexity
       return unless allowed?(1)
       return unless top == right
 

data/lib/scss_lint/linter/space_after_property_colon.rb

@@ -24,6 +24,8 @@ module SCSSLint
         check_for_at_least_one_space(node, whitespace)
       when 'one_space_or_newline'
         check_for_one_space_or_newline(node, whitespace)
+      when 'at_least_one_space_or_newline'
+        check_for_at_least_one_space_or_newline(node, whitespace)
       end
 
       yield # Continue linting children
@@ -52,6 +54,12 @@ module SCSSLint
       add_lint(node, 'Colon after property should be followed by one space or a newline')
     end
 
+    def check_for_at_least_one_space_or_newline(node, whitespace)
+      return if [[' '], ["\n"]].include?(whitespace.uniq)
+      return if whitespace[0] == "\n" && whitespace[1..-1].uniq == [' ']
+      add_lint(node, 'Colon after property should be followed by at least one space or newline')
+    end
+
     def check_properties_alignment(rule_node)
       properties = rule_node.children.select { |node| node.is_a?(Sass::Tree::PropNode) }
 

data/lib/scss_lint/linter/space_between_parens.rb

@@ -1,6 +1,4 @@
 module SCSSLint
-  # rubocop:disable Metrics/AbcSize
-
   # Checks for the presence of spaces between parentheses.
   class Linter::SpaceBetweenParens < Linter
     include LinterRegistry
@@ -33,7 +31,7 @@ module SCSSLint
 
     TRAILING_WHITESPACE = /\s*$/
 
-    def check(node, source) # rubocop:disable Metrics/MethodLength
+    def check(node, source) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       @spaces = config['spaces']
       source = trim_right_paren(source)
       return if source.count('(') != source.count(')')
@@ -71,7 +69,7 @@ module SCSSLint
     # An expression enclosed in parens will include or not include each paren, depending
     # on whitespace. Here we feel out for enclosing parens, and return them as the new
     # source for the node.
-    def feel_for_enclosing_parens(node) # rubocop:disable Metrics/CyclomaticComplexity
+    def feel_for_enclosing_parens(node) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       range = node.source_range
       original_source = source_from_range(range)
       left_offset = -1

data/lib/scss_lint/reporter/clean_files_reporter.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Reporter::CleanFilesReporter < Reporter
     def report_lints
       dirty_files = lints.map(&:filename).uniq
-      clean_files = files - dirty_files
+      clean_files = files.map { |e| e['path'] } - dirty_files
       clean_files.sort.join("\n") + "\n" if clean_files.any?
     end
   end

data/lib/scss_lint/sass/script.rb

@@ -22,7 +22,7 @@ module Sass::Script
     types.each do |type|
       node_name = type.downcase
 
-      eval <<-DECL
+      eval <<-DECL, binding, __FILE__, __LINE__ + 1
         class #{namespace}::#{type}
           def self.node_name
             :script_#{node_name}
@@ -76,3 +76,5 @@ module Sass::Script
     end
   end
 end
+
+# rubocop:enable Documentation

data/lib/scss_lint/sass/tree.rb

@@ -165,4 +165,6 @@ module Sass::Tree
       self.class == other.class && imported_filename == other.imported_filename && super
     end
   end
+
+  # rubocop:enable Documentation
 end

data/lib/scss_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.56.0'.freeze
+  VERSION = '0.57.0'.freeze
 end

data/spec/scss_lint/linter/color_variable_spec.rb

@@ -4,6 +4,7 @@ describe SCSSLint::Linter::ColorVariable do
   context 'when a color literal is used in a variable declaration' do
     let(:scss) { <<-SCSS }
       $my-color: #f00;
+      $my-shadow: 2px 2px 2px #f00;
     SCSS
 
     it { should_not report_lint }
@@ -12,6 +13,7 @@ describe SCSSLint::Linter::ColorVariable do
   context 'when a color function containing literals is used in a variable declaration' do
     let(:scss) { <<-SCSS }
       $my-color: rgba(0, 0, 0, 0.2);
+      $my-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
     SCSS
 
     it { should_not report_lint }

data/spec/scss_lint/linter/space_after_property_colon_spec.rb

@@ -266,6 +266,16 @@ describe SCSSLint::Linter::SpaceAfterPropertyColon do
       it { should_not report_lint }
     end
 
+    context 'when the colon after a property is followed by multiple spaces' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin:  bold;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
     context 'when the colon after a property is followed by a newline and spaces' do
       let(:scss) { <<-SCSS }
         p {
@@ -300,6 +310,93 @@ url(https://something.crazy.long/with/paths?and=queries)
     end
   end
 
+  context 'when at least one space or newline is preferred' do
+    let(:style) { 'at_least_one_space_or_newline' }
+
+    context 'when the colon after a property is not followed by space' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin:0;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'when the colon after a property is followed by a space' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 0;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when the colon after a property is surrounded by spaces' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin : bold;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when the colon after a property is followed by multiple spaces' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin:  bold;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when the colon after a property is followed by multiple spaces and a tab' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin:  \tbold;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'when the colon after a property is followed by a newline and spaces' do
+      let(:scss) { <<-SCSS }
+        p {
+          background-image:
+            url(https://something.crazy.long/with/paths?and=queries)
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when the colon after a property is followed by a newline and no spaces' do
+      let(:scss) { <<-SCSS }
+        p {
+          background-image:
+url(https://something.crazy.long/with/paths?and=queries)
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when the colon after a property is followed by a space and then a newline' do
+      let(:scss) { <<-SCSS }
+        p {
+          background-image:\s
+url(https://something.crazy.long/with/paths?and=queries)
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+  end
+
   context 'when aligned property values are preferred' do
     let(:style) { 'aligned' }
 

data/spec/scss_lint/reporter/clean_files_reporter_spec.rb

@@ -14,7 +14,7 @@ describe SCSSLint::Reporter::CleanFilesReporter do
     end
 
     context 'when there are no lints but some files were linted' do
-      let(:files) { %w[c.scss b.scss a.scss] }
+      let(:files) { [{ 'path' => 'c.scss' }, { 'path' => 'b.scss' }, { 'path' => 'a.scss' }] }
       let(:lints) { [] }
 
       it 'prints each file on its own line' do
@@ -33,25 +33,25 @@ describe SCSSLint::Reporter::CleanFilesReporter do
     end
 
     context 'when there are lints in some files' do
-      let(:dirty_files) { %w[a.scss b.scss] }
-      let(:clean_files) { %w[c.scss d.scss] }
+      let(:dirty_files) { [{ 'path' => 'a.scss' }, { 'path' => 'b.scss' }] }
+      let(:clean_files) { [{ 'path' => 'c.scss' }, { 'path' => 'd.scss' }] }
       let(:files) { dirty_files + clean_files }
 
       let(:lints) do
         dirty_files.map do |file|
-          SCSSLint::Lint.new(SCSSLint::Linter::Comment.new, file, SCSSLint::Location.new, '')
+          SCSSLint::Lint.new(SCSSLint::Linter::Comment.new, file['path'], SCSSLint::Location.new, '')
         end
       end
 
       it 'prints the file for each lint' do
         clean_files.each do |file|
-          subject.report_lints.scan(file).count.should == 1
+          subject.report_lints.scan(file['path']).count.should == 1
         end
       end
 
       it 'does not print clean files' do
         dirty_files.each do |file|
-          subject.report_lints.scan(file).count.should == 0
+          subject.report_lints.scan(file['path']).count.should == 0
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.3
+        version: 3.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.3
+        version: 3.5.5
 description: Configurable tool for writing clean and consistent SCSS
 email:
 - eng@brigade.com
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: SCSS lint tool