scss_lint 0.42.1 → 0.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f22ef7a1e5735cdd001ff93b7fe1dff595dc609
-  data.tar.gz: 1af1a879ec132f70a04fc3b9cc794e0f8dd9a94b
+  metadata.gz: 5bb29e6e4cef4d98cce3e61248d11f2dde2315a1
+  data.tar.gz: 52c5cdfb7895f10c883188633a75c32b3e77267a
 SHA512:
-  metadata.gz: 23cb255d2401258655eb94a88c41a7c639ec1d45bc3dae0a413e3fdd68fe2f7bc8d900066673a60c35e4a862c5e3499354328b1547f2a445b0abdbb6acfe8c00
-  data.tar.gz: 0ccd62fd3f715cf3ce291e240e22be5bdbfb4ef5d483cf52c4339ff3baa0296cb625182d48abefbef557e37f2a13e7381cdb6f6e17aab591469cbd7865e9994b
+  metadata.gz: 5e68b7e8d5afa4970b42da268f4fb2085c2ee81ab5f4eb0d020a67b97af286ec629ccad33429d542723bf0dd851e9c8ae31a93c464d203609c0b0c4c26db7c5b
+  data.tar.gz: 5cc833524095ed48bd5a01e3aebd2a4919ec4c79149b7d0f7c006552bdeb5d6fd42512109fdb6994ee78b50461cb144c3a7283703726d99b71a5cca2d4b691f7

data/lib/scss_lint/linter/color_variable.rb

@@ -33,7 +33,7 @@ module SCSSLint
     end
 
     def visit_script_funcall(node)
-      if color_function?(node) && all_arguments_are_literals?(node)
+      if literal_color_function?(node)
         record_lint node, node.to_sass
       else
         yield
@@ -63,6 +63,10 @@ module SCSSLint
         parent.node_parent.is_a?(Sass::Tree::VariableNode)
     end
 
+    def function_in_variable_declaration?(node)
+      node.node_parent.is_a?(Sass::Tree::VariableNode)
+    end
+
     def in_rgba_function_call?(node)
       grandparent = node_ancestor(node, 2)
 
@@ -83,5 +87,11 @@ module SCSSLint
     def color_function?(node)
       COLOR_FUNCTIONS.include?(node.name)
     end
+
+    def literal_color_function?(node)
+      color_function?(node) &&
+        all_arguments_are_literals?(node) &&
+        !function_in_variable_declaration?(node)
+    end
   end
 end

data/lib/scss_lint/linter/hex_validation.rb

@@ -6,7 +6,7 @@ module SCSSLint
     def visit_script_string(node)
       return unless node.type == :identifier
 
-      node.value.scan(/(#\h+)/) do |match|
+      node.value.scan(/(?:\W|^)(#\h+)(?:\W|$)/) do |match|
         check_hex(match.first, node)
       end
     end

data/lib/scss_lint/linter/space_around_operator.rb

@@ -21,24 +21,33 @@ module SCSSLint
       yield
     end
 
+    # Making a public version of #source_from_range, a private method.
     def source_fm_range(range)
       source_from_range(range)
     end
 
   private
 
-    def check(node, operation_sources)
+    def check(node, operation_sources) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/LineLength
       match = operation_sources.operator_source.match(/
         (?<left_space>\s*)
         (?<operator>\S+)
         (?<right_space>\s*)
       /x)
 
+      # We forgive spacing with newlines. In the case of a newline occurring on
+      # one side or another, we don't care about indentation, and the
+      # TrailingWhitespace linter will worry about trailing whitespace, so we
+      # just don't worry about space with a newline.
+      left_newline = match[:left_space].include?("\n")
+      right_newline = match[:right_space].include?("\n")
       if config['style'] == 'one_space'
-        if match[:left_space] != ' ' || match[:right_space] != ' '
+        if (match[:left_space] != ' ' && !left_newline) ||
+          (match[:right_space] != ' ' && !right_newline)
           add_lint(node, operation_sources.space_msg(match[:operator]))
         end
-      elsif match[:left_space] != '' || match[:right_space] != ''
+      elsif (match[:left_space] != '' && !left_newline) ||
+        (match[:right_space] != '' && !right_newline)
         add_lint(node, operation_sources.no_space_msg(match[:operator]))
       end
     end

data/lib/scss_lint/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.42.1'
+  VERSION = '0.42.2'
 end

data/spec/scss_lint/linter/color_variable_spec.rb

@@ -9,6 +9,14 @@ describe SCSSLint::Linter::ColorVariable do
     it { should_not report_lint }
   end
 
+  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);
+    SCSS
+
+    it { should_not report_lint }
+  end
+
   context 'when a color literal is used in a property' do
     let(:scss) { <<-SCSS }
       p {

data/spec/scss_lint/linter/hex_validation_spec.rb

@@ -37,4 +37,15 @@ describe SCSSLint::Linter::HexValidation do
     it { should report_lint line: 2 }
     it { should report_lint line: 3 }
   end
+
+  context 'when rule contains hex codes in a longer string' do
+    let(:scss) { <<-SCSS }
+      p {
+        content: 'foo#bad';
+        content: 'foo #ba';
+      }
+    SCSS
+
+    it { should report_lint line: 3 }
+  end
 end

data/spec/scss_lint/linter/space_around_operator_spec.rb

@@ -60,18 +60,28 @@ describe SCSSLint::Linter::SpaceAroundOperator do
       it { should report_lint line: 10 }
     end
 
-    context 'when numeric values with infix operators and newlines exist' do
+    context 'when infix operators and newlines exist' do
       let(:scss) { <<-SCSS }
         p {
           margin: 7px+
               7px;
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
+    context 'when infix operators and newlines exist, but otherwise correct spacing' do
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 7px +
+              7px;
           padding: 9px
               + 9px;
         }
       SCSS
 
-      it { should report_lint line: 2 }
-      it { should report_lint line: 4 }
+      it { should_not report_lint }
     end
 
     context 'when numeric values with multiple infix operators exist' do
@@ -232,7 +242,7 @@ describe SCSSLint::Linter::SpaceAroundOperator do
     end
   end
 
-  context 'when one space is preferred' do
+  context 'when no space is preferred' do
     let(:style) { 'no_space' }
 
     context 'when values with single-spaced infix operators exist' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.42.2
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow