From ac474b091460c20fd804bb275c89a785ec2deff0 Mon Sep 17 00:00:00 2001
From: Thibaut Courouble <thibaut@me.com>
Date: Sat, 23 Apr 2016 12:17:22 -0400
Subject: [PATCH] Update Express documentation (4.13.4)

---
 .../javascripts/templates/pages/about_tmpl.coffee  |  6 +++---
 assets/javascripts/views/pages/javascript.coffee   |  1 -
 assets/javascripts/views/pages/simple.coffee       |  1 +
 lib/docs/filters/express/clean_html.rb             | 11 +++++++++--
 lib/docs/scrapers/express.rb                       | 14 ++++++++------
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 9a942ed6..581a7c6c 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -192,9 +192,9 @@ credits = [
     'https://raw.githubusercontent.com/erlang/otp/maint/LICENSE.txt'
   ], [
     'Express',
-    '2009-2015 TJ Holowaychuk',
-    'MIT',
-    'https://raw.githubusercontent.com/visionmedia/express/master/LICENSE'
+    '2016 StrongLoop, IBM, and other expressjs.com contributors.',
+    'Unknown',
+    'https://github.com/expressjs/expressjs.com/issues/413'
   ], [
     'GCC<br>GNU Fortran',
     'Free Software Foundation',
diff --git a/assets/javascripts/views/pages/javascript.coffee b/assets/javascripts/views/pages/javascript.coffee
index fdd2fd2a..0dcbfc52 100644
--- a/assets/javascripts/views/pages/javascript.coffee
+++ b/assets/javascripts/views/pages/javascript.coffee
@@ -16,7 +16,6 @@ class app.views.JavascriptWithMarkupCheckPage extends app.views.BasePage
     return
 
 app.views.ChaiPage =
-app.views.ExpressPage =
 app.views.GruntPage =
 app.views.LodashPage =
 app.views.MarionettePage =
diff --git a/assets/javascripts/views/pages/simple.coffee b/assets/javascripts/views/pages/simple.coffee
index a33fb1e1..9443555f 100644
--- a/assets/javascripts/views/pages/simple.coffee
+++ b/assets/javascripts/views/pages/simple.coffee
@@ -8,6 +8,7 @@ class app.views.SimplePage extends app.views.BasePage
 
 app.views.AngularPage =
 app.views.EmberPage =
+app.views.ExpressPage =
 app.views.GoPage =
 app.views.MeteorPage =
 app.views.MomentPage =
diff --git a/lib/docs/filters/express/clean_html.rb b/lib/docs/filters/express/clean_html.rb
index 2d99be8d..75b532a4 100644
--- a/lib/docs/filters/express/clean_html.rb
+++ b/lib/docs/filters/express/clean_html.rb
@@ -2,7 +2,7 @@ module Docs
   class Express
     class CleanHtmlFilter < Filter
       def call
-        css('section').each do |node|
+        css('section', 'div.highlighter-rouge').each do |node|
           node.before(node.children).remove
         end
 
@@ -21,8 +21,15 @@ module Docs
         end
 
         # Remove code highlighting
-        css('pre').each do |node|
+        css('figure.highlight').each do |node|
+          node['data-language'] = node.at_css('code[data-lang]')['data-lang']
           node.content = node.content
+          node.name = 'pre'
+        end
+
+        css('pre > code').each do |node|
+          node.parent['data-language'] = node['class'][/language-(\w+)/, 1] if node['class']
+          node.parent.content = node.parent.content
         end
 
         doc
diff --git a/lib/docs/scrapers/express.rb b/lib/docs/scrapers/express.rb
index 3eeed77f..803a7df3 100644
--- a/lib/docs/scrapers/express.rb
+++ b/lib/docs/scrapers/express.rb
@@ -2,9 +2,13 @@ module Docs
   class Express < UrlScraper
     self.name = 'Express'
     self.type = 'express'
-    self.release = '4.13.0'
-    self.base_url = 'http://expressjs.com/'
+    self.release = '4.13.4'
+    self.base_url = 'http://expressjs.com/en/'
     self.root_path = '4x/api.html'
+    self.initial_paths = %w(
+      starter/installing.html
+      guide/routing.html
+      advanced/developing-template-engines.html )
     self.links = {
       home: 'http://expressjs.com/',
       code: 'https://github.com/strongloop/express/'
@@ -19,12 +23,10 @@ module Docs
     options[:only_patterns] = [
       /\Astarter/,
       /\Aguide/,
-      /\Aadvanced/
-    ]
+      /\Aadvanced/ ]
 
     options[:attribution] = <<-HTML
-      &copy; 2009&ndash;2015 TJ Holowaychuk<br>
-      Licensed under the MIT License.
+      &copy; 2016 StrongLoop, IBM, and other expressjs.com contributors.
     HTML
   end
 end