[WIP] Update suite to run against the latest

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    json (1.4.6)
+    json (1.8.3)
     nokogiri (1.5.5)
     peach (0.4)
     rack (1.2.1)
@@ -20,3 +20,6 @@ DEPENDENCIES
   rake
   sass
   yui-compressor
+
+BUNDLED WITH
+   1.10.6

Makefile

@@ -4,42 +4,29 @@ CURL=curl
 PYTHON=python
 RUBY=ruby
 PATCH=patch
-SPLITTER=html5-tools/spec-splitter/spec-splitter.py
-SPLITTERFLAGS=--html5lib-serialiser
 
-postprocess: clean-output process_assets LOG
+postprocess: clean-output process_assets tidy
 	bundle exec rake postprocess:execute
 
-LOG: index.html $(SPLITTER)
-	$(PYTHON) $(SPLITTER) $(SPLITTERFLAGS) $< ./public > LOG
+multipage-dev.zip:
+	$(CURL) --compressed https://html5.org/temp/multipage-dev.zip > $@
 
-index.html: html5-full.html anolis/anolis
-	$(PYTHON) anolis/anolis \
-	  --parser=lxml.html \
-	  --filter=.impl \
-	  --output-encoding="ascii" \
-	  $< $@
+multipage-dev: multipage-dev.zip
+	unzip -o multipage-dev.zip
 
-html5-full.html:
-	$(CURL) --compressed http://www.whatwg.org/specs/web-apps/current-work/dev-index > $@
-	$(RUBY) tidy.rb $@
+tidy: multipage-dev
+	$(RUBY) tidy.rb multipage-dev/index.html
+	cp -r multipage-dev/*.html public
 
 process_assets:
 	$(RUBY) assets.rb
 
 clean: clean-output
-	$(RM) html5-full.html
+	$(RM) -r multipage-dev
+	$(RM) multipage-dev.zip
 
 clean-output:
-	$(RM) LOG
 	$(RM) -r public/**/*.html
 	$(RM) -r public/css/*.css
 	$(RM) -r public/javascript/*.js
 	$(RM) -r public/*.manifest
-
-anolis/anolis:
-	$(HG) clone http://hg.hoppipolla.co.uk/anolis/
-	$(PATCH) -p1 -d anolis < patch.anolis
-
-$(SPLITTER):
-	$(SVN) checkout http://html5.googlecode.com/svn/trunk/ html5-tools

Rakefile

@@ -36,16 +36,10 @@ namespace :postprocess do
     end
   end
 
-  # This will seem strange, we'll get the header, keep its contents, remove it from the DOM
-  # Then, we'll get everything within the body, wrap it within a <section role="main">
-  # Finally, we'll add back the header above the newly created <section>
+  # we'll get everything within the body, wrap it within a <section role="main">
   task :add_main_section do
     each_page do |doc, filename|
-      header = doc.at("header")
-      header.remove
-
       doc.at("body").children = Nokogiri::HTML::fragment("<section role='main'>#{doc.at("body").to_html}</section>")
-      doc.at("section[role='main']").before(Nokogiri::HTML::fragment(header.to_html))
     end
   end
 
@@ -71,19 +65,19 @@ namespace :postprocess do
     end
 
     # Remove links that are the same page as their parent, remove them.
-    doc.css("ol.toc li a").each do |item|
-      item_href = item.attributes["href"].to_s.gsub(/#.*\Z/, "")
-      branch = item.parent.parent.parent
+    #doc.css("ol.toc li a").each do |item|
+    #  item_href = item.attributes["href"].to_s.gsub(/#.*\Z/, "")
+    #  branch = item.parent.parent.parent
 
-      if branch.node_name == "li"
-        a = branch.at("a")
-        a_href = a.attributes["href"].to_s.gsub(/#.*\Z/, "")
+    #  if branch.node_name == "li"
+    #    a = branch.at("a")
+    #    a_href = a.attributes["href"].to_s.gsub(/#.*\Z/, "")
 
-        if a_href == item_href
-          item.remove
-        end
-      end
-    end
+    #    if a_href == item_href
+    #      item.remove
+    #    end
+    #  end
+    #end
   end
 
   desc "Add document footer"
@@ -142,7 +136,7 @@ namespace :postprocess do
 
   desc "Add search to each html file"
   task :insert_search do
-    insert("html/search.html", "header.head")
+    #insert("html/search.html", "header.head")
   end
 
   desc "Insert javascripts"
@@ -190,7 +184,7 @@ namespace :postprocess do
   desc "Insert WHATWG logo"
   task :insert_whatwg_logo do
     each_page do |doc, filename|
-      doc.at("header.head hgroup").before('<div class="logo">WHATWG</div>')
+      #doc.at("header.head hgroup").before('<div class="logo">WHATWG</div>')
     end
   end