Generate valid markup.

fnando · Mar 15, 2015 · c96eafa · c96eafa
1 parent 25ce27b
commit c96eafa
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/lib/kitabu/exporter/html.rb b/lib/kitabu/exporter/html.rb
@@ -64,7 +64,7 @@ def format(file)
       #
       def parse_layout(html)
         toc = TOC::HTML.generate(html)
-        content = Footnotes::HTML.process(toc.content).html.css('html').first.inner_html
+        content = Footnotes::HTML.process(toc.content).html.css('body').first.inner_html
 
         locals = config.merge({
           content: content,

diff --git a/lib/kitabu/toc/html.rb b/lib/kitabu/toc/html.rb
@@ -28,7 +28,7 @@ def self.normalize(content)
           tag.set_attribute("id", permalink)
         end
 
-        html.css("body").to_xhtml.gsub(/<body>(.*?)<\/body>/m, "\\1")
+        html.css("body").first.inner_html
       end
 
       # Traverse every title normalizing its content as a permalink.

diff --git a/spec/kitabu/exporter/html_spec.rb b/spec/kitabu/exporter/html_spec.rb
@@ -9,6 +9,16 @@
     let(:html) { File.read(file) }
     before { format.export }
 
+    it "generates valid markup", osx: RUBY_PLATFORM.include?('darwin') do
+      `./vendor/bin/tidy5_osx '#{file}' 2>&1 > /dev/null`
+      expect($?.exitstatus).to eq(0)
+    end
+
+    it "generates valid markup", linux: RUBY_PLATFORM.include?('linux') do
+      `./vendor/bin/tidy5_linux '#{file}' 2>&1 > /dev/null`
+      expect($?.exitstatus).to eq(0)
+    end
+
     it "keeps html file around" do
       expect(file).to be_file
     end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -22,7 +22,13 @@ def bundle_install
   config.include(SpecHelper)
   config.include(Matchers)
 
-  config.filter_run_excluding html2text: false, kindlegen: false, prince: false
+  config.filter_run_excluding(
+    html2text: false,
+    kindlegen: false,
+    prince: false,
+    osx: false,
+    linux: false
+  )
 
   cleaner = proc do
     [TMPDIR].each do |i|

diff --git a/vendor/bin/tidy5_linux b/vendor/bin/tidy5_linux
diff --git a/vendor/bin/tidy5_osx b/vendor/bin/tidy5_osx