diff options
| author | Eric Wong <normalperson@yhbt.net> | 2013-07-25 01:58:33 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2013-07-25 01:58:33 +0000 |
| commit | 2219b79cba07d26662fa6d780fdf9aa93425bfc2 (patch) | |
| tree | 0848c95be32d06f72b73b508ff2c25409f1372a4 | |
| parent | 3ea4d5cfbedf0285fda52f9fc307ee6cbd28153b (diff) | |
| download | wrongdoc-2219b79cba07d26662fa6d780fdf9aa93425bfc2.tar.gz | |
remove the Tidy dependency for RDoc 4 / HTML5 compatibility
Ugh, I've mostly given up on HTML.
| -rw-r--r-- | lib/wrongdoc/final.rb | 2 | ||||
| -rw-r--r-- | lib/wrongdoc/parse_xml.rb | 8 | ||||
| -rw-r--r-- | lib/wrongdoc/rdoc.rb | 3 | ||||
| -rw-r--r-- | wrongdoc.gemspec | 3 |
4 files changed, 4 insertions, 12 deletions
diff --git a/lib/wrongdoc/final.rb b/lib/wrongdoc/final.rb index cf12a9c..35fa949 100644 --- a/lib/wrongdoc/final.rb +++ b/lib/wrongdoc/final.rb @@ -40,7 +40,7 @@ class Wrongdoc::Final doc.search('span.search-toggle').each(&unlink) doc.search('form').each(&unlink) - # remove W3C validator link, we use tidy instead + # remove W3C validator link, we don't care as long as there's no JS doc.search('div#validator-badges p').each { |x| /Validate/i =~ x.content and x.unlink } diff --git a/lib/wrongdoc/parse_xml.rb b/lib/wrongdoc/parse_xml.rb index 6d7abe2..cd43f3c 100644 --- a/lib/wrongdoc/parse_xml.rb +++ b/lib/wrongdoc/parse_xml.rb @@ -1,11 +1,5 @@ module Wrongdoc::ParseXML def parse_xml(str) - opts = { - :input_encoding => 'utf8', - :output_encoding => 'utf8', - :wrap => 0, - :tidy_mark => false, - } - Nokogiri::XML(TidyFFI::Tidy.new(str, opts).clean) + Nokogiri::XML(str) end end diff --git a/lib/wrongdoc/rdoc.rb b/lib/wrongdoc/rdoc.rb index cb0b5a1..806852b 100644 --- a/lib/wrongdoc/rdoc.rb +++ b/lib/wrongdoc/rdoc.rb @@ -4,8 +4,7 @@ if (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && \ require 'rubygems' end -# we never want the rdoc 2.5.x from Ruby 1.9.2 -gem 'rdoc', '~> 3.9.4' +gem 'rdoc', '~> 4.0' require 'rdoc/rdoc' class Wrongdoc::Rdoc diff --git a/wrongdoc.gemspec b/wrongdoc.gemspec index f2889e5..d5c84d2 100644 --- a/wrongdoc.gemspec +++ b/wrongdoc.gemspec @@ -22,6 +22,5 @@ Gem::Specification.new do |s| s.require_paths = %w(lib) s.rubyforge_project = %q{rainbows} s.add_dependency(%q<nokogiri>, ['~> 1.5']) - s.add_dependency(%q<tidy_ffi>, ['~> 0.1.3']) - s.add_dependency(%q<rdoc>, ['~> 3.9.4']) + s.add_dependency(%q<rdoc>, ['~> 4.0']) end |