jakewendt-html_test 0.2.3 → 0.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 381eba33dcd5526ed109a48740e5729f6e273013
+  data.tar.gz: ddcda1e319cd7f54b0a51c60e053617aa140cc67
+SHA512:
+  metadata.gz: 0df2dfc51a4aa429ce69624b784a52dc682d9db6da72b13b920d8fda91a20dc7f71f05b3850b72a0358dc3d4f81a445dde3734c4b4092a0485bd76398ee0d3d2
+  data.tar.gz: 3124f0b840e5f1dc1ecfeba3b07eac4da04781fcf18759e6dfe42aa4531fc0f8314741f72eb36f1f18ff9220f46289dd0988b5557c6f8a82062a35872251677e

data/README.rdoc

@@ -103,3 +103,40 @@ Peter Marklund (http://marklunds.com)
 
 == License
 Licensed under the same terms as Ruby on Rails.
+
+
+
+
+
+
+== Gemified with Jeweler
+
+ vi Rakefile
+ rake version:write
+
+ rake version:bump:patch
+ rake version:bump:minor
+ rake version:bump:major
+
+ rake gemspec
+
+ rake install
+ rake release
+
+== Testing
+
+Since upgrading some apps to rails 3, I found that this gem has some issues.
+So, I'm wrapping the repo code in a rails 3 app solely for testing.
+During gem creation/installation only the necessary code will be included.
+
+Features untested in rails 3 due to me not using them ...
+
+* the tidy validator
+* the check_urls option
+  * ActionController::Routing::Routes doesn't exist in Rails 3
+* also note, Test::Unit::AssertionFailedError doesn't exist in Ruby 1.9
+  * replaced all with "MiniTest::Assertion"
+  * these assert_raises are wrapped around assertion that don't have a negative
+* also, the gem now adds the Gemfile dependencies to it which isn't really true
+
+

data/Rakefile

@@ -1,25 +1,35 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the html_test plugin.'
-Rake::TestTask.new(:test) do |t|
-	t.libs << 'lib'
-	t.pattern = 'test/**/*_test.rb'
-	t.verbose = true
-end
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-desc 'Generate documentation for the html_test plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-	rdoc.rdoc_dir = 'rdoc'
-	rdoc.title		= 'HtmlTest'
-	rdoc.options << '--line-numbers' << '--inline-source'
-	rdoc.rdoc_files.include('README')
-	rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require File.expand_path('../config/application', __FILE__)
+
+HtmlTest::Application.load_tasks
+
+#require 'rake'
+#require 'rake/testtask'
+##require 'rake/rdoctask'
+#require 'rdoc/task'
+#
+#desc 'Default: run unit tests.'
+#task :default => :test
+
+#desc 'Test the html_test plugin.'
+#Rake::TestTask.new(:test) do |t|
+#	t.libs << 'test'
+#	t.libs << 'lib'
+#	t.pattern = 'test/**/*_test.rb'
+#	t.verbose = true
+#end
+
+#desc 'Generate documentation for the html_test plugin.'
+#Rake::RDocTask.new(:rdoc) do |rdoc|
+#	rdoc.rdoc_dir = 'rdoc'
+#	rdoc.title		= 'HtmlTest'
+#	rdoc.options << '--line-numbers' << '--inline-source'
+#	rdoc.rdoc_files.include('README')
+#	rdoc.rdoc_files.include('lib/**/*.rb')
+#end
 
 begin
 	require 'jeweler'
@@ -27,12 +37,25 @@ begin
 		gem.name = "jakewendt-html_test"
 		gem.summary = %Q{Ruby on Rails plugin for HTML validation and link checking}
 		gem.description = %Q{Ruby on Rails plugin for HTML validation and link checking}
-		gem.email = "github@jake.otherinbox.com"
+		gem.email = "github@jakewendt.com"
 		gem.homepage = "http://github.com/jakewendt/html_test"
 		gem.authors = ["Peter Marklund", "George 'Jake' Wendt"]
 		# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+
+		gem.files  = FileList['**/*']
+		gem.files -= FileList['app/**/*']
+		gem.files -= FileList['config/**/*']
+		gem.files -= FileList['test/**/*']
+		gem.files -= FileList['log/**/*']
+		gem.files -= FileList['pkg/**/*']
+		gem.files -= FileList['**/versions/**/*']
+		gem.files -= FileList['*Gemfile*']
+		gem.files -= FileList['rails/init.rb*']
+		gem.files -= FileList['coverage/**/*']
 	end
 	Jeweler::GemcutterTasks.new
 rescue LoadError
 	puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+
+

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.5

data/jakewendt-html_test.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{jakewendt-html_test}
-  s.version = "0.2.3"
+  s.name = "jakewendt-html_test"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Marklund", "George 'Jake' Wendt"]
-  s.date = %q{2011-08-10}
-  s.description = %q{Ruby on Rails plugin for HTML validation and link checking}
-  s.email = %q{github@jake.otherinbox.com}
+  s.date = "2013-12-04"
+  s.description = "Ruby on Rails plugin for HTML validation and link checking"
+  s.email = "github@jakewendt.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -36,33 +36,12 @@ Gem::Specification.new do |s|
     "lib/url_selector.rb",
     "lib/validate_filter.rb",
     "lib/validator.rb",
-    "rails/init.rb",
-    "script/validate",
-    "test/controller_test.rb",
-    "test/integration_test.rb",
-    "test/invalid.html",
-    "test/link_validator_test.rb",
-    "test/public/image.jpg",
-    "test/rhtml_template.rhtml",
-    "test/rxml_template.rxml",
-    "test/test_helper.rb",
-    "test/untidy.html",
-    "test/valid.html",
-    "test/valid_links.html",
-    "test/validate_all_test.rb"
+    "script/rails",
+    "script/validate"
   ]
-  s.homepage = %q{http://github.com/jakewendt/html_test}
+  s.homepage = "http://github.com/jakewendt/html_test"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Ruby on Rails plugin for HTML validation and link checking}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.rubygems_version = "2.0.14"
+  s.summary = "Ruby on Rails plugin for HTML validation and link checking"
 end
 

data/lib/assertions.rb

@@ -28,7 +28,9 @@ module Html
 						assert_message = "Validator #{t} failed"
 						assert_message << " for url #{url}" if url
 						assert_message << " with message '#{error}'"
-						Rails.logger.error(assert_message + " for response body:\n #{with_line_counts(body)}")
+
+#	Why would I want to print this in the log file???
+#						Rails.logger.error(assert_message + " for response body:\n #{with_line_counts(body)}")
 						assert(error.nil?, assert_message)
 					end
 				end
@@ -42,7 +44,9 @@ module Html
 			def with_line_counts(body)
 				separator = ("-" * 40) + $/
 				body_counts = separator.dup
-				body.each_with_index do |line, i|
+				#	string no longer responds to each_with_index in ruby 1.9.3
+				#	body.each_with_index do |line, i|
+				body.split(/\n/).each_with_index do |line, i|
 					body_counts << sprintf("%4u %s", i+1, line) # Right align line numbers
 				end
 				body_counts << separator

data/lib/html_test.rb

@@ -1,4 +1,5 @@
-if !defined?(RAILS_ENV) || RAILS_ENV == 'test'
+#if !defined?(RAILS_ENV) || RAILS_ENV == 'test'
+if !defined?(RAILS_ENV) || RAILS_ENV == 'test' || Rails.env == 'test'
 
 	%w(validator assertions url_selector url_checker link_validator validate_filter).each do |file|
 		require File.join(File.dirname(__FILE__), file)
@@ -74,11 +75,15 @@ validators.each do |validator|
 end
 
 if validate
-	ApplicationController.validate_all = true
+#	In Rails 3, ApplicationController not defined yet
+#	ApplicationController.validate_all = true
+	ActionController::Base.validate_all = true
 	#       default is :tidy, but it doesn't really validate.       
 	#       I've purposely not closed tags and it doesn't complain.
 	#       :w3c is ridiculously slow! even when used locally
-	ApplicationController.validators = [:w3c]
+#	ApplicationController.validators = [:w3c]
+#	In Rails 3, ApplicationController not defined yet
+	ActionController::Base.validators = [:w3c]
 	#ApplicationController.validators = [:tidy, :w3c]
 	Html::Test::Validator.verbose = false
 	Html::Test::Validator.revalidate_all = true
@@ -90,7 +95,4 @@ else
 	puts "NOT validating html at all"
 end
 
-
-
-
 end	#if !defined?(RAILS_ENV) || RAILS_ENV == 'test'

data/lib/url_checker.rb

@@ -1,142 +1,147 @@
 module Html
-  module Test
-    class InvalidUrl < RuntimeError; end
-
-    class UrlChecker
-      attr_accessor :request, :response, :params
-      
-      include Html::Test::UrlSelector    
-      
-      def initialize(controller)
-        self.request = controller.request
-        self.response = controller.response
-        self.params = controller.params
-      end
-      
-      def check_urls_resolve
-        urls_to_check.each do |url|
-          check_url_resolves(url)
-        end
-      end
-
-      def check_redirects_resolve        
-        redirect_url = response.headers['Location']
-        if response.status =~ /302/ && redirect_url.present?
-          check_url_resolves(redirect_url)
-        end
-      end
-
-      private
-      def urls_to_check
-        anchor_urls + image_urls + form_urls
-      end
-
-      def check_url_resolves(url)
-        return if skip_url?(url, root_url) || external_http?(url, root_url)
-        url = strip_anchor(remove_query(make_absolute(url)))
-        return if public_file_exists?(url)
-        check_action_exists(url)
-      end
-
-      def root_url
-        request.protocol + request.host_with_port
-      end
-
-      def public_file_exists?(url)
-        public_path = File.join(rails_public_path, url)
-        File.exists?(public_path) || File.exists?(public_path + ".html")
-      end
-
-      def rails_public_path
-        File.join(RAILS_ROOT, "public")
-      end
-
-      # Make URLs absolute paths, i.e. relative to the site root
-      def make_absolute(url)
-        url = remove_host(url) if has_protocol?(url)
-        return url if url =~ %r{^/}
-        current_url = request.request_uri || url_from_params
-        current_url = File.dirname(current_url) if current_url !~ %r{/$}
-        url = File.join(current_url, url) 
-      end
-
-      def remove_host(url)
-        url_no_host = url[%r{^[a-z]+://[^/]+(/.+)$}, 1]
-        url_no_host.blank? ? "/" : url_no_host
-      end
-
-      def remove_query(url)
-        url =~ /\?/ ? url[/^(.+?)\?/, 1] : url
-      end
-
-      def strip_anchor(url)
-        url =~ /\#/ ? url[/^(.+?)\#/, 1] : url
-      end
-
-      # Each URL is required to have at least one HTTP method for which there is a route with an action
-      def check_action_exists(url)
-        unless routes_from_url(url).any? { |route| route_has_action?(route) }
-          raise_invalid_url(url, "No action or template")
-        end
-      end
-
-      def route_has_action?(route)
-        controller = "#{route[:controller].camelize}Controller".constantize
-        controller.public_instance_methods.include?(route[:action]) || template_file_exists?(route, controller)        
-      end
-
-      def template_file_exists?(route, controller)
-        # Workaround for Rails 1.2 that doesn't have the view_paths method
-        template_dirs = controller.respond_to?(:view_paths) ?
-          controller.view_paths : [controller.view_root]
-        template_dirs.each do |template_dir|
-          template_file = File.join(template_dir, controller.controller_path, "#{route[:action]}.*")
-          return true if !Dir.glob(template_file).empty?
-        end
-        false
-      end
-
-      # This is a special case where on my site I had a catch all route for 404s. If you have
-      # such a route, you can override this method and check for it, i.e. you could do something
-      # like this:
-      #
-      #   if params[:action] == "rescue_404"
-      #     raise Html::Test::InvalidUrl.new("Action rescue_404 invoked for url '#{url}'")
-      #   end
-      def check_not_404(url, params)
-        # This method is unimplemented by default
-      end
-
-      def routes_from_url(url)
-        routes = [:get, :post, :put, :delete].map do |method|
-          begin
-            # Need to specify the method here for RESTful resource routes to work, i.e.
-            # for /posts/1 to be recognized as the show action etc.
-            params = ::ActionController::Routing::Routes.recognize_path(url, {:method => method})
-            check_not_404(url, params)
-            params
-          rescue
-            # Could not find a route with that method
-            nil
-          end
-        end.compact
-        routes.present? ? routes : raise_invalid_url(url, "Cannot find a route")
-      end
-
-      def url_from_params(options = params)
-        return "/" if params.empty?
-        options[:controller] ||= params[:controller]
-        ::ActionController::Routing::Routes.generate_extras(symbolize_hash(options))[0]
-      end
-
-      # Convert all keys in the hash to symbols. Not sure why this is needed.
-      def symbolize_hash(hash)
-        hash.keys.inject({}) { |h, k| h[k.to_sym] = hash[k]; h }
-      end
-      
-      def raise_invalid_url(url, message)
-        raise(Html::Test::InvalidUrl.new("#{message} for url '#{url}' request_uri='#{request.request_uri}' body='#{response.body}'"))
-      end
-    end
-  end
-end
+	module Test
+		class InvalidUrl < RuntimeError; end
+
+		class UrlChecker
+			attr_accessor :request, :response, :params
+			
+			include Html::Test::UrlSelector		
+			
+			def initialize(controller)
+				self.request = controller.request
+				self.response = controller.response
+				self.params = controller.params
+			end
+			
+			def check_urls_resolve
+				urls_to_check.each do |url|
+					check_url_resolves(url)
+				end
+			end
+
+			def check_redirects_resolve				
+				redirect_url = response.headers['Location']
+				if response.status =~ /302/ && redirect_url.present?
+					check_url_resolves(redirect_url)
+				end
+			end
+
+			private
+			def urls_to_check
+				anchor_urls + image_urls + form_urls
+			end
+
+			def check_url_resolves(url)
+				return if skip_url?(url, root_url) || external_http?(url, root_url)
+				url = strip_anchor(remove_query(make_absolute(url)))
+				return if public_file_exists?(url)
+				check_action_exists(url)
+			end
+
+			def root_url
+				request.protocol + request.host_with_port
+			end
+
+			def public_file_exists?(url)
+				public_path = File.join(rails_public_path, url)
+				File.exists?(public_path) || File.exists?(public_path + ".html")
+			end
+
+			def rails_public_path
+				File.join(Rails.root, "public")
+			end
+
+			# Make URLs absolute paths, i.e. relative to the site root
+			def make_absolute(url)
+				url = remove_host(url) if has_protocol?(url)
+				return url if url =~ %r{^/}
+				current_url = request.url || url_from_params
+				current_url = File.dirname(current_url) if current_url !~ %r{/$}
+				url = File.join(current_url, url) 
+			end
+
+			def remove_host(url)
+				url_no_host = url[%r{^[a-z]+://[^/]+(/.+)$}, 1]
+				url_no_host.blank? ? "/" : url_no_host
+			end
+
+			def remove_query(url)
+				url =~ /\?/ ? url[/^(.+?)\?/, 1] : url
+			end
+
+			def strip_anchor(url)
+				url =~ /\#/ ? url[/^(.+?)\#/, 1] : url
+			end
+
+			# Each URL is required to have at least one HTTP method for which there is a route with an action
+			def check_action_exists(url)
+				unless routes_from_url(url).any? { |route| route_has_action?(route) }
+					raise_invalid_url(url, "No action or template")
+				end
+			end
+
+			def route_has_action?(route)
+				controller = "#{route[:controller].camelize}Controller".constantize
+				controller.public_instance_methods.include?(route[:action]) || template_file_exists?(route, controller)				
+			end
+
+			def template_file_exists?(route, controller)
+				# Workaround for Rails 1.2 that doesn't have the view_paths method
+				template_dirs = controller.respond_to?(:view_paths) ?
+					controller.view_paths : [controller.view_root]
+				template_dirs.each do |template_dir|
+					template_file = File.join(template_dir, controller.controller_path, "#{route[:action]}.*")
+					return true if !Dir.glob(template_file).empty?
+				end
+				false
+			end
+
+			# This is a special case where on my site I had a catch all route for 404s. If you have
+			# such a route, you can override this method and check for it, i.e. you could do something
+			# like this:
+			#
+			#	 if params[:action] == "rescue_404"
+			#		 raise Html::Test::InvalidUrl.new("Action rescue_404 invoked for url '#{url}'")
+			#	 end
+			def check_not_404(url, params)
+				# This method is unimplemented by default
+			end
+
+			def routes_from_url(url)
+				routes = [:get, :post, :put, :delete].map do |method|
+					begin
+						# Need to specify the method here for RESTful resource routes to work, i.e.
+						# for /posts/1 to be recognized as the show action etc.
+
+
+#	ActionController::Routing::Routes does not exist in Rails 3!
+#	fortunately, I don't use "check_urls" so not an issue right now.
+
+						params = ::ActionController::Routing::Routes.recognize_path(url, {:method => method})
+						check_not_404(url, params)
+						params
+					rescue
+						# Could not find a route with that method
+						nil
+					end
+				end.compact
+				routes.present? ? routes : raise_invalid_url(url, "Cannot find a route")
+			end
+
+			def url_from_params(options = params)
+				return "/" if params.empty?
+				options[:controller] ||= params[:controller]
+				::ActionController::Routing::Routes.generate_extras(symbolize_hash(options))[0]
+			end
+
+			# Convert all keys in the hash to symbols. Not sure why this is needed.
+			def symbolize_hash(hash)
+				hash.keys.inject({}) { |h, k| h[k.to_sym] = hash[k]; h }
+			end
+			
+			def raise_invalid_url(url, message)
+				raise(Html::Test::InvalidUrl.new("#{message} for url '#{url}' request_uri='#{request.url}' body='#{response.body}'"))
+			end
+		end
+	end
+end

data/lib/validate_filter.rb

@@ -14,7 +14,9 @@ module Html
 			end
 
 			def validate_page
-				url = request.request_uri
+#				url = request.request_uri
+#	no more request_uri in Rails 3
+				url = request.url
 				return if (!should_validate? || ValidateFilter.already_validated?(url))
 #				assert_validates(validators, response.body.strip, url, :verbose => true)
 				assert_validates(validators, response.body.strip, url )
@@ -39,8 +41,13 @@ module Html
 
 			# Override this method if you only want to validate a subset of pages
 			def should_validate?
-				response.status =~ /200/ &&
-					(response.headers['Content-Type'] =~ /text\/html/i || response.body =~ /<html/)
+#				response.status =~ /200/ &&
+#         (response.headers['Content-Type'] =~ /text\/html/i || response.body =~ /<html/)
+#	In rails 3, 
+#		response.status is a Fixnum which would return nil in this match
+#		and response.headers['Content-Type'] is blank
+				response.status.to_s =~ /200/ &&
+					(response.content_type =~ /text\/html/i || response.body =~ /<html/)
 			end			
 
 			#	Used in testing (of html_test_extension plugin)

data/lib/validator.rb

@@ -57,7 +57,13 @@ module Html
 					# Reference in the stylesheets
 					response.body.sub!(%r{@import "./base.css"}, %Q{@import "#{File.dirname(w3c_url)}/base.css"})
 					response_file = find_unique_path(File.join(tmp_dir, "w3c_response.html"))
-					open(response_file, "w") { |f| f.puts(response.body) }
+
+					#	open(response_file, "w" ) { |f| f.puts(response.body) }
+					#	I was getting many errors like ...  (in ruby 1.9.3 and rails 3)
+					#	Encoding::UndefinedConversionError: "\xE2" from ASCII-8BIT to UTF-8
+					#	adding force_encoding('UTF-8') seems to fix this.
+					open(response_file, "w" ) { |f| f.puts(response.body.force_encoding('UTF-8')) }
+
 					"W3C status #{status}. Response from W3C was written to the file #{response_file}"
 				else
 					nil

data/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

metadata

@@ -1,34 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jakewendt-html_test
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+version: !ruby/object:Gem::Version
+  version: 0.3.5
 platform: ruby
-authors: 
+authors:
 - Peter Marklund
 - George 'Jake' Wendt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-10 00:00:00 -07:00
-default_executable: 
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby on Rails plugin for HTML validation and link checking
-email: github@jake.otherinbox.com
+email: github@jakewendt.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - Rakefile
 - VERSION
@@ -49,53 +38,29 @@ files:
 - lib/url_selector.rb
 - lib/validate_filter.rb
 - lib/validator.rb
-- rails/init.rb
+- script/rails
 - script/validate
-- test/controller_test.rb
-- test/integration_test.rb
-- test/invalid.html
-- test/link_validator_test.rb
-- test/public/image.jpg
-- test/rhtml_template.rhtml
-- test/rxml_template.rxml
-- test/test_helper.rb
-- test/untidy.html
-- test/valid.html
-- test/valid_links.html
-- test/validate_all_test.rb
-has_rdoc: true
 homepage: http://github.com/jakewendt/html_test
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby on Rails plugin for HTML validation and link checking
 test_files: []
-

data/rails/init.rb

@@ -1 +0,0 @@
-require 'jakewendt-html_test' if RAILS_ENV == 'test'

data/test/controller_test.rb

@@ -1,120 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "..", "test", "test_helper")
-require File.join(File.dirname(__FILE__), "test_helper")
-
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'test/:action', :controller => 'test'
-end
-
-class Html::Test::ControllerTest < ActionController::TestCase
-  def setup
-    @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    
-    ActionController::Base.validate_all = false
-    ActionController::Base.check_urls = true
-    ActionController::Base.check_redirects = true
-    Html::Test::Validator.tidy_ignore_list = []
-    Html::Test::UrlChecker.any_instance.stubs(:rails_public_path).returns(File.join(File.dirname(__FILE__), "public"))
-  end
-  
-  def test_assert_validates_success
-    get :valid
-    assert_response :success
-    assert_validates # Should validate tidy, w3c, and xmllint
-  end
-  
-  def test_assert_tidy_failure
-    get :untidy
-    assert_response :success
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_tidy
-    end
-    assert_w3c
-    assert_xmllint
-  end
-  
-  def test_assert_w3c_failure
-    get :invalid
-    assert_response :success
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_w3c
-    end
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_xmllint
-    end
-    assert_tidy
-  end
-  
-  def test_url_no_route
-    assert_raise(Html::Test::InvalidUrl) do
-      get :url_no_route
-    end
-  end
-
-  def test_url_no_action
-    assert_raise(Html::Test::InvalidUrl) do
-      get :url_no_action
-    end
-  end
- 
- # TODO: figure out why those tests don't work 
-#  def test_url_rhtml_template_exists
-#    get :rhtml_template
-#  end
-  
-#  def test_url_rxml_template_exists
-#    get :rxml_template    
-#  end
-
-  def test_url_action_no_template
-    get :action_no_template
-  end
-
-  def test_redirect_no_action
-    assert_raise(Html::Test::InvalidUrl) do
-      get :redirect_no_action
-    end    
-  end
-  
-  def test_redirect_valid_action
-    get :redirect_valid_action
-    assert_response :redirect
-  end
-
-  def test_redirect_external
-    get :redirect_external
-    assert_response :redirect
-  end
-
-  def test_redirect_valid_with_host
-    get :redirect_valid_with_host
-    assert_response :redirect    
-  end
-
-  def test_image_file_exists
-    get :image_file_exists
-    assert_response :success
-  end
-
-  def test_image_does_not_exist
-    assert_raise(Html::Test::InvalidUrl) do
-      get :image_file_does_not_exist
-    end
-  end
-
-  def test_urls_to_resolve
-    checker = Html::Test::UrlChecker.new(@controller)
-    checker.stubs(:response_body).returns(<<-HTML
-      <a href="anchor_url">hej</a>
-      Some text and <div>markup</div>
-      <img src="image_url"/>
-      Some more text
-      <form action="form_url">
-        Some text
-      </form>
-    HTML
-    )
-    assert_equal(%w(anchor_url form_url image_url), checker.send(:urls_to_check).sort)
-  end
-end

data/test/integration_test.rb

@@ -1,73 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "..", "test", "test_helper")
-require File.join(File.dirname(__FILE__), "test_helper")
-
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'test/:action', :controller => 'test'
-end
-ApplicationController.validate_all = false
-ApplicationController.check_urls = true
-ApplicationController.check_redirects = true
-
-class Html::Test::IntegrationTest < ActionController::IntegrationTest
-  def test_assert_valides_invokes_all
-    get('/test/valid')
-    assert_response :success
-
-    [:tidy_errors, :w3c_errors, :xmllint_errors].each do |method|
-      Html::Test::Validator.expects(method).with(@response.body)
-    end
-    assert_validates
-  end
-
-  def test_assert_tidy_invoked
-    get('/test/valid')
-    assert_response :success
-    Html::Test::Validator.expects(:tidy_errors).with(@response.body)
-    assert_tidy
-  end
-  
-  def test_assert_valid_success
-    get('/test/valid')
-    assert_response :success
-    assert_validates
-  end
-
-  def test_assert_tidy_failure
-    file_string = TestController.test_file_string(:untidy)
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_tidy(file_string)
-    end
-    assert_w3c(file_string)
-    assert_xmllint(file_string)
-  end
-  
-  def test_assert_w3c_failure
-    file_string = TestController.test_file_string(:invalid)
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_w3c(file_string)
-    end
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_xmllint(file_string)
-    end
-    assert_raise(Test::Unit::AssertionFailedError) do
-      Html::Test::Validator.expects(:dtd).returns("doctype")
-      assert_xmllint(file_string)
-    end    
-    assert_tidy(file_string)
-  end
-  
-  def test_url_no_route
-    TestController.any_instance.expects(:rescue_action).with() { |e| e.class == Html::Test::InvalidUrl }
-    get '/test/url_no_route'
-  end
-
-  def test_url_no_route_relative
-    TestController.any_instance.expects(:rescue_action).with() { |e| e.class == Html::Test::InvalidUrl }
-    get '/test/url_no_route_relative'
-  end
-  
-  def test_redirect_valid_action
-    get '/test/redirect_valid_action'
-    assert_response :redirect
-  end
-end

data/test/invalid.html

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>A perfectly invalid document</title>
-  </head>
-  <body>
-    <h1>This is a perfectly invalid XHTML 1 document</h1>
-    
-    Here are some unquoted chars: <>
-    
-    Tidy may not complain about this document, but that's just crazy.
-  </body>
-</html>

data/test/link_validator_test.rb

@@ -1,141 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "..", "test", "test_helper")
-require File.join(File.dirname(__FILE__), "test_helper")
-require 'ostruct'
-
-# Stub out the HTTP requests
-module Net
-  class HTTP
-    @@test_requests = []
-    cattr_accessor :test_requests
-    
-    @@test_with_links = false
-    cattr_accessor :test_with_links    
-    
-    def self.get_response(uri)
-      self.test_requests << uri.to_s
-
-      if uri.path =~ /valid_links/ or test_with_links
-        file = :valid_links
-      else
-        file = :valid
-      end
-      test_with_links = false
-      return OpenStruct.new({
-        :body => TestController.test_file_string(file),
-        :code => "200",
-        :header => {'content-type' => 'text/html'}
-        })
-    end
-  end
-end
-
-class Html::Test::LinkValidatorTest < Test::Unit::TestCase
-  def setup
-    Net::HTTP.test_requests = []
-  end
-  
-  def test_parse_command_line
-    # Missing URL
-    assert_raise(RuntimeError) { Html::Test::LinkValidator.parse_command_line(["--no-follow"]) }
-
-    # Missing skip patterns
-    options_no_skip = ["http://my.url.com", "--no-follow", "--validators", "w3c,tidy,xmllint",
-      "--no-external", "--dtd", "some.dtd", "--only", "some/url", "--skip"]
-    assert_raise(OptionParser::MissingArgument) do
-      Html::Test::LinkValidator.parse_command_line(options_no_skip.dup)
-    end
-
-    # All options - valid
-    assert_equal({
-      :follow_links => false,
-      :validators => ["w3c", "tidy", "xmllint"],
-      :follow_external => false,
-      :dtd => "some.dtd",
-      :only_pattern => Regexp.new("some/url"),
-      :skip_patterns => [/pattern1/, /pattern2/]
-    }, Html::Test::LinkValidator.parse_command_line(options_no_skip << "pattern1,pattern2"))
-  end
-
-  def test_default_options
-    url = "http://localhost:3000"
-    validator = Html::Test::LinkValidator.new(url)
-    
-    assert_equal url, Net::HTTP.test_requests.first
-    assert_equal 1, Net::HTTP.test_requests.size
-
-    assert validator.options[:follow_links]
-    assert_equal ['tidy'], validator.options[:validators]
-    assert_equal [], validator.options[:skip_patterns]
-    assert_nil validator.options[:only_pattern]
-    assert validator.options[:follow_external]
-  end
-
-  def test_quiet
-    validator = Html::Test::LinkValidator.new("http://my.cool.site", {:quiet => true})
-    # Even in quiet mode the log should be populated
-    assert_match /my\.cool\.site/, validator.log
-  end
-  
-  def test_link_follow_page
-    validator = Html::Test::LinkValidator.new("http://site.com/dir/valid_links")
-    # All links visited
-    assert_equal(["http://site.com/dir/valid_links",
-      "http://site.com/link1",
-      "http://site.com/dir/link2",
-      "http://site.com/dir/foobar/link3",
-      "http://foobar.com/external"].sort,
-      Net::HTTP.test_requests.sort)
-  end
-
-  def test_link_follow_root
-    %w(http://site.com http://site.com/).each do |url|
-      Net::HTTP.test_requests = []
-      Net::HTTP.test_with_links = true
-      validator = Html::Test::LinkValidator.new(url)
-      # All links visited
-      assert_equal([url,
-        "http://site.com/link1",
-        "http://site.com/link2",
-        "http://site.com/foobar/link3",
-        "http://foobar.com/external"].sort,
-        Net::HTTP.test_requests.sort)
-    end
-  end
-
-  def test_link_follow_dir
-    Net::HTTP.test_with_links = true
-    validator = Html::Test::LinkValidator.new("http://site.com/dir/")
-    # All links visited
-    assert_equal(["http://site.com/dir/",
-      "http://site.com/link1",
-      "http://site.com/dir/link2",
-      "http://site.com/dir/foobar/link3",
-      "http://foobar.com/external"].sort,
-      Net::HTTP.test_requests.sort)
-  end
-
-  def test_skip_patterns
-    url = "http://my.cool.site/valid_links"
-    validator = Html::Test::LinkValidator.new(url,
-      {:skip_patterns => [/link[12]/, /http/]})
-    assert_equal [url, "http://my.cool.site/foobar/link3"].sort,
-      Net::HTTP.test_requests.sort
-  end
-  
-  def test_only_pattern
-    url = "http://my.cool.site/dir/valid_links"
-    validator = Html::Test::LinkValidator.new(url, {:only_pattern => /link[12]/})
-    assert_equal [url, "http://my.cool.site/link1", "http://my.cool.site/dir/link2"].sort,
-      Net::HTTP.test_requests.sort
-  end
-  
-  def test_follow_external_false
-    Net::HTTP.test_with_links = true
-    validator = Html::Test::LinkValidator.new("http://site.com/dir/", {:follow_external => false})
-    assert_equal(["http://site.com/dir/",
-      "http://site.com/link1",
-      "http://site.com/dir/link2",
-      "http://site.com/dir/foobar/link3"].sort,
-      Net::HTTP.test_requests.sort)
-  end
-end

data/test/rhtml_template.rhtml

@@ -1 +0,0 @@
-Some contents

data/test/rxml_template.rxml

@@ -1,2 +0,0 @@
-xml.foo do
-end

data/test/test_helper.rb

@@ -1,61 +0,0 @@
-class TestController < ActionController::Base
-  prepend_view_path(File.dirname(__FILE__))
-
-  layout nil
-  def valid; render :file => TestController.test_file(:valid) end
-  def untidy; render :file => TestController.test_file(:untidy) end
-  def invalid; render :file => TestController.test_file(:invalid) end
-
-  def url_no_route
-    render :text => %Q{<a href="/norouteforthisurl">No route</a>}
-  end
-
-  def url_no_route_relative
-    render :text => %Q{<a href="norouteforthisurl">No route</a>}    
-  end
-
-  def url_no_action
-    render :text => %Q{<a href="/test/thisactiondoesnotexist">no action</a>}
-  end
-
-  def action_no_template
-    render :text => %Q{<a href="/test/valid">valid</a>}
-  end
-
-  def redirect_no_action
-    redirect_to :action => 'thisactiondoesnotexist'
-  end
-
-  def redirect_valid_action
-    redirect_to :action => 'valid'
-  end
-
-  def redirect_external
-    redirect_to "http://google.com/foobar"
-  end
-
-  def redirect_valid_with_host
-    redirect_to "http://test.host/test/valid"
-  end
-
-  def image_file_exists
-    render :text => %Q{<img src="/image.jpg?23049829034"/>}
-  end
-
-  def image_file_does_not_exist
-    render :text => %Q{<img src="/image2.jpg?23049829034"/>}
-  end
-
-  def self.test_file(action)
-    File.join(File.dirname(__FILE__), "#{action}.html")
-  end
-
-  def self.test_file_string(action)
-    IO.read(test_file(action))
-  end
-  
-  # Re-raise errors caught by the controller.
-  def rescue_action(e)
-    raise e
-  end
-end

data/test/untidy.html

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>A perfectly valid untidy document</title>
-  </head>
-  <body>
-    <h1>This is a perfectly valid but untidy XHTML 1 document</h1>
-
-    <table>
-      <tr>
-        <td>
-          A table with no summary attribute. Tidy will kill us for this.
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>

data/test/valid.html

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>A perfectly valid document</title>
-  </head>
-  <body>
-    <h1>This is a perfectly valid XHTML 1 document</h1>
-    <p>
-      Here is some text.
-    </p>
-  </body>
-</html>

data/test/valid_links.html

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title>A perfectly valid document</title>
-  </head>
-  <body>
-    <h1>This is a perfectly valid XHTML 1 document</h1>
-    <p>
-      Here is some text.
-    </p>
-    <ul>
-      <li><a href="/link1">Link 1</a></li>
-      <li><a href="link2">Link 2</a></li>
-      <li><a href="link2">Link 2</a></li>
-      <li><a href="link2#comments">Link 2</a></li>
-      <li><a href="foobar/link3">Link 3</a></li>
-      <li><a href="http://foobar.com/external">External Link</a></li>
-    </ul>
-  </body>
-</html>

data/test/validate_all_test.rb

@@ -1,16 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "..", "test", "test_helper")
-require File.join(File.dirname(__FILE__), "test_helper")
-
-class Html::Test::ValidateAllTest < ActionController::TestCase
-  def setup
-    @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    ApplicationController.validate_all = true
-    ApplicationController.validators = [:tidy]
-  end
-
-  def test_validate_all
-    assert_raise(Test::Unit::AssertionFailedError) { get :untidy }
-  end
-end