scss-lint 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d896111a17640c23d31de062d34329fd52a56a
-  data.tar.gz: 6f34a07866cd4b7c77a18137f2bec2570e9f31e5
+  metadata.gz: b4c9a5150295e39ef201b5e859ec234fca634c4f
+  data.tar.gz: 7ba8ffe0e6d78046545adc099c8da31fa66ade90
 SHA512:
-  metadata.gz: d100dfddcde8591cbff342d88bc37f685ac337eb32b9193b87f09c46cf50dc61c04717a4e67fe843f6135fb186f8c5e43b7c6711680d67e766e56e71bb04ff94
-  data.tar.gz: 65e67618d2e00e428a38adb5243236dea6464f17df75914937da60afbf3eded4f3b0e7be4d526b4d05c264c9a0ef5f5ed1cc13cbab3dac4a5cde3673f4e991d0
+  metadata.gz: f845f596de85f75b73877b5119d7b489595235ae0bf528fc6b5d1bfa3a9d9876ae362a3971358fe3f3851b068fb61fad663ecf54360ed1c52ac0e3a0e1eaf4d4
+  data.tar.gz: 91ef3f85f89903fa81f3f6d125c6514af658da43c9ba13d46d86e11aa0cfcdafdb3f6f88ba5723ed634a9ca276523bdb689acbc49b351c631fdebc4b6669fda9

data/config/default.yml

@@ -176,11 +176,11 @@ linters:
     enabled: false
     properties: []
 
-  VendorPrefixes:
+  VendorPrefix:
     enabled: true
     identifier_list: base
-    include: []
-    exclude: []
+    additional_identifiers: []
+    excluded_identifiers: []
 
   ZeroUnit:
     enabled: true

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

@@ -22,6 +22,16 @@ clear
 transform
 transition
 
+animation
+animation-name
+animation-duration
+animation-timing-function
+animation-delay
+animation-iteration-count
+animation-direction
+animation-fill-mode
+animation-play-state
+
 visibility
 opacity
 z-index

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

@@ -89,7 +89,6 @@ background-image
 background-repeat
 background-position
 background-size
-cursor
 
 # Text
 

data/lib/scss_lint/control_comment_processor.rb

@@ -88,11 +88,13 @@ module SCSSLint
       # the comment itself).
       child = node
       prev_child = node
-      while (child = last_child(child)) != prev_child
+      until [nil, prev_child].include?(child = last_child(child))
         prev_child = child
       end
 
-      end_line = child.line
+      # Fall back to prev_child if last_child() returned nil (i.e. node had no
+      # children with line numbers)
+      end_line = (child || prev_child).line
 
       @disabled_lines.merge(start_line..end_line)
     end
@@ -103,13 +105,22 @@ module SCSSLint
     # tree's {#children} method does not return nodes sorted by their line
     # number.
     #
+    # Returns `nil` if node has no children or no children with associated line
+    # numbers.
+    #
     # @param node [Sass::Tree::Node, Sass::Script::Tree::Node]
     # @return [Sass::Tree::Node, Sass::Script::Tree::Node]
     def last_child(node)
-      node.children.inject(node) do |lowest, child|
+      last = node.children.inject(node) do |lowest, child|
         return lowest unless child.respond_to?(:line)
         lowest.line < child.line ? child : lowest
       end
+
+      # In this case, none of the children have associated line numbers or the
+      # node has no children at all, so return `nil`.
+      return if last == node
+
+      last
     end
   end
 end

data/lib/scss_lint/engine.rb

@@ -13,12 +13,14 @@ module SCSSLint
     # Creates a parsed representation of an SCSS document from the given string
     # or file.
     #
-    # @param scss_or_filename [String]
-    def initialize(scss_or_filename)
-      if File.exist?(scss_or_filename)
-        build_from_file(scss_or_filename)
-      else
-        build_from_string(scss_or_filename)
+    # @param options [Hash]
+    # @option options [String] :file The file to load
+    # @option options [String] :code The code to parse
+    def initialize(options = {})
+      if options[:file]
+        build_from_file(options[:file])
+      elsif options[:code]
+        build_from_string(options[:code])
       end
 
       # Need to force encoding to avoid Windows-related bugs.

data/lib/scss_lint/linter/color_variable.rb

@@ -9,7 +9,7 @@ module SCSSLint
       # Source range sometimes includes closing parenthesis, so extract it
       color = source_from_range(node.source_range)[/(#?[a-z0-9]+)/i, 1]
 
-      record_lint(node, color)
+      record_lint(node, color) if color?(color)
     end
 
     def visit_script_string(node)

data/lib/scss_lint/linter/indentation.rb

@@ -1,6 +1,6 @@
 module SCSSLint
   # Checks for consistent indentation of nested declarations and rule sets.
-  class Linter::Indentation < Linter
+  class Linter::Indentation < Linter # rubocop:disable ClassLength
     include LinterRegistry
 
     def visit_root(_node)
@@ -40,7 +40,7 @@ module SCSSLint
     end
 
     def check_indent_width(node, other_character, character_name, other_character_name)
-      actual_indent = engine.lines[node.line - 1][/^(\s*)/, 1]
+      actual_indent = node_indent(node)
 
       if actual_indent.include?(other_character)
         add_lint(node.line,
@@ -49,14 +49,11 @@ module SCSSLint
         return true
       end
 
-      unless allow_arbitrary_indent?(node) || actual_indent.length == @indent
-        add_lint(node.line,
-                 "Line should be indented #{@indent} #{character_name}s, " \
-                 "but was indented #{actual_indent.length} #{character_name}s")
-        return true
+      if config['allow_non_nested_indentation']
+        check_arbitrary_indent(node, actual_indent.length, character_name)
+      else
+        check_regular_indent(node, actual_indent.length, character_name)
       end
-
-      false
     end
 
     # Deal with `else` statements
@@ -131,10 +128,70 @@ module SCSSLint
       same_position?(node.source_range.end_pos, first_child_source.start_pos)
     end
 
-    def allow_arbitrary_indent?(node)
-      @indent == 0 &&
-        config['allow_non_nested_indentation'] &&
-        node.is_a?(Sass::Tree::RuleNode)
+    def check_regular_indent(node, actual_indent, character_name)
+      return if actual_indent == @indent
+
+      add_lint(node.line,
+               "Line should be indented #{@indent} #{character_name}s, " \
+               "but was indented #{actual_indent} #{character_name}s")
+      true
+    end
+
+    def check_arbitrary_indent(node, actual_indent, character_name) # rubocop:disable CyclomaticComplexity, MethodLength, LineLength
+      # Allow rulesets to be indented any amount when the indent is zero, as
+      # long as it's a multiple of the indent width
+      if ruleset_under_root_node?(node)
+        unless actual_indent % @indent_width == 0
+          add_lint(node.line,
+                   "Line must be indented a multiple of #{@indent_width} " \
+                   "#{character_name}s, but was indented #{actual_indent} #{character_name}s")
+          return true
+        end
+      end
+
+      if @indent == 0
+        unless node.is_a?(Sass::Tree::RuleNode) || actual_indent == 0
+          add_lint(node.line,
+                   "Line should be indented 0 #{character_name}s, " \
+                   "but was indented #{actual_indent} #{character_name}s")
+          return true
+        end
+      elsif !one_shift_greater_than_parent?(node, actual_indent)
+        parent_indent = node_indent(node.node_parent).length
+        expected_indent = parent_indent + @indent_width
+
+        add_lint(node.line,
+                 "Line should be indented #{expected_indent} #{character_name}s, " \
+                 "but was indented #{actual_indent} #{character_name}s")
+        return true
+      end
+    end
+
+    # Returns whether node is a ruleset not nested within any other ruleset.
+    #
+    # @param node [Sass::Tree::Node]
+    # @return [true,false]
+    def ruleset_under_root_node?(node)
+      @indent == 0 && node.is_a?(Sass::Tree::RuleNode)
+    end
+
+    # Returns whether node is indented exactly one indent width greater than its
+    # parent.
+    #
+    # @param node [Sass::Tree::Node]
+    # @return [true,false]
+    def one_shift_greater_than_parent?(node, actual_indent)
+      parent_indent = node_indent(node.node_parent).length
+      expected_indent = parent_indent + @indent_width
+      expected_indent == actual_indent
+    end
+
+    # Return indentation of a node.
+    #
+    # @param node [Sass::Tree::Node]
+    # @return [Integer]
+    def node_indent(node)
+      engine.lines[node.line - 1][/^(\s*)/, 1]
     end
   end
 end

data/lib/scss_lint/linter/{vendor_prefixes.rb → vendor_prefix.rb}

@@ -1,12 +1,12 @@
 module SCSSLint
   # Checks for vendor prefixes.
-  class Linter::VendorPrefixes < Linter
+  class Linter::VendorPrefix < Linter
     include LinterRegistry
 
     def visit_root(_node)
       @identifiers = Set.new(extract_identifiers_from_config)
-      @identifiers.merge(Set.new(config['include']))
-      @exclusions = Set.new(config['exclude'])
+      @identifiers.merge(Set.new(config['additional_identifiers']))
+      @exclusions = Set.new(config['excluded_identifiers'])
       yield
     end
 

data/lib/scss_lint/runner.rb

@@ -30,7 +30,7 @@ module SCSSLint
 
     # @param file [String]
     def find_lints(file)
-      engine = Engine.new(file)
+      engine = Engine.new(file: file)
 
       @linters.each do |linter|
         begin

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/cli_spec.rb

@@ -34,6 +34,7 @@ describe SCSSLint::CLI do
 
     before do
       SCSSLint::FileFinder.any_instance.stub(:find).and_return(files)
+      SCSSLint::Runner.any_instance.stub(:find_lints)
     end
 
     def safe_run

data/spec/scss_lint/engine_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SCSSLint::Engine do
-  let(:engine) { described_class.new(scss) }
+  let(:engine) { described_class.new(code: scss) }
 
   context 'when a @media directive is present' do
     let(:scss) { <<-SCSS }

data/spec/scss_lint/linter/color_variable_spec.rb

@@ -99,4 +99,24 @@ describe SCSSLint::Linter::ColorVariable do
 
     it { should_not report_lint }
   end
+
+  context 'when a property contains "transparent"' do
+    let(:scss) { <<-SCSS }
+      p {
+        border: 1px solid transparent;
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
+
+  context 'when a property with function calls contains "transparent"' do
+    let(:scss) { <<-SCSS }
+      p {
+        border: 1px solid some-func(transparent);
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
 end

data/spec/scss_lint/linter/indentation_spec.rb

@@ -309,5 +309,39 @@ describe SCSSLint::Linter::Indentation do
 
       it { should report_lint line: 2 }
     end
+
+    context 'and a nested non-ruleset is correctly indented' do
+      let(:scss) { <<-SCSS }
+        .one {
+          color: #000;
+        }
+          .two {
+            margin: 0;
+          }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
+    context 'and a nested non-ruleset is incorrectly indented' do
+      let(:scss) { <<-SCSS }
+        .one {
+          color: #000;
+        }
+          .two {
+              margin: 0;
+          }
+      SCSS
+
+      it { should report_lint line: 5 }
+    end
+
+    context 'and a non-nested non-ruleset is correctly indented' do
+      let(:scss) { <<-SCSS }
+        $var: 1
+      SCSS
+
+      it { should_not report_lint }
+    end
   end
 end

data/spec/scss_lint/linter/{vendor_prefixes_spec.rb → vendor_prefix_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SCSSLint::Linter::VendorPrefixes do
+describe SCSSLint::Linter::VendorPrefix do
   context 'when no vendor-prefix is used' do
     let(:scss) { <<-SCSS }
       div {
@@ -280,11 +280,16 @@ describe SCSSLint::Linter::VendorPrefixes do
   # Excluding and Including
 
   context 'when manually excluding identifiers' do
-    let(:linter_config) { { 'exclude' => %w[transform selection] } }
+    let(:linter_config) do
+      {
+        'identifier_list' => 'base',
+        'excluded_identifiers' => %w[transform selection],
+      }
+    end
 
     let(:scss) { <<-SCSS }
       div {
-        -wekit-transform: translateZ(0);
+        -webkit-transform: translateZ(0);
       }
       ::-moz-selection {
         color: #000;
@@ -295,7 +300,13 @@ describe SCSSLint::Linter::VendorPrefixes do
   end
 
   context 'when manually including identifiers' do
-    let(:linter_config) { { 'include' => ['padding-end'] } }
+    let(:linter_config) do
+      {
+        'identifier_list' => 'base',
+        'additional_identifiers' => ['padding-end'],
+        'excluded_identifiers' => [],
+      }
+    end
 
     let(:scss) { <<-SCSS }
       div {

data/spec/scss_lint/runner_spec.rb

@@ -71,7 +71,7 @@ describe SCSSLint::Runner do
       end
 
       before do
-        SCSSLint::Engine.stub(:new).with(files.last).and_raise(error)
+        SCSSLint::Engine.stub(:new).with(file: files.last).and_raise(error)
       end
 
       it 'records the error as a lint' do

data/spec/scss_lint/selector_visitor_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe SCSSLint::SelectorVisitor do
   describe '#visit' do
-    let(:engine) { SCSSLint::Engine.new(scss) }
+    let(:engine) { SCSSLint::Engine.new(code: scss) }
     before { RuleVisitor.new(visitor).run(engine) }
 
     # Visits every rule in the given parse tree and passes the parsed selector

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ RSpec.configure do |config|
                        SCSSLint::Config.default.linter_options(subject)
                      end
 
-      subject.run(SCSSLint::Engine.new(normalized_css), local_config)
+      subject.run(SCSSLint::Engine.new(code: normalized_css), local_config)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -142,7 +142,7 @@ files:
 - lib/scss_lint/linter/url_format.rb
 - lib/scss_lint/linter/url_quotes.rb
 - lib/scss_lint/linter/variable_for_property.rb
-- lib/scss_lint/linter/vendor_prefixes.rb
+- lib/scss_lint/linter/vendor_prefix.rb
 - lib/scss_lint/linter/zero_unit.rb
 - lib/scss_lint/linter_registry.rb
 - lib/scss_lint/location.rb
@@ -211,7 +211,7 @@ files:
 - spec/scss_lint/linter/url_format_spec.rb
 - spec/scss_lint/linter/url_quotes_spec.rb
 - spec/scss_lint/linter/variable_for_property_spec.rb
-- spec/scss_lint/linter/vendor_prefixes_spec.rb
+- spec/scss_lint/linter/vendor_prefix_spec.rb
 - spec/scss_lint/linter/zero_unit_spec.rb
 - spec/scss_lint/linter_registry_spec.rb
 - spec/scss_lint/linter_spec.rb
@@ -254,9 +254,7 @@ signing_key:
 specification_version: 4
 summary: SCSS lint tool
 test_files:
-- spec/scss_lint/cli_spec.rb
 - spec/scss_lint/config_spec.rb
-- spec/scss_lint/engine_spec.rb
 - spec/scss_lint/file_finder_spec.rb
 - spec/scss_lint/linter/bang_format_spec.rb
 - spec/scss_lint/linter/border_zero_spec.rb
@@ -277,7 +275,6 @@ test_files:
 - spec/scss_lint/linter/id_selector_spec.rb
 - spec/scss_lint/linter/import_path_spec.rb
 - spec/scss_lint/linter/important_rule_spec.rb
-- spec/scss_lint/linter/indentation_spec.rb
 - spec/scss_lint/linter/leading_zero_spec.rb
 - spec/scss_lint/linter/mergeable_selector_spec.rb
 - spec/scss_lint/linter/name_format_spec.rb
@@ -305,8 +302,9 @@ test_files:
 - spec/scss_lint/linter/url_format_spec.rb
 - spec/scss_lint/linter/url_quotes_spec.rb
 - spec/scss_lint/linter/variable_for_property_spec.rb
-- spec/scss_lint/linter/vendor_prefixes_spec.rb
+- spec/scss_lint/linter/vendor_prefix_spec.rb
 - spec/scss_lint/linter/zero_unit_spec.rb
+- spec/scss_lint/linter/indentation_spec.rb
 - spec/scss_lint/linter_registry_spec.rb
 - spec/scss_lint/linter_spec.rb
 - spec/scss_lint/location_spec.rb
@@ -318,9 +316,10 @@ test_files:
 - spec/scss_lint/reporter/json_reporter_spec.rb
 - spec/scss_lint/reporter/xml_reporter_spec.rb
 - spec/scss_lint/reporter_spec.rb
+- spec/scss_lint/cli_spec.rb
+- spec/scss_lint/engine_spec.rb
 - spec/scss_lint/runner_spec.rb
 - spec/scss_lint/selector_visitor_spec.rb
-- spec/spec_helper.rb
 - spec/support/isolated_environment.rb
 - spec/support/matchers/report_lint.rb
-has_rdoc: 
+- spec/spec_helper.rb