html_validation 0.6.0 → 1.0.0

data/README.rdoc

@@ -13,13 +13,13 @@ barring that, review and accept any errors and warnings.
 
 == HTML 5
 
-The current (as of March 2013) default version of Tidy doesn't support HTML 5.
+The current (as of May 2013) default version of Tidy doesn't support HTML 5.
 To get HTML 5 support, install this fork of tidy:  https://github.com/w3c/tidy-html5
 
-Be sure to get rid of the old tidy first if you have it already. on Debian variants: sudo apt-get remove tidy
-
 Download the repo as a zip file and extract somewhere, then follow the instructions
-given on the page (using sudo for make commands if on Linux).
+given on the page (using sudo for make commands if on Linux).  Add it to the PATH.
+Note that OS X and Debian like to install the old version of tidy in /usr/bin so
+if you don't remove it or place the newer one earlier on the PATH, sadness may ensue.
 
 On linux/OS X machines, confirm the right installation path using:  which tidy
 
@@ -33,18 +33,22 @@ On linux/OS X machines, confirm the right installation path using:  which tidy
 
     page.should have_valid_html
 
+    or with the new syntax:
+
+    expect(page).to have_valid_html
+
     It can be convenient to see the html printed in the RSpec failure messages.
     To set this feature (globally for all):
 
     HaveValidHTML.show_html_in_failures = true
 
 
-    All tidy flags, including using a config file can be handled.
+    All Tidy flags, including using a config file can be handled.
 
     A shortcut to disable Tidy Warning messages (they are on by default)
     has been created for your convenience. However, some things that might be
     called "errors" show up as warnings, so the recommended approach is
-    run, then accept the errors / warnings that are noted. The shortcut
+    run, then accept the errors / warnings that are noted. At your peril, the shortcut
     is:
 
     HTMLValidation.show_warnings = false
@@ -107,7 +111,9 @@ On linux/OS X machines, confirm the right installation path using:  which tidy
 
 == Requirements
 
-    HTML Tidy needs to be either installed at /usr/bin/tidy or on the PATH.
+    HTML Tidy needs to be on the PATH.
+
+    Make sure the right Tidy is being picked up with:  which tidy
 
 
 == Contributing to html_validation

data/bin/html_validation

@@ -9,7 +9,7 @@ class HTMLValidationReview < Thor
   include PageValidations
   desc "review", "Review and Accept (or fix and rerun) HTML Validation errors"
 
-  method_option :data_path, :aliases => "-d", :desc => "Optional custom data path (if not default of /spec/.validate)"
+  method_option :data_path, :aliases => "-d", :desc => "Optional custom data path (if not default of .validation in project root)"
   def review
     data_path = options[:data_path] || File.join(Dir.getwd, '.validation')
     $stdout.puts "Reviewing validation results in: #{data_path}"
@@ -22,6 +22,7 @@ class HTMLValidationReview < Thor
         result.accept!
         $stdout.puts "Accepted!"
       else
+        result.reject!
         $stdout.puts "Rejected!"
       end
       exit if sin.downcase == 'exit' or sin.downcase == 'quit' or sin.downcase == 'q'

data/lib/html_validation/html_validation_result.rb

@@ -57,12 +57,21 @@ class HTMLValidationResult
     File.open(data_path("accepted"), 'w') {|f| f.write(@exceptions) }
   end
 
+  def reject!
+    if File.exists?(data_path("accepted"))
+      File.delete data_path("accepted")
+    end
+  end
+
   private
-  # We specifically prefer /usr/bin/tidy by default on *nix as there is another "tidy" program
-  # that could end up earlier on the path.  tidy was installed at this location for me by default.
+  # We used to specifically prefer /usr/bin/tidy by default on *nix as there is another "tidy" program
+  # that could end up earlier on the path. Tidy was installed at this location for me by default.
+  # The norm is now to custom install the tidy fork for HTML 5, though, and respecting the PATH is
+  # better philosophically. Now we expect the PATH to be correct. ie,
+  # if which Tidy being used is an issue, put the right tidy first on the PATH.
   def tidy_command
     is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-    bin = (is_windows or !File.exists?("/usr/bin/tidy")) ? 'tidy' : '/usr/bin/tidy'
+    bin = is_windows ? 'tidy.exe' : 'tidy'
     cmd = "#{bin} #{@tidy_flags.join(' ')}"
     cmd
   end

data/lib/html_validation/version.rb

@@ -1,3 +1,3 @@
 module PageValidations
-  HTML_VALIDATOR_VERSION = "0.6.0"
+  HTML_VALIDATOR_VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_validation
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies: []
 description: HTML Validation lets you validate html locally. Lets you build html validation
   into your test suite, but break the rules if you must.
@@ -68,3 +68,4 @@ test_files:
 - spec/html_validation_matcher_spec.rb
 - spec/html_validation_spec.rb
 - spec/spec_helper.rb
+has_rdoc: