code_terminator 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9dd80f0480385f782d16f013ea23b3e5da72d0
-  data.tar.gz: 82e5bba3270ec1abca8d1d827f0bf14c41f82993
+  metadata.gz: 8aceb132c1e05ea755d7692ecf035f0918db62da
+  data.tar.gz: c9fdcf92ebcd55ef592fb2b5904fa0c3ef0278f1
 SHA512:
-  metadata.gz: 8d26de5396d0d3fb12c5c1e667fe43633bd893ebccd21103236ed13366714ae456a9052d7c3d0f54f224e9e4b2cb7b4757cdb024681b6d23d56388dc07c30853
-  data.tar.gz: d93ddd7ba64c42beb2e3ba276ff2c4c7dcc0e98e61c7174737a6dd3e4cdff4525f3196da5f4d33426fcb819bd393c71a5b1e73e89d2ec6577f7e48cdb56c0f00
+  metadata.gz: 70a295a63d6099ea31f0ac1392931d1264b383010416f2499ab200a20eed6b3ce60ecf342ac00f7ab221b2a298674c40ae4f0a04e57b3ce03c47f3e61a930ff0
+  data.tar.gz: f810a42cc618a59021f28effa1fea7061c18dfe43105e134b00ece5ae347a220d3438d5f51823815629770e436c2c470edbdd2417289244fe7ec85b9507f240a

data/README.md

@@ -26,7 +26,7 @@ Or install it yourself as:
 
 ## Quick Start
 
-#HTML
+#####HTML
 To parse HTML and match the file with html code you just need to do:
 ```ruby
     # code = code get from an editor
@@ -53,7 +53,7 @@ You will know that the code and the source file have the same html elements when
     #   => ["h1 not exist"]
 ```
 
-# CSS
+##### CSS
 To parse CSS and match the file with css code you just need to do:
 ```ruby
     # code = code get from an editor
@@ -84,7 +84,7 @@ You will know that the code and the source file have the same css elements when
 ###match(source, code)
 Match if the code have the same elements than the exercise. Return an array with the mismatches.
 
-#HTML
+####HTML
 ```ruby
    #   hola_mundo.html
    # => <h1>Come with me if you want to live!</h1>
@@ -96,7 +96,7 @@ Match if the code have the same elements than the exercise. Return an array with
    #
 ```
 
-#CSS
+#####CSS
 ```ruby
    #   test.css
    # => h1{ margin: 100px; }
@@ -110,13 +110,13 @@ Match if the code have the same elements than the exercise. Return an array with
 
 ###new_file(source, code)
 Create a Html/Css file with the code of the editor. Return a boolean that indicate if the file was created or not.
-#HTML
+#####HTML
 ```ruby
     >> ct = CodeTerminator::Html.new
     >> ct.new_file("hola_mundo.html", "<h1>Come with me if you want to live!</h1>")
     #   => true
 ```
-#CSS
+#####CSS
 ```ruby
     >> ct = CodeTerminator::Css.new
     >> ct.new_file("hola_mundo.css", "h1{ margin: 50px; }")
@@ -125,13 +125,13 @@ Create a Html/Css file with the code of the editor. Return a boolean that indica
 
 ###read_file(source)
 Read a html file. Return the text of the file.
-#HTML
+#####HTML
 ```ruby
     >> ct = CodeTerminator::Html.new
     >> ct.read_file("hola_mundo.html")
      #   => "<h1>Come with me if you want to live!</h1>"
 ```
-#CSS
+#####CSS
 ```ruby
     >> ct = CodeTerminator::Css.new
     >> ct.read_file("hola_mundo.css")
@@ -140,13 +140,13 @@ Read a html file. Return the text of the file.
 
 ###validate_syntax(code)
 Validate if the syntax is correct. Return an array with errors.
-#HTML
+#####HTML
 ```ruby
     >> ct = CodeTerminator::Html.new
     >> ct.validate_syntax("<h1>Come with me if you want to live!</h1")
      #   => [#<Nokogiri::XML::SyntaxError: expected '>'>]
 ```
-#CSS
+#####CSS
 ```ruby
     >> ct = CodeTerminator::Css.new
     >> ct.validate_syntax("h1{ margi")
@@ -155,13 +155,13 @@ Validate if the syntax is correct. Return an array with errors.
 
 ###get_elements(source)
 Get html elements of a html file. Return a list of Nokogiri XML objects.
-#HTML
+#####HTML
 ```ruby
     >> ct = CodeTerminator::Html.new
     >> ct.get_elements("hola_mundo.html")
-     #   => [#<Nokogiri::XML::Element:0x3fe3391547d8 name="h1" children=[#<Nokogiri::XML::Text:0x3fe33915474c "Come with me if you want to live!">]>, #<Nokogiri::XML::Text:0x3fe33915474c "Come with me if you want to live!">]
+     #   => [{:parent=>"body", :tag=>"div", :attribute=>"class", :value=>"col-md-12"}, {:parent=>"div", :tag=>"h1"}, {:parent=>"h1", :tag=>"text", :content=>"Come with me if you want to live!"}]
 ```
-#CSS
+#####CSS
 ```ruby
     >> ct = CodeTerminator::Css.new
     >> ct.get_elements("hola_mundo.css")
@@ -172,13 +172,13 @@ Get html elements of a html file. Return a list of Nokogiri XML objects.
 Get the elements of the code in html format. Return a string with elements in html.
 <br>
 **Get 'Elements Array' calling 'get_elements()'
-#HTML
+#####HTML
 ```ruby
-     CodeTerminator::Html.print_elements([#<Nokogiri::XML::Element:0x3fe31dc42bfc name="h1" children=[#<Nokogiri::XML::Text:0x3fe31dc42b70 "Come with me if you want to live!">]>, #<Nokogiri::XML::Text:0x3fe31dc42b70 "hola mundo">])
+     CodeTerminator::Html.print_elements(=> [{:parent=>"body", :tag=>"div", :attribute=>"class", :value=>"col-md-12"}, {:parent=>"div", :tag=>"h1"}, {:parent=>"h1", :tag=>"text", :content=>"Come with me if you want to live!"}] )
      #   => "name = h1<br><hr>name = text<br>content = Come with me if you want to live!<br><hr>"
      #
 ```
-#CSS
+#####CSS
 ```ruby
      CodeTerminator::Css.print_elements([{:selector=>"h1"}, {:selector=>"h1", :property=>"margin", :value=>"50px"}])
      #   => "selector = h1<br><hr>property = margin<br>value = 50px<br><hr>"

data/exercises/test.html

@@ -1 +1,5 @@
-<h2>hola test</h2>
+<body>
+  <div class="col-md-12">
+    <h1>Come with me if you want to live!</h1>
+  </div>
+</body>

data/lib/code_terminator/html.rb

@@ -7,6 +7,7 @@ class CodeTerminator::Html
     @code = args[:code]
     @source = args[:source]
     @tags = Array.new
+    @elements = Array.new
   end
 
     # Create a Html file with the code of the editor. Return a boolean that indicate if the file was created or not.
@@ -44,13 +45,37 @@ class CodeTerminator::Html
      #   source: (String)
 
    def get_elements(source)
+     @elements = Array.new
      reader = Nokogiri::HTML(File.open(source))
      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
      reader.at('body').children.each do |child|
-       @tags.push(child)
-       add_children(child) if child.children.any?
+      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|
+          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
-     @tags
+     @elements
    end
 
      # Validate if the syntax is correct. Return an array with Nokogiri errors.
@@ -128,11 +153,11 @@ class CodeTerminator::Html
    def print_elements(elements)
      text = ""
      elements.each do |child|
-       text << "name = " + child.name + "<br>"
-       text << "content = " + child.text + "<br>" if child.text?
-       child.attribute_nodes.each do |child_attribute|
-          text << child.name + " attribute = " + child_attribute.name + " - " + child_attribute.value + "<br>"
-       end
+       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 << "<hr>"
      end
      text
@@ -160,26 +185,47 @@ class CodeTerminator::Html
 
      elements = get_elements(source)
      #@elements = Html::PrintElements.call(elements)
+# '[{:parent=>"body", :tag=>"div"}, {:parent=>"body", :tag=>"div", :attribute=>"class", :value=>"col-md-12"}, {:parent=>"div", :tag=>"h2"}, {:parent=>"h2", :tag=>"text", :content=>"hola test"}, {:parent=>"div", :tag=>"h1"}] '
 
-     elements.each do |element|
-       if element.name == "text"
-         #code if element is text
+     elements.each do |e|
+       item = e[:tag]
+       if item=="text"
+         if !e[:content].nil?
+           if code.css(e[:parent]).text != e[:content]
+             html_errors << e[:parent] + " haven't the same text " + e[:content]
+           end
+           e[:content] == code.css()
+         end
+         #manage text
        else
-         if code.css(element.name).length == 0
-           html_errors << element.name + " not exist"
-         else
-           element.attribute_nodes.each do |element_attribute|
-             if !code.css(element.name).attribute(element_attribute.name).nil?
-               if code.css(element.name).attribute(element_attribute.name).value != element_attribute.value
-                 html_errors << element_attribute.name + " not is the same value " + element_attribute.value
-               end
-             else
-               html_errors << element_attribute.name + " not exist"
+       if code.css(e[:tag]).length > 0
+
+         if !e[:attribute].nil?
+           if code.css(e[:tag]).attribute(e[:attribute]).nil?
+             html_errors << e[:attribute] + " not exist in " + e[:tag]
+           else
+             if code.css(e[:tag]).attribute(e[:attribute]).value != e[:value]
+               html_errors << e[:attribute] + " not is the same value " +  e[:value]
              end
            end
          end
+
+         if code.at_css(e[:tag]).parent.name != e[:parent]
+           html_errors << e[:tag] + " not exist in " + e[:parent]
+         end
+
+       else
+
+        #if code.css(e[:tag]).parent.name != e[:parent]
+           #html_errors << e[:tag] + " not exist in " + e[:parent]
+        #end
+
        end
+
+      end
      end
+
+
      html_errors
    end
 
@@ -187,7 +233,22 @@ class CodeTerminator::Html
 
    def add_children(parent)
      parent.children.each do |child|
-       @tags.push(child)
+       if child.attribute_nodes.empty?
+          node = Hash.new
+          node[:parent] = parent.name
+          node[:tag] = child.name
+          node[:content] = child.text if child.text?
+          @elements << node
+       else
+         child.attribute_nodes.each do |element_attribute|
+           node = Hash.new
+           node[:parent] = parent.name
+           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
    end

data/lib/code_terminator/version.rb

@@ -1,3 +1,3 @@
 module CodeTerminator
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Evelin Ponce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - code_terminator-0.2.0.gem
 - code_terminator-0.2.1.gem
 - code_terminator-0.2.2.gem
+- code_terminator-0.2.3.gem
 - code_terminator.gemspec
 - exe/code_terminator
 - exercises/new.html