haml_lint 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4615a213ff3d87b4d05a6e7455f253563862506b
-  data.tar.gz: c7c3c9355d79429eab84513b8fd41c134c31f69f
+  metadata.gz: a141a32ca4f42038548109417fc4ce7e48cb04e5
+  data.tar.gz: 3cd8985abe66dd3164e0f61a76f55abddf2b3f54
 SHA512:
-  metadata.gz: 05e2289d369fcd2709a4f99d8ddbb3fdef1c34016c65df8e239ab50e7c107b9c0947654615f2bab1d673b89e1f1f6d079a50e423cf88d3813ca70677964f2abd
-  data.tar.gz: b4c4d6034bc65f380dbd84eb5a28072ecfccb379b62442c4d55a7675a9b434576c23410f208db58e71a3c9a3599ab57e139b9598833aee2eb69b722e1b777dfb
+  metadata.gz: d4d2b851b17f04696979385e41f8a8b9c699cbe7db29bd497e130d64f465c54cc29945126a53eec6d4dc5e99f5b96e89bf623b597ae02294a5af62d0b1021827
+  data.tar.gz: 389f9c938a65d66368de138aa56cc1a63eb26e70da3e97463f0f3a890aa9a59e3964e51dfc80d3c032ca5130b76541b2ee5247078841df15251c5015d61aa7b9

data/lib/haml_lint/linter/classes_before_ids.rb

@@ -9,18 +9,20 @@ module HamlLint
       '#' => :id,
     }.freeze
 
+    MSG = '%s should be listed before %s (%s should precede %s)'.freeze
+
     def visit_tag(node)
       # 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?(first) &&
-                    components[index - 1].start_with?(second)
+      components.each_cons(2) do |current_val, next_val|
+        next unless next_val.start_with?(first) &&
+                    current_val.start_with?(second)
 
-        record_lint(node, 'Classes should be listed before IDs '\
-                          "(#{components[index]} should precede #{components[index - 1]})")
+        failure_message = format(MSG, *(attribute_type_order + [next_val, current_val]))
+        record_lint(node, failure_message)
         break
       end
     end
@@ -28,13 +30,23 @@ module HamlLint
     private
 
     def attribute_prefix_order
-      enforced_style = config.fetch('EnforcedStyle', 'class')
-      case enforced_style
-      when 'id'
-        ['#', '.']
-      else
-        ['.', '#']
-      end
+      default = %w[. #]
+      default.reverse! if ids_first?
+      default
+    end
+
+    def attribute_type_order
+      default = %w[Classes IDs]
+      default.reverse! if ids_first?
+      default
+    end
+
+    def enforced_style
+      config.fetch('EnforcedStyle', 'class')
+    end
+
+    def ids_first?
+      enforced_style == 'id'
     end
   end
 end

data/lib/haml_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml