haml_lint 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe12a287eaf253fd83053061ac62a26b908918e6
-  data.tar.gz: cf8bae7a2e75dde6befbe09a9764fb223ea72583
+  metadata.gz: 2ec594ab38cde43b4bfc77c30d2d01cdaa8efcce
+  data.tar.gz: 91068f84316b31511721b023a677609085796314
 SHA512:
-  metadata.gz: 55334bc83c7c8f377c78b290db34ba08a2939bd9179e06541d27f3919118d3942500c85a5028ad2dde31a868ac82c4bd49b7ebf6492ec14400ae0f8b213e72d5
-  data.tar.gz: 84e178971e6068b40dd896f49efac863a244a8ed952b4d4d45d93872d6a2030a68134721c2cffbba94cffc5d3b11b88283b487c35a1d3907132eab86df44eb26
+  metadata.gz: 4d852491b8757d078d5285d18a54017d70589fc98cc4d68e30e6d73be239e704dcf5fd0575fd7756bbfb4807fa68abdfe4fb361636e712423ad4614b9964e8df
+  data.tar.gz: 775dc9d01056561a235508e7d4dee8af74fff6484424270796ecb2ab1fb2c0e17d61917d3ad6c2d8358b9688d88e84851e7e71678476d42f0ccad7c7e76f7d31

data/config/default.yml

@@ -22,6 +22,7 @@ linters:
 
   ConsecutiveComments:
     enabled: true
+    max_consecutive: 1
 
   ConsecutiveSilentScripts:
     enabled: true
@@ -52,6 +53,9 @@ linters:
     character: space # or tab
     width: 2 # ignored if character == tab
 
+  InlineStyles:
+    enabled: true
+
   InstanceVariables:
     enabled: true
     file_types: partials

data/lib/haml_lint/adapter.rb

@@ -17,6 +17,7 @@ module HamlLint
       version = haml_version
       case version
       when '~> 4.0' then HamlLint::Adapter::Haml4
+      when '~> 4.1' then HamlLint::Adapter::Haml4
       when '~> 5.0' then HamlLint::Adapter::Haml5
       else fail HamlLint::Exceptions::UnknownHamlVersion, "Cannot handle Haml version: #{version}"
       end

data/lib/haml_lint/linter/class_attribute_with_static_value.rb

@@ -16,7 +16,7 @@ module HamlLint
   class Linter::ClassAttributeWithStaticValue < Linter
     include LinterRegistry
 
-    STATIC_TYPES = [:str, :sym].freeze
+    STATIC_TYPES = %i[str sym].freeze
 
     VALID_CLASS_REGEX = /^-?[_a-zA-Z]+[_a-zA-Z0-9-]*$/
 

data/lib/haml_lint/linter/consecutive_comments.rb

@@ -11,6 +11,7 @@ module HamlLint
       HamlLint::Utils.for_consecutive_items(
         possible_group(node),
         COMMENT_DETECTOR,
+        config['max_consecutive'] + 1,
       ) do |group|
         group.each { |group_node| reported_nodes << group_node }
         record_lint(group.first,

data/lib/haml_lint/linter/inline_styles.rb

@@ -0,0 +1,14 @@
+module HamlLint
+  # Detects use of inline `style` attributes on any tag
+  class Linter::InlineStyles < Linter
+    include LinterRegistry
+
+    MESSAGE = 'Do not use inline style attributes'.freeze
+
+    def visit_tag(node)
+      if node.has_hash_attribute?(:style)
+        record_lint(node, MESSAGE)
+      end
+    end
+  end
+end

data/lib/haml_lint/linter/rubocop.rb

@@ -51,7 +51,7 @@ module HamlLint
     def extract_lints_from_offenses(offenses, source_map)
       dummy_node = Struct.new(:line)
 
-      offenses.select { |offense| !Array(config['ignored_cops']).include?(offense.cop_name) }
+      offenses.reject { |offense| Array(config['ignored_cops']).include?(offense.cop_name) }
               .each do |offense|
         record_lint(dummy_node.new(source_map[offense.line]), offense.message)
       end

data/lib/haml_lint/linter/trailing_whitespace.rb

@@ -3,13 +3,15 @@ module HamlLint
   class Linter::TrailingWhitespace < Linter
     include LinterRegistry
 
+    DummyNode = Struct.new(:line)
+
     def visit_root(root)
       document.source_lines.each_with_index do |line, index|
         next unless line =~ /\s+$/
 
         node = root.node_for_line(index + 1)
         unless node.disabled?(self)
-          record_lint node, 'Line contains trailing whitespace'
+          record_lint DummyNode.new(index + 1), 'Line contains trailing whitespace'
         end
       end
     end

data/lib/haml_lint/linter/unnecessary_string_output.rb

@@ -33,7 +33,7 @@ module HamlLint
 
     def outputs_string_literal?(script_node)
       return unless tree = parse_ruby(script_node.script)
-      [:str, :dstr].include?(tree.type) &&
+      %i[str dstr].include?(tree.type) &&
         !starts_with_reserved_character?(tree.children.first)
     rescue ::Parser::SyntaxError # rubocop:disable Lint/HandleExceptions
       # Gracefully ignore syntax errors, as that's managed by a different linter

data/lib/haml_lint/options.rb

@@ -21,7 +21,7 @@ module HamlLint
       end.parse!(args)
 
       # Any remaining arguments are assumed to be files
-      @options[:files] = args.empty? ? ["."] : args
+      @options[:files] = args.empty? ? ['.'] : args
 
       @options
     rescue OptionParser::InvalidOption => ex
@@ -56,12 +56,12 @@ module HamlLint
         @options[:reporter] = load_reporter_class(reporter.capitalize)
       end
 
-      parser.on('--fail-fast', 'Fail after the first file with lint above the fail level') do
+      parser.on('--fail-fast', 'Fail after the first file with lint at or above the fail level') do
         @options[:fail_fast] = true
       end
 
       parser.on('--fail-level fail_level', String,
-                'Specify which level you want the suite to fail') do |fail_level|
+                'Specify which level (warning or error) you want the suite to fail') do |fail_level|
         @options[:fail_level] = HamlLint::Severity.new(fail_level.to_sym)
       end
     end

data/lib/haml_lint/report.rb

@@ -39,7 +39,7 @@ module HamlLint
       @reporter.display_report(self)
     end
 
-    # Checks whether any lints were over the fail level
+    # Checks whether any lints were at or above the fail level
     #
     # @return [Boolean]
     def failed?

data/lib/haml_lint/tree/tag_node.rb

@@ -7,9 +7,20 @@ module HamlLint::Tree
     # different attribute setting syntaxes (`{...}`/`(...)`), converted into
     # Ruby code.
     #
+    # @note This has to be memoized because of a design decision in Haml 5. When
+    # calling `DynamicAttributes#to_literal`, they mutate the "old" parameter using
+    # `String#sub!` instead of returning a new string. This means that any subsequent
+    # calls can return a nil instead of a string for that attribute, which causes
+    # any subsequent calls to the method to raise an error.
+    #
     # @return [Array<String>]
     def dynamic_attributes_sources
-      @value[:attributes_hashes]
+      @dynamic_attributes_sources ||=
+        if Gem::Version.new(Haml::VERSION) < Gem::Version.new('5')
+          @value[:attributes_hashes]
+        else
+          Array(@value[:dynamic_attributes].to_literal).reject(&:empty?)
+        end
     end
 
     # Returns whether this tag contains executable script (e.g. is followed by a

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.24.0'.freeze
+  VERSION = '0.25.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -133,6 +133,7 @@ files:
 - lib/haml_lint/linter/id_names.rb
 - lib/haml_lint/linter/implicit_div.rb
 - lib/haml_lint/linter/indentation.rb
+- lib/haml_lint/linter/inline_styles.rb
 - lib/haml_lint/linter/instance_variables.rb
 - lib/haml_lint/linter/leading_comment_space.rb
 - lib/haml_lint/linter/line_length.rb
@@ -203,9 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: HAML lint tool
 test_files: []
-has_rdoc: