haml_lint 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398ba6aea803c2ccd2cb94f71cc64b376b349d0a
-  data.tar.gz: a9718d142545be1f4b1dbb74cba9e4e6c8b68a02
+  metadata.gz: cf21b69028eb0a691d60eaad90bdab27b7a52829
+  data.tar.gz: 58a24369859f1384180c1e928b672417abebac94
 SHA512:
-  metadata.gz: 1d7d1a80c77be94d7caf19ae80035aca983571d57e5c74b7b6e127cb51ed7b3c0fdbff7406a3d71e052501d9a717cf338250af87041205e9f6c8ff865f09ad18
-  data.tar.gz: 55aaaad3b2112e3e94e1ca24f955b851168a47b556bae2f3398d3ce24ca8cb825350e5795189966ddb656a801252a2adc56019dbf38ab6934665b198761a8738
+  metadata.gz: cf10d59ef201f50b68daa5328fef0df54f2cd455e1c82779355f13bffff833dc3b35770719785460c3cf10d7b517e16ec4d6b61ffb23df560b59597666788ea3
+  data.tar.gz: ad94abfd0a1c776e86ffdf3a1ac271323ab519a5a62e38adc01ad22632b32f0f0a0c6548d74bcb2795c72ac47556ec316a128beb39fb3e18286f42ae0c50ca4a

data/lib/haml_lint/linter/classes_before_ids.rb

@@ -13,14 +13,28 @@ module HamlLint
       # Convert ".class#id" into [.class, #id] (preserving order)
       components = node.static_attributes_source.scan(/[.#][^.#]+/)
 
+      first, second = attribute_prefix_order
+
       (1...components.count).each do |index|
-        next unless components[index].start_with?('.') &&
-                    components[index - 1].start_with?('#')
+        next unless components[index].start_with?(first) &&
+                    components[index - 1].start_with?(second)
 
         record_lint(node, 'Classes should be listed before IDs '\
                           "(#{components[index]} should precede #{components[index - 1]})")
         break
       end
     end
+
+    private
+
+    def attribute_prefix_order
+      enforced_style = config.fetch('EnforcedStyle', 'class')
+      case enforced_style
+      when 'id'
+        ['#', '.']
+      else
+        ['.', '#']
+      end
+    end
   end
 end

data/lib/haml_lint/linter/rubocop.rb

@@ -60,7 +60,7 @@ module HamlLint
     def extract_lints_from_offenses(offenses, source_map)
       dummy_node = Struct.new(:line)
 
-      offenses.select { |offense| !config['ignored_cops'].include?(offense.cop_name) }
+      offenses.select { |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.rb

@@ -168,7 +168,7 @@ module HamlLint
       # Normalize each of the lines to ignore the multiline bar (|) and
       # excess whitespace
       @document.source_lines[(tag_node.line - 1)...(following_node_line(tag_node) - 1)]
-        .map do |line|
+               .map do |line|
         line.strip.gsub(/\|\z/, '').rstrip
       end.join(' ')
     end

data/lib/haml_lint/reporter/json_reporter.rb

@@ -43,7 +43,9 @@ module HamlLint
         location: {
           line: offense.line,
         },
-      }
+      }.tap do |h|
+        h[:linter_name] = offense.linter.name if offense.linter
+      end
     end
   end
 end

data/lib/haml_lint/ruby_extractor.rb

@@ -108,6 +108,10 @@ module HamlLint
       end
     end
 
+    def visit_haml_comment(node)
+      add_line("##{node.text}", node)
+    end
+
     def visit_silent_script(node, &block)
       visit_script(node, &block)
     end

data/lib/haml_lint/tree/node.rb

@@ -55,8 +55,8 @@ module HamlLint::Tree
         end
 
       @document.source_lines[@line - 1...next_node_line]
-        .join("\n")
-        .gsub(/^\s*\z/m, '') # Remove blank lines at the end
+               .join("\n")
+               .gsub(/^\s*\z/m, '') # Remove blank lines at the end
     end
 
     def inspect

data/lib/haml_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -165,8 +165,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: HAML lint tool
 test_files: []
+has_rdoc: