From 931e9feb83d4fef78595e6fc596fa321c1e72bfb Mon Sep 17 00:00:00 2001 From: Erin Fahy Date: Fri, 18 Aug 2017 15:52:45 -0700 Subject: [PATCH] Upgrades jekyll and adjustments for passing tests --- .gitignore | 2 +- Gemfile | 10 +- Gemfile.lock | 103 ++++++++++++++++++ _config.yml | 8 +- source/_includes/head.html | 2 +- source/_includes/sub-showcase_md.html | 2 - source/index.html | 2 +- source/showcase/osd-viewer.html | 2 - source/showcase/uv.html | 2 +- source/showcase/wellcome-player.html | 2 +- .../spec/javascripts/fixtures/mirador.html | 3 +- test.sh | 7 +- 12 files changed, 124 insertions(+), 21 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index cd9d5f8..2712462 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ _site node_modules/ -Gemfile.lock .DS_Store +.ruby-version diff --git a/Gemfile b/Gemfile index f804faf..e3a607d 100644 --- a/Gemfile +++ b/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' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..0fc345a --- /dev/null +++ b/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 diff --git a/_config.yml b/_config.yml index beeae74..88324ee 100644 --- a/_config.yml +++ b/_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" diff --git a/source/_includes/head.html b/source/_includes/head.html index 46fc268..5cff06c 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -9,6 +9,6 @@ - + diff --git a/source/_includes/sub-showcase_md.html b/source/_includes/sub-showcase_md.html index 9870375..64ccd8d 100644 --- a/source/_includes/sub-showcase_md.html +++ b/source/_includes/sub-showcase_md.html @@ -1,8 +1,6 @@ -

{% for item in site.data.showcase %} {% if item.id == id %}

{{ item.desc }}

{% if item.github_url %} GitHub {% endif %} {% endif %} {% endfor %} -

diff --git a/source/index.html b/source/index.html index 5d9b859..49bb733 100644 --- a/source/index.html +++ b/source/index.html @@ -12,7 +12,7 @@
- + {{ item.name }}

{{ item.name }}

diff --git a/source/showcase/osd-viewer.html b/source/showcase/osd-viewer.html index fa3d276..22ea027 100644 --- a/source/showcase/osd-viewer.html +++ b/source/showcase/osd-viewer.html @@ -53,12 +53,10 @@ }); -

{% for item in site.data.showcase %} {% if item.id == "mirador" %}

{{ item.desc }}

{% if item.github_url %} GitHub {% endif %} {% endif %} {% endfor %} -

diff --git a/source/showcase/uv.html b/source/showcase/uv.html index 312d047..6880b10 100644 --- a/source/showcase/uv.html +++ b/source/showcase/uv.html @@ -9,7 +9,7 @@ {% include showcase_return.html %}
- + {% assign id = "uv" %} {% include sub-showcase_md.html %} diff --git a/source/showcase/wellcome-player.html b/source/showcase/wellcome-player.html index b832e2c..c8569e6 100644 --- a/source/showcase/wellcome-player.html +++ b/source/showcase/wellcome-player.html @@ -8,7 +8,7 @@
{% include showcase_return.html %} -
+
{% assign id = "wellcome" %} diff --git a/source/viewer/mirador/spec/javascripts/fixtures/mirador.html b/source/viewer/mirador/spec/javascripts/fixtures/mirador.html index cecdcf6..0bcc9c8 100644 --- a/source/viewer/mirador/spec/javascripts/fixtures/mirador.html +++ b/source/viewer/mirador/spec/javascripts/fixtures/mirador.html @@ -12,5 +12,4 @@ }] }); }); - diff --git a/test.sh b/test.sh index c9bf3b8..dd653f1 100755 --- a/test.sh +++ b/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