erb_lint 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a211bea7ec247bcf1d79ede8f37db1b6b7d1b8c
-  data.tar.gz: 362ca7b4ffb1f184818889166cb572198c1def7e
+  metadata.gz: 3e9127a9303ed73745516b7a4432e08f8f1e9cd5
+  data.tar.gz: 2c689a6e356cc463eb9f892294cf7d4c6ea5d1b9
 SHA512:
-  metadata.gz: 45c2ff7d03c2ec43e37562887ad9cdc9f396b0084bf290036a848aa820fed661a0f99a49d120be62100aa15c640fa4374f5937c9accb0066a06028632ac56e8f
-  data.tar.gz: 16279ef10a1f004fe97309dde027de0bf244ac0a9e047b9a0ff04be73d5d9d71494e1e2ab08d584b9123ee96f35a05525ff7b8ff09d005d3f75f000c009eacbf
+  metadata.gz: e9f5598858497fffa0217f7f8869184bdd27f3f034a2b080dec4666e1605d9d44a0d5fd5a1d2d44e50faa3802471d08cca79a995e28bfc849914cbd3deb3d6e6
+  data.tar.gz: eb350b03fd5dbe4e73b15417abe76e4674958dbc19b8381ad39c23177a2bddf193e406df28ebebe27e30548692facfc080695ba20449ad1757b55f937abf5a5e

data/lib/erb_lint/linters/deprecated_classes.rb

@@ -62,7 +62,7 @@ module ERBLint
         each_element_with_index(iterator) do |element, index|
           type = element.find_attr('type')
           next unless type
-          next unless 'text/html' == type.value_without_quotes
+          next unless type.value_without_quotes == 'text/html'
           next_node = iterator.nodes[index + 1]
 
           yield next_node if next_node&.text?

data/lib/erb_lint/linters/rubocop.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'better_html'
+require 'rubocop'
+require 'tempfile'
+
+module ERBLint
+  module Linters
+    # Run selected rubocop cops on Ruby code
+    class Rubocop < Linter
+      include LinterRegistry
+
+      # copied from Rails: action_view/template/handlers/erb/erubi.rb
+      BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+      def initialize(config_hash)
+        @enabled_cops = config_hash.delete('only')
+        tempfile_from('.erblint-rubocop', config_hash.except('enabled').to_yaml) do |tempfile|
+          custom_config = RuboCop::ConfigLoader.load_file(tempfile.path)
+          @config = RuboCop::ConfigLoader.merge_with_default(custom_config, '')
+        end
+      end
+
+      def lint_file(file_content)
+        errors = []
+        erb = BetterHtml::NodeIterator::HtmlErb.new(file_content)
+        erb.tokens.each do |token|
+          next unless [:stmt, :expr_literal, :expr_escaped].include?(token.type)
+          ruby_code = token.code.sub(BLOCK_EXPR, '')
+          offenses = inspect_content(ruby_code)
+          offenses&.each do |offense|
+            errors << format_error(token, offense)
+          end
+        end
+        errors
+      end
+
+      private
+
+      def tempfile_from(filename, content)
+        Tempfile.create(File.basename(filename), Dir.pwd) do |tempfile|
+          tempfile.write(content)
+          tempfile.rewind
+
+          yield(tempfile)
+        end
+      end
+
+      def inspect_content(content)
+        source = processed_source(content)
+        return unless source.valid_syntax?
+        offenses = team.inspect_file(source)
+        offenses.reject(&:disabled?)
+      end
+
+      def processed_source(content)
+        RuboCop::ProcessedSource.new(
+          content,
+          @config.target_ruby_version,
+          '(erb)'
+        )
+      end
+
+      def team
+        selected_cops = RuboCop::Cop::Cop.all.select { |cop| cop.match?(@enabled_cops) }
+        cop_classes = RuboCop::Cop::Registry.new(selected_cops)
+        RuboCop::Cop::Team.new(cop_classes, @config, extra_details: true, display_cop_names: true)
+      end
+
+      def format_error(token, offense)
+        {
+          line: token.location.line + offense.line - 1,
+          message: offense.message.strip
+        }
+      end
+    end
+  end
+end

data/lib/erb_lint/runner.rb

@@ -15,7 +15,7 @@ module ERBLint
     end
 
     def run(filename, file_content)
-      linters_for_file = @linters.select { |linter| !linter_excludes_file?(linter, filename) }
+      linters_for_file = @linters.reject { |linter| linter_excludes_file?(linter, filename) }
       linters_for_file.map do |linter|
         {
           linter_name: linter.class.simple_name,

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: better_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: html_tokenizer
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: better_html
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +93,7 @@ files:
 - lib/erb_lint/linters/deprecated_classes.rb
 - lib/erb_lint/linters/erb_safety.rb
 - lib/erb_lint/linters/final_newline.rb
+- lib/erb_lint/linters/rubocop.rb
 - lib/erb_lint/runner.rb
 homepage: https://github.com/justinthec/erb-lint
 licenses: