scss-lint 0.26.2 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16f9ac38af8dac62fb417a4a3dd09ed10e56f33
-  data.tar.gz: 06c53108efb983ee32ca189a0e9838b0a177bf49
+  metadata.gz: 09f5144a404feb287b0142ae57abdc1fba664079
+  data.tar.gz: 8d199cc76993c5b93a99e0ece1e91e929b052d2f
 SHA512:
-  metadata.gz: 87ed567488756c8b381b5a57c0d1ffced33bfe7711689a8a0844ccd34c884bb7655d8756096b278655685f31a6becd033654279837220b01ee282fb0a7a8a80f
-  data.tar.gz: 59bdaba7321a09c292d8e767cebd8a2813ddb4127f60518be40db3bd3c5c650643e59a3eda6d4c5d2ec7e915fcca9f8cf29c7911373c3211f53b9f8f0ed03ced
+  metadata.gz: 85c7e8f492803782ea48d4da4ed4981c1ed516e3dce5dfb2b7baef837986b7b27804b8294f10b4d640fd6898d64394ce8a8f2b30625b988e991b5d23417f22e0
+  data.tar.gz: e45e2bf8e0ec689a8b1561afc560ac9c5a960a560e3a8d4f40abe5b0f0a27669ed1eb9af3344a5d36912c2d1d3bc559fb19ebd06e50af3776b3d9828d2e5821d

data/lib/scss_lint/linter/hex_validation.rb

@@ -13,7 +13,7 @@ module SCSSLint
 
   private
 
-    HEX_REGEX = /(#(\h{3}|\h{6}))(?!\h)/
+    HEX_REGEX = /(#(\h{3}|\h{6}|\h{8}))(?!\h)/
 
     def check_hex(hex, node)
       return if HEX_REGEX.match(hex)

data/lib/scss_lint/linter/property_sort_order.rb

@@ -8,7 +8,7 @@ module SCSSLint
       yield
     end
 
-    def visit_rule(node)
+    def check_sort_order(node)
       sortable_props = node.children.select do |child|
         child.is_a?(Sass::Tree::PropNode) && !ignore_property?(child)
       end
@@ -33,6 +33,14 @@ module SCSSLint
       yield # Continue linting children
     end
 
+    alias_method :visit_rule,  :check_sort_order
+    alias_method :visit_mixin, :check_sort_order
+
+    def visit_if(node, &block)
+      check_sort_order(node, &block)
+      visit(node.else) if node.else
+    end
+
   private
 
     # Compares two properties which can contain a vendor prefix. It allows for a
@@ -109,7 +117,7 @@ module SCSSLint
     def ignore_property?(prop_node)
       return true if prop_node.name.any? { |part| !part.is_a?(String) }
 
-      config['ignored_unspecified'] &&
+      config['ignore_unspecified'] &&
         @preferred_order &&
         !@preferred_order.include?(prop_node.name.join)
     end

data/lib/scss_lint/linter/unnecessary_parent_reference.rb

@@ -12,6 +12,12 @@ module SCSSLint
     def visit_sequence(sequence)
       return unless sequence_starts_with_parent?(sequence.members.first)
 
+      # Allow sequences that contain multiple parent references, e.g.
+      # element {
+      #   & + & { ... }
+      # }
+      return if sequence.members[1..-1].any? { |ss| sequence_starts_with_parent?(ss) }
+
       # Special case: allow an isolated parent to appear if it is part of a
       # comma sequence of more than one sequence, as this could be used to DRY
       # up code.

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/hex_validation_spec.rb

@@ -11,11 +11,15 @@ describe SCSSLint::Linter::HexValidation do
   end
 
   context 'when rule contains valid hex codes or color keyword' do
+    gradient_css = 'progid:DXImageTransform.Microsoft.gradient' \
+                   '(startColorstr=#99000000, endColorstr=#99000000)'
+
     let(:css) { <<-CSS }
       p {
         background: #000;
         color: #FFFFFF;
         border-color: red;
+        filter: #{gradient_css};
       }
     CSS
 

data/spec/scss_lint/linter/property_sort_order_spec.rb

@@ -160,6 +160,85 @@ describe SCSSLint::Linter::PropertySortOrder do
     it { should report_lint line: 3 }
   end
 
+  context 'when include block contains properties in sorted order' do
+    let(:css) { <<-CSS }
+      @include some-mixin {
+        background: #000;
+        display: none;
+        margin: 5px;
+        padding: 10px;
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when include block contains properties not in sorted order' do
+    let(:css) { <<-CSS }
+      @include some-mixin {
+        background: #000;
+        margin: 5px;
+        display: none;
+      }
+    CSS
+
+    it { should report_lint line: 3 }
+  end
+
+  context 'when if block contains properties in sorted order' do
+    let(:css) { <<-CSS }
+      @if $var {
+        background: #000;
+        display: none;
+        margin: 5px;
+        padding: 10px;
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when if block contains properties not in sorted order' do
+    let(:css) { <<-CSS }
+      @if $var {
+        background: #000;
+        margin: 5px;
+        display: none;
+      }
+    CSS
+
+    it { should report_lint line: 3 }
+  end
+
+  context 'when if block contains properties in sorted order' do
+    let(:css) { <<-CSS }
+      @if $var {
+        // Content
+      } @else {
+        background: #000;
+        display: none;
+        margin: 5px;
+        padding: 10px;
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when else block contains properties not in sorted order' do
+    let(:css) { <<-CSS }
+      @if $var {
+        // Content
+      } @else {
+        background: #000;
+        margin: 5px;
+        display: none;
+      }
+    CSS
+
+    it { should report_lint line: 5 }
+  end
+
   context 'when the order has been explicitly set' do
     let(:linter_config) { { 'order' => %w[position display padding margin width] } }
 
@@ -200,14 +279,14 @@ describe SCSSLint::Linter::PropertySortOrder do
         }
       CSS
 
-      context 'and the ignored_omitted option is enabled' do
-        let(:linter_config) { super().merge('ignored_unspecified' => true) }
+      context 'and the ignore_unspecified option is enabled' do
+        let(:linter_config) { super().merge('ignore_unspecified' => true) }
 
         it { should_not report_lint }
       end
 
-      context 'and the ignored_omitted option is disabled' do
-        let(:linter_config) { super().merge('ignored_unspecified' => false) }
+      context 'and the ignore_unspecified option is disabled' do
+        let(:linter_config) { super().merge('ignore_unspecified' => false) }
 
         it { should report_lint }
       end

data/spec/scss_lint/linter/unnecessary_parent_reference_spec.rb

@@ -41,6 +41,17 @@ describe SCSSLint::Linter::UnnecessaryParentReference do
     it { should_not report_lint }
   end
 
+  context 'when an ampersand precedes a sibling operator' do
+    let(:css) { <<-CSS }
+      p {
+        & + & {}
+        & ~ & {}
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
   context 'when an amperand is used in a comma sequence to DRY up code' do
     let(:css) { <<-CSS }
       p {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow