ce9fcfaebb
Merge pull request #3553 from stevecrozz/jekyll-hooks
...
Merge pull request 3553
2015-05-09 23:58:46 -07:00
f99abc5314
Cache Document#to_liquid
2015-05-10 03:51:50 +00:00
4b038259c7
Release 💎 v3.0.0.pre.beta3
2015-05-06 23:19:23 -07:00
79a178f7f1
move document.post_render hook to after render call
2015-05-03 13:53:28 -07:00
736e6a78f1
address code review feedback from #3553
...
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
2015-05-02 15:56:19 -07:00
245d9677d7
Refine hook implementation
...
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
:high)
- implement hooks for collections as they are in octopress-hooks, aside
from post_init
2015-05-01 19:00:37 -07:00
6ca9633354
prototype of jekyll hooks, encapsulated
2015-05-01 14:35:15 -07:00
8546298047
fix collections output, see #2346
2015-04-29 10:49:06 -07:00
9ab3c201c8
Remove relative permalinks
2015-04-28 14:03:20 -07:00
269662d0f0
DRY config value fetching
...
Adds #get_config_value_with_override, refactoring the three fetch
methods to use it.
2015-04-18 16:59:36 -07:00
9c03fc3f27
Set logging to debug when verbose flag is set
...
Adds Jekyll::LogAdapter#adjust_verbosity which ensures that --quiet
always wins.
2015-04-18 16:57:57 -07:00
f908051aa4
mime.types: remove extraneous hyphen before comment
2015-04-14 17:15:08 -07:00
ab83f0bf2e
Merge pull request #3649 from schneems/schneems/utf8-myhomework
...
Merge pull request 3649
2015-04-14 16:51:21 -07:00
701617cb0e
Fix header for RSS feeds with UTF8 characters.
...
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```
Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
2015-04-14 18:21:25 -04:00
0072865512
Merge pull request #3629 from justinweiss/lsi_search_on_posts
...
Merge pull request 3629
2015-04-14 13:13:24 -07:00
ff3edbc16b
static files mtime liquid should return a Time obj
2015-04-14 11:52:25 -07:00
5a60adb6bd
Maruku deprecation error message
2015-04-14 10:58:47 -07:00
ae039663b9
Remove Maruku and references to it
2015-04-14 10:58:47 -07:00
c76c4e478b
Convertible#read_yaml should return self.data.
...
Broken in 4b108df3ab
2015-04-11 15:42:58 -04:00
4b108df3ab
convertible: abort with an error if Page/Post#data isn't a hash.
...
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.
Fixes #3643 .
2015-04-10 17:07:14 -04:00
bf98004843
Merge pull request #3608 from nickburlett/patch/incremental-build
...
Merge pull request 3608
2015-04-10 16:51:56 -04:00
eeb13872e3
Merge branch 'delftswa2014-remove-unused-method'
...
* delftswa2014-remove-unused-method:
static_file: extract extname in initializer and save as variable. #3632
removed unused method StaticFile::extname
2015-04-10 16:31:26 -04:00
f14af82da5
static_file: extract extname in initializer and save as variable. #3632
2015-04-10 16:31:19 -04:00
76416e50e8
Add WOFF2 font format
2015-04-10 00:13:02 +02:00
f0cac685de
removed unused method StaticFile::extname
2015-04-01 12:57:49 +02:00
fa435fae94
Use `Jekyll::Post`s for both LSI indexing and lookup.
...
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:
1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.
2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.
This is a more accurate fix for #3484 .
2015-03-29 23:43:55 -07:00
f75346c799
Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing
...
Incremental build if destination file missing
2015-03-28 19:26:01 -05:00
1f8157022a
Clean up destination modified check
...
Clean up the destination modified check in `source_modified_or_dest_missing?` to be easier to read. Note that it can now return `nil` instead of `false` for an unmodified `source_path` and a `nil` `dest_path`, but in a discussion on 706007ead9
2015-03-25 08:51:58 -07:00
d98047ef74
Removed the word 'Jekyll' a few times from the comments
2015-03-25 08:49:05 +01:00
8f4194eea5
Clean up regeneration missing-destination checks
...
Use easier-to-follow checks for missing-destinations in the regenerator.
2015-03-24 21:21:37 -07:00
e7d0b6c5a5
Merge pull request #3545 from delftswa2014/site_extract_readers
...
Merge pull request 3545
2015-03-23 19:53:07 -07:00
d4b8f0d9dd
Process metadata for all dependencies
...
When adding a dependency, also add the dependency to the metadata hash.
Addresses part 1 of #3591 . Prior to this fix, the regnerator only paid attention the mtime of the first dependency it checked, so for posts/pages with N multiple dependencies (i.e., every layout file used to render them), it continues to regenerate the post/page approximately N times, at which point it's seen all of the dependencies.
2015-03-22 13:33:12 -07:00
e91527058a
Merge pull request #3592 from nickburlett/patch/incremental-build
...
Merge pull request 3592
2015-03-21 19:29:45 -07:00
706007ead9
Incrementally regenerate missing destination file
...
Addresses the third point of #3591 , in which the incremental regenerator doesn't notice that destination files have gone missing.
2015-03-21 19:25:02 -07:00
63a1ec8949
Made corrections as suggested by @mattr-.
...
- Corrected TomDoc, added variables and fixed typos.
- deprecated_rel_permalink -> relative_permalinks_are_deprecated.
- Grouped calls together in @reader.read.
- Removed dynamic and static reader subdirectories.
- Removed unnecessary move of limit_posts.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-20 12:41:19 +01:00
324748a5a6
Added corrections as suggested by @parkr.
...
- Replaced occurrences of #array += with concat
operations.(performance)
- Corrected alignment.
- Removed rebase artifact.
Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
2015-03-19 14:56:46 +01:00
15ebf929e1
Use the new clear_cache method
...
Instead of assigning `@cache = {}`, clear the cache using `clear_cache`
2015-03-18 22:30:31 -07:00
adce349d7a
Clear the regenerator cache every time we process
...
To address part of #3591 , clear the regenerator's cache every time the
site is processed. This ensures that the regenerator doesn't incorrectly
believe a file hasn't changed based on stale information.
2015-03-18 10:27:40 -07:00
e268ee0f33
Whoops, forgot the pre in the beta tag.
2015-03-18 05:25:36 -05:00
eb2fc89776
Correct the semantics of checking for jekyll-paginate
2015-03-16 15:48:50 -07:00
bb57c80478
Perform jekyll-paginate deprecation warning correctly.
...
Fixes #3393
2015-03-16 14:54:31 -07:00
b178358cf9
Merge branch 'master' into site_extract_readers
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:28:45 +01:00
00cdcbc184
Separated some more readers from the main reader.rb file.
...
- Draft Reader
- Collection Reader
- Page Reader
- Post Reader
- Static File Reader
Fixed references and ran tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:20:25 +01:00
bebd80342e
Extracted draft, post reader into external classes.
...
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 12:39:50 +01:00
6d9258bcdc
Release 💎 v3.0.0.beta2
2015-03-05 13:40:10 -08:00
02e98f238e
Merge pull request #3520 from delftswa2014/sort-null
2015-03-05 14:35:40 -06:00
4b8e3cfdbd
Moved the in_(source/dest)_dir back to site.rb.
...
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-05 13:34:46 +01:00
7806f9ed52
Replace `File.exists?` with `File.exist?`
...
`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method .
2015-03-05 18:21:52 +09:00
489da6784a
Remove duplicated range from regex
...
`/\w/` is equivalent to `[a-zA-Z0-9_]`. See
http://ruby-doc.org/core-2.2.0/doc/regexp_rdoc.html#label-Character+Classes .
2015-03-05 18:19:32 +09:00
e229e3285f
Merge pull request #3537 from kleinfreund/patch-2
...
Removing unused code from post layout
2015-03-04 18:32:57 -08:00
f6f2626828
Merge pull request #3538 from willnorris/permalink
...
Improved permalinks for pages and collections
2015-03-04 15:18:43 -08:00
ced9146c11
Merge pull request #3544 from delftswa2014/micro_refactor_url
...
Refactored url.rb to be compliant with Ruby Style Guide.
2015-03-04 15:13:35 -08:00
ca7375a51b
Corrected quote-usage. Replaced [-1].eql with end_with.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:31:19 +01:00
9e1cb96a7e
Added site reference for encoding configuration.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:23:47 +01:00
7114380da7
Added and improved documentation, fixed long method name.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:37:25 +01:00
1b796354fb
Added documentation, made method private and fixed quotes.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:10:26 +01:00
f252a82afc
Made the Reader responsible for the actual Reading.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:00:45 +01:00
2f88a0c0a1
Extracted `read_collections` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:55:53 +01:00
2857350df1
Extracted `read_directories` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:51:26 +01:00
9bcad08e3a
Extracted `limit_posts` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:35:02 +01:00
a4adeb446b
Extracted `read_posts` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:22:37 +01:00
504c9a34ad
Extracted `read_drafts` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:19:39 +01:00
29169aa858
Extracted `aggregate_post_info` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:16:31 +01:00
67a2369854
Extracted `read_content` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:11:27 +01:00
537235c38b
Extracted `read_data` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:07:53 +01:00
5b0e2a294d
Extracted `read_data_to` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:05:10 +01:00
e586105b46
Extracted `sanitize_filename` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:01:27 +01:00
ddfecb0f53
Extracted `read_data_file` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:55:54 +01:00
6e06fd8734
Extracted `get_entries` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:51:44 +01:00
05bbcddb29
Extracted `filter_entries` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:46:10 +01:00
c836ec613d
Extracted `in_dest_dir` from site.rb into reader.rb
...
- Extracted in_dest_dir from site.rb.
- Updated References.
- Ran Tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:21:24 +01:00
bb9d43dff5
Extracted `in_source_dir` from site.rb and into reader.rb.
...
Extracted `in_source_dir` from site.rb into reader.rb.
Updated all the references and tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:16:03 +01:00
0d1586a5c4
Improved permalinks for pages and collections
...
This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting. If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well. Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections. If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.
This impacts only the default permalink structure for pages and
collections. Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.
Fixes #2691
2015-03-04 09:38:23 -08:00
2ef9bae75a
Refactored url.rb to compliant with Ruby Style Guide.
...
- Single Quotes
- Fixed Typo's in variable names.
- Removed Redundant Escaping in Regular Expressions.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 14:16:55 +01:00
d40b6d6ee0
Merge pull request #3418 from tarebyte/destination-and-source
...
Added build --destination and --source flags
2015-03-04 05:21:36 -06:00
d56df7592c
Removing unused code from post layout
...
The post from the site template does not have `meta` in its front matter.
Related to #3536 .
2015-03-03 09:52:23 +01:00
669c803912
always include file extension on destination files
...
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure. This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.
Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension. In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
2015-03-02 21:20:54 -08:00
7a31029c79
Removed deprecation inconsistency
...
Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.
Signed-off-by: Joop Aué <joopaue@gmail.com>
2015-03-02 21:54:05 +01:00
92a9582733
Corrected error message as suggested by @parkr.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 11:16:08 +01:00
78af3c5018
Improved clarity of sort nil input error message.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:51:59 +01:00
0565308ce6
Added test to check on nil input for sort filter.
...
- Added a test to check if the sort filter will raise the correct
exception on given nil input.
- Improved error message and used "nil" consistently.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:40:32 +01:00
531d0fb261
Sort will now raise error on nil object array input.
...
Sort will now throw an error when a nil object array is given as input.
See issue #3491 for more information.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-26 22:12:06 +01:00
3f3b203992
Use end_with? instead of regexp for adding index.html
2015-02-25 11:59:27 -08:00
b75db477e0
Merge pull request #3485 from watkyn/extra_slash_in_example_base_url
...
Removed the trailing slash from the example "/blog/" basurl comment.
2015-02-24 23:01:03 -08:00
5c388309b2
Spacing. [ci skip]
2015-02-23 01:25:58 -08:00
0903515c39
Merge pull request #3502 from delftswa2014/update-doc-link
...
Changed doc link in template
2015-02-23 01:25:05 -08:00
7a93ca6f6c
Merge pull request #3496 from yous/site-template-gitignore
...
Ignore .jekyll-metadata in site template
2015-02-22 21:21:08 -08:00
6bc3dee98d
Changed doc link in template
...
Changed the doc link in the template to link to /docs/home instead of /
Signed-off-by: Joop Aué <joopaue@gmail.com>
2015-02-22 18:42:12 +01:00
7db9397a9d
Remove trailing whitespace
2015-02-22 20:27:15 +09:00
ae244c4425
Ignore .jekyll-metadata
2015-02-22 18:31:46 +09:00
52c4ce2a5a
Finish of moving the unit tests over to Minitest
2015-02-21 00:31:07 -08:00
47ee5db5fc
Removed the trailing slash from the example "/blog/" basurl comment. Following the example would add two slashes into the url, i.e. http://yourdomain.com/blog//
2015-02-20 07:06:12 -06:00
6e89c1c02b
write .jekyll-metadata even on full_rebuild
...
For a full rebuild, we certainly don't want to *read* from
.jeykll-metadata, but we should still write it. Otherwise, a subsequent
incremental build would have to do a full rebuild again since there is
no metadata file to start from.
2015-02-14 22:43:43 -08:00
58dc1f77e9
add draft? method to identify if Post is a draft
2015-02-14 00:01:27 -08:00
c6d5a913f1
Site#read_data_file: read CSV's with proper file encoding
...
Fixes #3451 .
2015-02-13 19:39:15 -08:00
491cce7a99
Avoid requiring webrick at boot time
...
This is a bit uglier but allows deferring loading webrick until the
serve command is invoked as opposed to when it's required.
2015-02-12 22:16:12 -05:00
e99a9e5821
Custom WEBrick FileHandler for stripping .html extension
...
This first performs the normal static file check at the exact
location. If no file is found, attempt the check again with an
".html" suffix.
See the following for base class search_file implementation:
https://github.com/ruby/ruby/blob/4607f95/lib/webrick/httpservlet/filehandler.rb#L363-L383
2015-02-12 21:58:35 -05:00
a907addbe2
Optimize text rendering for legibility
2015-02-11 15:45:47 -08:00
a64b7e7a62
Merge pull request #3440 from tkrotoff/class-text
2015-02-11 13:58:44 -08:00
f933164a2a
use SCREAMING_SNAKE_CASE and remove --destination from --source options
2015-02-10 15:02:49 -05:00
Parker Moore
Florian Weingarten
Stephen Crosby
Bernardo Dias
Alfred Xing
Jim Meyer
schneems
Nicolas Hoizey
Martijn den Hoedt
Justin Weiss
Jordon Bedwell
Nicholas Burlett
Martin Jorn Rogalla
Matt Rogers
ChaYoung You
Will Norris
Philipp Rudloff
Joop Aué
Tony Eichelberger
Ryan Tomayko
Mark Tareshawty