Upgrades jekyll and adjustments for passing tests

.gitignore

@@ -1,4 +1,4 @@
 _site
 node_modules/
-Gemfile.lock
 .DS_Store
+.ruby-version

Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'jekyll', '2.0.3'
-gem 'kramdown', '1.3.3'
+gem 'jekyll', '3.4.3'
+gem 'kramdown', '1.12.0'
+gem 'rspec'
+gem 'faker'
 
 group :test do
-  gem 'html-proofer', '~> 3.0'
+  gem 'html-proofer'
 end
-gem 'rspec'
-gem 'faker'

Gemfile.lock

@@ -0,0 +1,103 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    colorator (1.1.0)
+    colored (1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    ethon (0.10.1)
+      ffi (>= 1.3.0)
+    faker (1.8.4)
+      i18n (~> 0.5)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    html-proofer (3.7.2)
+      activesupport (>= 4.2, < 6.0)
+      addressable (~> 2.3)
+      colored (~> 1.2)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.7)
+      parallel (~> 1.3)
+      typhoeus (~> 0.7)
+      yell (~> 2.0)
+    i18n (0.8.6)
+    jekyll (3.4.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.12.0)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    parallel (1.12.0)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rake (12.0.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (1.11.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    safe_yaml (1.0.4)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    thread_safe (0.3.6)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yell (2.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  faker
+  html-proofer
+  jekyll (= 3.4.3)
+  kramdown (= 1.12.0)
+  rake
+  rspec
+
+BUNDLED WITH
+   1.14.3

_config.yml

@@ -8,10 +8,16 @@ kramdown:
   input: GFM
   parse_block_html: true
   toc_levels: 2..6
-  use_coderay: true
+  enable_coderay: true
 
   coderay:
     coderay_wrap: div
     coderay_line_numbers: nil
     coderay_css: class
 
+defaults:
+  -
+    scope:
+      path: ""
+    values:
+      webprefix: "http://iiif.io"

source/_includes/head.html

@@ -9,6 +9,6 @@
     <link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
     <link href='http://fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/css/main.css">
-    <link type="application/atom+xml" rel="self" href="/news/atom.xml"/>
+    <link type="application/atom+xml" rel="self" href="{{ page.webprefix }}/news/atom.xml"/>
     <script src="/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
   </head>

source/_includes/sub-showcase_md.html

@@ -1,8 +1,6 @@
-  <p>
     {% for item in site.data.showcase %}
       {% if item.id == id %}
         <p>{{ item.desc }}</p>
         {% if item.github_url %} <a href="{{ item.github_url }}" target="_blank" class="button-turquoise">GitHub</a> {% endif %}
       {% endif %}
     {% endfor %}
-  </p>

source/index.html

@@ -12,7 +12,7 @@
     <div class="isotope-item"  ontouchstart="this.classList.toggle('hover');">
       <div class="flipper">
         <div class="front">
-          <img src="{{ item.img_url }}">
+          <img src="{{ item.img_url }}" alt="{{ item.name }}">
           <p>{{ item.name }}</p>
         </div>
         <div class="back">

source/showcase/osd-viewer.html

@@ -53,12 +53,10 @@
     });
   </script>
 
-  <p>
     {% for item in site.data.showcase %}
       {% if item.id == "mirador" %}
         <p>{{ item.desc }}</p>
         {% if item.github_url %} <a href="{{ item.github_url }}" target="_blank" class="button-turquoise">GitHub</a> {% endif %}
       {% endif %}
     {% endfor %}
-  </p>
 </section>

source/showcase/uv.html

@@ -9,7 +9,7 @@
   {% include showcase_return.html %}
 
   <div class="uv" data-locale="en-GB:English (GB),cy-GB:Cymraeg" data-config="" data-uri="http://wellcomelibrary.org/iiif/b18035723/manifest" style="width:100%; height:500px; background-color: #000"></div>
-  <script type="text/javascript" id="embedUV" src="http://universalviewer.io/examples/uv/lib/embed.js"></script>
+  <script type="text/javascript" id="embedUV" src="http://universalviewer.io/vendor/uv/lib/embed.js"></script>
 
   {% assign id = "uv" %}
   {% include sub-showcase_md.html %}

source/showcase/wellcome-player.html

@@ -8,7 +8,7 @@
 <section class="showcase showcase-item wrapper">
   {% include showcase_return.html %}
 
-  <div class="wellcomePlayer" data-uri="http://wellcomelibrary.org/package/b18035723" data-sequenceindex="0" data-assetindex="0" data-zoom="-0.5859,0,2.1719,1.3791" data-rotation"0" data-config="/service/playerconfig" style="width:100%; height:500px; background-color: #000"></div>
+  <div class="wellcomePlayer" data-uri="http://wellcomelibrary.org/package/b18035723" data-sequenceindex="0" data-assetindex="0" data-zoom="-0.5859,0,2.1719,1.3791" data-rotation="0" data-config="/service/playerconfig" style="width:100%; height:500px; background-color: #000"></div>
   <script type="text/javascript" id="embedWellcomePlayer" src="http://wellcomelibrary.org/spas/player/build/wellcomeplayer/js/embed.js"></script><script type="text/javascript">/* wordpress fix */</script>
 
   {% assign id = "wellcome" %}

source/viewer/mirador/spec/javascripts/fixtures/mirador.html

@@ -12,5 +12,4 @@
       }]
     });
   });
-</script
-
+</script>

test.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 #
 # Run the tests
-# 
-bundle exec jekyll build --drafts
-grunt test
-bundle exec htmlproofer ./_site
+#
+bundle exec jekyll build
+bundle exec htmlproofer --check-html ./_site