emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1300 commits 2 branches 36 tags 40 MiB
Commit graph

470 commits

Author SHA1 Message Date
Vincent Prouillet af00a2e8f1 Add tests for custom url scheme 2019-07-15 20:18:24 +02:00
Vincent Prouillet 7c3a112d7d Render draft pages in serve mode 2019-07-12 23:47:15 +02:00
Vincent Prouillet 28ecf553d5 Add counts in zola check 
Closes #726
 2019-07-12 23:38:46 +02:00
Vincent Prouillet f5c7b44027 Add warning for old style internal link + fix one 2019-07-12 22:56:07 +02:00
Vincent Prouillet d2a62153d7 Do not load draft pages 
Part fix of #742
 2019-07-12 22:54:18 +02:00
traviscross 46ee256ba4 Fix clippy warnings (#744) 
Clippy is returning some warnings.  Let's fix or explicitly ignore
them.  In particular:

- In `components/imageproc/src/lib.rs`, we implement `Hash` explicitly
  but derive `PartialEq`.  We need to maintain the property that two
  keys being equal implies the hashes of those two keys are equal.
  Our `Hash` implementations preserve this, so we'll explicitly ignore
  the warnings.

- In `components/site/src/lib.rs`, we were calling `.into()` on some
  values that are already of the correct type.

- In `components/site/src/lib.rs`, we were using `.map(|x| *x)` in
  iterator chains to remove a level of indirection; we can instead say
  `.copied()` (introduced in Rust v1.36) or `.cloned()`.  Using
  `.copied` here is better from a type-checking point of view, but
  we'll use `.cloned` for now as Rust v1.36 was only recently
  released.

- In `components/templates/src/filters.rs` and
  `components/utils/src/site.rs`, we were taking `HashMap`s as
  function arguments but not generically accepting alternate `Hasher`
  implementations.

- In `src/cmd/check.rs`, we use `env::current_dir()` as a default
  value, but our use of `unwrap_or` meant that we would always
  retrieve the current directory even when not needed.

- In `components/errors/src/lib.rs`, we can use `if let` rather than
  `match`.

- In `components/library/src/content/page.rs`, we can collapse a
  nested conditional into `else if let ...`.

- In `components/library/src/sorting.rs`, a function takes `&&Page`
  arguments.  Clippy warns about this for efficiency reasons, but
  we're doing it here to match a particular sorting API, so we'll
  explicitly ignore the warning.
 2019-07-12 22:54:18 +02:00
Jakub Turski 8a737d71fb Add an option to hard link files from static/ instead of copying. (#723) 
* Add hard_link_static config option.

* Copy or hardlink file depending on an argument.

Modify the call sites for `copy_file` to account for the extra argument.

* Plug the config setting through to copy_file.

Don't apply the config option to theme's static directory.

* Update documentation.

* Backticks make no sense in this comment.

* Addressing PR comments.

* Be consistent with argument naming.
 2019-07-12 22:54:18 +02:00
Jakub Wieczorek b716401217 Fix warnings caused by unnecessary mut qualifiers (#735) 2019-07-12 22:54:18 +02:00
Vincent Prouillet 627222afad Update sitemaps namespace 
Closes #722
 2019-07-12 22:54:18 +02:00
Igor Gnatenko d43812dee6 chore: Update toml to 0.5 everywhere 
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
 2019-07-12 22:54:18 +02:00
Vincent Prouillet df720a5baf Update deps 2019-06-21 09:24:14 +02:00
Vincent Prouillet fec33c8e8b
Merge pull request #706 from elbaro/next 
Round up reading time
 2019-06-20 10:00:22 +02:00
Vincent Prouillet dc4904dd5f Update escaping with latest version of Tera 2019-06-16 12:17:13 +02:00
elbaro 237671a0b2 Round up reading time 2019-06-16 15:38:49 +09:00
Vincent Prouillet 35138468ac Urlencode urls in xml templates 2019-06-15 11:49:47 +02:00
Vincent Prouillet 0aee33f9c5 Add very copy/pasty impl of anchor checking 2019-06-06 19:49:40 +02:00
Vincent Prouillet 83cf19877a
Merge pull request #703 from cbiffle/master 
Add XML declarations to XML templates.
 2019-06-05 19:21:28 +02:00
Cliff L. Biffle eba9726d07 Add XML declaration to XML templates. 
Without this, at least one search engine spider was generating a
validation warning.
 2019-06-05 08:03:22 -07:00
Vincent Prouillet 76dc62ac49 Copy static folders after processing images when building 2019-06-03 11:29:44 +02:00
Vincent Prouillet cb962f7a64 Add aliases to sections 2019-06-02 20:21:06 +02:00
Igor Gnatenko 1a05401ecd chore: Update glob to 0.3 (#700) 
* chore: Update glob to 0.3

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

* chore: Update ws to 0.8

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
 2019-05-31 22:46:48 +02:00
Vincent Prouillet debb1529ce Merge branch 'next' of github.com:getzola/zola into next 2019-05-30 20:08:51 +02:00
Stuart Small 12d2576fba Fix for #632 - add ability to get asset image dimensions (#670) 2019-05-30 20:06:24 +02:00
Vincent Prouillet fae644cffe Update pulldown_cmark 
Close #693
 2019-05-29 20:33:36 +02:00
Marcus Klaas de Vries bada9ab93f Touch up dead link error message (#698) 2019-05-27 16:24:42 +02:00
Vincent Prouillet ec61a57841 Use @/ for internal links rather than ./ 
Close #686
 2019-05-27 14:35:18 +02:00
Marcus Klaas de Vries 0d964204c3 Check command global (#683) 
* Add check subcommand

* Add some brief documentation for the check subcommand

* Start working on parallel link checks

* Check all external links in Site

* Return *all* dead links in site
 2019-05-27 14:05:07 +02:00
Chris Morgan 1a9ab968fe Allow manual specification of header IDs (#685) 
Justification for this feature is added in the docs.

Precedent for the precise syntax: Hugo.

Hugo puts this syntax behind a preference named headerIds, and automatic
header ID generation behind a preference named autoHeaderIds, with both
enabled by default. I have not implemented a switch to disable this.

My suggestion for a workaround for the improbable case of desiring a
literal “{#…}” at the end of a header is to replace `}` with `&#125;`.

The algorithm I have used is not identical to [that
which Hugo uses][0], because Hugo’s looks to work at the source level,
whereas here we work at the pulldown-cmark event level, which is
generally more sane, but potentially limiting for extremely esoteric
IDs.

Practical differences in implementation from Hugo (based purely on
reading [blackfriday’s implementation][0], not actually trying it):

- I believe Hugo would treat `# Foo {#*bar*}` as a heading with text
  “Foo” and ID `*bar*`, since it is working at the source level; whereas
  this code turns it into a heading with HTML `Foo {#<em>bar</em>}`, as
  it works at the pulldown-cmark event level and doesn’t go out of its
  way to make that work (I’m not familiar with pulldown-cmark, but I get
  the impression that you could make it work Hugo’s way on this point).
  The difference should be negligible: only *very* esoteric hashes would
  include magic Markdown characters.

- Hugo will automatically generate an ID for `{#}`, whereas what I’ve
  coded here will yield a blank ID instead (which feels more correct to
  me—`None` versus `Some("")`, and all that).

In practice the results should be identical.

Fixes #433.

[0]: a477dd1646/block.go (L218-L234)
 2019-05-20 13:08:49 -07:00
Vincent Prouillet b70f9f95e3 Process images at the end of the build process 
To also process the ones found in templates

Closes #669
 2019-05-20 11:29:54 +02:00
Vincent Prouillet 55a166ac9e Fix dodgy test 2019-05-17 07:53:07 -07:00
Vincent Prouillet 52f6072ea6 Use file path rather than page path for assets 
Closes #674
 2019-05-15 21:40:59 -07:00
Vincent Prouillet debe0633bc Revert "Allow default base-path command line option to be set for building and serving" 
This reverts commit 1815155c1d.
 2019-04-20 12:50:34 +02:00
Vincent Prouillet 603906de85 Add a test for local time in TOML 2019-04-18 18:55:09 +02:00
Vincent Prouillet 5604738048
Merge pull request #660 from bdjnk/strip_shortcode_outer_newlines 
strip wrapping whitespace from newline outward from shortcodes
 2019-04-17 19:29:07 +02:00
Konrad Gądek d9122b105e Sort sitemap elements by permalink 
This feature was originally reported in #257 and got fixed in
3a2dab5974, however it seems this
got lost during development.

Closes #661
Ref #257
 2019-04-13 19:06:39 +02:00
Michael Plotke 2804b40875 strip wrapping whitespace from newline outward from shortcodes 2019-04-10 13:31:33 -04:00
sebastien c2f682ede6 specify proper sitemap schema 2019-04-02 18:31:50 +02:00
Blake Smith 1815155c1d Allow default base-path command line option to be set for building and serving 2019-03-23 20:25:56 -05:00
Vincent Prouillet 97e796a724 More tests for load_data 2019-03-22 20:44:06 +01:00
Vincent Prouillet e00cd3e1b0 Always default to plain for load_data on unknown extensions 2019-03-22 20:34:02 +01:00
Vincent Prouillet 283a15cd93 Fix some deprecation notice of pest 2019-03-19 21:35:49 +01:00
Vincent Prouillet 2a8d0de532 Pass extra for page in sitemap entries 2019-03-19 20:42:16 +01:00
Vincent Prouillet c63b7fde44 load_data now defaults to plain type + fix bug with get_taxonomy fn 2019-03-16 10:01:11 +01:00
Vincent Prouillet 3eaf13d49b Update pulldown_cmark 2019-03-15 21:29:51 +01:00
Vincent Prouillet 8a802b1828 Make sitemap entries in a set 
Close #633
 2019-03-14 21:53:29 +01:00
Vincent Prouillet 9beaa26023 Add link to sitemap to robots.txt 2019-03-14 21:30:53 +01:00
Vincent Prouillet 7baf08cef2 Update docs for sitemap 2019-03-14 21:15:01 +01:00
Sébastien Mariaux 2a0d0b9b77 Split sitemap (#619) 
Split sitemap when it is getting too big
 2019-03-14 20:57:22 +01:00
Vincent Prouillet 3b8a95eb8f Generate assets before rendering templates 2019-03-11 20:25:28 +01:00
Vincent Prouillet 135dc5d5bc Change default directory for load_data 2019-03-11 20:21:13 +01:00
Vincent Prouillet eccb1e9986 Strip base_path from page/section paths 
To ensure we will get the right `content`
directory.
Fix #629
 2019-03-08 23:30:43 +01:00
Vincent Prouillet 974492bb7b Ensure we don't delete root index without 
adding back default in rebuild

Fix #620
 2019-02-22 21:48:31 +01:00
Vincent Prouillet 11c58458e8 Revert useless change in shortcodes 2019-02-22 21:02:42 +01:00
Vincent Prouillet 84f10f6b69 Use platform separator for shortcodes paths 2019-02-16 16:32:11 +01:00
Vincent Prouillet 25b943ec35 Print list of template names to debug Windows error 2019-02-16 15:40:59 +01:00
Vincent Prouillet 42089a18ba
Merge pull request #609 from mziter/next 
Handle csv parsing error when encountering rows with different lengths
 2019-02-16 08:59:56 +01:00
Vincent Prouillet 705a30aa8d Move toc to be a rendering page/section variable level 2019-02-09 20:49:18 +01:00
Vincent Prouillet 9bc675f2a7 Fix colocated dates + rustfmt 
Closes #607
 2019-02-09 19:54:47 +01:00
Vincent Prouillet a42e6dfec4 Fix benches 2019-02-08 19:06:01 +01:00
Matthew Ziter 844be88472 Handle csv parsing error to fix issue getzola/zola#588 2019-02-04 15:58:58 -05:00
Vincent Prouillet 97d11995c5 Skip render=false sections in sitemap 
Fix #604
 2019-01-31 19:55:36 +01:00
Vincent Prouillet 776bf41123 Show actual Tera source error 2019-01-30 20:42:53 +01:00
Vincent Prouillet 260c413de4 Fix double trailing slash for section permalinks 
Only happens for sections with lang != default
 2019-01-30 20:01:26 +01:00
Vincent Prouillet 5082e0f15a Render all relevant parent sections on rebuild 2019-01-30 09:15:46 +01:00
Vincent Prouillet 1c7729cac6 Default lang to config.default_language 2019-01-29 19:20:11 +01:00
Peng Guanwen 0b897ce7c7 Replace trim_{left, right} with trim_{start, end} 
trim_{start, end} is introduced in rust 1.30.0 and
trim_{left, right} is deprecated since 1.33.0.
 2019-01-29 16:30:54 +08:00
Vincent Prouillet 9398ab789c Clone-less toc making 2019-01-28 00:34:18 +01:00
Vincent Prouillet 21d67235ae Arc-ify Library 2019-01-27 18:57:07 +01:00
Vincent Prouillet d1154d236f Comment out failing test while its getting fixed in Tera 2019-01-26 11:46:54 +01:00
Vincent Prouillet 7c260eb5b2 Fix multilingual tests 2019-01-25 16:18:48 +01:00
Vincent Prouillet 1e2dd9ce03 Update tera to v1 alpha 2019-01-23 19:20:43 +01:00
Vincent Prouillet 464e384760
Merge pull request #581 from peng1999/event-refined 
Footnote is now supported in headers
 2019-01-22 17:24:33 +01:00
Vincent Prouillet e119b68533 Remove earlier/later/lighter/heavier from pages when rendering sections 2019-01-21 17:55:05 +01:00
Nicolas Pochet b65979fac7
Render the theme template files if present 
* Change the behavior of the template rendering:
    * Check if the template bare name is present
    * Check if the template is part of a theme
    * Fallback to defaults
* Change the behavior of the shortcode rendering:
    * Call the template rendering function
* Prepend `__zola_builtins/` to most of the default elements in `ZOLA_TERA`
* Add a test to verify the presence and content of a `404.html` page
from a theme's template
 2019-01-19 18:06:51 +01:00
Peng Guanwen 5ab3466e2b Doc improvements 2019-01-18 22:50:35 +08:00
Vincent Prouillet 1b4cfd49d0 More early tera fns and mention limitation of shortcodes in docs 2019-01-17 18:29:18 +01:00
Vincent Prouillet 83472a53d7 Register load_data early 
Closes #582
 2019-01-17 18:18:03 +01:00
Vincent Prouillet 5caf24f06c Remove error-chain 
Closes #576
 2019-01-17 14:31:47 +01:00
Vincent Prouillet 69fb399726 Add failing shortcode body split test 2019-01-17 14:31:47 +01:00
Peng Guanwen 1dbd8874c0 derive Debug for HeaderIndex 2019-01-16 17:09:23 +08:00
Peng Guanwen 80786a2fbb Revert accidentally change 2019-01-12 17:25:01 +08:00
Peng Guanwen c027cd97d6 Footnote is now supported in headers 
This fixes #569 .

`markdown_to_html` is heavily refactored, header-related things is
handled in a second pass.
 2019-01-12 16:55:52 +08:00
Vincent Prouillet 538866487b Add multilingual taxonomies 2019-01-07 21:03:34 +01:00
toidiu 09f691fa47 add id to continue reading p tag (#577) 
* add id to continue reading p tag
 2019-01-07 19:20:19 +01:00
Peng Guanwen 7130616f63 Minor fixes 2019-01-06 19:04:53 +08:00
Peng Guanwen 972aab1ac4 Add emphasis, strong and code support in header 2019-01-05 23:50:30 +08:00
Peng Guanwen 774514f4d4 refactor markdown_to_html 
this commit contains two refactors:
- extract custom link transformations into a function.
- separate some trivial markup generation.
 2019-01-05 23:50:30 +08:00
Vincent Prouillet 2e126b3a08 Fix race condition with language folder creation 2019-01-04 21:57:27 +01:00
Vincent Prouillet f45293ab25 cargo fmt 2019-01-04 20:34:28 +01:00
Vincent Prouillet 19075191ff Add translations to page/sections 2019-01-04 20:31:31 +01:00
Vincent Prouillet 3d22b4f1f9 Generate per language RSS feed 2019-01-02 22:11:34 +01:00
Vincent Prouillet 832360f9b1 Update deps + rustfmt 2019-01-02 20:41:29 +01:00
Vincent Prouillet fdb6a2864c
Merge pull request #566 from vojtechkral/imgproc 
Implement suggestions in #546
 2018-12-30 12:44:48 +01:00
Vincent Prouillet a12e9512bc fmt/clippy 2018-12-29 11:17:43 +01:00
Vincent Prouillet 34708d6592 Handle editing language index colocated 2018-12-28 18:18:12 +01:00
Vincent Prouillet 7313b41f4d Start adding some tests for building multilingual sites 2018-12-28 17:30:47 +01:00
Vincent Prouillet 779511ae43 Pass down lang and start docs 2018-12-28 13:24:49 +01:00
Vincent Prouillet 1d06324a65 Load multi-languages pages/sections 2018-12-28 12:15:17 +01:00
Vincent Prouillet b0f6963e4c Use lang code in permalinks 2018-12-28 10:42:26 +01:00
Vojtech Kral 9bd6a559c1 imageproc: Use Lanczos3 filter instead of Gaussian 2018-12-28 01:41:22 +01:00
Vojtech Kral 6e84eec32b imageproc: Add the format option, support for PNG thumbnails 
Fix #546
 2018-12-28 01:41:22 +01:00
Vincent Prouillet e50d3daad1 Get language from filename 2018-12-27 13:26:53 +01:00
Vincent Prouillet f0cafcd1d6 Add languages to config 2018-12-27 10:53:17 +01:00
Vincent Prouillet c0bbe16eac cargo fmt + update 2018-12-10 18:21:08 +01:00
Anton Lazarev 885c7ded80
inject livereloader for 404 template 2018-12-07 20:47:01 -05:00
Anton Lazarev 7cff1d335c
add rendering for 404.html when running zola serve 2018-12-06 20:07:34 -05:00
Vincent Prouillet 814cec99e2 Allow RFC3339 datetimes in filenames 
Closes #537
 2018-11-30 22:21:00 +01:00
Vincent Prouillet 0cf8e8ca1c Fix pagers not being in sitemap 
Closes #521
 2018-11-29 21:48:04 +01:00
Vincent Prouillet b3004c69ef Fix broken taxonomies pagination 
Closes #533
 2018-11-29 20:24:46 +01:00
Vincent Prouillet 4fa9d89ea8
Merge pull request #532 from sinkuu/redundant_clone 
Remove redundant clone
 2018-11-20 11:46:06 +01:00
Vincent Prouillet 9a99b40216 Add test for rebuild after deletion 2018-11-19 17:25:24 +01:00
Vincent Prouillet a465d6a61e Fix deleting while zola serve 2018-11-19 17:19:05 +01:00
Shotaro Yamada 692103bff4 Remove redundant clone 2018-11-19 23:08:34 +09:00
Vincent Prouillet aee41f279c Fix reload with taxonomies 2018-11-16 23:51:11 +01:00
Vincent Prouillet e2c3bb2ce2 Fix shortcodes <-> markdown indentation 2018-11-16 18:19:38 +01:00
Vincent Prouillet 41a693a528 Ignore rename of non md files 2018-11-16 16:59:06 +01:00
Vincent Prouillet 7af314c61e Update deps + fmt 2018-11-14 17:34:21 +01:00
Vincent Prouillet 20a05da475 Fix bug with pages starting with dates 2018-11-13 00:08:46 +01:00
Vincent Prouillet afc30543cc Handle file/dir renaming 
Closes #385
 2018-11-10 22:23:39 +01:00
Vincent Prouillet 59f3e54e4e Add test for nested page_template 2018-11-07 20:48:39 +01:00
Vincent Prouillet 2d324b3cee Do not clone tpl name for pages 2018-11-07 20:38:07 +01:00
Vincent Prouillet 9c2eeaf1f7 Fewer string cloning for tpl names 2018-11-07 20:38:07 +01:00
Vincent Prouillet 56af4ca7f9 Add page_template to sections 
To override all child pages

Closes #397
Tests from PR #434
 2018-11-07 19:42:23 +01:00
Vincent Prouillet a3b0f1e103 Add transparent sections 
Closes #413
Closes #408
 2018-11-06 00:46:13 +01:00
Vincent Prouillet 3c8505ffb4 Fix 1.28 build for real 2018-11-05 22:22:15 +01:00
Vincent Prouillet 988811a4bd Fix build for 1.28 2018-11-02 08:30:57 +01:00
Vincent Prouillet cb3c42078a Fix load_toml date handling and fix bug in date conversion 2018-11-01 10:36:19 +01:00
Vincent Prouillet b7ce4e59fb rustfmt 2018-10-31 08:18:57 +01:00
Vincent Prouillet 8586bc1838 Some clippy fixes 2018-10-30 15:47:49 +01:00
Vincent Prouillet d524482ac1 Cargo update & some doc tweak 2018-10-30 15:07:23 +01:00
Jake Howard aad12d829f Remote data (#494) 2018-10-29 20:13:09 +01:00
Vincent Prouillet a0da580f87 Do not error on files starting with utf-8 BOM 
Close #501
 2018-10-29 12:43:53 +01:00
Vincent Prouillet db4def63dc Set date from filename 
Fix #396
 2018-10-25 16:22:02 +02:00
Vincent Prouillet 0f6c0736cb Serialize page/section assets only once 2018-10-24 11:49:09 +02:00
Vincent Prouillet 4e3d231ca9 Small refactor for serialized page/sections 2018-10-24 11:40:57 +02:00
Vincent Prouillet dc94aa219b Do not paginate drafts 
Fix #495
 2018-10-23 13:37:24 +02:00
Vincent Prouillet 19b4341957 Fix test 2018-10-22 22:34:38 +02:00
Magnus Hovland Hoff 05b8bb4ac6 Ensure root output directory exists explicitly. 
Aliases that have no directory nesting sneakily avoid the code path that ensures the directories exist
 2018-10-22 22:17:51 +02:00
Vincent Prouillet 4c9fd0d302 Do not panic if something is already bound to 1111 in serve 2018-10-19 16:33:11 +02:00
Vincent Prouillet e2b0ad47c6
Merge pull request #489 from jwatt/next 
Remove unmatchable rules from render_shortcodes
 2018-10-19 14:11:41 +02:00
Vincent Prouillet 465778c196 Always populate sections on section change 2018-10-19 08:59:45 +02:00
Jonathan Watt f1b6f3082e Remove unmatchable rules from render_shortcodes 2018-10-19 01:00:11 +01:00
Vincent Prouillet 1811c18b4a No need for clone 2018-10-18 23:20:29 +02:00
Vincent Prouillet 0101e5cb12 Update docs to refer to zola 2018-10-18 23:11:36 +02:00
Vincent Prouillet f84ae7c93b Rename all occurrences of gutenberg to zola in code 2018-10-18 22:50:06 +02:00
Vincent Prouillet dffd39aa8f Do not have trailing slash for rss.xml 
Closes #486
 2018-10-18 18:09:32 +02:00
Vincent Prouillet 83b04a561c Expose relative path of pages & sections 
Closes #485
 2018-10-18 18:00:40 +02:00
Luke Frisken 1baa7750f3 CSV and TOML loading global functions (#379) 
Local CSV/TOML/JSON loading Tera function
 2018-10-18 17:32:30 +02:00
Vincent Prouillet ad6e443ffa
Merge pull request #484 from Keats/subsections 
section.subsections is now an array of paths
 2018-10-18 17:17:57 +02:00
Vincent Prouillet 86c418372f Add metadata_only to get_section 2018-10-18 16:49:33 +02:00