From 5b11ec43c5893c860e56eb612f8117f758f859b9 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 14:46:42 -0500 Subject: [PATCH 01/21] Version bump --- Gemfile.lock | 79 +++++++++++----------------------------------- preparermd.gemspec | 4 +-- 2 files changed, 21 insertions(+), 62 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4f5b4d8..1c365a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,8 +3,8 @@ PATH specs: preparermd (0.1.0) faraday (= 0.9.1) - jekyll (= 2.5.3) - jekyll-assets (= 0.14.0) + jekyll (= 3.0.1) + jekyll-assets (= 2.0.1) json (= 1.8.3) therubyracer (= 0.12.2) @@ -12,107 +12,66 @@ GEM remote: https://rubygems.org/ specs: addressable (2.3.8) - blankslate (2.1.2.4) - classifier-reborn (2.0.3) - fast-stemmer (~> 1.0) coderay (1.1.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.9.1.1) colorator (0.1) - execjs (2.6.0) faraday (0.9.1) multipart-post (>= 1.2, < 3) - fast-stemmer (1.0.2) - fastimage (1.7.0) + fastimage (1.8.0) addressable (~> 2.3, >= 2.3.5) ffi (1.9.10) hashdiff (0.2.3) - hike (1.2.3) - jekyll (2.5.3) - classifier-reborn (~> 2.0) + jekyll (3.0.1) colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) - jekyll-assets (0.14.0) - fastimage (~> 1.6) - jekyll (~> 2.0) - mini_magick (~> 4.1) - sass (~> 3.2) - sprockets (~> 2.10) - sprockets-helpers - sprockets-sass - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-gist (1.3.4) - jekyll-paginate (1.1.0) + jekyll-assets (2.0.1) + fastimage (~> 1.8) + jekyll (~> 3.0) + sprockets (~> 3.3) + sprockets-helpers (~> 1.2) jekyll-sass-converter (1.3.0) sass (~> 3.2) jekyll-watch (1.3.0) listen (~> 3.0) json (1.8.3) - kramdown (1.8.0) - libv8 (3.16.14.11) - liquid (2.6.3) - listen (3.0.3) + kramdown (1.9.0) + libv8 (3.16.14.13) + liquid (3.0.6) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) method_source (0.8.2) - mini_magick (4.3.3) - multi_json (1.11.2) multipart-post (2.0.0) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.11) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) rack (1.6.4) rake (10.4.2) rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.3.3) ref (2.0.0) + rouge (1.10.1) safe_yaml (1.0.4) - sass (3.4.18) + sass (3.4.19) slop (3.6.0) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (3.4.0) + rack (> 1, < 3) sprockets-helpers (1.2.1) sprockets (>= 2.2) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) term-ansicolor (1.3.2) tins (~> 1.0) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - tilt (1.4.1) tins (1.7.0) - toml (0.1.2) - parslet (~> 1.5.0) - yajl-ruby (1.2.1) PLATFORMS ruby diff --git a/preparermd.gemspec b/preparermd.gemspec index 4d0dff4..f7dc13f 100644 --- a/preparermd.gemspec +++ b/preparermd.gemspec @@ -28,9 +28,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.9" spec.add_development_dependency "rake", "~> 10.0" - spec.add_runtime_dependency "jekyll", "2.5.3" + spec.add_runtime_dependency "jekyll", "3.0.1" spec.add_runtime_dependency "faraday", "0.9.1" - spec.add_runtime_dependency "jekyll-assets", "0.14.0" + spec.add_runtime_dependency "jekyll-assets", "2.0.1" spec.add_runtime_dependency "therubyracer", "0.12.2" spec.add_runtime_dependency "json", "1.8.3" end From 6b8c946afa6b92d73b4635366fea7add4229866c Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:02:02 -0500 Subject: [PATCH 02/21] Track renames a little. --- Gemfile.lock | 2 ++ lib/preparermd/overrides/environment.rb | 4 ++-- preparermd.gemspec | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1c365a0..f657654 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,7 @@ PATH jekyll (= 3.0.1) jekyll-assets (= 2.0.1) json (= 1.8.3) + redcarpet (= 3.3.3) therubyracer (= 0.12.2) GEM @@ -57,6 +58,7 @@ GEM rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) + redcarpet (3.3.3) ref (2.0.0) rouge (1.10.1) safe_yaml (1.0.4) diff --git a/lib/preparermd/overrides/environment.rb b/lib/preparermd/overrides/environment.rb index 896f26a..1d44163 100644 --- a/lib/preparermd/overrides/environment.rb +++ b/lib/preparermd/overrides/environment.rb @@ -4,7 +4,7 @@ require 'faraday' require 'sprockets' -require 'jekyll/assets_plugin/environment' +require 'jekyll/assets/env' # Module to be mixed in to each uploaded Asset to ensure that the correct URLs are generated. # @@ -41,7 +41,7 @@ def build_asset(path, pathname, options) # Custom Sprockets Environment subclass that uses our injected Index subclass. # -class Environment < Jekyll::AssetsPlugin::Environment +class Env < Jekyll::Assets::Env def index Index.new(self) end diff --git a/preparermd.gemspec b/preparermd.gemspec index f7dc13f..cc63ab8 100644 --- a/preparermd.gemspec +++ b/preparermd.gemspec @@ -31,6 +31,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll", "3.0.1" spec.add_runtime_dependency "faraday", "0.9.1" spec.add_runtime_dependency "jekyll-assets", "2.0.1" + spec.add_runtime_dependency "redcarpet", "3.3.3" spec.add_runtime_dependency "therubyracer", "0.12.2" spec.add_runtime_dependency "json", "1.8.3" end From f77a5b3aa4e04a505f28681f730cf11b1c7e6cce Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:02:54 -0500 Subject: [PATCH 03/21] We don't need a JS engine anymore --- Gemfile.lock | 6 ------ preparermd.gemspec | 1 - 2 files changed, 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f657654..91f7c4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,6 @@ PATH jekyll-assets (= 2.0.1) json (= 1.8.3) redcarpet (= 3.3.3) - therubyracer (= 0.12.2) GEM remote: https://rubygems.org/ @@ -41,7 +40,6 @@ GEM listen (~> 3.0) json (1.8.3) kramdown (1.9.0) - libv8 (3.16.14.13) liquid (3.0.6) listen (3.0.5) rb-fsevent (>= 0.9.3) @@ -59,7 +57,6 @@ GEM rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.3.3) - ref (2.0.0) rouge (1.10.1) safe_yaml (1.0.4) sass (3.4.19) @@ -70,9 +67,6 @@ GEM sprockets (>= 2.2) term-ansicolor (1.3.2) tins (~> 1.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) - ref tins (1.7.0) PLATFORMS diff --git a/preparermd.gemspec b/preparermd.gemspec index cc63ab8..9b380bb 100644 --- a/preparermd.gemspec +++ b/preparermd.gemspec @@ -32,6 +32,5 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "faraday", "0.9.1" spec.add_runtime_dependency "jekyll-assets", "2.0.1" spec.add_runtime_dependency "redcarpet", "3.3.3" - spec.add_runtime_dependency "therubyracer", "0.12.2" spec.add_runtime_dependency "json", "1.8.3" end From af04b0e8a212c08f860e80ee09dfbb176b005588 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:11:42 -0500 Subject: [PATCH 04/21] Include an asset. --- .gitignore | 1 + test/envelopes/dest/assets/wheatley-icon.jpg | Bin 0 -> 6566 bytes test/envelopes/src/_assets/img/wheatley-icon.jpg | Bin 0 -> 6566 bytes test/envelopes/src/asset.md | 4 ++++ 4 files changed, 5 insertions(+) create mode 100644 test/envelopes/dest/assets/wheatley-icon.jpg create mode 100644 test/envelopes/src/_assets/img/wheatley-icon.jpg create mode 100644 test/envelopes/src/asset.md diff --git a/.gitignore b/.gitignore index 415377f..67a2a85 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ build/ env preparer-test-* +.asset-cache diff --git a/test/envelopes/dest/assets/wheatley-icon.jpg b/test/envelopes/dest/assets/wheatley-icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b62eeb62abeda660943090cc45968a2fff8efd30 GIT binary patch literal 6566 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 literal 0 HcmV?d00001 diff --git a/test/envelopes/src/_assets/img/wheatley-icon.jpg b/test/envelopes/src/_assets/img/wheatley-icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b62eeb62abeda660943090cc45968a2fff8efd30 GIT binary patch literal 6566 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 literal 0 HcmV?d00001 diff --git a/test/envelopes/src/asset.md b/test/envelopes/src/asset.md new file mode 100644 index 0000000..9cf4d6e --- /dev/null +++ b/test/envelopes/src/asset.md @@ -0,0 +1,4 @@ +--- +--- + +This document contains a reference to an [asset]({% asset_path wheatley-icon %}). From ff2fc88cd42b2afac1107a46114c0ac025dde2ca Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:15:07 -0500 Subject: [PATCH 05/21] Separate out the image asset test. --- test/envelopes/src/_config.yml | 5 ----- .../dest/assets/wheatley-icon.jpg | Bin test/image-asset/dest/image-asset-base%2Fasset | 1 + .../src/_assets/img/wheatley-icon.jpg | Bin test/image-asset/src/_config.yml | 14 ++++++++++++++ test/image-asset/src/_deconst.json | 3 +++ test/{envelopes => image-asset}/src/asset.md | 0 7 files changed, 18 insertions(+), 5 deletions(-) rename test/{envelopes => image-asset}/dest/assets/wheatley-icon.jpg (100%) create mode 100644 test/image-asset/dest/image-asset-base%2Fasset rename test/{envelopes => image-asset}/src/_assets/img/wheatley-icon.jpg (100%) create mode 100644 test/image-asset/src/_config.yml create mode 100644 test/image-asset/src/_deconst.json rename test/{envelopes => image-asset}/src/asset.md (100%) diff --git a/test/envelopes/src/_config.yml b/test/envelopes/src/_config.yml index ca16065..ea90ec0 100644 --- a/test/envelopes/src/_config.yml +++ b/test/envelopes/src/_config.yml @@ -7,8 +7,3 @@ markdown: redcarpet encoding: UTF-8 redcarpet: extensions: ["with_toc_data"] - -# Jekyll Assets -assets: - sources: - - _assets/img diff --git a/test/envelopes/dest/assets/wheatley-icon.jpg b/test/image-asset/dest/assets/wheatley-icon.jpg similarity index 100% rename from test/envelopes/dest/assets/wheatley-icon.jpg rename to test/image-asset/dest/assets/wheatley-icon.jpg diff --git a/test/image-asset/dest/image-asset-base%2Fasset b/test/image-asset/dest/image-asset-base%2Fasset new file mode 100644 index 0000000..627c4de --- /dev/null +++ b/test/image-asset/dest/image-asset-base%2Fasset @@ -0,0 +1 @@ +{"title":null,"body":"

This document contains a reference to an asset.

\n","categories":[],"meta":{"layout":null},"tags":[]} \ No newline at end of file diff --git a/test/envelopes/src/_assets/img/wheatley-icon.jpg b/test/image-asset/src/_assets/img/wheatley-icon.jpg similarity index 100% rename from test/envelopes/src/_assets/img/wheatley-icon.jpg rename to test/image-asset/src/_assets/img/wheatley-icon.jpg diff --git a/test/image-asset/src/_config.yml b/test/image-asset/src/_config.yml new file mode 100644 index 0000000..ca16065 --- /dev/null +++ b/test/image-asset/src/_config.yml @@ -0,0 +1,14 @@ +# Site settings +title: The site title +description: The site description + +# Build settings +markdown: redcarpet +encoding: UTF-8 +redcarpet: + extensions: ["with_toc_data"] + +# Jekyll Assets +assets: + sources: + - _assets/img diff --git a/test/image-asset/src/_deconst.json b/test/image-asset/src/_deconst.json new file mode 100644 index 0000000..1283963 --- /dev/null +++ b/test/image-asset/src/_deconst.json @@ -0,0 +1,3 @@ +{ + "contentIDBase": "image-asset-base" +} diff --git a/test/envelopes/src/asset.md b/test/image-asset/src/asset.md similarity index 100% rename from test/envelopes/src/asset.md rename to test/image-asset/src/asset.md From 4a6279ddd104d63fa6f3da96d47bcff5afd9a8d6 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:17:45 -0500 Subject: [PATCH 06/21] Separate the maximum and minimum envelope cases. --- test/envelopes/src/_deconst.json | 3 --- test/{envelopes => maximum-envelope}/src/_config.yml | 0 test/maximum-envelope/src/_deconst.json | 3 +++ test/{envelopes => maximum-envelope}/src/maximum.md | 0 test/minimum-envelope/src/_config.yml | 9 +++++++++ test/minimum-envelope/src/_deconst.json | 3 +++ test/{envelopes => minimum-envelope}/src/minimal.md | 0 7 files changed, 15 insertions(+), 3 deletions(-) delete mode 100644 test/envelopes/src/_deconst.json rename test/{envelopes => maximum-envelope}/src/_config.yml (100%) create mode 100644 test/maximum-envelope/src/_deconst.json rename test/{envelopes => maximum-envelope}/src/maximum.md (100%) create mode 100644 test/minimum-envelope/src/_config.yml create mode 100644 test/minimum-envelope/src/_deconst.json rename test/{envelopes => minimum-envelope}/src/minimal.md (100%) diff --git a/test/envelopes/src/_deconst.json b/test/envelopes/src/_deconst.json deleted file mode 100644 index 5c2f9a9..0000000 --- a/test/envelopes/src/_deconst.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "contentIDBase": "idbase" -} diff --git a/test/envelopes/src/_config.yml b/test/maximum-envelope/src/_config.yml similarity index 100% rename from test/envelopes/src/_config.yml rename to test/maximum-envelope/src/_config.yml diff --git a/test/maximum-envelope/src/_deconst.json b/test/maximum-envelope/src/_deconst.json new file mode 100644 index 0000000..1c09d64 --- /dev/null +++ b/test/maximum-envelope/src/_deconst.json @@ -0,0 +1,3 @@ +{ + "contentIDBase": "maximum-base" +} diff --git a/test/envelopes/src/maximum.md b/test/maximum-envelope/src/maximum.md similarity index 100% rename from test/envelopes/src/maximum.md rename to test/maximum-envelope/src/maximum.md diff --git a/test/minimum-envelope/src/_config.yml b/test/minimum-envelope/src/_config.yml new file mode 100644 index 0000000..ea90ec0 --- /dev/null +++ b/test/minimum-envelope/src/_config.yml @@ -0,0 +1,9 @@ +# Site settings +title: The site title +description: The site description + +# Build settings +markdown: redcarpet +encoding: UTF-8 +redcarpet: + extensions: ["with_toc_data"] diff --git a/test/minimum-envelope/src/_deconst.json b/test/minimum-envelope/src/_deconst.json new file mode 100644 index 0000000..1b91537 --- /dev/null +++ b/test/minimum-envelope/src/_deconst.json @@ -0,0 +1,3 @@ +{ + "contentIDBase": "minimal-base" +} diff --git a/test/envelopes/src/minimal.md b/test/minimum-envelope/src/minimal.md similarity index 100% rename from test/envelopes/src/minimal.md rename to test/minimum-envelope/src/minimal.md From d674fded7b3eccbe917b347771fb85551b14e260 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:19:14 -0500 Subject: [PATCH 07/21] Report stdout and stderr on failing tests too. --- test/all.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/all.rb b/test/all.rb index be476fc..b67715e 100644 --- a/test/all.rb +++ b/test/all.rb @@ -126,7 +126,7 @@ def report case @outcome when :fail - header, diff = true, true + header, output, diff = true, true, true when :error header, output, stacktrace = true, true, true end From 16197b5b93a8a8dd51480d714e907be0e5a5416a Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 20 Nov 2015 15:27:29 -0500 Subject: [PATCH 08/21] Exclude the asset directory itself. --- test/all.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/all.rb b/test/all.rb index b67715e..fcde533 100644 --- a/test/all.rb +++ b/test/all.rb @@ -115,6 +115,7 @@ def asset_set_from dir return assets unless File.directory? base Find.find(base) do |path| + next if path == base assets << path[base.size..-1] end assets.sort From 20ae2a067bf136404e9dd21c98014a4cfdaec714 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Wed, 4 Oct 2017 09:17:40 -0500 Subject: [PATCH 09/21] updating to latest alpine for latest node, updating maintainer, fixing the last bits of the update to jekyll 3 --- Dockerfile | 4 ++-- Gemfile.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ebb99b..62989b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM alpine:3.3 -MAINTAINER Ash Wilson +FROM alpine:3.6 +LABEL maintainer="Laura Santamaria " RUN apk add --no-cache ruby ruby-io-console ruby-irb ruby-rdoc ruby-dev \ git build-base libffi-dev nodejs python diff --git a/Gemfile.lock b/Gemfile.lock index 91f7c4c..4891ea3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM sass (~> 3.2) jekyll-watch (1.3.0) listen (~> 3.0) - json (1.8.3) + json (1.8.5) kramdown (1.9.0) liquid (3.0.6) listen (3.0.5) From 581a2d1773e98ebca17edd678d39041eadb5f806 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Fri, 6 Oct 2017 09:57:58 -0500 Subject: [PATCH 10/21] working on fixing the gem --- Gemfile.lock | 125 +++++++++++++++++++++----------------- lib/preparermd/version.rb | 2 +- preparermd.gemspec | 14 ++--- 3 files changed, 77 insertions(+), 64 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4891ea3..3f87bcd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,84 +1,97 @@ PATH remote: . specs: - preparermd (0.1.0) - faraday (= 0.9.1) - jekyll (= 3.0.1) - jekyll-assets (= 2.0.1) - json (= 1.8.3) - redcarpet (= 3.3.3) + preparermd (0.2.0) + faraday (= 0.13.1) + jekyll (= 3.6.0) + jekyll-assets (= 2.4.0) + json (= 2.1.0) + redcarpet (= 3.4.0) GEM remote: https://rubygems.org/ specs: - addressable (2.3.8) - coderay (1.1.0) - colorator (0.1) - faraday (0.9.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + coderay (1.1.2) + colorator (1.1.0) + concurrent-ruby (1.0.5) + extras (0.3.0) + forwardable-extended (~> 2.5) + faraday (0.13.1) multipart-post (>= 1.2, < 3) - fastimage (1.8.0) - addressable (~> 2.3, >= 2.3.5) - ffi (1.9.10) - hashdiff (0.2.3) - jekyll (3.0.1) - colorator (~> 0.1) + fastimage (2.1.0) + ffi (1.9.18) + forwardable-extended (2.6.0) + hashdiff (0.3.6) + jekyll (3.6.0) + addressable (~> 2.4) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) + kramdown (~> 1.14) + liquid (~> 4.0) mercenary (~> 0.3.3) - rouge (~> 1.7) + pathutil (~> 0.9) + rouge (>= 1.7, < 3) safe_yaml (~> 1.0) - jekyll-assets (2.0.1) - fastimage (~> 1.8) - jekyll (~> 3.0) - sprockets (~> 3.3) - sprockets-helpers (~> 1.2) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-watch (1.3.0) - listen (~> 3.0) - json (1.8.5) - kramdown (1.9.0) - liquid (3.0.6) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - mercenary (0.3.5) - method_source (0.8.2) + jekyll-assets (2.4.0) + concurrent-ruby (~> 1.0) + extras (~> 0.2) + fastimage (~> 2.0, >= 1.8) + jekyll (~> 3.1, >= 3.0) + pathutil (>= 0.8) + rack (~> 1.6) + sprockets (~> 3.3, < 3.8) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + json (2.1.0) + kramdown (1.15.0) + liquid (4.0.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + method_source (0.9.0) multipart-post (2.0.0) - pry (0.10.1) + pathutil (0.16.0) + forwardable-extended (~> 2.6) + pry (0.11.1) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rack (1.6.4) - rake (10.4.2) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - redcarpet (3.3.3) - rouge (1.10.1) + method_source (~> 0.9.0) + public_suffix (3.0.0) + rack (1.6.8) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redcarpet (3.4.0) + rouge (2.2.1) safe_yaml (1.0.4) - sass (3.4.19) - slop (3.6.0) - sprockets (3.4.0) + sass (3.5.2) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.2.1) - sprockets (>= 2.2) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) - tins (1.7.0) + tins (1.15.0) PLATFORMS ruby DEPENDENCIES - bundler (~> 1.9) + bundler (~> 1.15) hashdiff preparermd! pry - rake (~> 10.0) + rake (~> 12.1) term-ansicolor BUNDLED WITH - 1.10.6 + 1.15.4 diff --git a/lib/preparermd/version.rb b/lib/preparermd/version.rb index 20797e0..2539d06 100644 --- a/lib/preparermd/version.rb +++ b/lib/preparermd/version.rb @@ -1,3 +1,3 @@ module PreparerMD - VERSION = "0.1.0" + VERSION = "0.2.0" end diff --git a/preparermd.gemspec b/preparermd.gemspec index 9b380bb..ff30011 100644 --- a/preparermd.gemspec +++ b/preparermd.gemspec @@ -25,12 +25,12 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_development_dependency "bundler", "~> 1.9" - spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "bundler", "~> 1.15" + spec.add_development_dependency "rake", "~> 12.1" - spec.add_runtime_dependency "jekyll", "3.0.1" - spec.add_runtime_dependency "faraday", "0.9.1" - spec.add_runtime_dependency "jekyll-assets", "2.0.1" - spec.add_runtime_dependency "redcarpet", "3.3.3" - spec.add_runtime_dependency "json", "1.8.3" + spec.add_runtime_dependency "jekyll", "3.6.0" + spec.add_runtime_dependency "faraday", "0.13.1" + spec.add_runtime_dependency "jekyll-assets", "2.4.0" + spec.add_runtime_dependency "redcarpet", "3.4.0" + spec.add_runtime_dependency "json", "2.1.0" end From 64eea220ee8981e769f4349a41f1a905960e5b8e Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Mon, 2 Apr 2018 17:49:41 -0500 Subject: [PATCH 11/21] fixed nokogiri, fixed renamed call to Sprockets::Index to Sprockets::CachedEnvironment --- Dockerfile | 2 +- Gemfile.lock | 94 +++++++++++++++++-------- lib/preparermd/overrides/environment.rb | 2 +- preparermd.gemspec | 6 +- 4 files changed, 68 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62989b8..191300d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.6 LABEL maintainer="Laura Santamaria " RUN apk add --no-cache ruby ruby-io-console ruby-irb ruby-rdoc ruby-dev \ - git build-base libffi-dev nodejs python + git build-base libffi-dev nodejs python ruby-nokogiri libxml2-dev libxslt-dev RUN adduser -D -g "" -u 1000 preparer RUN mkdir -p /usr/src/app /usr/content-repo diff --git a/Gemfile.lock b/Gemfile.lock index 3f87bcd..96139ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,85 +2,117 @@ PATH remote: . specs: preparermd (0.2.0) - faraday (= 0.13.1) - jekyll (= 3.6.0) - jekyll-assets (= 2.4.0) + faraday (= 0.14.0) + jekyll (= 3.7.3) + jekyll-assets (= 3.0.8) json (= 2.1.0) redcarpet (= 3.4.0) GEM remote: https://rubygems.org/ specs: + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) coderay (1.1.2) colorator (1.1.0) concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.5) + execjs (2.7.0) extras (0.3.0) forwardable-extended (~> 2.5) - faraday (0.13.1) + faraday (0.14.0) multipart-post (>= 1.2, < 3) - fastimage (2.1.0) - ffi (1.9.18) + fastimage (2.1.1) + ffi (1.9.23) forwardable-extended (2.6.0) - hashdiff (0.3.6) - jekyll (3.6.0) + hashdiff (0.3.7) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.7.3) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) + jekyll-watch (~> 2.0) kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 3) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-assets (2.4.0) - concurrent-ruby (~> 1.0) + jekyll-assets (3.0.8) + activesupport (~> 5.0) + execjs (~> 2.7) extras (~> 0.2) fastimage (~> 2.0, >= 1.8) - jekyll (~> 3.1, >= 3.0) - pathutil (>= 0.8) - rack (~> 1.6) - sprockets (~> 3.3, < 3.8) - jekyll-sass-converter (1.5.0) + jekyll (>= 3.5, < 4.0) + jekyll-sanity (~> 1.2) + liquid-tag-parser (~> 1.0) + nokogiri (~> 1.8) + pathutil (~> 0.16) + sprockets (>= 3.3, < 4.1.beta) + jekyll-sanity (1.2.0) + jekyll (~> 3.1) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) + jekyll-watch (2.0.0) + listen (~> 3.0) json (2.1.0) - kramdown (1.15.0) + kramdown (1.16.2) liquid (4.0.0) - listen (3.0.8) + liquid-tag-parser (1.8.0) + extras (~> 0.3) + liquid (>= 3.0, < 5.0) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) method_source (0.9.0) + mini_portile2 (2.3.0) + minitest (5.11.3) multipart-post (2.0.0) - pathutil (0.16.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pathutil (0.16.1) forwardable-extended (~> 2.6) - pry (0.11.1) + pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.0) - rack (1.6.8) - rake (12.1.0) - rb-fsevent (0.10.2) + public_suffix (3.0.2) + rack (2.0.4) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) redcarpet (3.4.0) - rouge (2.2.1) + rouge (3.1.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.2) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sprockets (3.7.1) + sprockets (4.0.0.beta7) concurrent-ruby (~> 1.0) rack (> 1, < 3) term-ansicolor (1.6.0) tins (~> 1.0) - tins (1.15.0) + thread_safe (0.3.6) + tins (1.16.3) + tzinfo (1.2.5) + thread_safe (~> 0.1) PLATFORMS ruby diff --git a/lib/preparermd/overrides/environment.rb b/lib/preparermd/overrides/environment.rb index 1d44163..d45da21 100644 --- a/lib/preparermd/overrides/environment.rb +++ b/lib/preparermd/overrides/environment.rb @@ -16,7 +16,7 @@ module AssetPatch # Custom Index subclass that uploads each built asset to the content service as it is discovered. # -class Index < Sprockets::Index +class Index < Sprockets::CachedEnvironment def build_asset(path, pathname, options) super.tap do |asset| dest = File.join(PreparerMD.config.asset_dir, asset.logical_path) diff --git a/preparermd.gemspec b/preparermd.gemspec index ff30011..e3c2bfb 100644 --- a/preparermd.gemspec +++ b/preparermd.gemspec @@ -28,9 +28,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.15" spec.add_development_dependency "rake", "~> 12.1" - spec.add_runtime_dependency "jekyll", "3.6.0" - spec.add_runtime_dependency "faraday", "0.13.1" - spec.add_runtime_dependency "jekyll-assets", "2.4.0" + spec.add_runtime_dependency "jekyll", "3.7.3" + spec.add_runtime_dependency "faraday", "0.14.0" + spec.add_runtime_dependency "jekyll-assets", "3.0.8" spec.add_runtime_dependency "redcarpet", "3.4.0" spec.add_runtime_dependency "json", "2.1.0" end From 7016d52888926cebf3b93c520091ae1084a7eb0b Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 08:43:54 -0500 Subject: [PATCH 12/21] updating Travis to the current version of Ruby on Alpine 3.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a33846..078f3c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: ruby rvm: -- "2.2.3" +- "2.4.4" script: bin/test From 2c77b6a0c9c37cc52b70bc423e237969169074d5 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 08:59:28 -0500 Subject: [PATCH 13/21] BREAK - jekyll_assets uses asset plus @path now instead of asset_path --- lib/preparermd/version.rb | 2 +- test/assets/src/useit.md | 2 +- test/image-asset/src/asset.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/preparermd/version.rb b/lib/preparermd/version.rb index 2539d06..23c4ef4 100644 --- a/lib/preparermd/version.rb +++ b/lib/preparermd/version.rb @@ -1,3 +1,3 @@ module PreparerMD - VERSION = "0.2.0" + VERSION = "1.0.0" end diff --git a/test/assets/src/useit.md b/test/assets/src/useit.md index 49af2d5..0670701 100644 --- a/test/assets/src/useit.md +++ b/test/assets/src/useit.md @@ -5,6 +5,6 @@ Including some actual markup before it to test the offsets. -![here it is]({% asset_path somepath/coffee-selfie-small.jpg %}) +![here it is]({% asset somepath/coffee-selfie-small.jpg @path %}) And a little markup after it to keep things interesting. diff --git a/test/image-asset/src/asset.md b/test/image-asset/src/asset.md index 9cf4d6e..340c692 100644 --- a/test/image-asset/src/asset.md +++ b/test/image-asset/src/asset.md @@ -1,4 +1,4 @@ --- --- -This document contains a reference to an [asset]({% asset_path wheatley-icon %}). +This document contains a reference to an [asset]({% asset wheatley-icon @path %}). From 9af3f6982a315016e3a397bad5d5e2852bfcaa0d Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 08:59:56 -0500 Subject: [PATCH 14/21] fixing deprecated call for Jekyll --- lib/preparermd/plugins/metadata_envelopes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/preparermd/plugins/metadata_envelopes.rb b/lib/preparermd/plugins/metadata_envelopes.rb index ec33157..bd7acaa 100644 --- a/lib/preparermd/plugins/metadata_envelopes.rb +++ b/lib/preparermd/plugins/metadata_envelopes.rb @@ -18,7 +18,7 @@ def generate(site) end end - site.posts.each do |post| + site.posts.docs.each do |post| render_json(post, site) end From 811d9b0dc986a9b63b4079433062af66ee0cf729 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 09:02:43 -0500 Subject: [PATCH 15/21] forgot to update the Gemfile when bumping the version... --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 96139ac..8707407 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - preparermd (0.2.0) + preparermd (1.0.0) faraday (= 0.14.0) jekyll (= 3.7.3) jekyll-assets (= 3.0.8) From 1ae9baa5351345a029107e93d41d1fb9316027bc Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 09:11:34 -0500 Subject: [PATCH 16/21] the tests did not like that one --- lib/preparermd/plugins/metadata_envelopes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/preparermd/plugins/metadata_envelopes.rb b/lib/preparermd/plugins/metadata_envelopes.rb index bd7acaa..ec33157 100644 --- a/lib/preparermd/plugins/metadata_envelopes.rb +++ b/lib/preparermd/plugins/metadata_envelopes.rb @@ -18,7 +18,7 @@ def generate(site) end end - site.posts.docs.each do |post| + site.posts.each do |post| render_json(post, site) end From 0281ec4b4278138614023c2c828521d875b1fef0 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 14:28:27 -0500 Subject: [PATCH 17/21] attempting to do a lift-and-shift to the current API without much mucking --- lib/preparermd/overrides/environment.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/preparermd/overrides/environment.rb b/lib/preparermd/overrides/environment.rb index d45da21..a5ce39e 100644 --- a/lib/preparermd/overrides/environment.rb +++ b/lib/preparermd/overrides/environment.rb @@ -50,11 +50,11 @@ def index # Monkey-patch the Jekyll Assets plugin AssetPath class to use the #asset_render_url # module Jekyll - module AssetsPlugin + module Assets - class AssetPath - alias_method :orig_to_s, :to_s - def to_s + class Context + alias_method :orig_to_s, :asset_path + def asset_path @asset.respond_to?(:asset_render_url) ? @asset.asset_render_url : orig_to_s end end From a88e62906b562fee6e65ca601a29d37403754322 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 14:33:29 -0500 Subject: [PATCH 18/21] I can Ruby --- lib/preparermd/overrides/environment.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/preparermd/overrides/environment.rb b/lib/preparermd/overrides/environment.rb index a5ce39e..81e0f42 100644 --- a/lib/preparermd/overrides/environment.rb +++ b/lib/preparermd/overrides/environment.rb @@ -51,13 +51,11 @@ def index # module Jekyll module Assets - - class Context + module Context alias_method :orig_to_s, :asset_path def asset_path @asset.respond_to?(:asset_render_url) ? @asset.asset_render_url : orig_to_s end end - end end From 1b42c7e4a92e478c5d726ce90dd917e377a9fe4b Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Tue, 3 Apr 2018 15:26:55 -0500 Subject: [PATCH 19/21] might have found the replacement class... --- lib/preparermd/overrides/environment.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/preparermd/overrides/environment.rb b/lib/preparermd/overrides/environment.rb index 81e0f42..701257a 100644 --- a/lib/preparermd/overrides/environment.rb +++ b/lib/preparermd/overrides/environment.rb @@ -51,11 +51,13 @@ def index # module Jekyll module Assets - module Context - alias_method :orig_to_s, :asset_path - def asset_path + + class Drop + alias_method :orig_to_s, :to_s + def to_s @asset.respond_to?(:asset_render_url) ? @asset.asset_render_url : orig_to_s end end + end end From e9889055051b6c36afbc556ebd54d24e4520b7f3 Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Wed, 4 Apr 2018 11:35:13 -0500 Subject: [PATCH 20/21] hiding test artifacts --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 67a2a85..0796dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ env preparer-test-* .asset-cache +.jekyll-cache From 6d6a02ca0a37025f403d5d65c2301ff00a2fc5da Mon Sep 17 00:00:00 2001 From: Laura Santamaria Date: Wed, 11 Apr 2018 16:58:41 -0500 Subject: [PATCH 21/21] (fix): still trying to fix the API calls to jekyll-assets; posting so others can grab it if I can't get back to it --- lib/preparermd/overrides/environment.rb | 17 +++++++---------- lib/preparermd/plugins/metadata_envelopes.rb | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/preparermd/overrides/environment.rb b/lib/preparermd/overrides/environment.rb index 701257a..8cd5378 100644 --- a/lib/preparermd/overrides/environment.rb +++ b/lib/preparermd/overrides/environment.rb @@ -47,17 +47,14 @@ def index end end -# Monkey-patch the Jekyll Assets plugin AssetPath class to use the #asset_render_url +# Monkey-patch the Jekyll Assets plugin SassFunctions module (run from the +# Functions module) to use the #asset_render_url if present. # -module Jekyll - module Assets - - class Drop - alias_method :orig_to_s, :to_s - def to_s - @asset.respond_to?(:asset_render_url) ? @asset.asset_render_url : orig_to_s - end +module Sprockets + class Asset + alias_method :orig_to_s, :to_s + def to_s + @asset.respond_to?(:asset_render_url) ? @asset.asset_render_url : orig_to_s end - end end diff --git a/lib/preparermd/plugins/metadata_envelopes.rb b/lib/preparermd/plugins/metadata_envelopes.rb index ec33157..bd7acaa 100644 --- a/lib/preparermd/plugins/metadata_envelopes.rb +++ b/lib/preparermd/plugins/metadata_envelopes.rb @@ -18,7 +18,7 @@ def generate(site) end end - site.posts.each do |post| + site.posts.docs.each do |post| render_json(post, site) end