code_terminator 0.4.17 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36841a7175d4921d5897f6b8d6564c30c3faf304
-  data.tar.gz: c1dd23d69fb8f0a0b854d994c66b8a211b96602a
+  metadata.gz: 8d82edb81884a6b638e866c4e0d76ad85fca7d63
+  data.tar.gz: bed0a57860cb02b6e4335a9be299858f8a870f0d
 SHA512:
-  metadata.gz: 8d6731a9d11dfedbf61575bd88a4c21b407d43f07ad56d3be4b8d5f9f1f539a332a3b724844821cb710e3592a3cc406572d0845271e3b0b3ea8453dbb0dbb45a
-  data.tar.gz: c756dba97ae07804dccd80af20aa3055402985d974f64304dbba8ed6ff5ea7382f49a02b149b1a1d6b02c8d39f8f2288f13bc5beb3460af90f1cc48ebc50ee4d
+  metadata.gz: 29ccbd2cd7d53dd0838a62848ba2372b100e4a125b27e4f1487c908a13a1b75d2ebf2fe364ce478b3bc1a71b96d460924a106fb3cd9f681bee00431bba3c36a4
+  data.tar.gz: ef8fefbc5477d093d10faa05963af43b61346a67ecfacc27d2ecbf3cb860454031c569a34ff0043b90468c14515129ba340ff3de2351ae600db62da6ae1ceb60

data/lib/code_terminator/html.rb

@@ -289,7 +289,7 @@ class CodeTerminator::Html
 
      elements.each do |e|
 
-      p item = e[:tag]
+       item = e[:tag]
 
        if item == "text" or item == "comment"
 
@@ -298,63 +298,53 @@ class CodeTerminator::Html
            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"
+               @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
+                 code.css(e[:parent]).children.each do |node_child|
 
-                     if item == "comment" && node_child.class == Nokogiri::XML::Comment
-                       comment_found = true
+                   if node_child.class == Nokogiri::XML::Comment
+                     if e[:content].strip != ""
+                       if node_child.text.strip! != e[:content].strip!
+                         error330 = new_error(element: e, type: 330, description: "The text inside the comment should be #{e[:content]}")
+                       end
                      end
+                     @comment_found = true
+                   end
 
-                   if node_child.class != Nokogiri::XML::Element
-                     #embebed code
-                     #if code.css(e[:parent]).text != e[:content]
-
+                   if node_child.class == Nokogiri::XML::Text
                      if node_child.text.strip != e[:content].strip
-                       if item == "comment"
-                         #  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]}")
-                         end
-                       else
-                         error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
-                       end
+                       error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
                      else
                        text_found = true
                      end
-                     #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"
-                      error330 = new_error(element: e, type: 330, description: "The text inside the comment should be #{e[:content]}")
+
+                    if code.css(e[:parent]).text.strip != e[:content].strip
+                      #validate if comment exist and has the expected content
+                      if item == "comment"
+                        error330 = new_error(element: e, type: 330, description: "The text inside the comment should be #{e[:content]}")
+                        @comment_found = true
+                      else
+                        error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
+                      end
                     else
-                      error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
+                      text_found = true
                     end
-                  else
-                    text_found = true
-                  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 comment not found, throw error
+                if !(defined? @comment_found).nil?
+                  html_errors << new_error(element: e, type: 404, description:  "Remember to add the `<#{e[:tag]}>` tag") if !@comment_found
+                  remove_instance_variable(:@comment_found)
+                end
 
                if !text_found && !error330.nil?
                  html_errors << error330
@@ -365,19 +355,15 @@ class CodeTerminator::Html
            else
              exist = false
              code.css(e[:parent]).each do |code_css|
-               #if code_css.at_css(e[:tag]).parent.name == e[:parent]
-               p "text content: " + code_css.text
-                 if code_css.text == e[:content]
-                   exist = true
-                 end
-               #end
+               if code_css.text == e[:content]
+                 exist = true
+               end
              end
              if !exist
               html_errors << new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
              end
            end
            #end if parent < 2
-
          end
          #end if content is null
 

data/lib/code_terminator/version.rb

@@ -1,3 +1,3 @@
 module CodeTerminator
-  VERSION = "0.4.17"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.5.0
 platform: ruby
 authors:
 - Evelin Ponce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler