code_terminator 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a74c3589fc1cce252bdc6c1f1cfbbc8c39610cf
-  data.tar.gz: f500e2e20044cba091c042b3788108b36d6a022f
+  metadata.gz: 07d27181d39afffab7a5f87adb4a0675bf38a4fa
+  data.tar.gz: b3a2acfffd34be17ed25a1a726071110a6c93aee
 SHA512:
-  metadata.gz: 5aeedd345f4b1976d3d4c31c74734ab3f677df087e54c925da3db2b5c9c21ab9976b155a82d2901e04d0b1cd8d7c89adcec4c55d8316bce25b43c3f4dce0cd61
-  data.tar.gz: 58701c448eda38a40ef722c6bc22ea276ee57e5f0bddad29f4c069c1b2de36d73a332f70cf1e0648f3069c0bbbff853ac416ba1a6c1b14e22e09d23a0e434157
+  metadata.gz: 104a007f586cd4803827afbe0ca4e1078b6a78f0bbfa526bb4dfade4a8a6eb260957a07e9f52b1bc3b7afd6f37a397f1dc4af15f1ac04a3577800de84eccac7c
+  data.tar.gz: aa53f7f5641c2434c6bd29063f0f87d19f00c66f48e7a8ea499bd906bd955dbde6fb8b9b50dc5ba6f63db1f4f51a3803145f77d2549d62a6d185749af0270b50

data/lib/code_terminator/html.rb

@@ -289,19 +289,27 @@ class CodeTerminator::Html
 
      elements.each do |e|
 
-       item = e[:tag]
+      #  p item = e[:tag]
 
        if item == "text" or item == "comment"
 
         #  Check the text
          if !e[:content].nil?
-
            if code.css(e[:parent]).count < 2
              if code.css(e[:parent]).class == Nokogiri::XML::NodeSet
                text_found = false
+               comment_found = false if item == "comment"
                error330 = nil
                if code.css(e[:parent]).children.any?
                  code.css(e[:parent]).children.each do |node_child|
+
+                  #  p "node child " + node_child.class.to_s
+                  #  p "item " + item
+
+                     if item == "comment" && node_child.class == Nokogiri::XML::Comment
+                       comment_found = true
+                     end
+
                    if node_child.class != Nokogiri::XML::Element
                      #embebed code
                      #if code.css(e[:parent]).text != e[:content]
@@ -311,8 +319,6 @@ class CodeTerminator::Html
                          #  if comment isn't present in the code, mark add tag
                          if e[:content].strip != ""
                            error330 = new_error(element: e, type: 330, description: "The text inside the comment should be #{e[:content]}")
-                         else
-                          #  html_errors << new_error(element: e, type: 404, description:  "Remember to add the `<#{e[:tag]}>` tag")
                          end
                        else
                          error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
@@ -323,8 +329,17 @@ class CodeTerminator::Html
                      #end embebed code
                    end
                  end
+
+                 if !(defined? comment_found).nil?
+                   if !comment_found
+                     html_errors << new_error(element: e, type: 404, description:  "Remember to add the `<#{e[:tag]}>` tag")
+                   end
+                 end
                  #end each
                 else
+                  if item == "comment"
+                    html_errors << new_error(element: e, type: 404, description:  "Remember to add the `<#{e[:tag]}>` tag")
+                  end
                   if code.css(e[:parent]).text.strip != e[:content].strip
                   # p "text of node: " + code.css(e[:parent]).text
                     if item == "comment"
@@ -337,6 +352,9 @@ class CodeTerminator::Html
                   end
                 end
                 #end if parent has children
+                # if !comment_found
+                #   html_errors << new_error(element: e, type: 404, description:  "Remember to add the `comment` tag")
+                # end
 
                if !text_found && !error330.nil?
                  html_errors << error330

data/lib/code_terminator/version.rb

@@ -1,3 +1,3 @@
 module CodeTerminator
-  VERSION = "0.4.15"
+  VERSION = "0.4.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Evelin Ponce