haml_lint 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa23a0a6cf7859c1d52147bb83dffea555ca12ef
-  data.tar.gz: f68ba67d32f4d76cb0632b69ff10e3d801f4e0e8
+  metadata.gz: 11dfd8283a78d7d9464e3a003a7f97446178b76f
+  data.tar.gz: de67f6e626da0bd9e3f91e1183af9d88af54d369
 SHA512:
-  metadata.gz: adbaa7dba069ef58a9522a8b5ad7ce39f21aa54a9aa3fe132799f6f2fee929f7510df2029bb6e55d2a4776a8fb1e091c5896ece3a3b1b73ffcc897df44b15c64
-  data.tar.gz: 8e8246c549c8322a202885179c301f98e5e818aefdb2badc9c0fa83ee4974366d88dee6da61f2a0df571df05829950be26e8ada196e00c4f3ad90ce024235655
+  metadata.gz: bd464c7c0f1542a93a3bf3fa1b017117ffef544dbc6b5c95cd05c7a2ff99ff78362786d23b024b3608596acc8cc165eb3e3791d659a3752e87f6aff7506d702c
+  data.tar.gz: 41b5410fc090a6151476edfdadc7d3f24eb7f2d0ed8e7d7065463901d382e412fc017694a6725532546095e08dc8b9eaa05274d30f99b93eb05786159e6465af

data/lib/haml_lint/file_finder.rb

@@ -22,6 +22,8 @@ module HamlLint
     # @raise [HamlLint::Exceptions::InvalidFilePath]
     # @return [Array<String>] list of actual files
     def find(patterns, excluded_patterns)
+      excluded_patterns = excluded_patterns.map { |pattern| normalize_path(pattern) }
+
       extract_files_from(patterns).reject do |file|
         excluded_patterns.any? do |exclusion_glob|
           HamlLint::Utils.any_glob_matches?(exclusion_glob, file)
@@ -62,7 +64,15 @@ module HamlLint
         end
       end
 
-      files.uniq.sort
+      files.uniq.sort.map { |file| normalize_path(file) }
+    end
+
+    # Trim "./" from the front of relative paths.
+    #
+    # @param path [String]
+    # @return [String]
+    def normalize_path(path)
+      path.start_with?(".#{File::SEPARATOR}") ? path[2..-1] : path
     end
 
     # Whether the given file should be treated as a Haml file.

data/lib/haml_lint/haml_visitor.rb

@@ -14,13 +14,14 @@ module HamlLint
         visit_children(node) if descend == :children
       end
 
-      method = "visit_#{node_name(node)}"
-      send(method, node, &block) if respond_to?(method, true)
+      safe_send("visit_#{node_name(node)}", node, &block)
 
       # Visit all children by default unless the block was invoked (indicating
       # the user intends to not recurse further, or wanted full control over
       # when the children were visited).
       visit_children(node) unless block_called
+
+      safe_send("after_visit_#{node_name(node)}", node, &block)
     end
 
     def visit_children(parent)
@@ -32,5 +33,9 @@ module HamlLint
     def node_name(node)
       node.type
     end
+
+    def safe_send(name, *args, &block)
+      send(name, *args, &block) if respond_to?(name, true)
+    end
   end
 end

data/lib/haml_lint/linter/space_inside_hash_attributes.rb

@@ -13,7 +13,7 @@ module HamlLint
       },
       'space' => {
         start_regex: /\A\{ [^ ]/,
-        end_regex:  /[^ ] \}\z/,
+        end_regex: /[^ ] \}\z/,
         start_message: 'Hash attribute should start with one space after the opening brace',
         end_message: 'Hash attribute should end with one space before the closing brace'
       }

data/lib/haml_lint/ruby_extractor.rb

@@ -84,6 +84,11 @@ module HamlLint
       add_line(code, node) unless code.empty?
     end
 
+    def after_visit_tag(node)
+      # We add a dummy puts statement for closing tag.
+      add_line("puts # #{node.tag_name}/", node)
+    end
+
     def visit_script(node)
       code = node.text
       add_line(code.strip, node)
@@ -164,7 +169,7 @@ module HamlLint
     end
 
     def anonymous_block?(text)
-      text =~ /\bdo\s*(\|\s*[^\|]*\s*\|)?\z/
+      text =~ /\bdo\s*(\|\s*[^\|]*\s*\|)?(\s*#.*)?\z/
     end
 
     START_BLOCK_KEYWORDS = %w[if unless case begin for until while]

data/lib/haml_lint/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: HAML lint tool