erb_lint 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90eb5bc60ea0fb154c329ea823b47cdc6668fd2
-  data.tar.gz: c3dd8088e111dba073a39680862892455f083d55
+  metadata.gz: 86e60e8bfa31cd289e7ead368d8eff2832a6a8f8
+  data.tar.gz: cae30be744c94ed73048403a4c1d911d2a5b8c15
 SHA512:
-  metadata.gz: f529f21d18aaa426d922c935f788baca62229af323991f8e2fce8ca58264e220500bb90c2ada9bb453669f1b6eb2fcfa8b6c90cd167c79aa8418e265eb5c0e20
-  data.tar.gz: 535e6ff06f827dc2724bfddcdaa31efcd2485c882d5815021ad1b7430b40761410ac83aa196f53041904bf6beb911464dac9a4ea495f60e2aeda7a9a3b048e56
+  metadata.gz: c5b8f374aecc1a4541bbaa363d65e8b8b38cf3d6ffb36f9f517b8057527205c48cb2225c190fcf35f2a2c0952b0aa5035439509d2c8e5b517905a18c848b2127
+  data.tar.gz: 3661165a60a0c6f6185957a6c61948e7d66c6cdaaa27c9e205ca39e340c75aa366094f1859e3ab4a9bd4d122744f73f4c66bd2e4086e060e89ec2f310ea7a4d9

data/lib/erb_lint.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'erb_lint/version'
+require 'erb_lint/offense'
 require 'erb_lint/linter_config'
 require 'erb_lint/linter_registry'
 require 'erb_lint/linter'

data/lib/erb_lint/cli.rb

@@ -40,12 +40,11 @@ module ERBLint
       runner_config = @config.merge(runner_config_override)
       runner = ERBLint::Runner.new(file_loader, runner_config)
       lint_files.each do |filename|
-        lint_result = runner.run(filename, File.read(filename))
-        errors = lint_result.map { |r| r[:errors] }.flatten
-        errors.each do |lint_error|
+        offenses = runner.run(filename, File.read(filename))
+        offenses.each do |offense|
           puts <<~EOF
-            #{lint_error[:message]}
-            In file: #{relative_filename(filename)}:#{lint_error[:line]}
+            #{offense.message}
+            In file: #{relative_filename(filename)}:#{offense.line_range.begin}
 
           EOF
           errors_found = true

data/lib/erb_lint/linters/deprecated_classes.rb

@@ -32,7 +32,7 @@ module ERBLint
         errors = []
         parser = build_parser(file_content)
         class_name_with_loc(parser).each do |class_name, loc|
-          errors.push(*generate_errors(class_name, loc.line))
+          errors.push(*generate_errors(class_name, loc.line_range))
         end
         text_tags_content(parser).each do |content|
           errors.push(*lint_file(content))
@@ -83,14 +83,16 @@ module ERBLint
         parser.nodes_with_type(:tag)
       end
 
-      def generate_errors(class_name, line_number)
+      def generate_errors(class_name, line_range)
         violated_rules(class_name).map do |violated_rule|
           suggestion = " #{violated_rule[:suggestion]}".rstrip
           message = "Deprecated class `%s` detected matching the pattern `%s`.%s #{@addendum}".strip
-          {
-            line: line_number,
-            message: format(message, class_name, violated_rule[:class_expr], suggestion)
-          }
+
+          Offense.new(
+            self,
+            line_range,
+            format(message, class_name, violated_rule[:class_expr], suggestion)
+          )
         end
       end
 

data/lib/erb_lint/linters/erb_safety.rb

@@ -25,7 +25,7 @@ module ERBLint
         errors = []
         tester = Tester.new(file_content, config: better_html_config)
         tester.errors.each do |error|
-          errors << format_error(error)
+          errors << format_offense(error)
         end
         errors
       end
@@ -44,11 +44,12 @@ module ERBLint
         end
       end
 
-      def format_error(error)
-        {
-          line: error.location.line,
-          message: error.message
-        }
+      def format_offense(error)
+        Offense.new(
+          self,
+          error.location.line_range,
+          error.message
+        )
       end
     end
   end

data/lib/erb_lint/linters/final_newline.rb

@@ -25,14 +25,16 @@ module ERBLint
         ends_with_newline = lines.last.chars[-1] == "\n"
 
         if @new_lines_should_be_present && !ends_with_newline
-          errors.push(
-            line: lines.length,
-            message: 'Missing a trailing newline at the end of the file.'
+          errors << Offense.new(
+            self,
+            Range.new(lines.length, lines.length),
+            'Missing a trailing newline at the end of the file.'
           )
         elsif !@new_lines_should_be_present && ends_with_newline
-          errors.push(
-            line: lines.length,
-            message: 'Remove the trailing newline at the end of the file.'
+          errors << Offense.new(
+            self,
+            Range.new(lines.length, lines.length),
+            'Remove the trailing newline at the end of the file.'
           )
         end
         errors

data/lib/erb_lint/linters/rubocop.rb

@@ -37,7 +37,7 @@ module ERBLint
           code = code.sub(BLOCK_EXPR, '')
           offenses = inspect_content(code)
           offenses&.each do |offense|
-            errors << format_error(code_node, offense)
+            errors << format_offense(file_content, code_node, offense)
           end
         end
         errors
@@ -82,11 +82,17 @@ module ERBLint
         RuboCop::Cop::Team.new(cop_classes, @rubocop_config, extra_details: true, display_cop_names: true)
       end
 
-      def format_error(code_node, offense)
-        {
-          line: code_node.loc.line + offense.line - 1,
-          message: offense.message.strip
-        }
+      def format_offense(file_content, code_node, offense)
+        loc = BetterHtml::Tokenizer::Location.new(
+          file_content,
+          code_node.loc.start + offense.location.begin_pos,
+          code_node.loc.start + offense.location.end_pos - 1,
+        )
+        Offense.new(
+          self,
+          loc.line_range,
+          offense.message.strip
+        )
       end
 
       def config_from_hash(hash)

data/lib/erb_lint/offense.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ERBLint
+  # Defines common functionality available to all linters.
+  class Offense
+    attr_reader :linter, :line_range, :message
+
+    def initialize(linter, line_range, message)
+      @linter = linter
+      @line_range = line_range
+      @message = message
+    end
+
+    def inspect
+      "#<#{self.class.name} linter=#{linter.class.name} "\
+        "line_range=#{line_range} "\
+        "message=#{message}>"
+    end
+
+    def ==(other)
+      other.class == self.class &&
+        other.linter == linter &&
+        other.line_range == line_range &&
+        other.message == message
+    end
+  end
+end

data/lib/erb_lint/runner.rb

@@ -16,13 +16,13 @@ module ERBLint
     end
 
     def run(filename, file_content)
-      linters_for_file = @linters.reject { |linter| linter.excludes_file?(filename) }
-      linters_for_file.map do |linter|
-        {
-          linter_name: linter.class.simple_name,
-          errors: linter.lint_file(file_content)
-        }
+      offenses = []
+      @linters
+        .reject { |linter| linter.excludes_file?(filename) }
+        .each do |linter|
+        offenses += linter.lint_file(file_content)
       end
+      offenses
     end
   end
 end

data/lib/erb_lint/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ERBLint
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -141,6 +141,7 @@ files:
 - lib/erb_lint/linters/erb_safety.rb
 - lib/erb_lint/linters/final_newline.rb
 - lib/erb_lint/linters/rubocop.rb
+- lib/erb_lint/offense.rb
 - lib/erb_lint/runner.rb
 - lib/erb_lint/runner_config.rb
 - lib/erb_lint/version.rb