scss-lint 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7439d0611e864629c12a2f1e95c417b0e0615a
-  data.tar.gz: 4ca3047aa3497339ee4dc9164764d229e38f9a27
+  metadata.gz: 70bae0144c5b9e28dc02a481787f9a59d6904829
+  data.tar.gz: 0ae51c9a6ab0cca63274d0026ad07c27acecad75
 SHA512:
-  metadata.gz: 74cf4f6c5e8fcd106500db1a05ef37d311065cbd97ef4e120380d2d6c6c90ff252d9f6818a863708337b42cc24d352cd6ba5909a2216c987b7b1d07419f9aa79
-  data.tar.gz: 04e23316befdbaf54f37f6004df3b5e93a9eab83ce00a5f36de107ec5176485092c1f22e965fc3f2617e4a7c7f536d171a8099a5c5ea50353b80cd86030aee0c
+  metadata.gz: a3040302bcde27b996f2f1bb0e3825c0173c6b965d5ffe41e50d7c9313de01ef00482a7c4b408837776882098c9a492c82fb1bd86a2f9eb9b8536c7db838e7c1
+  data.tar.gz: ded041dd16b6b836c21db252c2747acabe2be2296b321cbfc763a7cdd89f9c8232c00b76f37f11045deb4adbb30842316154a32670f7c29c831a94e4061f0943

data/config/default.yml

@@ -28,6 +28,10 @@ linters:
   EmptyRule:
     enabled: true
 
+  FinalNewline:
+    enabled: true
+    present: true
+
   HexFormat:
     enabled: true
 
@@ -77,6 +81,7 @@ linters:
 
   SpaceBeforeBrace:
     enabled: true
+    allow_single_line_padding: false
 
   SpaceBetweenParens:
     enabled: true

data/lib/scss_lint/engine.rb

@@ -20,11 +20,11 @@ module SCSSLint
         @contents = scss_or_filename
       end
 
-      @lines = @contents.split("\n")
+      @lines = @contents.lines.to_a # Need `to_a` for Ruby 1.9.3
       @tree = @engine.to_tree
-    rescue Encoding::UndefinedConversionError, ArgumentError => error
+    rescue Encoding::UndefinedConversionError, Sass::SyntaxError => error
       if error.is_a?(Encoding::UndefinedConversionError) ||
-         error.message.include?('invalid byte sequence')
+         error.message.match(/invalid.*(byte sequence|character)/i)
         raise FileEncodingError,
               "Unable to parse SCSS file: #{error}",
               error.backtrace

data/lib/scss_lint/linter/empty_line_between_blocks.rb

@@ -80,19 +80,5 @@ module SCSSLint
           .children
           .select { |child| child.is_a?(Sass::Tree::Node) }
     end
-
-    def node_on_single_line(node)
-      return if node.source_range.start_pos.line != node.source_range.end_pos.line
-
-      # The Sass parser reports an incorrect source range if the trailing curly
-      # brace is on the next line, e.g.
-      #
-      #   p {
-      #   }
-      #
-      # Since we don't want to count this as a single line node, check if the
-      # last character on the first line is an opening curly brace.
-      engine.lines[node.line - 1].strip[-1] != '{'
-    end
   end
 end

data/lib/scss_lint/linter/final_newline.rb

@@ -0,0 +1,20 @@
+module SCSSLint
+  # Checks for final newlines at the end of a file.
+  class Linter::FinalNewline < Linter
+    include LinterRegistry
+
+    def visit_root(node)
+      return if engine.lines.empty?
+
+      ends_with_newline = engine.lines[-1][-1] == "\n"
+
+      if config['present']
+        add_lint(engine.lines.count,
+                 'Files should end with a trailing newline') unless ends_with_newline
+      else
+        add_lint(engine.lines.count,
+                 'Files should not end with a trailing newline') if ends_with_newline
+      end
+    end
+  end
+end

data/lib/scss_lint/linter/space_after_property_colon.rb

@@ -4,15 +4,20 @@ module SCSSLint
   class Linter::SpaceAfterPropertyColon < Linter
     include LinterRegistry
 
-    EXPECTED_SPACES_AFTER_COLON = 1
+    MINIMUM_SPACES_AFTER_COLON = 1
 
     def visit_prop(node)
       spaces = spaces_after_colon(node)
 
-      if spaces != EXPECTED_SPACES_AFTER_COLON
+      if config['allow_extra_spaces']
+        if spaces < MINIMUM_SPACES_AFTER_COLON
+          add_lint node, 'Colon after property should be followed by ' <<
+                         "at least #{pluralize(MINIMUM_SPACES_AFTER_COLON, 'space')} "
+        end
+      elsif spaces != MINIMUM_SPACES_AFTER_COLON
         add_lint node, 'Colon after property should be followed by ' <<
-                       "#{pluralize(EXPECTED_SPACES_AFTER_COLON, 'space')} instead of " <<
-                       pluralize(spaces, 'space')
+                       pluralize(MINIMUM_SPACES_AFTER_COLON, 'space') <<
+                       " instead of #{pluralize(spaces, 'space')}"
       end
     end
 

data/lib/scss_lint/linter/space_before_brace.rb

@@ -5,8 +5,17 @@ module SCSSLint
 
     def visit_root(node)
       engine.lines.each_with_index do |line, index|
-        line.scan /[^"#](?<![^ ] )\{/ do |match|
-          add_lint(index + 1, 'Opening curly braces ({) should be preceded by one space')
+
+        if config['allow_single_line_padding'] && node_on_single_line(node)
+          line.scan(/[^"#' ]\{/) do |match|
+            add_lint(index + 1, 'Opening curly brace `{` should be ' <<
+                                'preceded by at least one space')
+          end
+        else
+          line.scan(/[^"#'](?<![^ ] )\{/) do |match|
+            add_lint(index + 1, 'Opening curly brace `{` should be ' <<
+                                'preceded by one space')
+          end
         end
       end
     end

data/lib/scss_lint/linter/trailing_semicolon_after_property_value.rb

@@ -7,8 +7,18 @@ module SCSSLint
     def visit_prop(node)
       has_nested_props = has_nested_properties?(node)
 
-      if !has_nested_props && !ends_with_semicolon?(node)
-        add_lint node.line, 'Property declaration should end with a semicolon'
+      unless has_nested_props
+        if has_space_before_semicolon?(node)
+          line = node.source_range.end_pos
+          add_lint line, 'Property declaration should be terminated by a semicolon'
+        elsif !ends_with_semicolon?(node)
+          # Adjust line since lack of semicolon results in end of source range
+          # being on the next line
+          line = node.source_range.end_pos.line - 1
+          add_lint line,
+                   'Property declaration should not have a space before ' <<
+                   'the terminating semicolon'
+        end
       end
 
       yield if has_nested_props
@@ -22,8 +32,11 @@ module SCSSLint
 
     # Checks that the property is ended by a semicolon (with no whitespace)
     def ends_with_semicolon?(node)
-      character_at(node.source_range.end_pos) == ';' &&
-        character_at(node.source_range.end_pos, -1) !~ /\s/
+      source_from_range(node.source_range) =~ /;$/
+    end
+
+    def has_space_before_semicolon?(node)
+      source_from_range(node.source_range) =~ /\s;$/
     end
   end
 end

data/lib/scss_lint/linter/url_format.rb

@@ -43,6 +43,7 @@ module SCSSLint
     end
 
     def check_url(url, node)
+      return if url.match(/^data:/)
       uri = URI(url)
 
       if uri.scheme || uri.host

data/lib/scss_lint/linter/zero_unit.rb

@@ -4,6 +4,8 @@ module SCSSLint
     include LinterRegistry
 
     def visit_script_string(node)
+      return unless node.type == :identifier
+
       node.value.scan(ZERO_UNIT_REGEX) do |match|
         add_lint(node, MESSAGE_FORMAT % match.first)
       end

data/lib/scss_lint/linter.rb

@@ -37,9 +37,6 @@ module SCSSLint
       actual_line   = source_position.line - 1
       actual_offset = source_position.offset + offset - 1
 
-      # Return a newline if offset points at the very end of the line
-      return "\n" if actual_offset == engine.lines[actual_line].length
-
       engine.lines[actual_line][actual_offset]
     end
 
@@ -60,20 +57,35 @@ module SCSSLint
 
       current_line += 1
       while current_line < last_line
-        source += "#{engine.lines[current_line]}\n"
+        source += "#{engine.lines[current_line]}"
         current_line += 1
       end
 
-      if source_range.start_pos.line != source_range.end_pos.line &&
-         # Sometimes the parser reports ranges ending on the first column of the
-         # line after the last line; don't include the last line in this case.
-         engine.lines.count == current_line - 1
-        source += "#{engine.lines[current_line][0...source_range.end_pos.offset]}\n"
+      if source_range.start_pos.line != source_range.end_pos.line
+        source += "#{(engine.lines[current_line] || '')[0...source_range.end_pos.offset]}"
       end
 
       source
     end
 
+    # Returns whether a given node spans only a single line.
+    #
+    # @param node [Sass::Tree::Node]
+    # @return [true,false] whether the node spans a single line
+    def node_on_single_line(node)
+      return if node.source_range.start_pos.line != node.source_range.end_pos.line
+
+      # The Sass parser reports an incorrect source range if the trailing curly
+      # brace is on the next line, e.g.
+      #
+      #   p {
+      #   }
+      #
+      # Since we don't want to count this as a single line node, check if the
+      # last character on the first line is an opening curly brace.
+      engine.lines[node.line - 1].strip[-1] != '{'
+    end
+
     # Modified so we can also visit selectors in linters
     #
     # @param node [Sass::Tree::Node, Sass::Script::Tree::Node,

data/lib/scss_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -78,56 +78,57 @@ extra_rdoc_files: []
 files:
 - config/default.yml
 - data/properties.txt
-- lib/scss_lint/cli.rb
-- lib/scss_lint/config.rb
+- lib/scss_lint/version.rb
 - lib/scss_lint/constants.rb
-- lib/scss_lint/engine.rb
+- lib/scss_lint/utils.rb
+- lib/scss_lint/reporter/files_reporter.rb
+- lib/scss_lint/reporter/xml_reporter.rb
+- lib/scss_lint/reporter/default_reporter.rb
+- lib/scss_lint/runner.rb
+- lib/scss_lint/reporter.rb
 - lib/scss_lint/lint.rb
-- lib/scss_lint/linter/border_zero.rb
-- lib/scss_lint/linter/capitalization_in_selector.rb
-- lib/scss_lint/linter/color_keyword.rb
-- lib/scss_lint/linter/comment.rb
-- lib/scss_lint/linter/compass/property_with_mixin.rb
+- lib/scss_lint/linter.rb
+- lib/scss_lint/rake_task.rb
+- lib/scss_lint/selector_visitor.rb
+- lib/scss_lint/sass/tree.rb
+- lib/scss_lint/sass/script.rb
+- lib/scss_lint/config.rb
 - lib/scss_lint/linter/compass.rb
-- lib/scss_lint/linter/debug_statement.rb
-- lib/scss_lint/linter/declaration_order.rb
-- lib/scss_lint/linter/duplicate_property.rb
-- lib/scss_lint/linter/empty_line_between_blocks.rb
-- lib/scss_lint/linter/empty_rule.rb
-- lib/scss_lint/linter/hex_format.rb
-- lib/scss_lint/linter/id_with_extraneous_selector.rb
+- lib/scss_lint/linter/space_after_comma.rb
+- lib/scss_lint/linter/space_before_brace.rb
+- lib/scss_lint/linter/capitalization_in_selector.rb
 - lib/scss_lint/linter/indentation.rb
-- lib/scss_lint/linter/leading_zero.rb
-- lib/scss_lint/linter/name_format.rb
+- lib/scss_lint/linter/trailing_semicolon_after_property_value.rb
+- lib/scss_lint/linter/shorthand.rb
+- lib/scss_lint/linter/final_newline.rb
+- lib/scss_lint/linter/id_with_extraneous_selector.rb
+- lib/scss_lint/linter/empty_line_between_blocks.rb
+- lib/scss_lint/linter/declaration_order.rb
+- lib/scss_lint/linter/zero_unit.rb
 - lib/scss_lint/linter/placeholder_in_extend.rb
-- lib/scss_lint/linter/property_sort_order.rb
-- lib/scss_lint/linter/property_spelling.rb
 - lib/scss_lint/linter/selector_depth.rb
-- lib/scss_lint/linter/shorthand.rb
-- lib/scss_lint/linter/single_line_per_selector.rb
-- lib/scss_lint/linter/space_after_comma.rb
-- lib/scss_lint/linter/space_after_property_colon.rb
+- lib/scss_lint/linter/compass/property_with_mixin.rb
 - lib/scss_lint/linter/space_after_property_name.rb
-- lib/scss_lint/linter/space_before_brace.rb
+- lib/scss_lint/linter/property_spelling.rb
+- lib/scss_lint/linter/url_quotes.rb
+- lib/scss_lint/linter/name_format.rb
 - lib/scss_lint/linter/space_between_parens.rb
+- lib/scss_lint/linter/border_zero.rb
+- lib/scss_lint/linter/space_after_property_colon.rb
+- lib/scss_lint/linter/debug_statement.rb
+- lib/scss_lint/linter/duplicate_property.rb
+- lib/scss_lint/linter/property_sort_order.rb
+- lib/scss_lint/linter/hex_format.rb
+- lib/scss_lint/linter/color_keyword.rb
 - lib/scss_lint/linter/string_quotes.rb
-- lib/scss_lint/linter/trailing_semicolon_after_property_value.rb
+- lib/scss_lint/linter/leading_zero.rb
+- lib/scss_lint/linter/comment.rb
+- lib/scss_lint/linter/empty_rule.rb
+- lib/scss_lint/linter/single_line_per_selector.rb
 - lib/scss_lint/linter/url_format.rb
-- lib/scss_lint/linter/url_quotes.rb
-- lib/scss_lint/linter/zero_unit.rb
-- lib/scss_lint/linter.rb
+- lib/scss_lint/cli.rb
+- lib/scss_lint/engine.rb
 - lib/scss_lint/linter_registry.rb
-- lib/scss_lint/rake_task.rb
-- lib/scss_lint/reporter/default_reporter.rb
-- lib/scss_lint/reporter/files_reporter.rb
-- lib/scss_lint/reporter/xml_reporter.rb
-- lib/scss_lint/reporter.rb
-- lib/scss_lint/runner.rb
-- lib/scss_lint/sass/script.rb
-- lib/scss_lint/sass/tree.rb
-- lib/scss_lint/selector_visitor.rb
-- lib/scss_lint/utils.rb
-- lib/scss_lint/version.rb
 - lib/scss_lint.rb
 - bin/scss-lint
 homepage: https://github.com/causes/scss-lint