html_validation 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c71f1d5bf532b471165022225527f2eb624abac
-  data.tar.gz: 3544c06a88e7c88ccf01beea50da0dfb3e706683
+  metadata.gz: 5922a978e4acaf0b7f437d4c42a77f23d2b02aab
+  data.tar.gz: e3d9a002a264c181e69668d6817d5a2631823d53
 SHA512:
-  metadata.gz: 2f5f523eb348772060dc955ad5500ce2e51d873d20c3f226cf907ddce96a51739df3133be57e07b2bd6ff61c3299d4fd97cbf764094c4055efd79d7e45ec6df7
-  data.tar.gz: f2baacdf1e9248d68733eafcf23c04629ed61bc1f9d2207f1bac9d332ae19214f702cfe4d278f69968f23a85bf473d05296bb4e9dac710325bd8668699c163ac
+  metadata.gz: e6e9a96483cac87c9c865daf501e42db8a7bea659df29b16da948c1abb40489a412f6d0e361586fbf2fd20405f84273774d35f009f7c722fcb5fa9e12372ddbc
+  data.tar.gz: 2c23cab2a04de790e4c9e6f872e7185a0a9fef2930e97cebfe5a89458aba7dc2faa710815a57fa720a0e56f1835c217031d3492569e690de7723ac93facfc6b9

data/lib/html_validation/html_validation_result.rb

@@ -14,12 +14,12 @@ class HTMLValidationResult
 
   # options ex: options[:tidy_opts] = ['--show-warnings false']
   def initialize(resource, html, datapath, tidy_flags = [], options = {})
-    @resource           = resource
-    @html               = html
-    @exceptions         = ''
-    @datapath           = datapath
-    @tidy_flags         = (HTMLValidation.default_tidy_flags + tidy_flags).uniq
-    @options            = options
+    @resource = resource
+    @html = html
+    @exceptions = ''
+    @datapath = datapath
+    @tidy_flags = (HTMLValidation.default_tidy_flags + tidy_flags).uniq
+    @options = options
     valid?
   end
 
@@ -32,9 +32,9 @@ class HTMLValidationResult
 
   # takes a .url and loads the data into this object
   def self.load_from_files(filepath)
-    resource  = File.open("#{filepath}.resource.txt", 'r').read
-    html      = File.open("#{filepath}.html.txt", 'r').read
-	  HTMLValidationResult.new(resource, html, filepath)
+    resource = File.open("#{filepath}.resource.txt", 'r').read
+    html = File.open("#{filepath}.html.txt", 'r').read
+    HTMLValidationResult.new(resource, html, filepath)
   end
 
   # Validates an html string using html tidy. If there are no warnings or exceptions, or
@@ -54,7 +54,7 @@ class HTMLValidationResult
   # string is identical, valid? will return true. Note that #exceptions will still list the
   # exception string, though, even if it is an accepted exception string.
   def accept!
-    File.open(data_path("accepted"), 'w') {|f| f.write(@exceptions) }
+    File.open(data_path("accepted"), 'w') {|f| f.write(@exceptions)}
   end
 
   def reject!
@@ -82,15 +82,15 @@ class HTMLValidationResult
   end
 
   def save_html_and_exceptions
-    File.open(data_path("html"), 'w')       {|f| f.write(@html) }
-    File.open(data_path("resource"), 'w')   {|f| f.write(@resource) }
-    File.open(data_path("exceptions"), 'w') {|f| f.write(@exceptions) }
+    File.open(data_path("html"), 'w') {|f| f.write(@html)}
+    File.open(data_path("resource"), 'w') {|f| f.write(@resource)}
+    File.open(data_path("exceptions"), 'w') {|f| f.write(@exceptions)}
   end
 
-    # have we previously accepted this exact string for this path?
+  # have we previously accepted this exact string for this path?
   def accepted?(exception_str)
     exception_str = filter(exception_str)
-    File.exists?(data_path('accepted')) ? filter(File.open(data_path('accepted'),"r").read) == exception_str : false
+    File.exists?(data_path('accepted')) ? filter(File.open(data_path('accepted'), "r").read) == exception_str : false
   end
 
   # Line numbers of exceptions are likely to change with any minor edit, so our validation
@@ -98,15 +98,15 @@ class HTMLValidationResult
   # if the errors change position in the file (up or down b/c you add or remove code),
   # accepted exception strings will remain valid.
   def filter(str)
-	  str = str.gsub(/^line.*trimming empty.*\n/, '')  # the messages about empty are overzealous, and not invalid
-	  str = str.gsub(/^line.*proprietary.*\n/, '') if options[:ignore_proprietary] # if you use IE only attributes like wrap, or spellcheck or things not in standard
+    str = str.gsub(/^line.*trimming empty.*\n/, '') # the messages about empty are overzealous, and not invalid
+    str = str.gsub(/^line.*proprietary.*\n/, '') if options[:ignore_proprietary] # if you use IE only attributes like wrap, or spellcheck or things not in standard
     str = str.gsub(/^line.*(?:Error|Warning):.*<\/?(?:#{options[:ignored_tag_errors].join('|')})>.*\n/, '') if options[:ignored_tag_errors] && options[:ignored_tag_errors].any?
     str = str.gsub(/^line.*(?:Error|Warning):.* attribute \"(?:#{options[:ignored_attribute_errors].join('|')})\".*\n/, '') if options[:ignored_attribute_errors] && options[:ignored_attribute_errors].any?
     if options[:ignored_errors] && options[:ignored_errors].any? && str.gsub(/^line.*(?:Error|Warning):/, '') =~ ignored_errors_regex
-      str = str.gsub(Regexp.new(/^line.*(?:Error|Warning):/.source + '.*' + ignored_errors_regex.source + '.*' +/\n/.source), '')
+      str = str.gsub(Regexp.new(/^line.*(?:Error|Warning):/.source + '.*' + ignored_errors_regex.source + '.*' + /\n/.source), '')
     end
     str.gsub(/line [0-9]+ column [0-9]+ -/, '')
-   # /line [0-9]+ column [0-9]+ - / +  =~ "line 1 column 1 - Warning: missing <!DOCTYPE> declaration"
+    # /line [0-9]+ column [0-9]+ - / +  =~ "line 1 column 1 - Warning: missing <!DOCTYPE> declaration"
   end
 
   def ignored_errors_regex
@@ -115,7 +115,7 @@ class HTMLValidationResult
 
   def validate
     stdin, stdout, stderr = Open3.popen3(tidy_command)
-    stdin.puts @html
+    stdin.puts @html.encode!("UTF-8", invalid: :replace, undef: :replace).force_encoding("utf-8")
     stdin.close
     stdout.close
     result = stderr.read

data/lib/html_validation/version.rb

@@ -1,3 +1,3 @@
 module PageValidations
-  HTML_VALIDATOR_VERSION = "1.1.4"
+  HTML_VALIDATOR_VERSION = "1.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_validation
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Eric Beland