code_terminator 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d023b54f3d9e4807758e10c9d8c9c1ad512d1feb
-  data.tar.gz: 81cc874ddd8da35b5ca80ac60cb6c8ad811ef544
+  metadata.gz: 6cde8d8d5a13de445c2bb97a0f5c530ab3213eaf
+  data.tar.gz: 5e943a9a25b0b3df4b4d7b35797b9667849178d8
 SHA512:
-  metadata.gz: c75b3ff7b196f630bd6fa95f83bc1b7f480e4c34f932747c744a4729dd979003d9cecf49d05a306dc187b13f04f056420b70b529d0b3c7affda954e94440382a
-  data.tar.gz: c94d216cd485c7f5f5e09e471aeb78f4c6f8a104c9bf2badb39f2bb04ac70b6185b6641783576d9ef3252984e1c4e96d15c56dff8b4727f8ac289f69352bc71c
+  metadata.gz: 768a6094ce3b967205a3f34004126bb796cd444e6def5f25d6d492c7c0fc10a0b6ce41bf5a128dac1b39a2235a117e96a795830f7a755bdcfe19337fc4d50872
+  data.tar.gz: 3b8795c1de1e23842660dc77b66a3ec443d7912da101a76a1e041ac8cb33da6ee028faa8a44e2d7200e6cd6a6846950e9725153387559c7a7bd925b7e99ccf38

data/exercises/issue12.html

@@ -0,0 +1 @@
+<footer><a href='#'>index</a><p>Please contact: </p><a href='mailto:joe@email.com'>joe@email.com</a></footer>

data/lib/code_terminator/html.rb

@@ -54,13 +54,15 @@ class CodeTerminator::Html
        reader = Nokogiri::HTML(File.open(source))
      end
      reader = remove_empty_text(reader)
-     reader.at('body').attribute_nodes.each do |element_attribute|
-       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?
-       @elements << node
-     end
+       if !reader.at('body').nil?
+         reader.at('body').attribute_nodes.each do |element_attribute|
+           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?
+           @elements << node
+         end
+       end
 
      if !reader.at('head').nil?
      reader.at('head').children.each do |child|
@@ -89,25 +91,26 @@ class CodeTerminator::Html
       add_children(child) if child.children.any?
     end
     end
-
-     reader.at('body').children.each do |child|
-      if child.attribute_nodes.empty?
-        node = Hash.new
-        node[:parent] = "body"
-        node[:tag] = child.name
-        node[:content] = child.text if child.text?
-        @elements << node
-      else
-        child.attribute_nodes.each do |element_attribute|
+    if !reader.at('body').nil?
+      reader.at('body').children.each do |child|
+        if child.attribute_nodes.empty?
           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[:content] = child.text if child.text?
           @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?
+            @elements << node
+          end
         end
+        add_children(child) if child.children.any?
       end
-      add_children(child) if child.children.any?
      end
      @elements
    end
@@ -256,7 +259,7 @@ class CodeTerminator::Html
      exist_in_body = Array.new
 
      error333 = nil
-     
+
      elements.each do |e|
 
        item = e[:tag]
@@ -382,12 +385,22 @@ class CodeTerminator::Html
    end
 
    def remove_empty_text (reader)
-     reader.at('html').children.each do |child|
+     if !reader.at('head').nil?
+     reader.at('head').children.each do |child|
        if !child.text.nil?
-         child.remove if child.content.to_s.squish.empty?
+         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?
+     reader.at('body').children.each do |child|
+       if !child.text.nil?
+         child.remove if child.content.to_s.squish.empty? && child.class == Nokogiri::XML::Text
+       end
+        check_children(child) if child.children.any?
+     end
+    end
      reader
    end
 

data/lib/code_terminator/version.rb

@@ -1,3 +1,3 @@
 module CodeTerminator
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Evelin Ponce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +156,7 @@ files:
 - bin/setup
 - code_terminator.gemspec
 - exe/code_terminator
+- exercises/issue12.html
 - exercises/new.html
 - exercises/new2.html
 - exercises/test.css