upgrade slate docs lib

Author: bsoule

Gemfile

@@ -1,11 +1,11 @@
+ruby '>=2.3.1'
 source 'https://rubygems.org'
 
 # Middleman
 gem 'middleman', '~>4.2.1'
 gem 'middleman-syntax', '~> 3.0.0'
 gem 'middleman-autoprefixer', '~> 2.7.0'
 gem "middleman-sprockets", "~> 4.1.0"
-gem "middleman-livereload"
 gem 'rouge', '~> 2.0.5'
-#gem 'redcarpet', '~> 3.4.0'
-gem 'maruku'
+gem 'redcarpet', '~> 3.4.0'
+gem 'nokogiri', '~> 1.6.8'

Gemfile.lock

@@ -20,11 +20,7 @@ GEM
     concurrent-ruby (1.0.4)
     contracts (0.13.0)
     dotenv (2.2.0)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.2.3)
     execjs (2.7.0)
     fast_blank (1.0.0)
     fastimage (2.0.1)
@@ -35,13 +31,11 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashie (3.5.1)
-    http_parser.rb (0.6.0)
     i18n (0.7.0)
     kramdown (1.13.2)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    maruku (0.7.3)
     memoist (0.15.0)
     middleman (4.2.1)
       coffee-script (~> 2.2)
@@ -79,17 +73,16 @@ GEM
       servolux
       tilt (~> 2.0)
       uglifier (~> 3.0)
-    middleman-livereload (3.4.6)
-      em-websocket (~> 0.5.1)
-      middleman-core (>= 3.3)
-      rack-livereload (~> 0.3.15)
     middleman-sprockets (4.1.0)
       middleman-core (~> 4.0)
       sprockets (>= 3.0)
     middleman-syntax (3.0.0)
       middleman-core (>= 3.2)
       rouge (~> 2.0)
+    mini_portile2 (2.1.0)
     minitest (5.10.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
     padrino-helpers (0.13.3.3)
       i18n (~> 0.6, >= 0.6.7)
       padrino-support (= 0.13.3.3)
@@ -99,11 +92,10 @@ GEM
     parallel (1.10.0)
     public_suffix (2.0.5)
     rack (2.0.1)
-    rack-livereload (0.3.16)
-      rack
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
+    redcarpet (3.4.0)
     rouge (2.0.7)
     sass (3.4.23)
     servolux (0.12.0)
@@ -122,13 +114,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  maruku
   middleman (~> 4.2.1)
   middleman-autoprefixer (~> 2.7.0)
-  middleman-livereload
   middleman-sprockets (~> 4.1.0)
   middleman-syntax (~> 3.0.0)
+  nokogiri (~> 1.6.8)
+  redcarpet (~> 3.4.0)
   rouge (~> 2.0.5)
 
+RUBY VERSION
+   ruby 2.4.0p0
+
 BUNDLED WITH
-   1.14.6
+   1.15.3

Vagrantfile

@@ -5,10 +5,12 @@ Vagrant.configure(2) do |config|
   config.vm.provision "bootstrap",
     type: "shell",
     inline: <<-SHELL
+      sudo apt-add-repository ppa:brightbox/ruby-ng
       sudo apt-get update
-      sudo apt-get install -yq ruby2.0 ruby2.0-dev pkg-config build-essential nodejs git libxml2-dev libxslt-dev
+      sudo apt-get install -yq ruby2.4 ruby2.4-dev
+      sudo apt-get install -yq pkg-config build-essential nodejs git libxml2-dev libxslt-dev
       sudo apt-get autoremove -yq
-      gem2.0 install --no-ri --no-rdoc bundler
+      gem2.4 install --no-ri --no-rdoc bundler
     SHELL
 
   # add the local user git config to the vm
@@ -34,6 +36,6 @@ Vagrant.configure(2) do |config|
       echo "Starting up middleman at http://localhost:4567"
       echo "If it does not come up, check the ~/middleman.log file for any error messages"
       cd /vagrant
-      bundle exec middleman server --force-polling --latency=1 &> ~/middleman.log &
+      bundle exec middleman server --watcher-force-polling --watcher-latency=1 &> ~/middleman.log &
     SHELL
-end
+end

config.rb

@@ -1,23 +1,24 @@
+# Unique header generation
+require './lib/unique_head.rb'
+
 # Markdown
-set :markdown_engine, :maruku
+set :markdown_engine, :redcarpet
 set :markdown,
     fenced_code_blocks: true,
     smartypants: true,
     disable_indented_code_blocks: true,
     prettify: true,
     tables: true,
     with_toc_data: true,
-    no_intra_emphasis: true
+    no_intra_emphasis: true,
+    renderer: UniqueHeadCounter
 
 # Assets
 set :css_dir, 'stylesheets'
 set :js_dir, 'javascripts'
 set :images_dir, 'images'
 set :fonts_dir, 'fonts'
 
-# Reload the browser automatically whenever files change
-activate :livereload
-
 # Activate the syntax highlighter
 activate :syntax
 ready do
@@ -50,3 +51,7 @@
 # Deploy Configuration
 # If you want Middleman to listen on a different port, you can set that below
 set :port, 4567
+
+helpers do
+  require './lib/toc_data.rb'
+end

lib/multilang.rb

@@ -1,15 +1,16 @@
 module Multilang
   def block_code(code, full_lang_name)
-    parts = full_lang_name.split('--')
-    rouge_lang_name = parts[0] || ""
-    super(code, rouge_lang_name).sub("highlight #{rouge_lang_name}") do |match|
-      match + " tab-" + full_lang_name
+    if full_lang_name
+      parts = full_lang_name.split('--')
+      rouge_lang_name = (parts) ? parts[0] : "" # just parts[0] here causes null ref exception when no language specified
+      super(code, rouge_lang_name).sub("highlight #{rouge_lang_name}") do |match|
+        match + " tab-" + full_lang_name
+      end
+    else
+      super(code, full_lang_name)
     end
   end
 end
 
-#require 'middleman-core/renderers/redcarpet'
-#Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, Multilang
-
-#require 'middleman-core/renderers/maruku'
-#Middleman::Renderers::Maruku.send :include, Multilang
+require 'middleman-core/renderers/redcarpet'
+Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, Multilang

lib/toc_data.rb

@@ -0,0 +1,30 @@
+require 'nokogiri'
+
+def toc_data(page_content)
+  html_doc = Nokogiri::HTML::DocumentFragment.parse(page_content)
+
+  # get a flat list of headers
+  headers = []
+  html_doc.css('h1, h2, h3').each do |header|
+    headers.push({
+      id: header.attribute('id').to_s,
+      content: header.children,
+      level: header.name[1].to_i,
+      children: []
+    })
+  end
+
+  [3,2].each do |header_level|
+    header_to_nest = nil
+    headers = headers.reject do |header|
+      if header[:level] == header_level
+        header_to_nest[:children].push header if header_to_nest
+        true
+      else
+        header_to_nest = header if header[:level] < header_level
+        false
+      end
+    end
+  end
+  headers
+end

lib/unique_head.rb

@@ -0,0 +1,17 @@
+# Unique header generation
+require 'middleman-core/renderers/redcarpet'
+class UniqueHeadCounter < Middleman::Renderers::MiddlemanRedcarpetHTML
+  def initialize
+    super
+    @head_count = {}
+  end
+  def header(text, header_level)
+    friendly_text = text.parameterize
+    @head_count[friendly_text] ||= 0
+    @head_count[friendly_text] += 1
+    if @head_count[friendly_text] > 1
+      friendly_text += "-#{@head_count[friendly_text]}"
+    end
+    return "<h#{header_level} id='#{friendly_text}'>#{text}</h#{header_level}>"
+  end
+end