erb_lint 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ae73f0612719d45eb240bb5c318022bbda31d6
-  data.tar.gz: b303b89d8fb7b4bc8eaaccd64e54f987b4cec953
+  metadata.gz: 4c63d51b88111aebeec5f4bc85009a499d61d750
+  data.tar.gz: b389e7f7f6aca2251369ae7491b9a58847a8db0e
 SHA512:
-  metadata.gz: cf30f6318bfbbdc123f3c8bf87981288bcdd8c125ca57466ed88e1e28438d83ec22f4900680cfe4ed789cdf656bcb31745a44e27561eb70d25a63fccad0db52c
-  data.tar.gz: 4ba1c926ea2cbb72b02dc8903cc2d753e2f680d6b46c1021b3278b9b3fbe0579a09f464922f6176a726adc534dab50dfe55d1539c8338b761c4239fb0f8dc707
+  metadata.gz: 5951a1d7466088a8298801fb6e41a00069417cd33a977cb5b2a8403fe1611f349162b710887b073410f23fa66f03f67ccf683a678f3068e61cd7bb22b79cfa5f
+  data.tar.gz: 1c505e1eb402fe827c8d0f542d8c8eba8efeeed9a5f973f21bb12a83ae698ea4f9eb77f6ed193d8a58c6e006eded532cd06544c610a9ea01846bd010e8e03260

data/lib/erb_lint.rb

@@ -3,6 +3,7 @@
 require 'erb_lint/linter_registry'
 require 'erb_lint/linter'
 require 'erb_lint/runner'
+require 'erb_lint/file_loader'
 
 # Load linters
 Dir[File.expand_path('erb_lint/linters/**/*.rb', File.dirname(__FILE__))].each do |file|

data/lib/erb_lint/file_loader.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ERBLint
+  # Loads file from disk
+  class FileLoader
+    attr_reader :base_path
+
+    def initialize(base_path)
+      @base_path = base_path
+    end
+
+    def yaml(filename)
+      YAML.safe_load(read_content(filename), [Regexp], [], false, filename) || {}
+    rescue Psych::SyntaxError
+      {}
+    end
+
+    private
+
+    def join(filename)
+      File.join(base_path, filename)
+    end
+
+    def read_content(filename)
+      File.read(join(filename))
+    end
+  end
+end

data/lib/erb_lint/linter.rb

@@ -20,8 +20,8 @@ module ERBLint
     end
 
     # Must be implemented by the concrete inheriting class.
-    def initialize(_config)
-      raise NotImplementedError, "must implement ##{__method__}"
+    def initialize(file_loader, _config)
+      @file_loader = file_loader
     end
 
     def lint_file(file_content)

data/lib/erb_lint/linters/deprecated_classes.rb

@@ -8,7 +8,9 @@ module ERBLint
     class DeprecatedClasses < Linter
       include LinterRegistry
 
-      def initialize(config)
+      def initialize(file_loader, config)
+        super
+
         @deprecated_ruleset = []
         config.fetch('rule_set', []).each do |rule|
           suggestion = rule.fetch('suggestion', '')

data/lib/erb_lint/linters/erb_safety.rb

@@ -10,12 +10,14 @@ module ERBLint
       include LinterRegistry
       include BetterHtml::TestHelper::SafeErbTester
 
-      def initialize(config)
+      def initialize(file_loader, config)
+        super
+        @config_filename = config['better-html-config']
       end
 
       def lint_file(file_content)
         errors = []
-        tester = Tester.new(file_content)
+        tester = Tester.new(file_content, config: better_html_config)
         tester.errors.each do |error|
           errors << format_error(error)
         end
@@ -24,6 +26,18 @@ module ERBLint
 
       private
 
+      def better_html_config
+        @better_html_config ||= begin
+          config_hash =
+            if @config_filename.nil?
+              {}
+            else
+              @file_loader.yaml(@config_filename)
+            end
+          BetterHtml::Config.new(**config_hash)
+        end
+      end
+
       def format_error(error)
         {
           line: error.location.line,

data/lib/erb_lint/linters/final_newline.rb

@@ -6,7 +6,8 @@ module ERBLint
     class FinalNewline < Linter
       include LinterRegistry
 
-      def initialize(config)
+      def initialize(file_loader, config)
+        super
         @new_lines_should_be_present = config['present'].nil? ? true : config['present']
       end
 

data/lib/erb_lint/linters/rubocop.rb

@@ -13,7 +13,8 @@ module ERBLint
       # copied from Rails: action_view/template/handlers/erb/erubi.rb
       BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
 
-      def initialize(config_hash)
+      def initialize(file_loader, config_hash)
+        super
         @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)

data/lib/erb_lint/runner.rb

@@ -3,14 +3,15 @@
 module ERBLint
   # Runs all enabled linters against an html.erb file.
   class Runner
-    def initialize(config = {})
+    def initialize(file_loader, config = {})
+      @file_loader = file_loader
       @config = default_config.merge(config || {})
 
       LinterRegistry.load_custom_linters
       @linters = LinterRegistry.linters.select { |linter_class| linter_enabled?(linter_class) }
       @linters.map! do |linter_class|
         linter_config = @config.dig('linters', linter_class.simple_name)
-        linter_class.new(linter_config)
+        linter_class.new(@file_loader, linter_config)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: html_tokenizer
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/erb_lint.rb
+- lib/erb_lint/file_loader.rb
 - lib/erb_lint/linter.rb
 - lib/erb_lint/linter_registry.rb
 - lib/erb_lint/linters/deprecated_classes.rb