code_terminator 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd44160b32331350392c5d4727b1452a642fd6c
-  data.tar.gz: 84ca42ce8d6ea053075fd2641c0f77bec1dfb608
+  metadata.gz: b1e8b4fbb2da92212f15642327bdf9effac8e772
+  data.tar.gz: a8c55254172be2a62348ee952ef4b147cee66f53
 SHA512:
-  metadata.gz: 4dbef31aae5338c9bca035bd29c9cb8793c18048ab9dadbf927d8c662a4473541faca1ada9a66b1a99ba6e73e070b563f332398d5d003bb910ce9c8e7256a61b
-  data.tar.gz: 32adf767833ac80b12bc666cedffbe5ad1c1c22890225ff09e880baa92687a23c538367f54c7f7809cffa7ba40e984b7717f4634765bd6e2c97f188d414a13f6
+  metadata.gz: 445a692e5ec0d4bede8bbd120e96e46a26d5c63951c000b65a315f69f8e68f9121f503a537844f508e292a5bc2910a03e88b9d9061b9bd9fa64b682bad8840a0
+  data.tar.gz: f6e1e1b313b5568685bf44a84fd579bef937e5ea3cabf637e608d581fc544eab9ab8047a4e3801b9d8126672b7a2d47195a66da408115a718719c61c00343f78

data/lib/code_terminator/css.rb

@@ -102,11 +102,11 @@ class CodeTerminator::Css
       #else
         #valid = false
       end
-    else
+     else
       errors[0] = "error"
-    end
+     end
     errors
-  end
+   end
 
      # Read a css file. Return a string with the text of the file.
      #
@@ -120,20 +120,16 @@ class CodeTerminator::Css
    def read_file(source)
      if @source_type == "url"
        fileCss = open(source).read
+       text = fileCss
      else
        fileCss = File.open(source, "r")
-     end
-
-     text = ""
-     begin
-       fileCss.each_line do |line|
-         text << line
+       begin
+         text = fileCss.read
+       rescue
+         text = false
+       ensure
+         #fileHtml.close unless fileHtml.nil?
        end
-       fileCss.close
-     rescue
-       text = false
-     ensure
-       #fileHtml.close unless fileHtml.nil?
      end
 
      text
@@ -216,7 +212,7 @@ class CodeTerminator::Css
      elements.each do |e|
        item = e[:selector]
        if !e[:property].nil?
-
+         property = e[:property]
          parser_array = parser.find_by_selector(item)
          if parser_array.any?
            parser_property = parser_array[0].split(";")
@@ -225,18 +221,18 @@ class CodeTerminator::Css
            if e[:value]==""
              property = e[:property] + ": "
              if parser_property.empty? { |s| s.include?(property) }
-               css_errors << new_error(element: e, type: 111, description: "Different property " + property + " on selector " + item)
+               css_errors << new_error(element: e, type: 111, description: "Make sure the property #{property} is in the selector #{item}.")
              end
            else
              property = e[:property] + ": " + e[:value]
              if !parser_property.include?(property)
-               css_errors << new_error(element: e, type: 111, description: "Different property " + property + " on selector " + item)
+               css_errors << new_error(element: e, type: 111, description: "Make sure the property #{property} is in the selector #{item}.")
              end
            end
 
          else
            node = Hash.new
-           css_errors << new_error(element: e, type: 101, description:  "Property "+ property + " not found on " + item)
+           css_errors << new_error(element: e, type: 101, description: "Add #{property} inside #{item}.")
          end
        end
      end

data/lib/code_terminator/html.rb

@@ -231,10 +231,11 @@ class CodeTerminator::Html
 
        if item=="text"
 
+        #  Check the text
          if !e[:content].nil?
            if code.css(e[:parent]).count < 2
              if code.css(e[:parent]).text != e[:content]
-               html_errors << new_error(element: e, type: 330, description: e[:parent] + " haven't the same text " + e[:content])
+               html_errors << new_error(element: e, type: 330, description: "The text inside #{e[:parent]} should be #{e[:content]}.")
              end
            else
              exist = false
@@ -246,7 +247,7 @@ class CodeTerminator::Html
                #end
              end
              if !exist
-              html_errors << new_error(element: e, type: 330, description: e[:parent] + " haven't the same text " + e[:content])
+              html_errors << new_error(element: e, type: 330, description: "The text inside #{e[:parent]} should be #{e[:content]}.")
              end
            end
         end
@@ -255,19 +256,21 @@ class CodeTerminator::Html
        if code.css(e[:tag]).length > 0
 
          if !e[:attribute].nil?
+          #  Check the tag's attributes
            if code.css(e[:tag]).attribute(e[:attribute]).nil?
-             html_errors << new_error(element: e, type: 334, description: e[:attribute] + " didn't exist in " + e[:tag])
+             html_errors << new_error(element: e, type: 334, description: "#{e[:tag]} should have an attribute named #{e[:attribute]}.")
            else
              if code.css(e[:tag]).attribute(e[:attribute]).value != e[:value]
-               html_errors << new_error(element: e, type: 333, description: e[:attribute] + " isn't the same value " +  e[:value])
+               html_errors << new_error(element: e, type: 333, description: "Make sure that the attribute #{e[:attribute]} in #{e[:tag]} has the value #{e[:value]}.")
              end
            end
          end
 
+        #  Check that tags exist within parent tags
          if code.css(e[:tag]).count < 2
-         if code.css(e[:tag]).first.parent.name != e[:parent]
-           html_errors << new_error(element: e, type: 440, description: e[:tag] + " didn't exist in " + e[:parent])
-         end
+           if code.css(e[: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
            code.css(e[:tag]).each do |code_css|
@@ -276,16 +279,15 @@ class CodeTerminator::Html
               end
             end
             if !exist_in_parent
-              html_errors << new_error(element: e, type: 440, description: e[:tag] + " didn't exist in " + e[:parent])
+              html_errors << new_error(element: e, type: 440, description: "Remember to add the #{e[:tag]} tag inside #{e[:parent]}.")
             end
          end
 
        else
-
+         #  Check that the tag is present
           if code.at_css(e[:tag]).nil?
-            html_errors << new_error(element: e, type: 404, description:  e[:tag] + " didn't exist")
+            html_errors << new_error(element: e, type: 404, description:  "Remember to add the #{e[:tag]} tag.")
           end
-
        end
 
       end

data/lib/code_terminator/version.rb

@@ -1,3 +1,3 @@
 module CodeTerminator
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Evelin Ponce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler