erb_lint 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab337195cd313e04726f3c3ca31cc6fd77e661ce
-  data.tar.gz: 52de035725a4a39e533552a056f17e2f6d87e980
+  metadata.gz: 7c5c19ac1eafb41b42b89239504fccaf8f1f52a0
+  data.tar.gz: 3afb969caac48e9c7960cddbec2f55630322580d
 SHA512:
-  metadata.gz: 35dc5da94ef03e07d04a933ac5ded2951fde3437c20410d333e28b5c0fde51a6fe7df2b743f80cc0e13840c73b18b2309fdcd3a15c8ae9ecb0de30bcaad5270d
-  data.tar.gz: f1a74b863008b9ed36f56d7ecbf12533b9ee8b3bb89aca0da8c118306013ea0e54c9d1ea84def71b49b912d41c3347163fa284029cab98c36a3ec6132ccc35c9
+  metadata.gz: 3716dfb6a37ffe9f3c4b27804cccc597f3da89a46c2075c0bdbb54c9b7840c952f391ff8d8a78bcc2bd07ee56d2baa5972084455671c79cd87a7f588080f1372
+  data.tar.gz: 7582a2c11435135fa681c27b5e7bcc904a3a1e67d01c8dad930e1d89b8d8d7e9959e4b632701971f14eac3374dd2789f1b68f8c9ebaf05bd7c988f536a57dc10

data/lib/erb_lint/linters/hard_coded_string.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'better_html/tree/tag'
+require 'active_support/core_ext/string/inflections'
 
 module ERBLint
   module Linters
@@ -8,25 +9,74 @@ module ERBLint
     class HardCodedString < Linter
       include LinterRegistry
 
+      ForbiddenCorrector = Class.new(StandardError)
+      MissingCorrector = Class.new(StandardError)
+
+      ALLOWED_CORRECTORS = %w(
+        I18nCorrector
+        RuboCop::I18nCorrector
+      )
+
+      class ConfigSchema < LinterConfig
+        property :corrector, accepts: Hash, required: false, default: {}
+      end
+      self.config_schema = ConfigSchema
+
       def offenses(processed_source)
         hardcoded_strings = processed_source.ast.descendants(:text).each_with_object([]) do |text_node, to_check|
           next if javascript?(processed_source, text_node)
 
-          offended_str = text_node.to_a.find { |node| relevant_node(node) }
-          to_check << [text_node, offended_str] if offended_str
+          offended_strings = text_node.to_a.select { |node| relevant_node(node) }
+          offended_strings.each do |offended_string|
+            offended_string.split("\n").each do |str|
+              to_check << [text_node, str] if str.length > 1
+            end
+          end
         end
 
         hardcoded_strings.compact.map do |text_node, offended_str|
+          range_begin, range_stop = find_range(text_node, offended_str)
+          source_range = processed_source.to_source_range(range_begin, range_stop)
+
           Offense.new(
             self,
-            processed_source.to_source_range(text_node.loc.start, text_node.loc.stop),
-            message(offended_str)
+            source_range,
+            message(source_range.source)
           )
         end
       end
 
+      def find_range(node, str)
+        match = node.loc.source.match(Regexp.new(Regexp.quote(str.strip)))
+        return unless match
+
+        range_begin = match.begin(0) + node.loc.start
+        range_end   = match.end(0) + node.loc.start - 1
+        [range_begin, range_end]
+      end
+
+      def autocorrect(processed_source, offense)
+        string = offense.source_range.source
+        return unless klass = load_corrector
+        return unless string.strip.length > 1
+
+        corrector = klass.new(processed_source.filename, offense.source_range)
+        node = RuboCop::AST::StrNode.new(:str, [string])
+        corrector.autocorrect(node, tag_start: '<%= ', tag_end: ' %>')
+      rescue MissingCorrector
+        nil
+      end
+
       private
 
+      def load_corrector
+        corrector_name = @config['corrector'].fetch('name') { raise MissingCorrector }
+        raise ForbiddenCorrector unless ALLOWED_CORRECTORS.include?(corrector_name)
+        require @config['corrector'].fetch('path') { raise MissingCorrector }
+
+        corrector_name.safe_constantize
+      end
+
       def javascript?(processed_source, text_node)
         ast = processed_source.parser.ast.to_a
         index = ast.find_index(text_node)
@@ -51,11 +101,7 @@ module ERBLint
       def message(string)
         stripped_string = string.strip
 
-        if stripped_string.length > 1
-          "String not translated: #{stripped_string}"
-        else
-          "Consider using Rails helpers to move out the single character `#{stripped_string}` from the html."
-        end
+        "String not translated: #{stripped_string}"
       end
     end
   end

data/lib/erb_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html