Commit graph

329 commits

Author SHA1 Message Date
Jonathan Allard
42e31c8c5e Make .html implicit for page IDs (#1996)
* Make .html implicit for page IDs

* Add Pry gem

* Add setting :page_id_generator to override page ID derivation
2016-11-16 21:00:16 -08:00
Mike Vastola
7c968b9572 Updates to support Rails 5, Rack 3 and Sinatra 2 (beta) (#1984)
* Updates to support Rails 5, Rack 3 and Sinatra 2 (beta).

- Bump upper boundary of version for Rack dependency from 2.0 to 3 (exclusive).
- Version bump sinatra for CI testing to >= 2.0.0.beta2.
- Also replaces use of String#hash in middleman-core/features/asset_host.feature
to ensure sufficiently random variables are returned.

Closes middleman/middleman#1983.

* Testing revert of the version requirements...

To confirm my changes don't cause a regression for any of:
- Rails < 5
- Sinatra < 2
- Rack < 2

* Revert "Testing revert of the version requirements..."

This reverts commit 5cf4c2a07c0814eefa573358b1bc9b0eeb62f9c1.
2016-09-13 10:25:17 +02:00
Adam Heath
389e3f5a8c Add prefix option to asset_hash (#1949)
This allows manually changing the filename so that fiel header changes
can be reflected on the CDN. E.g. if you turn on crossOrigin serving
(CORS) the asset hash doesn't change, but the CDN cache needs to be
broken in order to pickup the new header.
2016-07-02 17:55:25 -07:00
Shawn Van Ittersum
0d5c9e4313 Prevent overwrite of Slim embedded options (#1927)
* Fix middleman/middleman#1925: Slim embedded options overwrite

* Remove context_hack from Slim renderer

* Remove debugging output
2016-05-31 13:15:21 -07:00
Thomas Reynolds
4ffaa9dde5 Try to encode URI before parsing so spaces in paths work. Fixes #1914 2016-05-25 11:13:59 -07:00
Thomas Reynolds
ccc1cc1288 Fix ordering in tests 2016-05-11 11:48:21 -07:00
Thomas Reynolds
13d62cb276 Experiment with non-rack rewriters 2016-04-22 15:52:42 -07:00
Thomas Reynolds
0ac5650229 Throw when trying to overwrite a template context value. Fixes #1884 2016-04-19 11:06:51 -07:00
Thomas Reynolds
a01656df39 Steps should try passing unknown methods to config context before failing. Fixes #1879 2016-04-14 11:30:46 -07:00
Thomas Reynolds
b794961916 Only rewrite urls in sitemap. Fixes #1873 2016-04-12 12:53:50 -07:00
Thomas Reynolds
e99649b33e Make global config access work inside steps 2016-04-11 16:02:31 -07:00
Adam Heath
025e35f6a1 Fix asset_hash with content rule and uncommented CSS url
Fixes middleman/middleman#1852
2016-03-22 17:34:40 +08:00
Thomas Reynolds
d22bd914ae Add specific test for #1556 2016-03-18 10:37:02 -07:00
Greg Tarsa
fbc572f920 Ensure that misspelled or missing partials generate an error 2016-03-03 11:23:17 -05:00
Adam Heath
d883152e99 Add sourceMap comment to asset_hash and hash .map files by default 2016-02-26 08:46:00 +08:00
Thomas Reynolds
0d983231d0 Run helper after collections. Fixes #1226 2016-02-24 14:20:42 -08:00
Thomas Reynolds
edb1a53060 Add page_id concept 2016-02-22 11:17:21 -08:00
Adam Heath
351003b4fe Make build fail when external_pipeline fails 2016-02-18 12:41:48 +08:00
Jim Cushing
b1778a92cd fix partials used with blocks 2016-02-03 16:56:12 -05:00
Thomas Reynolds
c5aabbbe4f Confirm nested frontmatter doesn't work 2016-01-29 10:30:08 -08:00
FearGoidte
007c626d58 .xml removed from Gzip defaults 2016-01-28 08:16:23 +00:00
FearGoidte
475fa41de0 Support for .xhtml
I’ve attempted to make support for .htm and .xhtml consistent.
Extensions are in alphabetical order to make it easier to compare them.
2016-01-27 09:48:36 +00:00
Thomas Reynolds
2bba7888b0 Fixes #1780 2016-01-26 13:47:27 -08:00
Thomas Reynolds
4e8273295b tweak some checksums, something slightly changed file output upstream 2016-01-21 10:50:44 -08:00
Thomas Reynolds
ffa662a917 Add system-wide file read cache 2016-01-20 11:50:25 -08:00
Thomas Reynolds
65aebc1887 Move some tests around 2016-01-19 14:55:47 -08:00
Thomas Reynolds
7bf4e4681f Show an error message when git CLI is not available. Closes #1765 2016-01-19 09:43:40 -08:00
Thomas Reynolds
a47b2138f8 Add specific check for TLD-like strings when replacing inline urls. Fixes #1751 2016-01-14 14:29:45 -08:00
Thomas Reynolds
be2788b6ca Fix automatic images with absolute (or images dir missing) paths in markdown. Fixes #1755 2016-01-14 14:14:50 -08:00
Thomas Reynolds
ff9c34bca9 Allow sorting of rewriters. Fixes #1752 2016-01-14 14:02:33 -08:00
Thomas Reynolds
5f8beba4b3 Perf 2016-01-14 11:05:41 -08:00
Thomas Reynolds
179268a4f6 Create ConfigExtension to simplify the APIs for config vs Step. Fixes #1743. Fixes #1745 2016-01-11 13:05:41 -08:00
Thomas Reynolds
98fe7ce7d2 WIP encoding test 2016-01-10 17:24:43 -08:00
Thomas Reynolds
c6401f1cd9 Fixes #1716 2016-01-10 17:14:41 -08:00
Thomas Reynolds
5cac6a1896 Add test for #1718 2016-01-10 16:56:18 -08:00
Nick Muerdter
37be89ed68 Add rewrite_ignore option to asset_host, cache_buster, relative_assets. 2016-01-09 08:06:47 -07:00
Nick Muerdter
0563523a81 Add rewrite_ignore option to asset_hash extension.
This allows for configuring the files that will be skipped when
performing URL rewriting on the file content. This differs from the
existing `ignore` option, which configures the files that won't have
hashes added to the filename.
2016-01-08 15:04:45 -07:00
Thomas Reynolds
1605f425e8 Fixes #1733 2016-01-05 10:58:22 -08:00
Thomas Reynolds
bfb6a7fa16 Merge pull request #1725 from maxmeyer/feature/phantomjs
Added phantomjs as gem to make test suite pass
2016-01-05 10:34:46 -08:00
Thomas Reynolds
62b17d38ad Merge pull request #1734 from GhostGambler/issue-1702
Issue #1702
2016-01-05 09:50:41 -08:00
Ulrich Gabor
1ca5be7b19 Tests for issue #1702 2016-01-05 15:15:01 +01:00
Ulrich Gabor
bdeb19059a Test for issue 1709; parent relations with localized and non-localized sources 2016-01-05 15:08:26 +01:00
Dennis Günnewig
b0a4d53963 Added phantomjs as gem to make test suite pass 2016-01-01 20:51:26 +01:00
Thomas Reynolds
4a8cd4c3d2 fix extension test 2015-12-21 13:27:44 -08:00
Thomas Reynolds
a5821bccec Fix asset hash with query string or hash params. Closes #1411 2015-12-21 13:07:01 -08:00
Thomas Reynolds
9e5b137ed8 Really fix #1689 2015-12-15 09:58:22 -08:00
Thomas Reynolds
b6befd3fc3 Rubocop and disable an annoying test 2015-12-13 13:29:33 -08:00
Thomas Reynolds
76f591788e Change inline URL matcher to only match strings, not newlines. Fixes #1689 2015-12-13 13:06:05 -08:00
Thomas Reynolds
d3a5494062 Handle invalid URLs in rewriter. Fixed #1638 2015-12-13 12:32:21 -08:00
Thomas Reynolds
07a216d5ca Remove sprockets/compass references 2015-11-30 17:14:02 -08:00