erb_lint 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd514242d6b7920461eeecfe6b2042abc1dbd879
-  data.tar.gz: ad6e290ed5a2adce93c48d39da58df17d38a7a47
+SHA256:
+  metadata.gz: e4a94b402b5b0e78c8597154a55807ab0cdab042b02aa105f8a84e7a800d1f78
+  data.tar.gz: 211323032036eee8cdc61c866d3d3049a80d8ddcf16c2e00795e8955dd8b112e
 SHA512:
-  metadata.gz: ac08fba28282dfec1da5e078f4ddbcd42c26373947634789cd93d9f709a6c5e02f224c44fe72608c3d182630d9b0d39abd5fe181ca1d98695ed509f6e51dd9e2
-  data.tar.gz: cef726250e669949e9f4150c30a58f5b77e1201d9149a7b5adf38b7d853b76ca3bc2204b5a516db0fddfde0e72fe9d9e4a3ab56cb853eee77468614791833d34
+  metadata.gz: 7721c096adf5dc25e919a1f233292d393bfb005c14bd90e4271a191313fefc5ee6c6e64d625c3f5bac39fccb5eeba42d6fd1cb64c99c069a03cf7c2a64d7fe1b
+  data.tar.gz: b7e7f1f7fbfab896f3ade2708cf873a19c05011b76be978df594326b47d999d27692a0afaeb9d296395a2dc09678ee4008fbf06abed8cad2c4901dad1a071152

data/exe/erblint

@@ -6,4 +6,4 @@ $LOAD_PATH.unshift("#{__dir__}/../lib")
 require 'erb_lint/cli'
 
 cli = ERBLint::CLI.new
-exit cli.run
+exit(cli.run)

data/lib/erb_lint/cli.rb

@@ -67,27 +67,27 @@ module ERBLint
       if @stats.corrected > 0
         corrected_found_diff = @stats.found - @stats.corrected
         if corrected_found_diff > 0
-          warn Rainbow(
+          warn(Rainbow(
             "#{@stats.corrected} error(s) corrected and #{corrected_found_diff} error(s) remaining in ERB files"
-          ).red
+          ).red)
         else
           puts Rainbow("#{@stats.corrected} error(s) corrected in ERB files").green
         end
       elsif @stats.found > 0
-        warn Rainbow("#{@stats.found} error(s) were found in ERB files").red
+        warn(Rainbow("#{@stats.found} error(s) were found in ERB files").red)
       else
         puts Rainbow("No errors were found in ERB files").green
       end
 
       @stats.found == 0
     rescue OptionParser::InvalidOption, OptionParser::InvalidArgument, ExitWithFailure => e
-      warn Rainbow(e.message).red
+      warn(Rainbow(e.message).red)
       false
     rescue ExitWithSuccess => e
       puts e.message
       true
     rescue => e
-      warn Rainbow("#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}").red
+      warn(Rainbow("#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}").red)
       false
     end
 
@@ -146,7 +146,7 @@ module ERBLint
         config = RunnerConfig.new(file_loader.yaml(config_filename), file_loader)
         @config = RunnerConfig.default.merge(config)
       else
-        warn Rainbow("#{config_filename} not found: using default config").yellow
+        warn(Rainbow("#{config_filename} not found: using default config").yellow)
         @config = RunnerConfig.default
       end
       @config.merge!(runner_config_override)

data/lib/erb_lint/linter_config.rb

@@ -20,7 +20,7 @@ module ERBLint
     end
 
     property :enabled, accepts: [true, false], default: false, reader: :enabled?
-    property :exclude, accepts: array_of?(String), default: []
+    property :exclude, accepts: array_of?(String), default: -> { [] }
 
     def initialize(config = {})
       config = config.dup.deep_stringify_keys

data/lib/erb_lint/linters/allowed_script_type.rb

@@ -13,7 +13,7 @@ module ERBLint
 
       class ConfigSchema < LinterConfig
         property :allowed_types, accepts: array_of?(String),
-          default: ['text/javascript']
+          default: -> { ['text/javascript'] }
         property :allow_blank, accepts: [true, false], default: true, reader: :allow_blank?
         property :disallow_inline_scripts, accepts: [true, false], default: false, reader: :disallow_inline_scripts?
       end

data/lib/erb_lint/linters/deprecated_classes.rb

@@ -12,12 +12,12 @@ module ERBLint
       class RuleSet
         include SmartProperties
         property :suggestion, accepts: String, default: ''
-        property :deprecated, accepts: LinterConfig.array_of?(String), default: []
+        property :deprecated, accepts: LinterConfig.array_of?(String), default: -> { [] }
       end
 
       class ConfigSchema < LinterConfig
         property :rule_set,
-          default: [],
+          default: -> { [] },
           accepts: array_of?(RuleSet),
           converts: to_array_of(RuleSet)
         property :addendum, accepts: String

data/lib/erb_lint/linters/hard_coded_string.rb

@@ -22,7 +22,7 @@ module ERBLint
       BLACK_LISTED_TEXT = Set.new(%w(       ))
 
       class ConfigSchema < LinterConfig
-        property :corrector, accepts: Hash, required: false, default: {}
+        property :corrector, accepts: Hash, required: false, default: -> { {} }
         property :i18n_load_path, accepts: String, required: false, default: ''
       end
       self.config_schema = ConfigSchema
@@ -61,7 +61,7 @@ module ERBLint
 
       def autocorrect(processed_source, offense)
         string = offense.source_range.source
-        return unless klass = load_corrector
+        return unless (klass = load_corrector)
         return unless string.strip.length > 1
         node = RuboCop::AST::StrNode.new(:str, [string])
         corrector = klass.new(node, processed_source.filename, corrector_i18n_load_path, offense.source_range)

data/lib/erb_lint/linters/rubocop.rb

@@ -13,7 +13,7 @@ module ERBLint
 
       class ConfigSchema < LinterConfig
         property :only, accepts: array_of?(String)
-        property :rubocop_config, accepts: Hash, default: {}
+        property :rubocop_config, accepts: Hash, default: -> { {} }
       end
 
       self.config_schema = ConfigSchema
@@ -147,7 +147,7 @@ module ERBLint
       def base_configs(inherit_from)
         regex = URI::DEFAULT_PARSER.make_regexp(%w(http https))
         configs = Array(inherit_from).compact.map do |base_name|
-          if base_name.match?(/\A#{regex}\z/)
+          if base_name =~ /\A#{regex}\z/
             RuboCop::ConfigLoader.load_file(RuboCop::RemoteConfig.new(base_name, Dir.pwd))
           else
             config_from_hash(@file_loader.yaml(base_name))

data/lib/erb_lint/linters/self_closing_tag.rb

@@ -6,6 +6,11 @@ module ERBLint
     class SelfClosingTag < Linter
       include LinterRegistry
 
+      class ConfigSchema < LinterConfig
+        property :enforced_style, converts: :to_sym, accepts: [:always, :never], default: :never
+      end
+      self.config_schema = ConfigSchema
+
       SELF_CLOSING_TAGS = %w(
         area base br col command embed hr input keygen
         link menuitem meta param source track wbr img
@@ -20,16 +25,25 @@ module ERBLint
             start_solidus = tag_node.children.first
             add_offense(
               start_solidus.loc,
-              "Tag `#{tag.name}` is self-closing, it must not start with `</`.",
+              "Tag `#{tag.name}` is a void element, it must not start with `</`.",
               ''
             )
           end
 
-          next if tag.self_closing?
+          if @config.enforced_style == :always && !tag.self_closing?
+            add_offense(
+              tag_node.loc.end.offset(-1),
+              "Tag `#{tag.name}` is self-closing, it must end with `/>`.",
+              '/'
+            )
+          end
+
+          next unless @config.enforced_style == :never && tag.self_closing?
+          end_solidus = tag_node.children.last
           add_offense(
-            tag_node.loc.end.offset(-1),
-            "Tag `#{tag.name}` is self-closing, it must end with `/>`.",
-            '/'
+            end_solidus.loc,
+            "Tag `#{tag.name}` is a void element, it must end with `>` and not `/>`.",
+            ''
           )
         end
       end

data/lib/erb_lint/runner_config_resolver.rb

@@ -41,7 +41,7 @@ module ERBLint
         hash['inherit_from'] = Array(hash['inherit_from'])
         Array(config_path).reverse_each do |path|
           # Put gem configuration first so local configuration overrides it.
-          hash['inherit_from'].unshift gem_config_path(gem_name, path)
+          hash['inherit_from'].unshift(gem_config_path(gem_name, path))
         end
       end
     end

data/lib/erb_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ERB lint tool