code_terminator 0.5.2 → 0.5.3

data/lib/code_terminator/html.rb

@@ -62,7 +62,7 @@ class CodeTerminator::Html
      @elements << node
 
      #search elements from body section
-       if !reader.at('body').nil?
+       if reader.at('body')
          node = Hash.new
          node[:parent] = "html"
          node[:tag] = "body"
@@ -72,8 +72,8 @@ class CodeTerminator::Html
            node = Hash.new
            node[:parent] = "html"
            node[:tag] = "body"
-           node[:attribute] = element_attribute.name if !element_attribute.name.nil?
-           node[:value] = element_attribute.value if !element_attribute.value.nil?
+           node[:attribute] = element_attribute.name if element_attribute.name
+           node[:value] = element_attribute.value if element_attribute.value
            node[:pointer] = element_attribute.pointer_id
            @elements << node
          end
@@ -81,7 +81,7 @@ class CodeTerminator::Html
       #end search
 
       #search elements from head section
-     if !reader.at('head').nil?
+     if reader.at('head')
        node = Hash.new
        node[:parent] = "html"
        node[:tag] = "head"
@@ -91,8 +91,10 @@ class CodeTerminator::Html
            node = Hash.new
            node[:parent] = "head"
            node[:tag] = child.name
-           node[:content] = child.text if !child.text.nil? or child.comment?
+           node[:content] = child.text if child.text or child.comment?
            node[:pointer] = child.pointer_id
+           node[:parent_pointer] = child.parent.pointer_id
+
            @elements << node
          else
            child.attribute_nodes.each do |element_attribute|
@@ -105,9 +107,10 @@ class CodeTerminator::Html
              end
              # node[:tag] = ( ? "text", child.name)
              node[:content] = child.text if !child.text.nil?
-             node[:attribute] = element_attribute.name if !element_attribute.name.nil?
-             node[:value] = element_attribute.value if !element_attribute.value.nil?
+             node[:attribute] = element_attribute.name if element_attribute.name
+             node[:value] = element_attribute.value if element_attribute.value
              node[:pointer] = element_attribute.pointer_id
+             node[:parent_pointer] = child.pointer_id
              @elements << node
            end
          end
@@ -117,7 +120,7 @@ class CodeTerminator::Html
     #end search elements
 
     #search elements inside body (children)
-    if !reader.at('body').nil?
+    if reader.at('body')
       reader.at('body').children.each do |child|
         if child.attribute_nodes.empty?
           node = Hash.new
@@ -125,15 +128,17 @@ class CodeTerminator::Html
           node[:tag] = child.name
           node[:content] = child.text if child.text? or child.comment?
           node[:pointer] = child.pointer_id
+          node[:parent_pointer] = child.parent.pointer_id
           @elements << node
         else
           child.attribute_nodes.each do |element_attribute|
             node = Hash.new
             node[:parent] = "body"
             node[:tag] = child.name
-            node[:attribute] = element_attribute.name if !element_attribute.name.nil?
-            node[:value] = element_attribute.value if !element_attribute.value.nil?
+            node[:attribute] = element_attribute.name if element_attribute.name
+            node[:value] = element_attribute.value if element_attribute.value
             node[:pointer] = element_attribute.pointer_id
+            node[:parent_pointer] = child.pointer_id
             @elements << node
           end
         end
@@ -225,11 +230,11 @@ class CodeTerminator::Html
    def print_elements(elements)
      text = ""
      elements.each do |child|
-       text << "parent = " + child[:parent] + "<br>" if !child[:parent].nil?
-       text << "tag = " + child[:tag] + "<br>" if !child[:tag].nil?
-       text << "attribute = " + child[:attribute] + "<br>" if !child[:attribute].nil?
-       text << "value = " + child[:value] + "<br>" if !child[:value].nil?
-       text << "content = " + child[:content] + "<br>" if !child[:content].nil?
+       text << "parent = " + child[:parent] + "<br>" if child[:parent]
+       text << "tag = " + child[:tag] + "<br>" if child[:tag]
+       text << "attribute = " + child[:attribute] + "<br>" if child[:attribute]
+       text << "value = " + child[:value] + "<br>" if child[:value]
+       text << "content = " + child[:content] + "<br>" if child[:content]
        text << "<hr>"
      end
      text
@@ -282,95 +287,50 @@ class CodeTerminator::Html
    #   code: (String)
 
    def match(source, code)
-     html_errors = Array.new
+     @html_errors = Array.new
+     html_errors = @html_errors
 
      code = Nokogiri::HTML(code)
 
      elements = get_elements(source)
 
-     css_code_checked = Array.new
 
      exist_in_body = Array.new
 
+     error_elements = Array.new
+
+     errors_count = Array.new
+
      error333 = nil
 
+     #lista de relaciones entre tags y elementos
+     css_code_checked = Array.new
+
+
      elements.each do |e|
 
+       if errors_count.select {|element| element[:parent_pointer].to_s == e[:parent_pointer].to_s && element[:tag].to_s == e[:tag]}.count < 1
+         error_element = Hash.new
+         error_element[:tag] = e[:tag]
+         error_element[:parent_pointer] = e[:parent_pointer]
+         error_element[:count] = 0
+         errors_count << error_element
+       end
+
        item = e[:tag]
 
        if item == "text" or item == "comment"
-
         #  Check the text
-         if !e[:content].nil?
+         if e[:content]
            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|
-
-                   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::Text && item != "comment"
-                     if node_child.text.strip != e[:content].strip
-                       error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}")
-                     else
-                       text_found = true
-                     end
-                   end
-
-                 end
-                 #end each
-                else
-
-                    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
-                      text_found = true
-                    end
-
-                end
-                #end if parent has children
-
-                #if comment not found, throw error
-                if !(defined? @comment_found).nil?
-                  html_errors << new_error(element: e, type: 404, description:  "Remember to add the comment tag") if !@comment_found
-                  remove_instance_variable(:@comment_found)
-                end
-
-               if !text_found && !error330.nil?
-                 html_errors << error330
-                 error330 = nil
-               end
+               #look for children elements with texts or comments
+               look_comment_or_text(code,e)
              end
-             #end if parent is nodeset
            else
-             exist = false
-             code.css(e[:parent]).each do |code_css|
-               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
+             #check if parent tag of the user code has text apart from the children tags
+             look_parent_text(code,e)
            end
-           #end if parent < 2
          end
          #end if content is null
 
@@ -379,23 +339,58 @@ class CodeTerminator::Html
 
        if code.css(e[:tag]).length > 0
 
-
         code.css(e[:tag]).each do |tag|
 
-          p "code css + " + e[:tag].to_s
-          p "pointer element " + e[:pointer].to_s
+          e_check = css_code_checked.select {|element| element[:original_pointer].to_s == e[:pointer].to_s }
+          # p "echeck " + e_check.to_s
+          e_check2 = css_code_checked.select {|element| element[:pointer].to_s == tag.pointer_id.to_s }
+
+          #original_pointer es el pointer del elemento e[]
+          #busca si el original_pointer esta en la lista de relaciones
+          #busca si el pointer del tag esta en la lista de relaciones
+          #cuando un original pointer o un pointer esta en la lista de relaciones, ya no puede volver a ser ingresado en la lista
+          #si el original pointer ya esta en la lista de relaciones, ya no es necesario volver a checarlo
+          check_original_pointer = css_code_checked.select {|element| element[:original_pointer].to_s == e[:pointer].to_s }
+
+          check_add_pointer = css_code_checked.select {|element| element[:pointer].to_s == tag.pointer_id.to_s }
+
+          #si el target pointer- pointer no esta en la lista de check agregar,
+          #si es target-pointer que ya existe + otro pointer da error,
+          #si es target-pointer y si esta, hacer nada.
+          #si pointer ya esta en la lista hacer nada
+          #look for same tags in code
+
+              if check_original_pointer.count == 0
+                if check_add_pointer.count < 1
+                  element_checked = Hash.new
+                  element_checked[:pointer] = tag.pointer_id
+                  element_checked[:tag] = e[:tag]
+                  element_checked[:original_pointer] = e[:pointer]
+                  element_checked[:original_parent_pointer] = e[:parent_pointer]
+                  css_code_checked << element_checked
+
+
+                  error_element = errors_count.select {|element| element[:tag].to_s == e[:tag].to_s && element[:parent_pointer].to_s == e[:parent_pointer].to_s}.first
+                  error_element[:count] += 1
+
+                else
+
+                end
+              end
+            # end
+            # e_check_exist = nil
+          # end
 
-          p e_check = css_code_checked.select {|element| element[:target_pointer].to_s == e[:pointer].to_s }
-          p e_check2 = css_code_checked.select {|element| element[:pointer].to_s == tag.pointer_id.to_s }
           if e_check.count < 1 and e_check2.count < 1
 
-          element_checked = Hash.new
-          element_checked[:pointer] = tag.pointer_id
-          element_checked[:tag] = e[:tag]
-          element_checked[:target_pointer]= e[:pointer]
+            element_checked = Hash.new
+            element_checked[:pointer] = tag.pointer_id
+            element_checked[:tag] = e[:tag]
+            element_checked[:target_pointer] = e[:pointer]
+            element_checked[:target_parent_pointer] = e[:parent_pointer]
 
 
-         if !e[:attribute].nil?
+         if e[:attribute]
           #  Check the tag's attributes
            if tag.attribute(e[:attribute]).nil?
              html_errors << new_error(element: e, type: 334, description: "`<#{e[:tag]}>` should have an attribute named #{e[:attribute]}")
@@ -416,37 +411,48 @@ class CodeTerminator::Html
            end
 
           end #if element checked
+
          end
 
+
+        #  p "respond" + tag.parent.to_s
         #  Check that tags exist within parent tags
         if tag.first.respond_to? :parent
 
-         if tag.count < 2 && !tag.first.nil?
+          p  "check if exists in parent tags"
+
+          e_check4 = css_code_checked.select {|element| element[:pointer].to_s == e[:pointer].to_s }
+          e_check5 = css_code_checked.select {|element| element[:target_parent_pointer].to_s == e[:parent_pointer].to_s }
+
+         if (tag.count < 2 && tag.first) or (e_check4.count < 1 && e_check5.count < 1)
            if tag.first.parent.name != e[:parent]
              html_errors << new_error(element: e, type: 440, description: "Remember to add the `<#{e[:tag]}>` tag inside `<#{e[:parent]}>`")
            end
          else
-          exist_in_parent = false
+           exist_in_parent = false
            tag.each do |code_css|
-              if code_css.parent.name == e[:parent]
-                exist_in_parent = true
-              end
-            end
-            if !exist_in_parent
-              html_errors << new_error(element: e, type: 440, description: "Remember to add the `<#{e[:tag]}>` tag inside `<#{e[:parent]}>`")
-            end
-         end
+             exist_in_parent = true if code_css.parent.name == e[:parent]
+           end
+           html_errors << new_error(element: e, type: 440, description: "Remember to add the `<#{e[:tag]}>` tag inside `<#{e[:parent]}>`") if !exist_in_parent
+          end
         end
+
+
         end
 
+
        else
+         "pasa else"
          #  Check that the tag is present
-          if code.at_css(e[:tag]).nil?
+        #  p "check if exists in parent"
+         e_check4 = css_code_checked.select {|element| element[:pointer].to_s == e[:pointer].to_s }
+         e_check5 = css_code_checked.select {|element| element[:target_parent_pointer].to_s == e[:parent_pointer].to_s }
+          if code.at_css(e[:tag]).nil? or e_check4.count < 1 and e_check5.count < 1
             html_errors << new_error(element: e, type: 404, description:  "Remember to add the `<#{e[:tag]}>` tag")
           end
        end
 
-       if !exist_in_body.empty? && !exist_in_body.include?(true) && !error333.nil?
+       if exist_in_body && !exist_in_body.include?(true) && error333
          html_errors << error333
        end
        exist_in_body = []
@@ -454,16 +460,27 @@ class CodeTerminator::Html
       end
 
      end
-     p css_code_checked
+
+     errors_count.each do |x|
+       #filtrar por parent
+       # tag_count = code.css(x[:tag]).length
+       tag_count = elements.select {|element| element[:parent_pointer].to_s == x[:parent_pointer].to_s && element[:tag].to_s == x[:tag]}.count
+
+       if tag_count > 1
+         if x[:count] < tag_count
+           html_errors << new_error(element: x[:tag], type: 404, description:  "Remember to add the `<#{x[:tag]}>` tag")
+         end
+       end
+     end
 
      html_errors
+
    end
 
    private
 
    def add_children(parent)
      parent.children.each do |child|
-
        if child.attribute_nodes.empty?
           node = Hash.new
           node[:parent] = parent.name
@@ -474,6 +491,8 @@ class CodeTerminator::Html
             node[:tag] = child.name
           end
           node[:content] = child.text if !child.text.nil? and child.class!=Nokogiri::XML::Element
+          node[:pointer] = child.pointer_id
+          node[:parent_pointer] = child.parent.pointer_id
           @elements << node
        else
          child.attribute_nodes.each do |element_attribute|
@@ -489,6 +508,8 @@ class CodeTerminator::Html
            end
            node[:attribute] = element_attribute.name if !element_attribute.name.nil?
            node[:value] = element_attribute.value if !element_attribute.value.nil?
+           node[:pointer] = element_attribute.pointer_id
+           node[:parent_pointer] = child.pointer_id
            @elements << node
          end
        end
@@ -498,17 +519,17 @@ class CodeTerminator::Html
    end
 
    def remove_empty_text (reader)
-     if !reader.at('head').nil?
+     if reader.at('head')
      reader.at('head').children.each do |child|
-       if !child.text.nil?
+       if child.text
          child.remove if child.content.to_s.squish.empty? && child.class == Nokogiri::XML::Text
        end
         check_children(child) if child.children.any?
      end
     end
-      if !reader.at('body').nil?
+      if reader.at('body')
      reader.at('body').children.each do |child|
-       if !child.text.nil?
+       if child.text
          child.remove if child.content.to_s.squish.empty? && child.class == Nokogiri::XML::Text
        end
         check_children(child) if child.children.any?
@@ -519,8 +540,8 @@ class CodeTerminator::Html
 
    def check_children(parent)
      parent.children.each do |child|
-       if !child.text.nil?
-         child.remove if child.content.to_s.squish.empty?
+       if child.text
+         child.remove if child.content.to_s.squish.empty? && child.class == Nokogiri::XML::Text
        end
        check_children(child) if child.children.any?
      end
@@ -537,6 +558,83 @@ class CodeTerminator::Html
      node
    end
 
+
+#methods of match
+   def look_comment_or_text(code,e)
+     error330 = nil
+     text_found = false
+     @comment_found = false if e[:tag] == "comment"
+
+     #look for comments or text in code
+     #code, e
+     if code.css(e[:parent]).children.any?
+      #look for comments and text in children of body
+      # code, e
+      #save
+      #return
+      code.css(e[:parent]).children.each do |node_child|
+        #if class of the node is a comment, look in the code
+        # @e, node_child
+        #save error330
+        #return true (flag)
+        if node_child.class == Nokogiri::XML::Comment
+          error330 = new_error(element: e, type: 330, description: "The text inside the comment should be #{e[:content]}") if e[:content].strip != "" && node_child.text.strip! != e[:content].strip!
+          @comment_found = true
+        end
+
+        #if class of node is text and element is not a comment
+        #@e, node_child
+        #save a error330, text_found
+        #return true (flag)
+        if node_child.class == Nokogiri::XML::Text && e[:content] != "comment"
+          node_child.text.strip != e[:content].strip ? error330 = new_error(element: e, type: 330, description: "The text inside `<#{e[:parent]}>` should be #{e[:content]}") : text_found = true
+        end
+      end #each
+
+      else
+         #validate if comment exist and has the expected content in body
+         #code, @e
+         #save @comment_found, text_found
+         if code.css(e[:parent]).text.strip != e[:content].strip
+           if e[:tag] == "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
+            text_found = true
+          end
+       end #end if parent has children
+
+       #throw errors of comment or text
+       #if comment not found, throw error
+        if (defined? @comment_found) && !@comment_found
+          @html_errors << new_error(element: e, type: 404, description:  "Remember to add the comment tag")
+          remove_instance_variable(:@comment_found) if !@comment_found
+        end
+
+       if !text_found && error330
+         @html_errors << error330
+         error330 = nil
+       end
+       #end throw errors
+   end #end look_comment_or_text
+
+   def look_parent_text(code,e)
+     exist = false
+     #look for text in parent, if found check flag true
+     code.css(e[:parent]).each do |code_css|
+       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
 
 end