scss-lint 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f5144a404feb287b0142ae57abdc1fba664079
-  data.tar.gz: 8d199cc76993c5b93a99e0ece1e91e929b052d2f
+  metadata.gz: 42f28b5047a9fc0063a953cfe84bf4d7e61939ae
+  data.tar.gz: dbf4ea16dadcdff7fde653b7433478085bf80260
 SHA512:
-  metadata.gz: 85c7e8f492803782ea48d4da4ed4981c1ed516e3dce5dfb2b7baef837986b7b27804b8294f10b4d640fd6898d64394ce8a8f2b30625b988e991b5d23417f22e0
-  data.tar.gz: e45e2bf8e0ec689a8b1561afc560ac9c5a960a560e3a8d4f40abe5b0f0a27669ed1eb9af3344a5d36912c2d1d3bc559fb19ebd06e50af3776b3d9828d2e5821d
+  metadata.gz: 0354b7af1ee236a8add0483e6adc97751e687b1f19850cc248cc94a9200fa28c5a1f84244b35b01a812a7f48a6c25056fdb07508d9e3d9b55ba928b7daa2a998
+  data.tar.gz: 321fbeeee64c9d02cd4dddd2176ac1b546f71a4f4b66bb861d089de1490316ffe0ce804395ff02727b78a8c4908fc1cf2c7c30ca198147ec5f3f828af3406efa

data/lib/scss_lint/linter/capitalization_in_selector.rb

@@ -36,7 +36,7 @@ module SCSSLint
   private
 
     def check(node, selector_name = nil)
-      name = node.name.join
+      name = node.name
 
       return if @ignored_names.include?(name)
       return unless name =~ /[A-Z]/

data/lib/scss_lint/linter/single_line_per_selector.rb

@@ -3,37 +3,25 @@ module SCSSLint
   class Linter::SingleLinePerSelector < Linter
     include LinterRegistry
 
-    def visit_rule(node)
-      add_lint(node, MESSAGE) if invalid_comma_placement?(node)
-      yield # Continue linting children
-    end
-
-  private
-
     MESSAGE = 'Each selector in a comma sequence should be on its own line'
 
-    # A comma is invalid if it starts the line or is not the end of the line
-    def invalid_comma_placement?(node)
-      # We must ignore selectors with interpolation, since there's no way to
-      # tell if the overall selector is valid since the interpolation could
-      # insert commas incorrectly. Thus we simply ignore.
-      return unless node.rule.all? { |item| item.is_a?(String) }
+    def visit_comma_sequence(node)
+      return unless node.members.count > 1
 
-      normalize_spacing(condense_to_string(node.rule)) =~ /\n,|,[^\n]/
-    end
-
-    # Since RuleNode.rule returns an array containing both String and
-    # Sass::Script::Nodes, we need to condense it into a single string that we
-    # can run a regex against.
-    def condense_to_string(sequence_list)
-      sequence_list.select { |item| item.is_a?(String) }.inject(:+)
-    end
+      if node.members[0].members[1] == "\n"
+        # Comma is on its own line
+        add_lint(node, MESSAGE)
+      end
 
-    # Removes extra spacing between lines in a comma-separated sequence due to
-    # comments being removed in the parse phase. This makes it easy to check if
-    # a comma is where it belongs.
-    def normalize_spacing(string_sequence)
-      string_sequence.gsub(/,[^\S\n]*\n\s*/, ",\n")
+      node.members[1..-1].each_with_index do |sequence, index|
+        if sequence.members[0] != "\n"
+          # Next sequence doesn't reside on its own line
+          add_lint(node.line + index, MESSAGE)
+        elsif sequence.members[1] == "\n"
+          # Comma is on its own line
+          add_lint(node.line + index, MESSAGE)
+        end
+      end
     end
   end
 end

data/lib/scss_lint/linter/string_quotes.rb

@@ -3,6 +3,17 @@ module SCSSLint
   class Linter::StringQuotes < Linter
     include LinterRegistry
 
+    def visit_script_stringinterpolation(node)
+      # We can't statically determine what the resultant string looks like when
+      # string interpolation is used, e.g. "one #{$var} three" could be a very
+      # different string depending on $var = `'" + "'` or $var = `two`.
+      #
+      # Thus we manually skip the substrings in the string interpolation and
+      # visit the expressions in the interpolation itself.
+      node.children.reject { |child| child.is_a?(Sass::Script::Tree::Literal) }
+                   .each { |child| visit(child) }
+    end
+
     def visit_script_string(node)
       check_quotes(node, source_from_range(node.source_range))
     end

data/lib/scss_lint/linter/unnecessary_parent_reference.rb

@@ -38,7 +38,7 @@ module SCSSLint
       first = simple_sequence.members.first
       simple_sequence.members.size == 1 &&
         first.is_a?(Sass::Selector::Parent) &&
-        first.suffix.empty? # Ignore concatenated selectors, like `&-something`
+        first.suffix.nil? # Ignore concatenated selectors, like `&-something`
     end
   end
 end

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/single_line_per_selector_spec.rb

@@ -29,7 +29,7 @@ describe SCSSLint::Linter::SingleLinePerSelector do
       }
     CSS
 
-    it { should report_lint line: 1 }
+    it { should report_lint line: 3 }
   end
 
   context 'when commas are not at the end of the line' do
@@ -64,7 +64,7 @@ describe SCSSLint::Linter::SingleLinePerSelector do
       }
     CSS
 
-    it { should report_lint line: 2 }
+    it { should report_lint line: 4 }
   end
 
   context 'when rule contains interpolated selectors' do

data/spec/scss_lint/linter/string_quotes_spec.rb

@@ -218,6 +218,26 @@ describe SCSSLint::Linter::StringQuotes do
 
         it { should_not report_lint }
       end
+
+      context 'and contains interpolation inside a substring with single quotes' do
+        let(:css) { <<-CSS }
+          p {
+            content: "<svg width='\#{$something}'>";
+          }
+        CSS
+
+        it { should_not report_lint }
+      end
+
+      context 'and contains a single-quoted string inside interpolation' do
+        let(:css) { <<-CSS }
+          p {
+            content: "<svg width='\#{func('hello')}'>";
+          }
+        CSS
+
+        it { should report_lint }
+      end
     end
 
     context 'and string is written with double quotes' do

data/spec/scss_lint/selector_visitor_spec.rb

@@ -36,7 +36,7 @@ describe SCSSLint::SelectorVisitor do
     context 'when visitor defines visit_attribute' do
       class TestAttributeVisitor < TrackingSelectorVisitor
         def visit_attribute(attribute)
-          @node_order << attribute.name.join
+          @node_order << attribute.name
         end
       end
 
@@ -56,7 +56,7 @@ describe SCSSLint::SelectorVisitor do
     context 'when visitor defines visit_class' do
       class TestClassVisitor < TrackingSelectorVisitor
         def visit_class(klass)
-          @node_order << klass.name.join
+          @node_order << klass.name
         end
       end
 
@@ -76,7 +76,7 @@ describe SCSSLint::SelectorVisitor do
     context 'when visitor defines visit_element' do
       class TestElementVisitor < TrackingSelectorVisitor
         def visit_element(element)
-          @node_order << element.name.join
+          @node_order << element.name
         end
       end
 
@@ -96,7 +96,7 @@ describe SCSSLint::SelectorVisitor do
     context 'when visitor defines visit_id' do
       class TestIdVisitor < TrackingSelectorVisitor
         def visit_id(id)
-          @node_order << id.name.join
+          @node_order << id.name
         end
       end
 
@@ -137,7 +137,7 @@ describe SCSSLint::SelectorVisitor do
     context 'when visitor defines visit_placeholder' do
       class TestPlaceholderVisitor < TrackingSelectorVisitor
         def visit_placeholder(placeholder)
-          @node_order << placeholder.name.join
+          @node_order << placeholder.name
         end
       end
 
@@ -156,7 +156,7 @@ describe SCSSLint::SelectorVisitor do
     context 'when visitor defines visit_pseudo' do
       class TestPseudoVisitor < TrackingSelectorVisitor
         def visit_pseudo(pseudo)
-          @node_order << pseudo.name.join
+          @node_order << pseudo.name
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -31,20 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +73,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.25.0
 description: Configurable tool for writing clean and consistent SCSS
 email:
 - eng@causes.com
@@ -295,3 +289,4 @@ test_files:
 - spec/support/matchers/report_lint.rb
 - spec/support/isolated_environment.rb
 - spec/spec_helper.rb
+has_rdoc: