code_terminator 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8616d6be2d7e6877e6722e3cb0faf9b4be699fd
-  data.tar.gz: 261e03e5d01a646653eb7d3202202c66d272fc6c
+  metadata.gz: 986026e1b23cb931e122837f5e2c9ffc298e3818
+  data.tar.gz: 2d13072f71055e8e2c188078f6317ba78196b3da
 SHA512:
-  metadata.gz: f2d107298c0cf414e01edb594af73d21425c141be949d51439be1056cb899e489d798f3315133c7fd2dd07191614ca2df603e8416c8f4578bad428c1ec31335d
-  data.tar.gz: 0cb8ea6db083a884cd12bc9bba9d8df39afdb34dc6f1e7ef5115fbc004ead06b15209458662fe34ed61c6a9d59e9a82bc924454e60490e8bace2599d92ad744e
+  metadata.gz: b02faf723eb6f4e8898d8ebf061e12c18eb2b0ad51cd111d9e91c144066948fb6c4908574a63e0693d8a2777285b22b78484e15e8ccee57ea3be889918de19d0
+  data.tar.gz: c54040e0e49c5b85784a1a59a7037943412fe38187ef951f6f57ad19413cce59148c3522f9978af3270295cf83f9b3aa13ca32ea67b9ba3b280a7508b465540f

data/exercises/css/lesson0.css

@@ -0,0 +1,5 @@
+body {
+    background-image: ;
+    background-color: lightblue;
+
+     }

data/exercises/css/lesson0_w.css

@@ -0,0 +1,5 @@
+body {
+    background-image: url('paper.jpg');
+    background-color: lightblue;
+
+     }

data/exercises/css/lesson1_1.css

@@ -0,0 +1 @@
+#border{border-color:green; border-style:solid;}

data/exercises/css/lesson1_2.css

@@ -0,0 +1,5 @@
+ul{
+  width:;
+  height:;
+  background-color:;
+}

data/exercises/css/lesson1_5.css

@@ -0,0 +1,16 @@
+img{
+  background-color:blue;
+  padding: 3px;
+}
+
+h1{
+  margin:0px;
+  background-color:red;
+  padding: 3px;
+}
+
+p{
+  margin:0px;
+  background-color:green;
+  padding: 3px;
+}

data/lib/code_terminator/css.rb

@@ -208,16 +208,36 @@ class CodeTerminator::Css
      parser.load_string!(code)
      elements.each do |e|
        item = e[:selector]
-       if !e[:property].nil?
+       if e[:property]
          property = e[:property]
          parser_array = parser.find_by_selector(item)
          if parser_array.any?
+          #  p "array " + parser_array.to_s
            parser_property = parser_array[0].split(";")
-           parser_property.each {|a| a.strip! if a.respond_to? :strip! }
+          #  p "array  split" + parser_property.to_s
 
+           search_results = parser_property.select { |key| key.include?(property) }
+           if search_results.empty?
+             css_errors << new_error(element: e, type: 111, description: "Make sure the property _#{property}_ is in the selector **#{item}**")
+           end
+
+
+          #  parser_property.each do |pp|
+          #     p "include " + pp.include?(property).to_s
+          #     if !pp.include?(property)
+          #       css_errors << new_error(element: e, type: 111, description: "Make sure the property _#{property}_ is in the selector **#{item}**")
+          #     end
+          #  end
+
+
+          parser_property.each {|a| a.strip! if a.respond_to? :strip! }
+
+
+          #  p "value:" + e[:value]
            if e[:value]==""
              property = e[:property] + ": "
-             if parser_property.empty? { |s| s.include?(property) }
+            #  p "parser property: " + parser_property.to_s
+             if parser_property.empty?
                css_errors << new_error(element: e, type: 111, description: "Make sure the property _#{property}_ is in the selector **#{item}**")
              end
            else

data/lib/code_terminator/html.rb

@@ -131,13 +131,6 @@ class CodeTerminator::Html
           node[:parent_pointer] = child.parent.pointer_id
           @elements << node
         else
-          node = Hash.new
-          node[:parent] = "body"
-          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
           child.attribute_nodes.each do |element_attribute|
             node = Hash.new
             node[:parent] = "body"
@@ -303,7 +296,6 @@ class CodeTerminator::Html
 
 
      exist_in_body = Array.new
-     exist_value = Array.new
 
      error_elements = Array.new
 
@@ -316,25 +308,15 @@ class CodeTerminator::Html
 
 
      elements.each do |e|
-       p "element " + e.to_s
-       p "select ---"
-      #  p elements_count
-
-       if e[:attribute].nil?
-           #tag con el mismo parent pointer no se repite ni se cuenta
-          #  p "element count"
-          #  elements_count.select {|element| element[:parent_pointer].to_s == e[:parent_pointer].to_s && element[:tag].to_s == e[:tag]}
-
-
-          #  if elements_count.select {|element| element[:parent_pointer].to_s == e[:parent_pointer].to_s && element[:tag].to_s == e[:tag]}.count < 1
-             the_element = Hash.new
-             the_element[:tag] = e[:tag]
-             the_element[:pointer] = e[:pointer]
-             the_element[:parent_pointer] = e[:parent_pointer]
-             the_element[:count] = 1
-             elements_count << the_element
-          #  end
-        end
+
+       if elements_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[:pointer] = e[:pointer]
+         error_element[:parent_pointer] = e[:parent_pointer]
+         error_element[:count] = 0
+         elements_count << error_element
+       end
 
        item = e[:tag]
 
@@ -356,7 +338,6 @@ class CodeTerminator::Html
        #item class is different to text or comment
 
        code.css(e[:tag]).each do |tag|
-         p "tag " + tag.to_s
          tag_element = nil
          e_check = css_code_checked.select {|element| element[:original_pointer].to_s == e[:pointer].to_s }
          # p "echeck " + e_check.to_s
@@ -370,22 +351,9 @@ class CodeTerminator::Html
          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 }
-        #  p "check_add " + check_add_pointer.to_s
-         #look for same tags in code
-        #  p "elements_count"
-        #  p elements_count
 
+         #look for same tags in code
          if check_original_pointer.count == 0
-          #  p "pasa"
-          # #  if tag.attributes.nil?
-          # #    p "CON ATRIBUTOS"
-          # #  else
-          # #  p elements_count.to_s
-          #  p "element " +e[:tag].to_s
-          #  p "e pointer "+e[:pointer].to_s
-          #  p "e parent pointer "+e[:parent_pointer].to_s
-
-          # end
            if check_add_pointer.count < 1
              element_checked = Hash.new
              element_checked[:pointer] = tag.pointer_id
@@ -394,11 +362,8 @@ class CodeTerminator::Html
              element_checked[:original_parent_pointer] = e[:parent_pointer]
              css_code_checked << element_checked
 
-            #  the_element = elements_count.select {|element| element[:tag].to_s == e[:tag].to_s && element[:parent_pointer].to_s == e[:parent_pointer].to_s}.first
-            the_element = elements_count.select {|element| element[:tag].to_s == e[:tag].to_s && element[:pointer].to_s == e[:parent_pointer].to_s}.first
-
-            #  p "the element " + the_element.to_s
-             the_element[:count] += 1 if the_element
+             error_element = elements_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
            end
          end
         #  end
@@ -444,24 +409,13 @@ class CodeTerminator::Html
            else
              if tag.attribute(e[:attribute]).value != e[:value]
                  exist_in_body << false
-                #  p "value " + e[:value]
-                tag_attribute = tag.attribute(e[:attribute]).name
-                tag_attribute_value = tag.attribute(e[:attribute]).value
-                # p "type " + e[:tag] + " with attribute " + e[:attribute] + " value " + e[:value]
+                #  p "type " + e[:tag] + " with attribute " + e[:attribute] + " value " + e[:value]
                 # Check if the img have attribute src and value is null, the user can write whatever image he wants
-                # p exist_value
-                 if !(e[:tag] == "img" && (e[:attribute] == tag_attribute) && e[:value] == "")
-                   if (!exist_value.include? tag_attribute_value and !exist_value.include? e[:value])
-                     exist_in_body << false
-                      error333 = new_error(element: e, type: 333, description: "Make sure that the attribute #{e[:attribute]} in `<#{e[:tag]}>` has the value #{e[:value]}")
-                    end
-                    # html_errors << error333 if error333
-                 else
-
+                 if !(e[:tag] == "img" && e[:attribute] == "src" && e[:value] == "")
+                   error333 = new_error(element: e, type: 333, description: "Make sure that the attribute #{e[:attribute]} in `<#{e[:tag]}>` has the value #{e[:value]}")
                  end
                else
               #  p "add code_checked"
-              exist_value << e[:value]
               #  css_code_checked << element_checked
                exist_in_body << true
              end
@@ -473,7 +427,7 @@ class CodeTerminator::Html
         #  Check that tags exist within parent tags
         if tag.first.respond_to? :parent
 
-          # p  "check if exists in parent tags"
+          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 }
@@ -499,66 +453,31 @@ class CodeTerminator::Html
 
       # end #end tag
 
+
        if exist_in_body && !exist_in_body.include?(true) && error333
          html_errors << error333
        end
-
-      #  if exist_in_body && !exist_in_body.include?(true) && error333
-      #    html_errors << error333
-      #  end
-
        exist_in_body = []
-       error333 = nil
-      #  exist_value = []
 
       end
 
      end
 
-      # p "elements_count = " + elements_count.group_by{|h| h[:parent_pointer]}.to_s
-
-      # p "elements_count2 = "
-      grouped_elements = elements_count.select {|element| element[:count] > 0}.group_by { |s| [s[:parent_pointer], s[:tag]] }
+    #  p elements_count.to_s
 
-     grouped_elements.each do |x|
+     elements_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[0][0].to_s && element[:tag].to_s == x[0][1]}
-      # p "group="+tag_count.group_by{|h| h[:parent_pointer]}.values.to_s
-      # p result=Hash[tag_count.group_by{|x|x}.map{|k,v| [k,v.size]}]
-      p "tag" + x.to_s
-      p "tag count " + tag_count.count.to_s
-      p "grouped" + x.to_s
-      p "grouped count " + x[1].first[:count].to_s
-      (p "div count " + x[1][0].count.to_s) if x[0][1]=="div"
-
-      # p tag_count = elements.select {|element| element[:pointer].to_s == x[:pointer].to_s && element[:tag].to_s == x[:tag]}.count
+       # 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
       #  p x[:tag]!="body"
-       if tag_count.count >= 1 && !(x[0][1]=="body" || x[0][1]=="head" || x[0][1]=="text" || x[0][1]=="comment")
+       if tag_count >= 1 && !(x[:tag]=="body" || x[:tag]=="head" || x[:tag]=="text" || x[:tag]=="comment" || x[:tag]=="img")
       # if tag_count >= 1 && !(x[:tag]!="div")
-      if x[0][1]=="div"
-        if x[1][0].count.to_i < tag_count.count
-          html_errors << new_error(element: x[0][1], type: 404, description:  "Remember to add the `<#{x[0][1]}>` tag")
-        end
-      else
-         if x[1].first[:count] < tag_count.count
-           html_errors << new_error(element: x[0][1], type: 404, description:  "Remember to add the `<#{x[0][1]}>` tag")
+         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
      end
 
-    #  grouped_elements_null = elements_count.select {|element| element[:count] == 0}.group_by { |s| [s[:parent_pointer], s[:tag]] }
-     #
-    #  grouped_elements_null.each do |nulls|
-    #    if !(nulls[0][1]=="body" || nulls[0][1]=="head" || nulls[0][1]=="text" || nulls[0][1]=="comment")
-    #   # if tag_count >= 1 && !(x[:tag]!="div")
-    #     #  if x[1].count < tag_count.count
-    #        html_errors << new_error(element: nulls[0][1], type: 404, description:  "Remember to add the `<#{nulls[0][1]}>` tag")
-    #     #  end
-    #    end
-    #  end
-     p elements_count
      html_errors
 
    end

data/lib/code_terminator/version.rb

@@ -1,3 +1,3 @@
 module CodeTerminator
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Evelin Ponce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +156,11 @@ files:
 - bin/setup
 - code_terminator.gemspec
 - exe/code_terminator
+- exercises/css/lesson0.css
+- exercises/css/lesson0_w.css
+- exercises/css/lesson1_1.css
+- exercises/css/lesson1_2.css
+- exercises/css/lesson1_5.css
 - exercises/get_elements.html
 - exercises/html/check_body_tag_exist.html
 - exercises/html/check_comment_empty.html