scss_lint 0.50.2 → 0.50.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a828fe4841dd205ec2d5c9db1f0687bbb06730d0
-  data.tar.gz: 98d9275f39eae58357b78e66de361cb39d37f2ef
+  metadata.gz: 3bb1a4b4dfd030c6360b2bfe1a6d540662abaee0
+  data.tar.gz: ff64f063fdbecbcbb5fd48fc3d776f461481f8d7
 SHA512:
-  metadata.gz: ae8885c5253af977e4cf0aa675ed72648aeac42856b9890aae522e88bacf4376b15676ee71568b7e549c547a3927196acce58da47d1791fe42300aac2ecf9513
-  data.tar.gz: b32793150ac80378a87172a3fe14f75c4c6148c3438254c5f6fc4740f8687bcd49cef21c6a656860d8328d3d4f258142ef2afa90277c061310d537449aa4482b
+  metadata.gz: 254cbcaca9f62abd8011730785a71aa056330da801521f157a812528a99233279eaacddd50f63ebbe70da35b2a2d7df96deb63bb543aad7b0293f11b6e14039e
+  data.tar.gz: cb645fd0f5a41177a2f3a2595327f5ff0faf19420f27e4958a6e3e8adce84d2d2c091e7a9f87e236e85798a0125d38a77098e5fe02d104b3d34d6ba6fc01217f

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

@@ -8,6 +8,19 @@ right
 bottom
 left
 
+flex
+flex-basis
+flex-direction
+flex-flow
+flex-grow
+flex-shrink
+flex-wrap
+align-content
+align-items
+align-self
+justify-content
+order
+
 columns
 column-gap
 column-fill
@@ -43,6 +56,10 @@ margin-bottom
 margin-left
 
 outline
+outline-offset
+outline-width
+outline-style
+outline-color
 
 border
 border-top
@@ -76,6 +93,8 @@ border-left-color
 box-shadow
 
 background
+background-attachment
+background-clip
 background-color
 background-image
 background-repeat
@@ -118,6 +137,8 @@ text-shadow
 text-overflow
 
 line-height
+word-break
+word-wrap
 word-spacing
 letter-spacing
 white-space

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

@@ -80,6 +80,7 @@ pointer-events
 cursor
 background
 background-attachment
+background-clip
 background-color
 background-image
 background-position
@@ -150,7 +151,6 @@ transition-delay
 transition-duration
 transition-property
 transition-timing-function
-background-clip
 backface-visibility
 resize
 appearance

data/data/pseudo-elements.txt

@@ -58,6 +58,24 @@
 -webkit-inner-spin-button
 -webkit-input-placeholder
 -webkit-keygen-select
+-webkit-media-controls-current-time-display
+-webkit-media-controls-enclosure
+-webkit-media-controls-fullscreen-button
+-webkit-media-controls-mute-button
+-webkit-media-controls-overlay-play-button
+-webkit-media-controls-panel
+-webkit-media-controls-play-button
+-webkit-media-controls-return-to-realtime-button
+-webkit-media-controls-rewind-button
+-webkit-media-controls-seek-back-button
+-webkit-media-controls-seek-forward-button
+-webkit-media-controls-start-playback-button
+-webkit-media-controls-time-remaining-display
+-webkit-media-controls-timeline
+-webkit-media-controls-timeline-container
+-webkit-media-controls-toggle-closed-captions-button
+-webkit-media-controls-volume-slider
+-webkit-media-controls-volume-slider-container
 -webkit-meter-bar
 -webkit-meter-even-less-good-value
 -webkit-meter-optimum-value

data/lib/scss_lint/engine.rb

@@ -75,7 +75,7 @@ module SCSSLint
 
     def find_any_control_commands
       @any_control_commands =
-        @lines.any? { |line| line['scss-lint:disable'] || line['scss-line:enable'] }
+        @lines.any? { |line| line['scss-lint:disable'] || line['scss-lint:enable'] }
     end
 
     def preprocess_contents # rubocop:disable CyclomaticComplexity

data/lib/scss_lint/linter/border_zero.rb

@@ -17,7 +17,11 @@ module SCSSLint
     ].freeze
 
     def visit_root(_node)
-      @preference = CONVENTION_TO_PREFERENCE[config['convention']]
+      @preference = CONVENTION_TO_PREFERENCE[config['convention'].to_s]
+      unless @preference
+        raise "Invalid `convention` specified: #{config['convention']}." \
+              "Must be one of [#{CONVENTION_TO_PREFERENCE.keys.join(', ')}]"
+      end
       yield # Continue linting children
     end
 

data/lib/scss_lint/linter/color_keyword.rb

@@ -42,9 +42,8 @@ module SCSSLint
     end
 
     def in_allowed_function_call?(node)
-      if (funcall = node_ancestor(node, 2)).is_a?(Sass::Script::Tree::Funcall)
+      (funcall = node_ancestor(node, 2)).is_a?(Sass::Script::Tree::Funcall) &&
         FUNCTIONS_ALLOWING_COLOR_KEYWORD_ARGS.include?(funcall.name)
-      end
     end
   end
 end

data/lib/scss_lint/linter/comment.rb

@@ -4,7 +4,7 @@ module SCSSLint
     include LinterRegistry
 
     def visit_comment(node)
-      add_lint(node, 'Use `//` comments everywhere') unless valid_comment?(node)
+      add_lint(node, message) unless valid_comment?(node)
     end
 
   private
@@ -31,5 +31,13 @@ module SCSSLint
 
       node.value.join.match(re)
     end
+
+    def message
+      if config.fetch('style', 'silent') == 'silent'
+        'Use `//` comments everywhere'
+      else
+        'Use `/* */` comments everywhere'
+      end
+    end
   end
 end

data/lib/scss_lint/linter/duplicate_property.rb

@@ -57,6 +57,7 @@ module SCSSLint
       when Sass::Script::Funcall
         value.name
       when Sass::Script::String
+        nil
       when Sass::Script::Tree::Literal
         value.value
       when Sass::Script::Tree::ListLiteral
@@ -69,13 +70,13 @@ module SCSSLint
     def ignore_consecutive_of?(prop)
       case @ignore_consecutive
       when true
-        return true
+        true
       when false
-        return false
+        false
       when nil
-        return false
+        false
       when Array
-        return @ignore_consecutive.include?(prop.name.join)
+        @ignore_consecutive.include?(prop.name.join)
       else
         raise SCSSLint::Exceptions::LinterError,
               "#{@ignore_consecutive.inspect} is not a valid value for ignore_consecutive."

data/lib/scss_lint/linter/empty_line_between_blocks.rb

@@ -87,6 +87,7 @@ module SCSSLint
         Sass::Tree::RuleNode,
         Sass::Tree::CommentNode
         # Ignore
+        nil
       else
         unless engine.lines[node.line - 2].strip.empty?
           add_lint(node.line, MESSAGE_FORMAT % [type, 'preceded'])

data/lib/scss_lint/linter/final_newline.rb

@@ -9,8 +9,9 @@ module SCSSLint
       ends_with_newline = engine.lines[-1][-1] == "\n"
 
       if config['present']
-        add_lint(engine.lines.count,
-                 'Files should end with a trailing newline') unless ends_with_newline
+        unless ends_with_newline
+          add_lint(engine.lines.count, 'Files should end with a trailing newline')
+        end
       elsif ends_with_newline
         add_lint(engine.lines.count, 'Files should not end with a trailing newline')
       end

data/lib/scss_lint/linter/private_naming_convention.rb

@@ -107,11 +107,11 @@ module SCSSLint
 
       return false unless node_to_look_in.node_parent
 
+      return unless node_to_look_in.node_parent
+
       # We did not find a match yet, and haven't reached the top of the branch,
       # so recurse.
-      if node_to_look_in.node_parent
-        node_defined_earlier_in_branch?(node_to_look_in.node_parent, looking_for)
-      end
+      node_defined_earlier_in_branch?(node_to_look_in.node_parent, looking_for)
     end
 
     def private?(node)

data/lib/scss_lint/linter/qualifying_element.rb

@@ -1,5 +1,5 @@
 module SCSSLint
-  # Checks for element selectors qualifying id, classe, or attribute selectors.
+  # Checks for element selectors qualifying id, classes, or attribute selectors.
   class Linter::QualifyingElement < Linter
     include LinterRegistry
 

data/lib/scss_lint/linter/shorthand.rb

@@ -82,8 +82,10 @@ module SCSSLint
     def check_shorthand(prop, node, values)
       values = shorthand_values(values)
 
-      add_lint(node, "Shorthands of length `#{values.count}` are not allowed. " \
-                     "Value was `#{values.join(' ')}`") unless allowed?(values.count)
+      unless allowed?(values.count)
+        add_lint(node, "Shorthands of length `#{values.count}` are not allowed. " \
+                       "Value was `#{values.join(' ')}`")
+      end
 
       return unless (2..4).member?(values.count)
 
@@ -140,7 +142,7 @@ module SCSSLint
     # @param right [String]
     # @param left [String]
     # @return [Boolean]
-    def condense_to_three_values?(_, right, __, left)
+    def condense_to_three_values?(_, right, _, left)
       return unless allowed?(3)
 
       right == left

data/lib/scss_lint/linter/space_after_comment.rb

@@ -14,7 +14,7 @@ module SCSSLint
     def check_silent_comment(node, source)
       source.split("\n").each_with_index do |line, index|
         next if config['allow_empty_comments'] && line.strip.length <= 2
-        whitespace = whitespace_after_comment(line, 2)
+        whitespace = whitespace_after_comment(line.lstrip, 2)
         check_for_space(node.line + index, whitespace)
       end
     end

data/lib/scss_lint/linter/space_before_brace.rb

@@ -14,6 +14,11 @@ module SCSSLint
       yield
     end
 
+    def visit_if(node, &block)
+      check_node(node, &block)
+      check_node(node.else, &block) if node.else
+    end
+
     alias visit_function check_node
     alias visit_each check_node
     alias visit_for check_node

data/lib/scss_lint/linter/zero_unit.rb

@@ -7,6 +7,7 @@ module SCSSLint
 
     def visit_script_string(node)
       return unless node.type == :identifier
+      return if node.value.start_with?('calc(')
 
       node.value.scan(ZERO_UNIT_REGEX) do |match|
         next unless zero_with_length_units?(match.first)
@@ -21,6 +22,12 @@ module SCSSLint
       add_lint(node, MESSAGE_FORMAT % length)
     end
 
+    def visit_script_funcall(node)
+      # Don't report errors for values within `calc` expressions, since they
+      # require units in order to work
+      yield unless node.name == 'calc'
+    end
+
   private
 
     ZERO_UNIT_REGEX = /

data/lib/scss_lint/sass/tree.rb

@@ -122,9 +122,11 @@ module Sass::Tree
 
       # Keyword mapping is String -> Expr, so convert the string to a variable
       # node that supports lint reporting
-      keyword_exprs = keywords.as_stored.map do |var_name, var_expr|
-        [create_variable(var_name), var_expr]
-      end if keywords.any?
+      if keywords.any?
+        keyword_exprs = keywords.as_stored.map do |var_name, var_expr|
+          [create_variable(var_name), var_expr]
+        end
+      end
 
       concat_expr_lists super, args, keyword_exprs, splat
     end

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/space_after_comment_spec.rb

@@ -176,6 +176,17 @@ describe SCSSLint::Linter::SpaceAfterComment do
 
       it { should report_lint line: 1 }
     end
+
+    context 'when an indented block has comments on multiple lines' do
+      let(:scss) { <<-SCSS }
+        p {
+          // Comment one
+          // Comment two
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
   end
 
   context 'when no spaces are allowed' do
@@ -326,6 +337,17 @@ describe SCSSLint::Linter::SpaceAfterComment do
 
       it { should report_lint line: 1 }
     end
+
+    context 'when an indented block has comments on multiple lines' do
+      let(:scss) { <<-SCSS }
+        p {
+          //Comment one
+          //Comment two
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
   end
 
   context 'when at least one space is preferred' do
@@ -476,5 +498,16 @@ describe SCSSLint::Linter::SpaceAfterComment do
 
       it { should_not report_lint line: 1 }
     end
+
+    context 'when an indented block has comments on multiple lines' do
+      let(:scss) { <<-SCSS }
+        p {
+          // Comment one
+          //  Comment two
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
   end
 end

data/spec/scss_lint/linter/space_before_brace_spec.rb

@@ -494,6 +494,29 @@ describe SCSSLint::Linter::SpaceBeforeBrace do
     end
   end
 
+  context 'with an @if/@else statement' do
+    context 'when brace is preceded by space' do
+      let(:scss) { <<-SCSS }
+        @if some_expression {
+        } @else {
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'when brace is not preceded by space' do
+      let(:scss) { <<-SCSS }
+        @if some_expression{
+        } @else{
+        }
+      SCSS
+
+      it { should report_lint line: 1 }
+      it { should report_lint line: 2 }
+    end
+  end
+
   context 'with a mixin include with braces' do
     context 'with arguments' do
       context 'when brace is preceded by a space' do

data/spec/scss_lint/linter/zero_unit_spec.rb

@@ -110,4 +110,14 @@ describe SCSSLint::Linter::ZeroUnit do
 
     it { should_not report_lint }
   end
+
+  context 'when calc expression with zero value has units' do
+    let(:scss) { <<-SCSS }
+      p {
+        width: calc(0px + 1.5em);
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.50.2
+  version: 0.50.3
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -369,4 +369,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/isolated_environment.rb
 - spec/support/matchers/report_lint.rb
-has_rdoc: