scss-lint 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35968261ce332fb768bb4718428cae2dbc1ac092
-  data.tar.gz: 4ca8c381e68d044cc215c7a282c0cf638d5b7549
+  metadata.gz: a16f9ac38af8dac62fb417a4a3dd09ed10e56f33
+  data.tar.gz: 06c53108efb983ee32ca189a0e9838b0a177bf49
 SHA512:
-  metadata.gz: 026eb4b4c81ba0a753f5f804dd276f85f98e6d5b2c5ddc39c7979cfcecc55ac4470fae3e5d2c9bd8a78411743b64f8c07b71cb1999256337b488254bafaa779d
-  data.tar.gz: 45aa1649bae847377374ad44634bde37cee9ad3f4724359238cff14de0f634de29f42e783d3b45347838ca5a29fdd6828fc4a953e00408a447892f89609cff93
+  metadata.gz: 87ed567488756c8b381b5a57c0d1ffced33bfe7711689a8a0844ccd34c884bb7655d8756096b278655685f31a6becd033654279837220b01ee282fb0a7a8a80f
+  data.tar.gz: 59bdaba7321a09c292d8e767cebd8a2813ddb4127f60518be40db3bd3c5c650643e59a3eda6d4c5d2ec7e915fcca9f8cf29c7911373c3211f53b9f8f0ed03ced

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

@@ -8,12 +8,22 @@ right
 bottom
 left
 
+columns
+column-gap
+column-fill
+column-rule
+column-span
+column-count
+column-width
+
 float
 clear
 
+transform
+transition
+
 visibility
 opacity
-transform
 z-index
 
 margin
@@ -94,6 +104,8 @@ text-indent
 text-transform
 text-decoration
 text-rendering
+text-shadow
+text-overflow
 
 line-height
 word-spacing
@@ -105,6 +117,8 @@ font
 font-family
 font-size
 font-weight
+font-smoothing
+font-style
 
 content
 quotes

data/lib/scss_lint/linter/trailing_semicolon.rb

@@ -11,25 +11,24 @@ module SCSSLint
       check_semicolon(node)
     end
 
-    def visit_possible_parent(node)
-      if has_nested_properties?(node)
+    def visit_prop(node)
+      if node.children.any? { |n| n.is_a?(Sass::Tree::PropNode) }
         yield # Continue checking children
       else
         check_semicolon(node)
       end
     end
 
-    alias_method :visit_mixin, :visit_possible_parent
-    alias_method :visit_prop,  :visit_possible_parent
-
-  private
-
-    def has_nested_properties?(node)
-      node.children.any? do |n|
-        n.is_a?(Sass::Tree::PropNode) || n.is_a?(Sass::Tree::RuleNode)
+    def visit_mixin(node)
+      if node.children.any?
+        yield # Continue checking children
+      else
+        check_semicolon(node)
       end
     end
 
+  private
+
     def check_semicolon(node)
       if has_space_before_semicolon?(node)
         line = node.source_range.start_pos.line

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/trailing_semicolon_spec.rb

@@ -182,7 +182,21 @@ describe SCSSLint::Linter::TrailingSemicolon do
     it { should_not report_lint }
   end
 
-  context 'when @extend ends with a semicolon' do
+  context 'when @include takes a block with an if-node' do
+    let(:css) { <<-CSS }
+      .foo {
+        @include bar {
+          @if $var {
+            border: 0;
+          }
+        }
+      }
+    CSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when @include ends with a semicolon' do
     let(:css) { <<-CSS }
       .foo {
         @include bar;
@@ -202,7 +216,7 @@ describe SCSSLint::Linter::TrailingSemicolon do
     it { should report_lint line: 2 }
   end
 
-  context 'when @extend ends with a semicolon' do
+  context 'when variable declaration ends with a semicolon' do
     let(:css) { <<-CSS }
       .foo {
         $bar: 1;

metadata

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