8927898e1f
Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change
...
Merge pull request 3871
2015-08-23 12:55:00 -07:00
44a43b757d
Merge branch 'fniephaus-_includes' into 'master'
...
* fniephaus-_includes:
Unify renaming of configuration options to a single method. /cc #3782 .
Make _includes directory configurable; closes #2684
2015-08-16 13:30:45 -04:00
399606c544
Unify renaming of configuration options to a single method. /cc #3782 .
2015-08-16 13:30:39 -04:00
559cd6c7e7
Future should be set to false in the default config
2015-08-16 13:11:08 -04:00
2812341c37
Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
...
Conflicts:
bin/jekyll
2015-08-09 16:22:33 +01:00
ac56e9dd16
Make _includes directory configurable; closes #2684
...
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
371ca58e69
Fixes #3776 by changing to the correct name for whitelisting.
2015-08-05 00:20:14 +02:00
14e6809bcd
Merge pull request #3838 from gynter/issue-3836
...
Merge pull request 3838
2015-07-28 11:29:01 -07:00
7c4f319442
#3870 trigger hooks by owner symbol
2015-07-27 16:23:07 -07:00
1eb626b1df
Fix keep_files not to match a file with repeated path.
2015-07-13 19:08:11 -05:00
3b60237cb1
Fix keep_files to be used as paths relative to the destination.
...
They were used as keywords to match files containing them in the paths.
2015-07-13 18:34:40 -05:00
8bdfdae0ab
Fix reading of binary metadata file
2015-07-09 13:40:36 -04:00
b9f8fc1715
Fixes #3836 . Fix site template header menu iteration variables
2015-07-06 21:02:56 +03:00
f4bbbd6952
Fixed an unclear code comment
2015-07-06 10:43:28 -07:00
5bf5c36ce0
Close #3833 by removing execute bit.
2015-07-04 04:59:06 -05:00
3a49770ce2
Merge pull request #3823 from 18F/adapt-static-file
...
Adapt StaticFile for collections, config defaults
2015-07-01 12:06:08 -05:00
6d196275fc
Add build options ( fixes #3744 )
2015-06-30 20:53:31 +02:00
250b6ebb7e
Adapt StaticFile for collections, config defaults
...
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.
It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
2015-06-29 19:58:27 -04:00
8c9e9497a2
Release 💎 3.0.0.pre.beta8
2015-06-29 14:33:38 -07:00
3c656ae2ed
Remove unnecessary 'ensure' in LiquidRenderer
2015-06-23 21:27:24 +00:00
5647b91689
Release 💎 3.0.0.pre.beta7
2015-06-18 20:52:40 -07:00
8b44a7bb42
Merge pull request #3762 from fw42/liquid_profiler
...
Merge pull request 3762
2015-06-16 10:21:33 -07:00
137efdc9f4
Fix : #3738 ; Move code wrapper from div to figure.
2015-06-10 15:20:44 -05:00
a58f23aeaf
Add support for underscores.
2015-06-10 15:05:17 -05:00
34438ed325
Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
...
Reason: #3770
2015-06-10 15:04:25 -05:00
7bc9e1aae6
Add byte counter
2015-06-07 16:49:22 +00:00
1e9163fdf4
Liquid profiler
2015-06-07 16:38:05 +00:00
e9215ec047
Merge pull request #3732 from jekyll/fix-frontmatter-defaults
...
Fix it so that 'blog.html' matches 'blog.html'
2015-06-06 06:30:43 -05:00
a134e05fda
Release 💎 3.0.0.pre.beta6
2015-06-04 16:57:13 -07:00
bba7870f8b
Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files
...
Merge pull request 3717
2015-05-31 11:10:42 -07:00
e68d18c3cc
Update link in welcome post to talk.jekyllrb.com
...
Previously the link pointed to the jekyll-help repository on github
which no longer accepts issues.
2015-05-28 21:19:24 +02:00
14ed5cc954
Fix it so that 'blog.html' matches 'blog.html'
2015-05-25 02:07:21 -05:00
a2ee820609
Regenerator: handle deleted/renamed/moved dependencies
...
Should fix #3716
2015-05-19 22:47:58 -07:00
376c87b62e
Don't crash when reading/writing Marshal
2015-05-19 15:51:55 +00:00
73db98c244
Release 💎 3.0.0.pre.beta5
2015-05-19 10:54:37 +07:00
498ea4fd24
Merge pull request #3706 from fw42/marshal_metadata
...
Performance: Marshal metadata
2015-05-18 09:17:42 -05:00
3474481043
Marshal metadata
2015-05-18 14:02:43 +00:00
5928618de1
Performance: Sort files only once
2015-05-18 13:56:56 +00:00
ae11cae659
Fix #3653 : Add a doctor helper to test pwd's.
2015-05-17 02:46:40 -05:00
15c4d9bee2
Jekyll::Cleaner#existing_files: Call keep_file_regex and keep_dirs only once, not per iteration
2015-05-11 22:01:10 +00:00
ba12d28fbe
Release 💎 v3.0.0.pre.beta4
2015-05-10 01:10:57 -07:00
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
0914948099
Remove class="text"
...
There is no class text defined in the CSS
2015-02-10 17:09:06 +01:00
c96abf7e82
added -s and -d
2015-02-10 11:08:22 -05:00
bf149a0b97
highlight: fix problem with linenos and rouge.
...
Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435
The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.
To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
2015-02-09 21:42:52 -08:00
c625b94bc0
Merge pull request #3401 from jekyll/fix-code-cleanup
2015-02-09 16:26:19 -08:00
571800c8ad
Use 3 places to the right of the decimal place instead of 2.
2015-02-07 23:57:07 -08:00
d795113e94
Update build.rb
...
parenthesis added to round
2015-02-07 23:57:07 -08:00
dbc8530068
Show only two decimals in time to generate pages
...
no need to display 10 decimals.
it feels up my screen with useless numbers! ;-p
2015-02-07 23:57:07 -08:00
6521b84aac
Change `overflow-x` value to `auto`
...
`overflow-x: scroll;` makes scrollbar visible always whether the content
does overflow or not.
2015-02-07 06:21:21 +09:00
120d3e07ca
added flags from docs
2015-02-06 13:27:23 -05:00
5e541b5eb0
fix quote
2015-02-05 16:48:59 +07:00
2745be736e
A lighter font declaration
...
Removes unnecessary Sass
Thanks @kleinfreund :)
2015-02-02 11:43:53 +00:00
d24ea66933
The highlight tip should only clip the newlines before and after the *entire* block, not in between.
...
Ref: https://github.com/jneen/rouge/issues/230
2015-02-01 22:37:10 -08:00
9ba9c47cd6
Fixes #3339 Add `pkill -f jekyll` to ways to kill.
...
This shows people how to kill Jekyll without knowing the PID using `pkill` (you could also do `kill -9 $(pgrep -f jekyll)` but that is just the long way around doing `pkill -f` so it shouldn't be shown in the Jekyll logger but can be documented here for people.
2015-02-01 06:45:52 -06:00
3318c38eec
Merge pull request #3391 from jekyll/enspeeden-include
2015-01-31 15:41:34 -08:00
a87cda4b12
Add configuration fallback for paginate, and fix tests.
2015-01-31 13:53:17 -08:00
65d43ef398
Move previous runtime dependencies to development dependencies.
2015-01-31 13:53:17 -08:00
057b8cae7f
Use `rouge` as the default syntax highlighter.
2015-01-31 13:52:50 -08:00
336bb44750
Use #require_with_graceful_fail in Highlight tag.
2015-01-31 13:52:26 -08:00
18e0d2fe75
Make the {% include %} tag a teensy bit faster.
2015-01-31 12:59:25 -08:00
aceb5b5d53
Merge branch 'jekyll-gjtorikian-patch-1'
...
* jekyll-gjtorikian-patch-1:
Use the source_dir() helper
Add test for new extracted method
Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
a2b19c1d2b
Merge pull request #3383 from jekyll/respect-the-title
2015-01-31 00:07:10 -08:00
0c624eb11b
The :title URL placeholder for collections should be the filename slug.
...
This mimicks posts most closely. It can be overridden by the
YAML front matter.
Undoes some of #2864 .
2015-01-30 01:53:11 -08:00
e2e6e7dc22
Merge pull request #3376 from tkrotoff/helvetica
2015-01-29 18:52:07 -08:00
fe08405ae1
Merge pull request #3378 from kaatt/initial-build-time
2015-01-29 16:10:05 -06:00
63bca94bde
Merge pull request #3375 from tkrotoff/fix-nav-items-gaps
2015-01-29 14:07:49 -08:00
e1e60499b1
Factor out a `read_data_file` call to keep things clean
2015-01-29 12:41:19 -08:00
ff646738fc
Shows time after initial generation
2015-01-30 01:32:00 +05:30
aa44c7f53d
Switch default font to Helvetica Neue
...
Helvetica Neue (1983) features multiple improvements over the original Helvetica font (1957), 'neue' means 'new' in German
2015-01-29 16:38:12 +01:00
368b862ebb
Refactoring: replace !important with cleaner CSS
2015-01-29 16:18:22 +01:00
3e609b1cd9
Merge pull request #3329 from tkrotoff/fix-nav-items-gaps
2015-01-24 11:56:52 -08:00
31b03e9b86
Merge pull request #3325 from imathis/generate-url
2015-01-24 11:21:51 -08:00
317e2f460e
Release 💎 v3.0.0.beta1
2015-01-24 09:55:46 -08:00
53a59544e8
Fix site-nav alignment
2015-01-21 01:44:31 +01:00
58e231ce40
Rename Regenerator#write to Regenerator#write_metadata
2015-01-19 16:29:50 -08:00
90eecc5da6
Fix nav items alignment when in "burger" mode
2015-01-19 20:55:32 +01:00
fe5f0d124c
Move all regenerate? checking to Regenerator
2015-01-18 11:05:06 -08:00
589919d58a
Strip slashes on nil url tokens
2015-01-18 08:31:14 -06:00
c378f741a8
Merge pull request #3319 from jekyll/split-off-textile
2015-01-17 17:08:15 -08:00
cbe5f8e4dd
Merge pull request #3321 from jekyll/performance-upgrades
2015-01-17 16:55:51 -08:00
c1da91cf5c
Start removing mentions of Textile.
2015-01-17 16:51:28 -08:00
877cba9811
Remove direct baked-in support for Textile.
2015-01-17 16:51:28 -08:00
d28fb07bb9
Fixed typo [ci skip]
2015-01-18 00:45:28 +00:00
aaf0ba15cc
Use frozen regular expressions for Utils#slugify
2015-01-17 16:25:33 -08:00
ef2d558874
Markdown#matches should avoid regexp
2015-01-17 16:25:10 -08:00
10659e1eef
Merge branch 'nitoyon-slugify-new-param'
...
* nitoyon-slugify-new-param:
Remove superfluous Sass declarations.
Move the slugify options out to their own section so as to fix the formatting.
Document the mode parameter of slugify Liquid filter
Add tests for mode parameters of slugify Liquid filter
Add mode parameter to slugify Liquid filter
Conflicts:
lib/jekyll/utils.rb
---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
b2099ac763
Merge branch 'davidized-collection_yaml_dots'
...
* davidized-collection_yaml_dots:
Move YAML Front Matter regexp into a constant.
Add support for collections documents to have YAML front matter ending in dots.
Conflicts:
test/test_collections.rb
2015-01-17 15:24:33 -08:00
c7d92c4e6d
Move YAML Front Matter regexp into a constant.
2015-01-17 15:23:33 -08:00
6d9b4c2aba
Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path
2015-01-17 15:16:50 -08:00
a312115a5a
Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest
2015-01-17 15:13:17 -08:00
84cfc1ceff
Merge branch 'majioa-devel'
...
* majioa-devel:
Ensure Post#excerpt_separator always returns a string.
get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
18f3d76603
Ensure Post#excerpt_separator always returns a string.
2015-01-17 14:59:44 -08:00
ba2e1390ad
Merge pull request #2571 from yous/patch-mixed-case-category
2015-01-17 14:55:30 -08:00
60da4ef010
Fix weird spacing
2015-01-15 22:04:00 +01:00
ce78ea7818
Merge pull request #3220 from inukshuk/patch-1
2015-01-13 19:02:41 -06:00
80465efff7
Require date in filters.rb
2015-01-13 13:51:47 -05:00
936c737a32
Address #3298
2015-01-13 02:21:28 -05:00
60921132c6
Preserve original mtime when copying static files
2015-01-12 13:00:35 +01:00
4cbd814546
Add support for Windows line feeds too.
2015-01-09 23:55:47 -08:00
a0f2b5f944
get procedure for default excerpt separator for both cases site and page was
...
moved to the post's specific method :excerpt_separator.
2015-01-10 04:05:16 +03:00
b92274b101
only strip newlines when rendering highlight blocks ( #3265 )
2015-01-09 00:07:11 -08:00
54d0bf47e8
Added per post excerpt_separator functionality, so you are able to
...
specify :excerpt_separator (as well as just :excerpt) key direct inside
the post YAML, to make an excerpt based on the value in the post. Tests
were also added.
2015-01-08 15:18:06 +03:00
c4d617e6aa
Fix nav items alignment when on multiple lines
2015-01-07 12:30:48 +01:00
502fd94f2c
Merge pull request #3172 from alfredxing/docs-output-overrides
2015-01-05 23:19:12 -08:00
c58ac78a5e
Expose Publisher in Site
2015-01-05 16:13:04 -08:00
7655b533c9
Allow documents to set `published` in front matter
2015-01-05 16:11:02 -08:00
21bd3e6c5a
[imp] Semantic structure improvements
2015-01-02 12:14:58 +00:00
a098dc80cd
Merge pull request #3234 from jekyll/ruby-2-2
2014-12-29 20:49:04 -05:00
7cd5847826
Merge pull request #3244 from jekyll/store-messages
2014-12-29 20:48:23 -05:00
7bcf8d689e
Always call Time#localtime to translate to TZ'd time.
2014-12-29 20:12:35 -05:00
5e10958faa
Unescape Document output path
...
Document#destination wasn't unescaped properly.
For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.
We now unecape URL at Document#destination like Post#destination and
Page#destination.
2014-12-29 22:38:50 +09:00
7fc47bfc43
Initialize @messages at instantiation time.
2014-12-29 01:14:16 -05:00
b2146e8659
Store log messages in an array of messages.
2014-12-29 01:14:16 -05:00
35a5af783a
Merge pull request #3189 from robschia/patch-1
2014-12-29 00:49:40 -05:00
612eb737a5
Merge pull request #3047 from karouf/slugify-non-latin
2014-12-29 00:31:34 -05:00
004f923644
Revert "Revert "Make permalink parsing consistent with pages""
2014-12-29 00:30:42 -05:00
e39dfa3f0b
Merge pull request #2908 from alfredxing/document-path
2014-12-29 00:26:35 -05:00
be23e18555
Say 'since 2.0'
2014-12-28 23:54:03 -05:00
aa4beda868
Merge pull request #3240 from jekyll/snake_case
2014-12-28 23:36:08 -05:00
c576d23908
Use External instead of Deprecator for requiring gracefully
2014-12-28 14:37:49 -05:00
ac41312c5d
Separate jekyll-docs out into a separate gem & bless it
2014-12-28 14:37:02 -05:00
0c0aea3ad7
Improve Site#getConverterImpl and call it Site#find_converter_instance
2014-12-28 14:12:09 -05:00
b6641be8ef
Call it site_payload instead of payload.
2014-12-26 22:40:18 -05:00
2f8248a6f1
Only call #site_payload once for all collection work.
2014-12-26 22:24:18 -05:00
0eb2796a66
Sort static files just once.
...
Ref: #2075 .
2014-12-26 22:23:45 -05:00
d35af9c1f3
Read 'enable_coderay' in the Kramdown parser
2014-12-26 22:16:57 -05:00
f6bff6fb61
Have a deprecation fallback for 'use_coderay'
2014-12-26 22:16:47 -05:00
a103898980
Set 'use_coderay' to 'enable_coderay'
2014-12-26 22:16:33 -05:00
b68dd3a5cb
Add liquid c if it's available.
2014-12-26 21:53:56 -05:00
70a331d854
Set the error mode to :strict
2014-12-26 21:53:56 -05:00
0aa61f66a8
Remove unneeded end tag
2014-12-26 12:10:03 +01:00
cb2eea0e41
Release 💎 2.5.3
2014-12-22 09:16:40 -05:00
8284714d8a
Release 💎 2.5.3
2014-12-22 09:15:57 -05:00
7227ad4ebb
Merge pull request #3116 from alfredxing/incremental
2014-12-22 08:57:50 -05:00
49115dbdab
Merge pull request #3158 from afeld/as-liquid-refactor
2014-12-09 10:50:42 -08:00
383a0d0aa7
modify as_liquid to use case statement
2014-12-09 07:42:14 -05:00
59acdaab9a
Fixed itemprop="author name"
...
You are right, I tried to oversimplify it. Also, {{ page.date | %Y-%m-%d }} doesn't output what I expected. I think it's fixed now, I tried the code with a couple of validators and everything seems fine.
2014-12-08 19:46:49 +01:00
43a28aed96
Fix indentation
2014-12-05 19:38:43 -08:00
5d9662f80f
Always regenerate asset files
2014-12-05 19:07:18 -08:00
ed9cc80ff9
Update post.html
2014-12-06 00:49:04 +01:00
9b6eeba81e
Added basic microdata
2014-12-06 00:32:05 +01:00
52f0b36558
Add incremental rebuild info to build command output
2014-12-04 20:09:49 -08:00
c8fc567c8d
Site /feed.xml is RSS 2.0, fix auto-discovery header
...
Refs #2996
2014-12-02 22:40:22 +01:00
6055f112fb
Incorporate code review feedback
2014-11-30 14:52:16 +01:00
a0da18e4f8
Incorporate code review feedback
2014-11-30 14:30:22 +01:00
98405edf61
Add a Jekyll doctor warning for URLs that only differ by case
...
Those URLs are problematic on case-insensitive file systems because one of the URLs is overwritten by the other.
Fixes #3035
2014-11-29 15:14:44 +01:00
64b0102686
Fix viewport meta tag
2014-11-29 12:30:43 +01:00
d0e12d69bc
Last few revisions
2014-11-28 14:05:40 -08:00
b6d81c58df
Perform less expensive operation first
2014-11-27 10:00:29 -08:00
4776b27ff3
reduce nesting of #as_liquid
2014-11-27 04:20:05 -06:00
87d08ec827
refactor #as_liquid
2014-11-27 04:16:29 -06:00
02f281eef3
Add unit and cucumber tests
2014-11-26 21:15:53 -08:00
8a257aca6b
Implement more suggestions
2014-11-26 20:15:42 -08:00
0662d31bf6
fix jsonify filter when used with boolean values
2014-11-26 02:40:41 -06:00
e546eb3e9f
force markdown regexp to match the full extension
2014-11-24 20:08:31 -06:00
dc30114605
Use site.in_source_dir
2014-11-23 16:16:19 -08:00
2a5cf11ee2
Add --no-metadata option
2014-11-23 15:38:00 -08:00
5b77d02e3b
Merge pull request #3141 from jekyll/bundle-require-is-borking-pygments
...
Fix Bundler-integration Plugin Manager
2014-11-23 14:18:06 -08:00
c2b24e82e5
Refactor the case statement in highlighter for better readability. [ci skip]
2014-11-23 14:17:21 -08:00
10030ae8cd
Put that Bundle.require statement back.
2014-11-23 14:13:47 -08:00
75c5c16297
Handle path overrides
2014-11-23 14:06:29 -08:00
ef53e677a4
Better tests for plugin manager.
2014-11-23 13:14:51 -08:00
4acf343fea
Add clean command
2014-11-23 12:51:19 -08:00
b1bba1945a
Prepare for a v2.5.2 release.
2014-11-22 15:37:07 -08:00
d17b80bf2a
Keep track of the required gems.
2014-11-22 12:38:36 -08:00
ac03af3229
Implement @mattr-'s suggestions
2014-11-21 22:12:21 -08:00
fe6bfc6f1b
Fix failing tests
2014-11-21 22:12:21 -08:00
d438362971
Add regenerate front-matter variable
2014-11-21 22:12:21 -08:00
842470b0c4
Refinements
2014-11-21 22:12:21 -08:00
11917645f2
Incremental regeneration
2014-11-21 22:12:20 -08:00
d7e3d4df8f
Add support for collections documents to have YAML front matter ending in dots.
2014-11-20 14:38:17 -06:00
60202782ea
Only try bundler if the Gemfile is there.
2014-11-16 21:21:50 -08:00
32b14d6402
First, setup Bundler. Then, require it.
...
Per a conversation in
https://github.com/bundler/bundler/issues/3252#issuecomment-63208769
2014-11-16 21:18:23 -08:00
687b9cdf19
Merge pull request #3058 from alfredxing/fix-post-url-equality
2014-11-16 20:19:37 -08:00
314fb875b5
Merge pull request #3089 from jekyll/remove-duplication-in-regexp
2014-11-12 18:46:44 -08:00
d4c15efff9
Cache name matching regex
2014-11-11 17:35:09 -08:00
06750b8502
Print error message in renderer
2014-11-10 11:45:56 -08:00
bd907c5be6
Remove duplicate regexp phrase: ^\A.
...
Addresses @mastahyeti's comment in #3077 : https://github.com/jekyll/jekyll/pull/3077#discussion_r20077150
2014-11-10 11:36:05 -08:00
84cef2202d
Remove duplicate 'Conversion error:' message
2014-11-10 09:12:51 -08:00
eaa132c65b
Fall back to old method with deprecation warning
2014-11-09 11:55:47 -08:00
22d11bef2d
Prepare a 💎 v2.5.1 release.
2014-11-08 22:29:47 -08:00
067f8b6be7
Strip the drive name from both paths when checking the prefix.
2014-11-08 13:10:28 -08:00
e11fb4d427
Merge pull request #3067 from jekyll/specify-log-level
2014-11-06 12:05:07 -08:00
5b54f78875
Allow users to specify the log level via JEKYLL_LOG_LEVEL.
2014-11-06 12:03:07 -08:00
989c70fe4a
In the case that a Gemfile does not exist, ensure Jekyll doesn't fail.
2014-11-06 10:48:09 -08:00
a0afa19e9a
Release 💎 v2.5.0
2014-11-05 22:07:23 -08:00
13bb7360c0
Merge pull request #2865 from jekyll/some-kind-of-bundler-thingy
2014-11-05 22:01:37 -08:00
5a350788e7
Test JEKYLL_NO_BUNDLER_REQUIRE.
2014-11-05 21:04:34 -08:00
5a288e7de4
Add 'b' and 's' aliases for build and serve, respectively
2014-11-05 23:13:08 -05:00
8ee1b2a1fd
Finish up the plugin manager
...
And so it shall be.
2014-11-05 19:29:54 -08:00
b0a7f9c8c9
Require plugins from Gemfile :jekyll_plugins group.
2014-11-05 18:50:38 -08:00
34de676713
Require gems in :jekyll_plugins group in a Gemfile in unsafe mode.
...
Replaces #1658 . /cc @imathis
2014-11-05 18:39:54 -08:00
9a15a09028
Add {{ | jsonify }} support for hashes.
2014-11-05 11:37:34 -08:00
50d0fc3c85
Match post.name instead of slugs and dates
2014-11-04 16:13:04 -08:00
90cddade53
Commit the paths one by one to Jekyll.sanitized_path with the proper initial base.
...
Prevents errors like these:
[39/78] TestPost#test_: A Post processing posts should not be writable outside of destination. /Users/parker/jekyll/jekyll/test/dest
/Users/parker/jekyll/jekyll/test/dest/Users/parker/jekyll/baddie.html
= 0.01 s
1) Failure:
TestPost#test_: A Post processing posts should not be writable outside of destination. [/Users/parker/jekyll/jekyll/test/test_post.rb:152]:
Failed assertion, no message given.
2014-11-03 22:27:55 -08:00
2ee8d690c4
More conversion of Jekyll.sanitized_path ~> site.in_(source|dest)_dir
2014-11-03 22:16:48 -08:00
ca40c771d0
Only allow CWD _layouts outside of safe mode.
2014-11-03 22:16:48 -08:00
4bccbdead4
If no overrides are passed in, just default to a Hash.
2014-11-03 22:16:48 -08:00
68e9c84a18
Flatten paths sent into `#in_dest_dir`
2014-11-03 22:16:48 -08:00
f7b1782294
Fix post.rb permalink stuff in light of merge of #2925 .
2014-11-03 22:16:48 -08:00
656e772388
Cache the related posts most_recent_posts
...
/cc @mattr- is this safe to do, you think? it only happens at render
time...
2014-11-03 22:16:47 -08:00
817f6cb658
Fix problem where entries weren't stripped of their trailing slashes.
2014-11-03 22:16:47 -08:00
179b5ab193
Use site.in_source_dir as @mastahyeti suggested
2014-11-03 22:16:47 -08:00
b4a2788626
Just swallow it if there is no content for the excerpt to parse.
2014-11-03 22:16:47 -08:00
3762878381
Correctly access the StaticFile's site variable.
2014-11-03 22:16:47 -08:00
9cbc24fce5
More safety. 🔒
2014-11-03 22:16:47 -08:00
461e16f8bc
More tests are passing. Hooray.
2014-11-03 22:15:40 -08:00
0bc88975c8
More removal of File.join
2014-11-03 22:15:40 -08:00
98182aab4a
Use site.in_source_dir in Collection.
2014-11-03 22:15:40 -08:00
3a3be7e5a7
Add Site#in_dest_dir
2014-11-03 22:15:40 -08:00
7e1cc4b684
Add Site#in_source_dir
2014-11-03 22:15:40 -08:00
0f2a3a606b
Append the site to Jekyll.sites upon creation
2014-11-03 22:15:40 -08:00
314dce62cf
Make Site.source and Site.dest "immutable"
2014-11-03 22:15:40 -08:00
bd72265e74
Reformat the Jekyll module's static methods.
2014-11-03 22:15:40 -08:00
ccd1941378
Merge pull request #3053 from alfredxing/fix-serve-host
2014-11-03 12:09:34 -08:00
a16dfef840
Use 127.0.0.1 as host instead of 0.0.0.0
2014-11-02 15:31:23 -08:00
e1f7139b9c
typo fixes
2014-11-02 23:00:09 +00:00
f9e249ae20
Generalize Utils#slugify for any scripts
...
It replaces any non alphanumeric glyphs by an hyphen.
2014-10-31 15:56:03 +01:00
8dcf7a6680
Merge pull request #3031 from alfredxing/frontmatter-permalinks
2014-10-29 15:13:12 -07:00
02e53fb6ff
Implement @parkr's suggestions
2014-10-27 22:59:15 -07:00
3fb1356593
The jsonify filter should deep-convert to Liquid when given an Array.
...
Fixes https://github.com/github/choosealicense.com/issues/225
2014-10-27 15:58:42 -07:00
cd9d38c5ea
Remove duplicate code
2014-10-26 21:38:19 -07:00
0fe1d0686a
Allow placeholders in permalinks
2014-10-26 18:23:58 -07:00
ae01b1d5df
😦
2014-10-22 02:16:50 -07:00
5cb0aee251
Have to go back on all these...
2014-10-22 02:10:21 -07:00
2eb318a929
Replace costly Hash#fetch with arity=2 with arity=1 + block.
2014-10-22 01:43:46 -07:00
0511ece2f5
Use String#<< instead of String#+=
...
I just couldn’t believe this but look:
~/jekyll/jekyll#master$ ruby benchmark/string-concat
Calculating -------------------------------------
+= 6367 i/100ms
<< 128697 i/100ms
-------------------------------------------------
+= 1704.3 (±0.6%) i/s - 12734 in 7.472170s
<< 4381212.4 (±6.3%) i/s - 21878490 in 5.014899s
WOW.
2014-10-22 00:58:20 -07:00
1395d5686b
Optimize more URL#sanitize_url
2014-10-22 00:57:53 -07:00
3227c4ecea
Use #tr instead of #gsub
2014-10-22 00:57:25 -07:00
b9c4fc93d7
Use flat_map instead of map.flatten
2014-10-22 00:57:06 -07:00
9cc3085dd0
Turn on FancyIndexing.
2014-10-20 21:23:30 -07:00
5b37ad57cc
If `--verbose` is given, debug the sh*t out of that.
2014-10-20 21:23:22 -07:00
3dedcbf894
Sort webrick_options
2014-10-20 21:23:00 -07:00
7fd9f102c0
Merge pull request #2997 from jekyll/utils-slugify
2014-10-20 20:11:04 -07:00
5ed4638400
Merge pull request #2986 from tamagokun/where_filters_enumerable
2014-10-20 20:09:21 -07:00
68c0e8f847
Hash#each_key instead of Hash#keys.each. Faster code.
2014-10-20 10:10:29 -02:00
078b2785e4
Revert "Make permalink parsing consistent with pages"
2014-10-18 12:07:44 -07:00
9f5835871b
Utils.slugify: Don't create new objects when gsubbing
2014-10-12 16:18:40 -07:00
00d29e7e77
Merge pull request #2994 from jekyll/fixes-from-benchmarking
2014-10-12 15:49:20 -07:00
b564214535
Pass the context on to IncludeRelativeTag#page_path
2014-10-12 15:16:38 -07:00
63a6d595c4
Fix feed link to respect baseurl
2014-10-12 23:14:41 +01:00
626706c8c5
Cache the `@includes_dir` in each instance so the method isn't called all the time
2014-10-12 15:11:28 -07:00
4942b2947b
Only compile the Converter#matches regexp when asked for
2014-10-12 14:31:49 -07:00
fbe98df488
Cache variables that won't change through the life of an object
2014-10-12 14:06:17 -07:00
44c9f81921
Cache the extname regexp in Converters::Markdown and Textile
2014-10-12 14:06:16 -07:00
3994d9116d
Link atom feed from html head
...
This makes it possible for browsers to autodiscover the feed. Fixes https://github.com/jekyll/jekyll/issues/2995
2014-10-12 20:09:14 +01:00
46e76bde3f
Add mode parameter to slugify Liquid filter
2014-10-12 02:44:58 +09:00
f6ea8b4d50
Allow Enumerables to be used with "where" filter.
2014-10-08 16:19:55 -04:00
b0c0fbd70b
site_template/feed.xml: Remove unneeded space.
2014-10-08 10:37:01 +03:00
28bb15d4ee
site_template/_includes/head.html: Minor refactoring.
...
Remove unneeded end tag, and also strip newlines.
Move `X-UA-Compatible` just after `meta charset`.
2014-10-08 10:33:39 +03:00
f0e22be32b
Merge pull request #2972 from tkrotoff/wrapper-width-hardcoded
2014-10-05 19:23:49 -07:00
1ccd2156c5
Fix head.html indentation
2014-10-05 18:53:53 +02:00
8e481cdf8e
New Sass variable $content-width instead of hardcoded value
2014-10-05 18:49:39 +02:00
42a8dba642
Page specific descriptions
2014-09-30 22:17:49 +01:00
0701fa7b16
Update outdated comment
...
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
3a96d01e4a
Make permalink parsing consistent with pages
...
Require permalink to end in a slash to write an index file.
Addresses #2920 .
2014-09-24 22:08:25 -07:00
bd0eebdb05
Merge pull request #2925 from pathawks/htm-extension
2014-09-24 17:08:02 -07:00
dc0add15af
Merge pull request #2946 from kleinfreund/patch-1
2014-09-24 17:06:53 -07:00
e6f89074d4
Rouge's Redcarpet plugin now has a different API
...
See for more:
- 18ec938e9chttps://github.com/jneen/rouge/issues/182
2014-09-22 23:03:49 -07:00
e013c16ba9
Fix code example for media query mixin
...
It was using an old variable name (`$palm`) instead of the current one (`$on-paln`).
2014-09-22 08:18:14 +02:00
fdf58c5ce2
Allow per post permalinks to end in `.htm`
...
Fixes #2920
2014-09-14 11:58:16 -07:00
566eb6ef3b
remove watch since it default in 2.4.0
2014-09-14 11:28:29 +08:00
c3ec158f2d
Keep backwards compatibility
...
Re-add `relative_path` Liquid variable too keep compatibility
2014-09-11 18:25:21 -07:00
6c0e791236
Use relative path for `path` Liquid variable in Documents
2014-09-10 21:04:40 -07:00
e72f8cf5b1
Release 💎 2.4.0
2014-09-09 22:24:09 -07:00
196a56e3ec
Add push, pop, shift, and unshift Liquid filters.
...
Fixes #2892 .
2014-09-09 21:29:23 -07:00
4fb6e1cde9
Merge pull request #2884 from gjtorikian/improve-docs-for-include-relative
2014-09-09 00:21:42 -07:00
06c9b1b33c
Fixing "vertycal" typo
...
s/vertycal/vertical
Unless, like, "vertycal" was on purpose or something.
2014-09-08 22:48:23 -07:00
deb4e0d24a
Set tag name as ivar
...
This lets us use just one syntax_example method for both classes.
2014-09-08 14:27:51 -07:00
0675f2a423
Update include_relative tests
...
This verifies you can’t go “up” in the include
2014-09-07 21:23:45 -07:00
6644c77d23
Merge pull request #2870 from gjtorikian/support-relative-include
2014-09-07 13:05:38 -07:00
a569799ffc
Sanitize the resolved includes path
2014-09-07 12:18:54 -07:00
3668437c96
Rename method to `resolved_includes_dir`
2014-09-07 12:18:35 -07:00
4da07bb2c3
Add tests around nasty include attempts
2014-09-07 12:00:37 -07:00
0e4549013d
Define methods for shared vars between include & include_relative
2014-09-07 11:21:40 -07:00
394eab4a3a
Add the slugify Liquid filter
2014-09-07 16:48:57 +09:00
9f558d1cec
Rename tag to `include_relative`
2014-09-06 21:48:15 -07:00
787bb582da
Trash the subclass
2014-09-06 21:48:00 -07:00
58a76911bb
Merge pull request #2864 from kansaichris/add-title-to-collection-urls
2014-09-05 10:04:38 -07:00
aa97f1025d
Support a new `relative_include` tag
2014-09-03 15:43:51 -07:00
4adc35aaf3
Revise Utils#slugify with inspiration from Rails
2014-09-02 14:32:14 +09:00
702b39dec5
Replace the 'name' parameter with 'string'
2014-09-02 13:34:44 +09:00
3ca1245027
Move Document#sluggify to Utils#slugify
2014-09-02 13:29:28 +09:00
cfd17b2e7d
Add inspect filter
2014-09-01 14:51:09 -07:00
05d65f0341
Rename 'slug' to 'sluggify' and clean up code
2014-09-01 16:25:42 +09:00
a5e51cfdbe
Properly handle titles with trailing punctuation
2014-09-01 13:25:38 +09:00
cca9c50c26
Add 'title' to url_placeholders
2014-09-01 12:53:31 +09:00
bcb6798838
Pass the filename as an argument to Document#slug
2014-09-01 12:45:41 +09:00
9e9f4f1c53
Fix orientation bugs
...
Maintain fontsize and and adapt width when switching to landscape mode.
2014-08-31 15:27:51 +02:00
081e34a5ab
Merge pull request #2858 from jekyll/auto-enable-watch
2014-08-31 00:05:42 -07:00
b5dbc36975
Use Jekyll.sanitized_path when adding static files to Collections.
...
h/t @benbalter https://github.com/jekyll/jekyll/pull/2737#discussion_r16713423
Not sure if the previous code can be exploited, but being super safe is never a bad thing.
2014-08-30 23:09:47 -07:00
6cee2a87cc
Auto-enable watch on 'serve'.
...
Addresses @kneath's and @chibicode's comments in #2695 .
2014-08-30 22:52:41 -07:00
eea5921856
Fix test for Liquid rendering in Sass.
2014-08-30 21:54:50 -07:00
190ab7f6b8
Merge pull request #2830 from kansaichris/render-liquid-in-coffeescript
2014-08-28 19:35:44 -07:00
d395183ee2
refactored where filter comment
2014-08-28 22:46:53 +03:00
79992fc3c8
Fix inaccurate comments
2014-08-26 17:17:13 +09:00
71b10e2d4a
Make render_with_liquid? true for CoffeeScript
2014-08-26 17:14:33 +09:00
56cd73eb35
Merge pull request #2799 from kansaichris/add-title-to-collection-permalinks
2014-08-25 23:15:23 -07:00
a72706ace6
Add Document#slug
2014-08-26 11:46:01 +09:00
cc4a0d1704
Change :title to :name
2014-08-26 11:26:19 +09:00
d9da7cbd76
add class << self idiom to new command
2014-08-25 10:59:58 +04:00
e8b00fb6f2
Add the 'title' variable to collection permalinks
2014-08-23 14:50:55 +09:00
3b7091aab7
Find variables in _config.yaml by searching with relative file path.
2014-08-20 00:07:51 +02:00
9df020f7e9
add .sass-cache to .gitignore and fix main.scss fileformat
2014-08-19 17:39:22 +08:00
cccfda7de8
hashrockets in CSV loading
2014-08-17 08:34:38 +01:00
866935dadf
map with proc for CSV loading
2014-08-16 20:26:29 +01:00
687176e22c
Autoload csv files from data directory
2014-08-16 14:54:14 +01:00
1f877fde1e
Make the intro text on the site template post a bit nicer.
2014-08-13 01:27:36 -04:00
d70f9d4a29
Layout for site template feed.xml should be 'null'.
2014-08-13 01:23:19 -04:00
4d8e335da1
The mighty classifier --- reborn!!!!!
...
Use classifier-reborn v2.0 in place of classifier 1.3.
Code at https://github.com/jekyll/classifier-reborn
2014-08-13 00:29:40 -04:00
9738ea452f
Merge pull request #2723 from jekyll/release-2-3-0
2014-08-13 00:04:15 -04:00
566d3718b0
added sassify and scssify filters fot converting sass and scss strings to css
2014-08-12 21:24:04 -06:00
10cc45fc45
Add StaticFile#destination_rel_dir
2014-08-12 18:07:13 -04:00
530e049d2d
Read in static files info `collection.files` as `StaticFile`s.
2014-08-12 15:59:45 -04:00
f16a5cbae1
Add Utils.has_yaml_header? so we can check the front matter existence in one place
2014-08-12 15:58:02 -04:00
7b1763a124
Release 💎 v2.3.0
2014-08-12 14:39:21 -04:00
eabde41267
Merge pull request #2733 from jekyll/sass-in-liquid
2014-08-12 14:36:15 -04:00
707278f099
Use the proper extname getter.
2014-08-12 14:11:27 -04:00
ba63a2c6d1
Merge pull request #2731 from jekyll/doc-to_s
2014-08-12 13:47:32 -04:00
8ff9074ce5
Allow Sass files to be rendered, but never place them in layouts.
...
Fixes #2573 .
2014-08-12 13:38:53 -04:00
db34c48927
Just like for Convertible, place the un-layouted content in document.content.
2014-08-12 12:52:38 -04:00
2fd155615f
Forgot a question mark == broken tests.
2014-08-12 12:22:48 -04:00
e36d433100
FrontmatterDefaults#update_deprecated_types deals with a set, not a scope
2014-08-12 12:22:39 -04:00
9c090c862f
Ask about 'Draft' before asking about 'Post'
...
`Draft`s are a subclass of `Post` so `draft.is_a?(Post)` will return
`true`, thus making all `Draft`s `Post`s, which is not desired. If
asking about `Draft` first, then we avoid this problem.
Fixes #2726
2014-08-12 11:52:16 -04:00
60c29561f2
Use plural 'type' in front matter defaults for pages/posts/drafts
...
Fixes #2657
2014-08-12 11:50:02 -04:00
d57c4f1c01
Document#to_s should produce just the content of the document.
...
Fixes #2655
2014-08-12 11:25:28 -04:00
1dcf241677
Merge pull request #2722 from jekyll/don-t-concat-extnames
2014-08-12 11:19:53 -04:00
1666bbc52e
Call #to_liquid before calling #to_json in jsonify filter.
2014-08-11 20:16:42 -04:00
fd2d7df9b7
Don't concat extnames in output for multiple converters
2014-08-10 20:32:29 -04:00
6f8b8816f5
Merge pull request #2704 from jekyll/mult-converters
2014-08-10 20:29:37 -04:00
47b38cf9ee
Merge pull request #2716 from jekyll/reform-watch
2014-08-10 20:28:38 -04:00
11373acb15
Merge pull request #2720 from jekyll/read-in-utf8
2014-08-10 16:45:11 -04:00
9b3ccee3dd
Pass in options to File.open in Document.
2014-08-10 16:23:33 -04:00
68fb130fd0
Add magic comments for UTF-8
2014-08-10 16:16:48 -04:00
45a347c022
Read in every Document's content as UTF-8
2014-08-10 16:16:41 -04:00
69cc414c1b
Don't need to capture the group.
2014-08-10 15:44:36 -04:00
3264766762
Use case-insensitive checking for the file extensions when loading config files.
2014-08-10 14:37:41 -04:00
c7c1eddd47
It's called Jekyll::Watcher
2014-08-10 14:33:11 -04:00
a2dfd6eddc
Refactor based on jekyll-watch clean-up.
...
https://github.com/jekyll/jekyll-watch/pull/5
2014-08-09 00:13:18 -04:00
c8d1c3d264
Remove duplicated mixed case categories
2014-08-07 11:27:42 +09:00
3768d90278
Use category in downcase only for URL ( Resolves #1739 )
2014-08-07 11:27:41 +09:00
939c67222a
Check to make sure the command is valid.
2014-08-06 21:28:21 -04:00
23515acc31
Slim down help command.
2014-08-06 21:20:39 -04:00
a0f449d613
Add 'jekyll help' command.
...
Ref: #2695
2014-08-06 21:17:44 -04:00
d0ac4915cb
Reverts 18c033dc5c
...
The merge that is reverted assigned categories to posts
based on the subfolders in the _posts directory and
was merged under the understanding that it was fixing a bug.
Subfolders in the _posts directory should not assign
metadata information to posts at this point in time and
was not a bug.
2014-08-06 14:20:03 -07:00
d004bc4ea5
Allow Convertibles to be converted by >= 1 converters.
2014-08-06 16:20:24 -04:00
229cedfc50
Reorganize and update default configuration settings. #2456 .
2014-08-06 16:01:47 -04:00
cb671acd0c
Merge pull request #2682 from alfredxing/date-parser-util
2014-08-06 15:30:02 -04:00
21b6a01980
Merge pull request #2693 from ivantsepp/2142_partial_liquid_output_tag_in_include_tag
2014-08-06 15:28:07 -04:00
5eacc9e831
Merge pull request #2696 from jekyll/jekyll-autogeneration-disabled
2014-08-06 15:27:16 -04:00
f0105158bf
Merge pull request #2687 from kleinfreund/sassify_site_template
2014-08-06 15:24:01 -04:00
8999df2f46
Adding markdown setting back to _config.yml
2014-08-06 21:12:36 +02:00
441a2496b8
Usind 3 instead of 7 SCSS files now
2014-08-06 19:20:06 +02:00
e5a7f842be
Add sentence about jekyll-help repo
2014-08-06 19:11:36 +02:00
7f92e7ce00
Reverting back to using content box and calc
2014-08-06 11:08:28 +02:00
4c4f803df2
Remove preemptive loading of the 'classifier' gem.
2014-08-05 16:47:30 -04:00
a27313b1d0
Use helper method #deprecation_message in Deprecator.no_subcommand.
2014-08-05 16:43:38 -04:00
9fd872e7b8
Notify the user when auto-regeneration is disabled.
2014-08-05 15:55:43 -04:00
13425266eb
Fixed Typo in error message
2014-08-05 15:37:09 +02:00
738dd502b4
Adding fill attribute to SVG's as fallback
2014-08-05 09:46:39 +02:00
0594adb8fd
Allow VARIABLE_SYNTAX to collect partial variables
2014-08-05 01:04:36 -04:00
020f684093
Adjusting heading hierarchy to reflect site-title change
2014-08-04 09:42:46 +02:00
101d614351
Removing h1 from site-title
2014-08-04 09:35:18 +02:00
d8c330b215
Removing unused column class
2014-08-03 23:15:22 +02:00
e4029426de
Adding and using media-query mixin
2014-08-03 23:07:47 +02:00
7d865269fd
Replacing CSS comments with Sass comments
2014-08-03 23:06:59 +02:00
b24b870ec6
Update welcome post to clarify front matter usage
2014-08-03 23:06:14 +02:00
74974979ba
Reworking site template to utilize Sass
2014-08-03 19:35:43 +02:00
4cfbdb07bb
Show input in error message
...
Show date input in error message to make it easier for user
to find infringing date/file
2014-08-02 11:51:04 -07:00
81807cb5af
Merge pull request #2615 from alfredxing/collections-static-files
2014-08-02 14:44:45 -04:00
d5322a73bf
Move instances of `Time.parse` into a Utils method
2014-08-02 09:38:50 -07:00
5fdf637c6a
Cache information about document YAML header existence
2014-08-01 22:03:29 -07:00
e75dc74bb1
Merge pull request #2649 from alfredxing/friendly-date-error
2014-08-02 00:06:20 -04:00
e44cfe29a8
No longer set "permalink: pretty" in the _config.yml for the site template
...
This causes unintuitive behaviour that doesn’t align with the
documentation.
Fixes #2399 .
2014-08-02 00:01:59 -04:00
989d5d357b
Use `relative_path` in error message instead of `path`
2014-08-01 21:00:17 -07:00
f8c19df79a
Add friendly error message for invalid dates
...
Catch the `ArgumentError` when parsing dates from the YAML front
matter
2014-08-01 21:00:17 -07:00
02b60d6d00
Add helpful comments to site template _config.yml
2014-08-01 23:59:57 -04:00
4ca3fe5137
Merge pull request #2664 from alfredxing/replace-deprecated-methods
2014-08-01 23:27:58 -04:00
503e54779a
Merge pull request #2673 from lucianosousa/patch-1
2014-08-01 23:27:13 -04:00
274c6d3667
Allow static files in collections
...
Allow Documents to be static files so static files can exist in collections
2014-08-01 13:24:27 -07:00
bc3b82850d
Merge pull request #2659 from alfredxing/front-matter-defaults-defaults
2014-08-01 13:47:42 -04:00
33cd956e4e
improving strftime call
...
set non padded config to avoid parse string type twice
2014-08-01 00:02:41 -03:00
f57f1c7eef
Use .scss for site_template styles.
2014-07-31 17:59:27 -04:00
6d62dbbafc
Replace deprecated Ruby methods
...
Replace `Hash#has_key?` and `File.exists?` with `Hash#key?`
and `File.exist?`
2014-07-31 12:50:20 -07:00
9437a7abcd
Don't require the `scope` key in front matter defaults
...
Set defaults for `scope` in front matter defaults as per #2656
2014-07-31 11:17:35 -07:00
dc894e41af
Prep for v2.2.0 release.
2014-07-29 19:02:51 -04:00
3cb2e74b5c
Add further testing for Highlight#sanitized_opts
2014-07-29 16:30:44 -04:00
a4c9925e99
Whitelist three Pygments options.
...
- startinline
- hl_lines
- linenos
2014-07-29 14:20:49 -04:00
592afc270e
Merge pull request #2620 from alfredxing/warn-on-layout-nonexistent
2014-07-29 00:11:41 -04:00
2785d702e2
Remove 'none' as a valid layout
2014-07-28 18:35:47 -07:00
592630d48c
Do not forget to downcase the categories here as well
2014-07-27 00:29:31 +02:00
16dbe54560
When using subdirs to reflect categories, the underlying `categories` attribute was not set
2014-07-24 18:59:26 +02:00
2eb57279fe
Remove unnecessary Jekyll::Tags::IncludeTag#blank? method
2014-07-22 21:06:43 +00:00
7586538432
Use `is_a?` instead of `class`
2014-07-21 09:23:21 -07:00
4bd5614f4c
Exclude excerpts from layout checks
2014-07-20 12:57:40 -07:00
c8e0fcfcdf
Fix up errors in CI build
2014-07-20 12:56:54 -07:00
7fa30c0dec
Add path of file requesting nonexistent layout
2014-07-20 12:17:04 -07:00
a0d679439f
Move layout validity logic to separate method
2014-07-20 10:01:09 -07:00
072ddb799f
Do the same for documents
2014-07-20 09:18:35 -07:00
ac744a6313
Give a build warning if a layout does not exist
...
Throw a warning if a non-"none" layout is specified but the corresponding
layout file does not exist.
2014-07-20 09:17:19 -07:00
475e08bba3
Replace all RubyForge links with new residences
2014-07-16 13:43:09 -07:00
c7cc36abdb
Put errors/exceptions into Jekyll::Errors module
2014-07-12 13:47:59 -07:00
a97ae67552
Gracefully require
2014-07-12 13:46:49 -07:00
4cc6a0f263
Mark certain gems as eventually-non-core.
2014-07-12 13:08:35 -07:00
685cdbe124
Release Jekyll v2.1.1
2014-07-10 09:40:36 -07:00
28131624b8
Don't use old `@url` variable
...
Fix for #2557
2014-07-07 10:54:19 -07:00
a66d96ce0a
Use Jekyll.sanitized_path more.
2014-07-01 18:29:15 -04:00
8882f4dd14
Merge pull request #2554 from alfredxing/fix-build-tomdoc
2014-06-28 21:37:25 -04:00
bb9517b73f
Fill in a bit of missing TomDoc
...
Fill in a piece of missing doc for the `build` function in `commands/build.rb`
2014-06-28 17:48:19 -07:00
08d0ff0922
Bump version in gem.
2014-06-28 17:41:29 -04:00
e332197660
Be quiet very quickly. Fixes #2520 .
2014-06-28 17:19:40 -04:00
5f7a3f2b69
Filter out directories from entries in the collection
2014-06-28 16:51:30 -04:00
02676572dd
Allow dots in collection labels.
2014-06-28 16:51:19 -04:00
12b47cc037
Spike out jekyll <cmd> --watch into a separate gem.
2014-06-27 16:41:10 -04:00
6a7386e6ba
Merge pull request #2432 from jekyll/docs-4-ci
2014-06-27 16:39:19 -04:00
bd4a8c1ce2
Fixes, fixes.
2014-06-27 15:32:16 -04:00
d16f62cb38
Ensure exclude and include arrays are arrays of strings.
...
Fixes #2542 .
2014-06-25 16:56:27 -04:00
cedbdf43ca
Merge pull request #2532 from alexmedearis/hl_lines
2014-06-25 16:14:14 -04:00
20180923cf
Merge pull request #2490 from penibelst/deep-defaults
2014-06-24 23:04:38 -04:00
6e104c3ed0
Ensure the post categories are unique (only one). Ref: #2527 #2531
...
h/t @Nicholas-Perry
https://github.com/jekyll/jekyll/issues/2527#issuecomment-47041756
2014-06-24 19:15:02 -04:00
edbc273829
Use Utils.deep_merge_hashes
2014-06-24 20:24:26 +02:00
5f807e7421
Merge deep
2014-06-24 20:20:15 +02:00
dc074fcc50
Merge pull request #2477 from jekyll/serve-skip-initial-build
2014-06-23 19:06:10 -04:00
d359c63018
Merge pull request #2493 from jekyll/fix-sort
2014-06-23 19:02:54 -04:00
e75dcc18f1
Merge pull request #2511 from denilsonsa/patch-1
2014-06-23 19:01:31 -04:00
b0e51e2cba
Merge pull request #2524 from jekyll/all-html-files
2014-06-23 18:59:57 -04:00
e58c1ee306
Merge pull request #2531 from jekyll/merge-post-categories
2014-06-23 18:58:51 -04:00
74f0f27d18
Before copying file, explicitly remove the old one
...
On Windows, FileUtils.cp(path, dest_path) will fail with a Permission
Denied if the dest_path already exists and is read-only. People have
complained about this since at least 2008.
This lets `jekyll build` work without error in Windows when one or more
read-only files exist.
This change will accommodate users of Team Foundation, which uses the
read-only flag for for source control status. (dumb, I know, but but a
real problem)
2014-06-19 18:25:00 -04:00
5846cc7b70
No private methods in LogAdapter.
2014-06-19 17:11:04 -04:00
b202b508f2
handles line numbers with more than 1 digit
2014-06-18 17:48:50 -07:00
674b540c6f
unit tests
2014-06-18 17:27:27 -07:00
8b860d3f0e
Fixes highlight.rb to correctly parse list values
2014-06-18 17:08:50 -07:00
99cc12cc0a
Merge file system categories with categories from YAML.
...
Fixes #2527
2014-06-18 18:10:07 -04:00
a78b5c2f8d
Include files with a url which ends in / in the site.html_pages list
...
https://github.com/jekyll/jekyll-sitemap/issues/27
2014-06-17 15:18:41 -04:00
cc734930c6
Making `highlight` behave more like redcarpet
...
See issue 2510 for details.
2014-06-13 03:31:38 -03:00
d59b2c3ef6
Merge pull request #2419 from jens-na/collection-defaults
2014-06-12 20:38:21 -04:00
411cdb29a1
Change Github/Twitter keywords to site.{twitter,github}_username
...
Re: https://github.com/jekyll/jekyll/pull/2485/files#r13525347
2014-06-10 00:00:01 +03:00
50b04cdf92
Use `raise` instead of logging & aborting
2014-06-08 19:33:45 -04:00
ccee1b6a55
Try item#to_liquid before looking at the data
2014-06-08 19:33:37 -04:00
35f5bb0039
Default entries for twitter/github usernames
2014-06-07 11:16:43 +03:00
ffd960ca4e
Allow usage of different Twitter and Github usernames
...
and show these links only if twitter-username or github.username are set on _config.yml
2014-06-07 11:08:34 +03:00
ccf97a62f1
Merge pull request #2459 from ivantsepp/watch_ignore_files
2014-06-06 23:11:44 -04:00
6684a8f914
Refactor logic into Command class. Add tests.
2014-06-04 14:23:40 -04:00
b126159360
Skip initial build of site on serve with flag.
...
Adds --skip-initial-build flag to jekyll-serve, which serves the destination
immediately rather than waiting for the site to be built.
Fixes #1252 .
2014-06-03 13:30:14 -04:00
441ac3742c
remove extra space
2014-06-02 15:05:03 -04:00
90bc9314f1
change label to collection
...
To make it clear the label is of the document's collection
2014-06-02 14:32:52 -04:00
00ab79b7cf
add collection.label to Document#to_liquid
2014-06-01 21:45:23 -04:00
497c10897f
Passes the url to FrontmatterDefaults.all instead of full path
2014-06-01 22:21:31 +02:00
c8786b7b28
Adds default front-matter support for collecitons
2014-06-01 22:21:31 +02:00
879abc0949
Externalize the {% gist %} tag as the jekyll-gist gem.
2014-06-01 13:18:00 -04:00
83fb1fd0f6
Merge pull request #2444 from createdbypete/configurable-logger
2014-05-30 18:16:47 -04:00
041f727fe3
Merge pull request #2438 from pathawks/spicy-feed
2014-05-30 18:02:25 -04:00
6849d6a5e5
If rouge isn't there, say so.
...
In the previous version, it would say 'redcarpet' wasn't installed,
due to the rescue LoadError block on line 93. This change will tell
the user that, in fact, rouge isn't installed and that this is the
cause of the error, not that redcarpet isn't installed.
Fixes #2464 .
https://github.com/jekyll/jekyll/issues/2464
2014-05-30 17:59:47 -04:00
e9ac432e0f
Merge pull request #2458 from karouf/cleaner-empty-dirs
2014-05-30 11:35:35 -04:00
a324eafac4
Using implicit returns to conform to coding style
2014-05-30 08:46:31 +02:00
c4434f27af
Get relative paths of directories to ignore
...
Use `Pathname#realpath` to get absolute paths so that
`Pathname#relative_path_from` will not raise an exception. Also add the
config files to this list.
2014-05-28 01:16:34 -04:00
6ba077cf37
Remove `Command.globs` method
...
It is no longer being used.
2014-05-28 01:15:07 -04:00
72c410363c
Keep parents of directories in keep_files
...
Closes #1297
2014-05-27 21:11:17 +02:00
3b41a44050
Fixing help command in deprecation warning
2014-05-27 18:42:44 +01:00
04baeefaa8
Make sure Cleaner doesn't remove dirs if they only contain subdirs
...
Closes #2204
2014-05-27 18:06:52 +02:00
671a62e0fe
Merge pull request #2437 from pathawks/date_to_rfc822
2014-05-26 22:06:33 -04:00
9e4ef3cbff
Add the paginator as a plugin: jekyll-paginate
2014-05-26 20:09:33 -04:00
4bdf4197db
Rocket style hash and switching integers for Logger severity constants
2014-05-25 23:19:29 +01:00
e6345f39a9
Renaming LogWriter to LogAdapter and adding tests for class
...
String coloring moved to Stevenson as not responsibility of LogAdapter
2014-05-24 21:22:10 +01:00
4a73e099b7
Allow Jekyll's logger to be set to any Logger compatible instance
...
* Stevenson now inherits from Logger and extends some methods to use $stderr
for log messages greater than info level.
* LogWriter provides an interface between Jekyll and Logger to maintain API.
2014-05-24 15:00:14 +01:00
bd836d88af
Spice up site_template feed
2014-05-23 09:42:12 -05:00
43074632b3
Take advantage of date_to_rfc822
...
Jekyll has a filter built just for this purpose
2014-05-23 09:34:49 -05:00
b9c3d8ba03
Merge pull request #2373 from tschmidt/handle-categories-in-site-config-defaults
2014-05-21 01:10:37 -04:00
3c6377d665
Merge pull request #2395 from rdumont/data-subdirectories
2014-05-21 01:09:15 -04:00
65275e5841
Merge pull request #2431 from jekyll/remove-collections-from-layouts
2014-05-21 01:07:01 -04:00
e37b3ca8e1
Any assets read in as Pages shall not be rendered or layout'd
2014-05-21 00:52:21 -04:00
5aefaa1c48
Merge pull request #2418 from mathbruyen/collections_permalink
2014-05-20 22:52:29 -04:00
7e05b6e0b3
Merge pull request #2420 from albertogg/fix-encoding-issue
2014-05-20 22:35:50 -04:00
cbe7e3e80e
Don't place asset files or yaml files in layouts
...
Ref: #2402
2014-05-20 17:11:34 -04:00
c76e41d157
Update `Utils#pluralized_array_from_hash` and `Utils#value_from_singular_key` per suggestion from @parkr
...
Switched to using the `#tap` method for more concise code. Also returning the value from
`value_from_singular_key` instead of returning an array wrapped presentation of the value.
This allows for a one-liner in `pluralized_array_from_hash`.
2014-05-20 12:32:59 -05:00
395d65454c
Merge pull request #2429 from jshawl/code-overflow-fix
2014-05-20 12:12:36 -04:00
e7c4fa0e5f
Prevent code overflowing container
2014-05-20 09:51:57 -04:00
7ce849a2b6
Revert changes and add encoding to the test file
...
* Add encoding to the test file as Ruby 1.9.3 doesn’t defaults to utf-8.
* Remove the forced encoding as encode seems too aggressive.
2014-05-20 00:03:40 -04:30
54fba9af4b
Merge pull request #2406 from yihangho/config-yaml
2014-05-20 00:15:58 -04:00
77cef764d6
Force encoding before escaping or unescaping
...
This will reassure not having any errors when escaping or
unescaping.
2014-05-19 18:50:25 -04:30
658a4d0b47
Try to load _config.yaml if _config.yml is nonexistent.
2014-05-19 09:06:55 +08:00
9932eb667b
Encode URLs in utf-8 when escaping and unescaping
...
There is a problem while returning a path that has some special and possible Non-ASCII characters that may lead jekyll to break while doing the unescaping process. This is can be addressed by “forcing” ASCII to UTF-8.
2014-05-17 17:53:40 -04:30
921dbe0547
Override collection url template
2014-05-17 10:40:52 +02:00
4147e92561
Merge pull request #2417 from jekyll/jekyll-env
2014-05-17 00:53:55 -04:00
780cff46b3
Add jekyll.environment to site_payload.
2014-05-17 00:38:21 -04:00
04b0fe0160
Merge pull request #2377 from jekyll/numeric
2014-05-16 03:50:50 -04:00
1c11afd78d
Fix #2413 and setup a Jekyll.env.
2014-05-15 16:28:37 -05:00
ba905a2c18
Merge pull request #2408 from quinn/patch-1
2014-05-15 12:37:56 -04:00
a38ea51994
Header links to pages which have a title
...
Header used to add link to all pages of the site, even those which do not have any title, creating empty anchors on the page like `<a class="page-link" href="/feed.xml"></a>`. Those were non click-able and used space on the page due to margins.
Now only displays pages with a title.
2014-05-15 08:59:29 +02:00
5ea62443f4
override EXCERPT_ATTRIBUTES_FOR_LIQUID
...
Allow EXCERPT_ATTRIBUTES_FOR_LIQUID to be overridden by inheriting class. Right now will always reference Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID. This is already being used in the codebase for ATTRIBUTES_FOR_LIQUID.
2014-05-14 13:39:16 -04:00
604fb3286c
Allow subdirectories in _data
2014-05-11 20:28:49 -03:00
6465cd6446
Setting log_level earlier to silence info level configuration output.
2014-05-11 21:14:10 +01:00
7756adc75c
Fixing spacing issue for `code` inside `pre`
...
Regular (one-line) code inside a `code` tag has some padding around it. This leads to some weird spacing when dealing with code blocks (e.g. inside `pre`).
Removing the horizontal paddings for these. (Also replacing `border: none;` with `border: 0;` because it's shorter)
2014-05-10 22:05:21 +02:00
01c09fd7fa
Merge pull request #2345 from penibelst/sort-collection
2014-05-10 15:42:53 -04:00
af9f1e6f48
Accept Numeric values for dates.
2014-05-09 23:11:05 -04:00
0371b69952
Set categor[y|ies] on post if they appear in site frontmatter defaults
2014-05-09 13:34:13 -05:00
bf3a20b2d7
allow json files in _data dir
2014-05-09 10:13:12 -04:00
fb523722b5
Fruity variables
2014-05-09 09:21:24 +02:00
df3c163eeb
Use item_property
2014-05-09 08:53:16 +02:00
d96f39360b
Revert "Make it fail"
...
This reverts commit c89e7539b86a483a2f8b14dd766ad90da1eb9773.
2014-05-09 08:53:16 +02:00
fd1778203d
Make it fail
2014-05-09 08:53:16 +02:00
9ba89b9ab1
Try item_property
2014-05-09 08:53:15 +02:00
ae7e485474
Add hash_property
2014-05-09 08:44:40 +02:00
036823cd06
Bump to 💎 v2.0.3
2014-05-08 22:43:04 -04:00
2d040c1aaa
Use Jekyll.logger for --watch error message.
2014-05-08 22:27:55 -04:00
81ff5ed7aa
Save --watch from errors.
...
Fixes #2355 .
2014-05-08 22:22:11 -04:00
a5c1a01965
Added item_property to where filter
2014-05-08 11:35:51 -07:00
348bcae763
If the input is a string but Time.parse can't parse it, maybe it's a UNIX timestamp.
...
Fixes #2339
2014-05-07 15:48:13 -04:00
77c0249d72
Use site.title instead of site.name in site template
...
Fixes #2324 .
2014-05-07 15:11:50 -04:00
f2f2ebfa4f
Register subclasses of subclasses of Jekyll::Plugin
...
The Sass and SCSS converters are practically the same – only different in
the input syntax and file extension. As such, we've created
`Jekyll::Converters::Scss` which is a subclass of `Jekyll::Converter`, and
`Jekyll::Converters::Sass` which is a subclass of
`Jekyll::Converters::Scss`. When `Site#instantiate_classes` is called on
`Jekyll::Converter`, it only instantiates the `Scss` converter, not the
`Sass` converter. This change fixes that.
Fixes #2334 .
2014-05-07 14:59:08 -04:00
8ad4dd332a
Don't fail if any of the path objects are nil.
...
Fixes #2325
2014-05-07 14:01:36 -04:00
da9b28d35c
Fix site template permalink typo
2014-05-07 11:36:14 -04:30
21f84e1548
Update gist.rb comments only
...
Strictly updated the reference to Examples and Valid Syntax to be inline with jekyll/jekyll-help#32
2014-05-07 07:34:00 -04:00
216f1150cd
The last of the site template prepending.
2014-05-07 00:31:53 -04:00
c71a4717dd
Prepend url, too, in feed.xml.
2014-05-07 00:09:12 -04:00
ac666490d2
Release 2.0.2
2014-05-06 23:59:49 -04:00
97e9fb29b0
Default baseurl to "" rather than to "/"
...
Also a fix for #2317
2014-05-06 23:54:56 -04:00
2dec333910
Set baseurl to nothing in new template site.
...
Previously, it caused all sorts of errors.
Fixes #2317 .
2014-05-06 23:50:58 -04:00
0a0d7858c6
Release 2.0.1
2014-05-06 21:57:33 -04:00
64cce065e6
Require kramdown instead of maruku.
...
CRAP CRAP CRAP whoops.
2014-05-06 21:55:11 -04:00
344906deb9
Release 2.0.0.
2014-05-06 20:11:44 -04:00
5c109ee8dc
Merge pull request #2299 from penibelst/sort-nils
2014-05-06 16:49:40 -05:00
1e0d9f899b
Follow Ruby Styleguide
2014-05-06 22:49:49 +02:00
b6cfb8aa4f
Merge pull request #2309 from jekyll/remove-unreleased-notes
2014-05-06 16:30:15 -04:00
c2d3f9d5b5
Close the file descriptor in has_yaml_header?
...
Previous method caused a problem where the calling Dir.chdir to get the next
directory's entries would cause the infamous 'Too many open files - getcwd'
error. Fixes #2279 .
2014-05-06 15:58:25 -04:00
7c1709fab4
Change nils argument to string
2014-05-06 21:36:13 +02:00
00f21ee93c
Add `output` to Document#to_liquid
2014-05-06 14:51:56 -04:00
6c1bb76316
Merge pull request #2303 from jekyll/jbranchaud-adding_exclude_tests
2014-05-06 14:40:18 -04:00
a7776f8279
Set relative_permalinks to false to deprecate!
2014-05-06 13:04:12 -04:00
2aa8908948
Stevenson now uses symbols instead of integers to set log level
2014-05-06 13:03:56 -04:00
63e959e4e1
Use Jekyll.logger, never puts
2014-05-06 13:02:35 -04:00
fda3461c5a
We deprecated relative permalinks in 2.0
2014-05-06 13:02:17 -04:00
413de3a0ee
Also exclude an entry if it starts with one of the items given in the exclude key.
2014-05-06 12:46:41 -04:00
a854a6a709
Merge pull request #2127 from XhmikosR/css
2014-05-06 12:32:52 -04:00
c8a715d09b
Merge pull request #2295 from jekyll/add-documents-listing
2014-05-06 12:28:58 -04:00
0087143b88
Merge pull request #2301 from TheTomThorogood/short_year_permalink
2014-05-06 12:14:25 -04:00
3755437d08
Write test for site.documents.
2014-05-06 00:11:35 -04:00
19e704f408
Override the sort filter
2014-05-05 10:26:46 +02:00
fc98f06ed7
Refactor docs_to_write
2014-05-04 21:22:57 -04:00
54b74fafba
Add documents to site payload
2014-05-04 21:22:51 -04:00
a2169bf0c4
Have separate methods for all docs and just the docs that are being written.
2014-05-04 21:19:09 -04:00
a0bbf7703b
make template site easier to customize
2014-05-04 21:07:23 -04:00
f2849ac269
Add :short_year to url_placeholders
2014-05-05 00:12:07 +09:30
3af22f12bf
Set content-type to text/html with utf-8 charset.
...
Fixes #2289
2014-05-03 18:51:55 -04:00
4ae8fefb95
Remove literal lang name from class, fix #2284
...
If code language is C classes for comment and language are the same
2014-05-03 20:23:28 +04:00
10f85eb856
Add missing vendor prefixed properties.
2014-05-02 09:15:03 +03:00
0463399389
Remove duplicate properties.
2014-05-02 09:15:02 +03:00
3e6a6ffb52
Update util functions
...
Cribbed from http://api.rubyonrails.org/classes/Hash.html#method-i-symbolize_keys
2014-04-28 02:06:41 -04:00
cf81331b39
Revert back to an intialize more similar to the original
2014-04-27 23:21:00 -04:00
446ca8f73d
Context is not used within any of the renders so no need to pass it
2014-04-27 23:21:00 -04:00
d6bd735aff
Refactor highlighting
...
Extract some of the common logic from the renderers.
2014-04-27 23:20:00 -04:00
513e77635b
Refactor 'jekyll serve' command.
2014-04-27 19:02:33 -04:00
3a610882f6
Avoid duplicated output using highlight tags
...
While using Rouge and an `highlight` tag, the output was duplicated
since the `output` variable in the Liquid tag definition was equal to
the highlighter's prefix value and the `<<` method changes its receiver.
Therefore, we should simply define an empty string and append the prefix
if it is present.
2014-04-27 12:22:40 +02:00
4e6d268ef3
Bump 💎 version.
2014-04-25 23:16:00 -04:00
068d921ef6
Fix up docs for collections.
...
#2238 .
2014-04-25 23:15:18 -04:00
6225073095
Use the 'output' key instead of 'write' for writing out collections' document files.
2014-04-25 19:47:35 -04:00
c906dfdf71
TEST THE COLLECTIONS
2014-04-24 14:01:23 -04:00
dd4fe87f69
Use Hash.new instead of hash literal
2014-04-24 13:59:25 -04:00
fb39b41ffb
NO MORE DATA COLLECTION I CAN'T HANDLE IT
2014-04-24 13:59:25 -04:00
b74c90dc20
Extract Collections metadata from site config
2014-04-24 13:59:24 -04:00
0dc680df0b
Always render collections, just don't always write them
2014-04-24 13:59:24 -04:00
7be78de93a
Don't read the collection if it's the data collection
2014-04-24 13:59:24 -04:00
f1a422dfff
Don't pretend there is a collections setter
2014-04-24 13:59:24 -04:00
a27e5825b9
Nil-out `@collections` so `#collections` will re-compile
2014-04-24 13:59:24 -04:00
fd98d5b1e6
Fetch collection names agnostically regarding the data structure of config['collections']
2014-04-24 13:59:24 -04:00
330005d932
Reset the collections hash on #reset.
...
Fixes #2234 .
2014-04-24 13:59:24 -04:00
4de2be8c5f
Add Jekyll::LiquidExtensions.lookup_variable
...
To use, just include `Jekyll::LiquidExtensions` as you please:
```ruby
class SayHi < Liquid::Tag
include Jekyll::LiquidExtensions
def initialize(tag_name, markup, tokens)
@markup = markup.strip
end
def render(context)
"hi #{lookup_variable(context, @markup)}"
end
end
```
Fixes #2071 .
2014-04-22 14:27:47 -04:00
9db5a1a6ce
Merge pull request #2205 from jekyll/maul-esel-frontmatter-defaults
2014-04-21 23:01:05 -04:00
6f0bebdfda
convert input to string before xml escaping
2014-04-18 16:54:48 -04:00
571fb95cc1
Only read in 5 bytes when checking for YAML header.
...
#2211 #2210
2014-04-15 09:48:44 -04:00
29fdc0946a
Use +rb switches when reading in file for checking existence of YAML header.
...
Fixes #2228 .
2014-04-15 09:46:53 -04:00
b0cf022983
Release 2.0.0.alpha.3
2014-04-14 23:17:32 -04:00
5a6f1d42a9
Fix #filtered_entries so it returns a new Array if the directory doesn't exist
2014-04-14 23:03:19 -04:00
696aea211a
Don't gather any entries if the collection directory doesn't exist
2014-04-14 22:56:23 -04:00
a1af95c34e
Clean up some code per @baweaver's suggestions.
2014-04-14 22:46:22 -04:00
ad7efb23e6
Code/docs cleanup, props @baweaver
2014-04-14 22:46:22 -04:00
af61451f87
Use #error instead of #warn when telling the user not to use a custom data source
2014-04-14 22:46:22 -04:00
62551b5ff9
Include data in the array of collections
2014-04-14 22:46:22 -04:00
aa502348e5
Filter entries in the collection per EntryFilter#filter
2014-04-14 22:46:21 -04:00
323ea0ef73
EntryFilter#special? should also check the base name of the entry
2014-04-14 22:46:21 -04:00
f0e68d7d86
Expose collections as site.<collection_name> in Liquid as array of docs.
2014-04-14 22:46:21 -04:00
00ca09a2ea
Add comments for Document
2014-04-14 22:46:21 -04:00
a307aff858
Do not render any asset files with Liquid.
2014-04-14 22:46:21 -04:00
5ae1c34857
Add comments for Collection
2014-04-14 22:46:21 -04:00
be769dcf00
SANITIZE THE collection name plz.
2014-04-14 22:46:21 -04:00
37a7236e20
Homagah it all renders I think.
2014-04-14 22:46:21 -04:00
a15a584136
Don't let that render get you down.
2014-04-14 22:46:21 -04:00
75f49a751e
OMG COLLECTIONS ARE RENDERING CALL THE POLICE
2014-04-14 22:46:21 -04:00
f082eca791
GUYS failing test for rendering
2014-04-14 22:45:20 -04:00
cefe99bed2
Sort the docs based on path
2014-04-14 22:44:29 -04:00
90807ac6e7
DEM TESTS
2014-04-14 22:44:29 -04:00
08162dbb50
Hey girl, i heard you like YAML.
2014-04-14 22:44:29 -04:00
50b46d7bee
OMG it's happening ~*Collections*~
2014-04-14 22:44:29 -04:00
a77c92aebe
Replace load-in of YAML data with Jekyll::Document logic.
...
COLLECTIONS IS COMING
2014-04-14 22:43:09 -04:00
6be33cf6ef
Merge pull request #1492 from maul-esel/publishing
2014-04-14 20:17:01 -05:00
4f66db6c38
Merge pull request #2211 from jekyll/pgp-key-header-frontmatter
2014-04-14 12:59:59 -04:00
b666ac787b
Stricter start of line check via \A
2014-04-11 15:15:37 -04:00
387cf2181a
use regex to verify yaml existence
2014-04-11 08:00:40 -04:00
46a5ab99f9
Support "published: false" for pages
...
Fixes 1034.
2014-04-07 16:22:04 +02:00
3a330dc7fc
Use Publisher instead of Post#published?
2014-04-07 16:20:13 +02:00
26663a6cf9
add the Publisher class to handle publishing logic
2014-04-07 16:17:51 +02:00
91e9ecfa63
Add an --unpublished option to render unpublished posts
...
Fixes #1337 , #469 .
2014-04-07 16:17:12 +02:00
fec6b59950
Use File.exist? instead of deprecated File.exists?
2014-04-06 13:31:34 +02:00
823c863a53
require newline after start of yaml header
2014-04-05 17:34:08 -04:00
955dc38400
Deep merge data overrides into defaults.
2014-04-05 15:42:53 -04:00
09c6ff4f9c
Post#published is no longer a thing.
2014-04-04 15:34:42 -04:00
6bd07501e8
Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
...
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
move self.type to convertible
oops, fix minor indentation quirk
document frontmatter defaults precedence
adjust frontmatter defaults precedence handling
change cucumber feature to test for precedence too
fix frontmatter defaults for custom paths
more robust cucumber features
fix slash handling for paths
move cucumber features to own file
fix minor docs quirk
improve path checking, now using Pathname instead of regex
Add site documentation for the new feature
add inline code docs
improve validation code
fix for Ruby 1.8
Add basic cucumber features for frontmatter defaults
Retrieve frontmatter defaults when retrieved internally
make frontmatter defaults available to liquid
add a class `FrontmatterDefaults` for handling of frontmatter defaults
Add a method to retrieve type to post, page and draft
Conflicts:
lib/jekyll.rb
lib/jekyll/convertible.rb
lib/jekyll/core_ext.rb
lib/jekyll/page.rb
lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
f3c54fcf50
Merge pull request #2189 from benhanzl/move_rouge_loading
2014-04-02 22:38:05 -04:00
9ace48c835
Merge pull request #2197 from jekyll/plugin-manager
2014-04-02 22:15:40 -04:00
1863057b7e
Ok handle the plugins_path stuff in the PluginManager.
2014-04-02 22:06:38 -04:00
4a4c8846f4
Fetching/determining the plugin path is beyond this it's kind of sad.
2014-04-02 21:59:15 -04:00
8ccdee4035
STRIP ALL THE NEWLINES FROM HIGHLIGHTED CODE ok just the ones at the beginning and end
2014-04-02 14:37:22 -04:00
2a3f0c0ec3
Strip content of the {% highlight %} block
...
A fix for #1801
2014-04-02 14:11:19 -04:00
806f43cdbc
Merge pull request #1568 from nitoyon/url-escape
2014-04-02 14:09:09 -04:00
52ac2b3850
Permit YAML blocks to end with three dots
...
The YAML spec permits blocks to end with three dots (...) in addition to
three dashes (---): http://www.yaml.org/spec/1.2/spec.html#id2760395 . Some
programs that work with Jekyll (e.g., Pandoc) prefer the dots to dashes. This
commit permits the YAML metadata block to end with either dots or dashes. It
includes tests.
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-04-02 14:06:22 -04:00
14d9902586
Merge pull request #2200 from fabianrbz/remove_unnecessary_post
2014-04-01 23:10:37 -04:00
04666cd0cf
remove default post with invalid date
2014-04-01 22:32:12 -03:00
5d761a1c2b
Require 'plugin_manager' in lib/jekyll.rb
2014-04-01 18:44:37 -04:00
f418ea5fc3
Extract plugin management into its own class.
2014-04-01 18:10:51 -04:00
f2ed30dff5
Move rouge loading
2014-03-31 19:48:18 -04:00
a6ab3abbf9
Update site_template/_includes/head.html.
...
* remove `chrome` from `X-UA-Compatible`; it's been discontinued
* remove unneeded end tags
* remove unneeded slash in `canonical` link
2014-03-31 20:38:18 +03:00
8c0e5d8d98
remove duplicate code for tags and categories
...
Previously the `Site#tags` and `Site#categories` actually had the
same structure as a hash returned by `Site#post_attr_hash()`, but
maintained separately. Remove this duplicated infrastructure. For
backwards-compatibility for plugins, provide aliases for them.
2014-03-31 01:02:08 +02:00
e277855eee
Merge pull request #2165 from Zequez/master
2014-03-30 00:19:03 -04:00
840ef35be9
Merge pull request #2175 from jekyll/security-yo
2014-03-29 23:18:07 -04:00
302bc46914
rename variable inside block
2014-03-27 19:53:28 -03:00
adcfde14ed
align 'end' with 'def'
2014-03-27 19:52:52 -03:00
4c5dfa1391
remove unused variables
2014-03-27 19:49:41 -03:00
009e2c200d
Only strip the drive name if it begins the string.
2014-03-27 18:19:35 -04:00
859a615e93
Bump 💎 version to 2.0.0.alpha.2 and release.
2014-03-26 14:04:59 -04:00
5745eb9be8
Added option to force watch to use polling
2014-03-23 01:09:00 -07:00
81e4e1d8f4
add support for unpublished drafts
...
I keep all my ideas for blog posts as drafts in my draft folder. However I'm
only really working on a couple at once. This let's me mark drafts that I'm
not working on right now as unpublished so they don't clutter the site while
I'm checking on the other drafts.
2014-03-22 19:52:10 -04:00
c56ce248c9
Move URL escape to Jekyll::URL
2014-03-21 16:59:25 +00:00
e3e1c11509
Fix Page#url escape
...
Post#url wasn't escaped at all.
For example, when we have a page named 'a#b.html',
we expect its url to be 'a%23b.html',
but it was actually 'a#b.html'.
We now use Jekyll::URL.escape_path and Jekyll::URL.unescape_path.
2014-03-21 16:57:41 +00:00
eebb6414bf
Fix Post#url escape
...
Post#url was escaped using CGI.escape.
When file name contains a space character, its url points to
non-existing URL.
For example, when we have a post named '2014-01-02-foo bar.md',
we expect its url to be '/2014/01/02/foo%20bar.html',
but it was actually '/2014/01/02/foo+bar.html'.
We now define Jekyll::URL.escape_path and Jekyll::URL.unescape_path,
and use them to escape and unescape Post#url
2014-03-21 16:57:40 +00:00
1b8205245e
Went with @stomar's suggestion
2014-03-19 00:49:50 -04:00
63e977721a
Add a message and error out when Pygments returns nil.
2014-03-19 00:48:35 -04:00
d80471c0a3
Merge pull request #994 from stephenmcd/master
2014-03-17 17:45:49 -04:00
de9ce3437d
Protect against nil @lang before fixing for css class names.
2014-03-18 08:41:49 +11:00
e746b3bd5f
Initialize each command in its own class so we can be *magical*.
2014-03-13 14:07:05 -04:00
ac37b8acee
Merge pull request #2122 from XhmikosR/whitespace
2014-03-11 11:10:04 -04:00
553338636b
Trim trailing spaces and convert tabs to spaces.
2014-03-11 07:44:01 +02:00
19dc855551
Properly strip drive name from clean path when sanitizing path.
2014-03-10 14:35:19 -04:00
37c2da5062
Properly clean path for Windows machines which is *nix-compliant.
2014-03-09 21:12:34 -04:00
7787d64bce
Rename those Utils functions.
2014-03-04 15:52:05 -05:00
5e8643d855
Add Utils.stringify_hash_keys
2014-03-04 15:44:53 -05:00
e2af1b547b
Extract core extensions into a Utils module
...
Fixes #2111
2014-03-03 22:13:03 -05:00
0633cbf8fa
Bring in jekyll-sass-converter
2014-02-28 21:20:20 -05:00
9ffb984f37
Sass support should be shipped outside core.
2014-02-28 21:12:00 -05:00
d7598ee9d2
Ensure inputted code is a string.
2014-02-24 17:42:46 -05:00
77f26d5681
Upgrade to guard/listen 2.x
2014-02-24 17:10:43 -05:00
8a0d036b87
Greatly simplify Jekyll's gemspec.
2014-02-24 16:15:51 -05:00
b6f006c152
Merge pull request #2050 from jglovier/master
...
* jglovier-master: (35 commits)
Fix for menu at mobile again
Fix site footer styles on mobile
Fix for menu not working on mobile
dat breathing room tho (expand site width slightly more)
Replace footer github and twitter link text with inline SVG icons
Post content styles for mobile
Replace unicode menu icon with inline SVG
Adds mobile styling for menu at sub 600px viewport widths
🔥 permalink option so default date permalink method is left in tact
For the love of perf, add syntax.css rules to main.css and call only one stylesheet
Adds another placeholder post to illustrate post content styles
Dem new styles tho
Copy tweaks - brevity FTW
Use class instead of id for CSS specificity ❤️
Add link for RSS subscription
Slightly friendlier and personal date formatting; classes for dem styles, yo
Remove to avoid confusion with site.title
demonstrate use of permalink settings
Add site.url for use in head canonical meta and feed.xml template
Add site.description for use in site head document meta, and feed.xml template
...
2014-02-24 16:07:20 -05:00
e2c67e0239
Fix for menu at mobile again
2014-02-24 16:03:39 -05:00
2c100a8e87
Fix site footer styles on mobile
2014-02-24 15:56:49 -05:00
7fbc636824
Fix for menu not working on mobile
2014-02-24 15:42:03 -05:00
57d07469d3
Sanitize paths uniformly, in a Windows-friendly way.
...
Fixes kinda a #1948 thing.
Related to #1946 .
2014-02-23 20:05:23 -05:00
f1c4e247a5
Remove unnecessary references to `self`
2014-02-21 16:27:21 -06:00
bdd35789db
dat breathing room tho (expand site width slightly more)
2014-02-20 20:34:09 -05:00
e0166682da
Sort the static files by relative path before sending to liquid
2014-02-19 14:02:03 -05:00
e3dd908d55
Add StaticFile#to_liquid['extname'] :)
2014-02-19 13:55:58 -05:00
b5a398bdff
Add StaticFile#to_liquid and StaticFile#relative_path
2014-02-19 13:35:13 -05:00
949aa3fc32
Test fetching of static files
2014-02-19 13:16:21 -05:00
6e40338f9e
Expose site.static_files to Liquid
2014-02-19 13:04:33 -05:00
6a6e66bf9e
Merge pull request #2058 from jekyll/layouts-relative-to-config
2014-02-18 01:53:15 -05:00
b68229aa2c
Make LayoutReader#layout_directory public.
...
Since it's being used in a test, let's go ahead and expose it instead of
dealing with using Object#send to send the message along.
2014-02-17 22:13:29 -06:00
6bc4776199
Replace footer github and twitter link text with inline SVG icons
2014-02-17 22:23:30 -05:00
aa4280904a
Post content styles for mobile
2014-02-17 16:58:12 -05:00
1c5ed75e72
Replace unicode menu icon with inline SVG
...
- unicode menu icon doesn’t render pixel crisp (has some
anti-aliasing), whereas SVG renders pixel optimized
- using inline SVG (instead of a referenced, attached file, will save
an http request
2014-02-17 16:52:48 -05:00
893b664f34
Adds mobile styling for menu at sub 600px viewport widths
2014-02-17 16:36:21 -05:00
e5bcddfbe0
Merge pull request #2041 from anthonyjsmith/webrick_index_xml
2014-02-17 16:23:25 -05:00
3e6f2d8cef
🔥 permalink option so default date permalink method is left in tact
2014-02-17 12:42:15 -05:00
1a879a04ab
Add tests for determining source dir
2014-02-16 23:19:03 -05:00
47babef79a
Make the layouts: config key relative to CWD or to Source
...
Fixes #1576 .
2014-02-16 22:42:38 -05:00
ab0ebadee3
Merge master into security-vuln-patches
2014-02-16 22:02:03 -05:00
264dfc164d
When an include cannot be found, only print file path relative to source.
2014-02-16 22:00:33 -05:00
fb8e562123
Merge pull request #2042 from anthonyjsmith/draft-path
2014-02-16 21:36:00 -05:00
c47751148c
Remove executable bits of non executable files.
2014-02-17 01:41:12 +01:00
28554fd307
For the love of perf, add syntax.css rules to main.css and call only one stylesheet
2014-02-15 23:27:34 -05:00
bd80ce4c61
Adds another placeholder post to illustrate post content styles
2014-02-15 23:24:30 -05:00
cac15574e7
Dem new styles tho
...
- Uses new typography, including Helvetica light, larger font-sizes,
and px values
- Wider site width, larger margins, and overall more whitespace
- Responsive down to mobile
2014-02-15 23:21:15 -05:00
1e28eee0c7
Copy tweaks - brevity FTW
2014-02-15 23:17:05 -05:00
6773307237
Use class instead of id for CSS specificity ❤️
2014-02-15 23:16:47 -05:00
a11f01784a
Add link for RSS subscription
2014-02-15 23:16:23 -05:00
e5cf3cbbc1
Slightly friendlier and personal date formatting; classes for dem styles, yo
2014-02-15 23:16:11 -05:00
3d464688fc
Remove to avoid confusion with site.title
2014-02-15 23:15:37 -05:00
8d05a54590
demonstrate use of permalink settings
2014-02-15 23:14:20 -05:00
e398c3b16c
Add site.url for use in head canonical meta and feed.xml template
2014-02-15 23:14:01 -05:00
287851ebb4
Add site.description for use in site head document meta, and feed.xml template
2014-02-15 23:13:43 -05:00
b3a2ea4e3e
Software with Personality™
2014-02-15 23:12:42 -05:00
240bbf4abb
Adds feed.xml file for generating an RSS feed
2014-02-15 23:10:25 -05:00
53ae5a7b0f
Add placeholder About page
2014-02-15 23:09:28 -05:00
1687f0855d
Add placeholder Projects page
2014-02-15 23:09:19 -05:00
16d8d05172
Adds a basic page template
...
Many users moving to Jekyll from other popular blogging options (like
Wordpress) will be used to thinking in terms of pages/posts. Having a
page template like this will be convenient for those users.
2014-02-15 23:07:10 -05:00
fcd2383de3
Refactor post template
...
- add article tags around post content
- creates post header
- add conditionals for extra options in meta
2014-02-15 23:04:44 -05:00
1b54afe67a
remove extra line
2014-02-15 23:03:13 -05:00
d5ea6e47dd
Restructure default template to include page content wrap
2014-02-15 23:02:41 -05:00
8fa48b492e
Footer markup restructuring
...
- rework footer to use columns
- add additional area for generic text
2014-02-15 23:02:04 -05:00
6d4e3f8c72
Refactor header markup
...
- use anchor instead of h1 for site title, for semantic accuracy, and
because post h1’s should be the post title
- implement nav wrapper for nav links
- use div.wrap for design structure
2014-02-15 23:00:37 -05:00
d52b9b7e5b
Remove redundant home link
2014-02-15 22:57:10 -05:00
a1b60430d6
Add canonical meta set with config params for more google ❤️
2014-02-15 22:56:30 -05:00
b9875b7bc8
Add description meta set in config, for teh google ❤️
2014-02-15 22:56:04 -05:00
7b0bf0d85c
Add conditional to default to site.name if no page.title is set
2014-02-15 22:55:14 -05:00
3b97799837
Separate global components into includes for convenience, and to familiarize users with includes structure
2014-02-15 22:53:48 -05:00
699066ef85
Add `.mkdown` as valid Markdown extension
...
GitHub Linguist recognizes `.mkdown` as Markdown, so Jekyll should support it as Jekyll is used on GitHub pages.
2014-02-15 22:01:37 +01:00
86208d8c33
Add index.xml to WEBrick DirectoryIndex
...
Resolves #2040
2014-02-13 23:12:36 +00:00
88e35f0852
Release 2.0.0.alpha.1
2014-02-13 18:02:49 -05:00
ac7bed335a
Merge pull request #1976 from jekyll/fix-pagination-issue
...
Relative posts should never fail to build, even if @dir or @name is nil
2014-02-13 12:39:23 -06:00
83f5b4d93b
Merge pull request #2031 from jekyll/utf8-heart
2014-02-13 12:53:58 -05:00
69dc96dc9f
Removed accidental linebreak
2014-02-13 13:28:11 +00:00
933590b6ba
Added a breakpoint for .site to make it responsive
2014-02-13 13:27:34 +00:00
c58c5b8782
Default to using the UTF-8 encoding when reading files.
...
Fixes #2029 .
2014-02-11 17:48:52 -05:00
18279558da
Update #relative_path for _drafts and add tests.
...
Resolves #2019 . Add new tests for drafts. Also check path variable in
test for posts.
2014-02-11 12:48:34 +00:00
56a633ae95
Update Jekyll version to latest released.
...
Latest release can be found on the v1-stable branch.
2014-02-09 18:44:30 -05:00
dd3018ce02
Merge pull request #1988 from jekyll/maruku-to-kramdown
2014-02-08 17:07:54 -05:00
22f2001ff5
Set default markdown converter to Kramdown
...
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
1176fc6f57
Give File.join the strings from the array
2014-02-08 00:38:59 -05:00
c36a6d3e0d
Wrap the LayoutReader in the Jekyll module
2014-02-06 23:07:38 -06:00
833b40095f
Rename `with` to `within`
...
Thanks @parkr
2014-02-06 23:07:11 -06:00
fd92820b03
Remove Site#read_layouts
2014-02-06 22:46:09 -06:00
70ecef0094
Sort methods from most important to least important
...
This idea is based on the concept of a newspaper. The most important
things such as the headlines and the major details of the story at the
top. This translates to code in that the public API and the more
important private methods are at the top of the file. The more detailed
information (or methods, in the code) are further down, so that if
you've gotten all you need out of the code up to a certain point, you
don't need to keep reading anymore.
2014-02-06 22:22:06 -06:00
c5b81d580b
Refactor the LayoutReader class
2014-02-06 22:22:06 -06:00
f581940c71
Create a LayoutReader class to read layouts
2014-02-06 22:22:06 -06:00
f638fb1784
Merge master into security-vuln-patches
2014-02-06 17:21:54 -05:00
5edb4c6bfd
Merge pull request #1982 from dtao/safe-yaml-no-clobber
2014-01-31 06:48:16 -08:00
baabe7eb7e
DRY up code, props @tamouse
2014-01-30 22:03:10 -05:00
2b973468bf
Merge pull request #1991 from jekyll/coffeescript
2014-01-30 18:39:40 -08:00
509e2181de
sync mime types to GitHub
2014-01-26 12:15:15 -06:00
fdbfd719ca
Add CoffeeScript converter.
2014-01-25 20:38:51 -05:00
4a769dbf5f
Optimize Post#{next,previous}
...
Use object equality for comparisons rather than Comparable#==,
which in turn uses Post#<=>, which is slow.
This yielded a 3x performance improvement for `jekyll build`
on a large site (1m6.467s -> 0m19.532s).
2014-01-24 17:17:41 -08:00
5b7a53b543
Merge pull request #1932 from jekyll/sass
2014-01-24 15:18:06 -08:00
c9a3c40f83
fixes based on @mattr-'s notes
2014-01-24 12:19:19 -05:00
774bf96c61
Merge master into sass
2014-01-24 12:17:35 -05:00
4f0b1bdf6d
switched from YAML.safe_load* to SafeYAML.load*
2014-01-23 17:25:17 -08:00
98857832cd
Merge pull request #1931 from liufengyun/published
2014-01-22 05:38:04 -08:00
606c525099
Relative posts should never fail to build, even if @dir or @name is nil
...
Fixes https://github.com/jekyll/jekyll/issues/1963
2014-01-21 23:50:20 -05:00
22e1e5f28c
make sure pages with published being false are not generated
2014-01-19 09:52:19 +08:00
4c140efba8
fix full path leak to source directory when using include tag
2014-01-15 21:36:35 +01:00
e3be74e376
sanity check for pages permalink traversal
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
a8dd34420b
Prevents disclosure of file existence
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
c84cb5c007
escape relative post permalinks, cleanup
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
a799e41b70
patch symlink vuln and properly test
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
323d14845f
rebreak tests, move sanitization closer to write
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
9b3068c15d
url escape before sanitizing
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
4afe39e461
Allow caching in unsafe mode, but disable in safe mode.
2014-01-12 21:36:08 -08:00
4784d1de18
Build Sass configuration options.
2014-01-12 21:30:30 -08:00
22d4e2aa90
Consolidate into one master 'Sass' converter.
2014-01-12 21:30:29 -08:00
daa0b76484
Allow users to specify options for Sass.
2014-01-12 21:30:29 -08:00
4da7223831
Fixes for Sass/SCSS converters.
2014-01-12 21:30:29 -08:00
824a84ef2a
Add support for Sass and SCSS.
2014-01-12 21:30:29 -08:00
6f394e82b5
Rename read_things to read_content.
2014-01-11 15:29:22 -06:00
d96165e3c4
Merge pull request #1916 from jekyll/gitignore-excludes
2014-01-11 10:37:31 -08:00
5a52986db0
Use 'Forwardable' module to pass along some attribute calls to @post
2014-01-10 22:54:06 -08:00
331c7adc08
Move #glob_include? from core_ext to entry_filter
2014-01-08 20:24:21 -08:00
3d67cdc150
Cast to string before duplicating.
2014-01-05 11:02:03 -08:00
35868807c1
Ensure leading slashes in path matching.
2014-01-05 10:54:52 -08:00
42fc5e9ee7
Excludes should be relative to the site source
2014-01-05 10:45:42 -08:00
883e16acde
Merge pull request #1910 from pborreli/typos
2014-01-04 08:12:20 -08:00
a33e86630d
Merge pull request #1899 from soimort/preview-404
2014-01-04 08:04:20 -08:00
bdda3a8ef6
Fixed typos
2014-01-04 14:17:38 +00:00
6ca731c13b
Use idiomatic #is_a? method instead of #class ==
2014-01-03 21:23:02 -08:00
39e4d6b3ba
add where filter to filter arrays of objects
2014-01-03 21:23:02 -08:00
99b36c7c30
Routing 404 errors to custom 404 page for development server
2014-01-03 03:23:46 +01:00
fdcf1f4526
Add --quiet flag
2014-01-01 18:50:27 +02:00
012387396a
Merge pull request #1859 from robin850/rouge
2013-12-30 22:45:07 -06:00
a2fd8ba7c3
Merge pull request #1849 from afeld/sort-attributes
2013-12-30 20:31:45 -08:00
791c6d815d
Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names
2013-12-25 22:32:50 -08:00
1a3a607fcf
Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks
2013-12-25 22:14:23 -08:00
6e8f31f406
Merge pull request #1841 from jens-na/include-variable-liquid-filters
2013-12-25 22:11:33 -08:00
ebaa484294
Merge pull request #1866 from colindean/patch-2
2013-12-25 22:06:34 -08:00
ab95cca434
Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class?
2013-12-26 00:33:34 -05:00
7b9984699c
Fix error in exception message in Markdown Converter [ci skip]
2013-12-26 00:14:24 -05:00
60b43104ee
Extract checks for acceptable custom markdown processors to method.
...
We should probably write more about what it does and how it works in a TomDoc block above.
@envygeeks, want to give that a shot?
2013-12-26 00:02:56 -05:00
a206dc1a8f
Use downcase.
2013-12-25 23:55:20 -05:00
c70350e275
Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
...
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
Depend on Jekyll.logger.error, not $stderr
Allow custom Markdown processors.
New is implied by `raise`, 2nd is the message.
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00
31bebf0f9e
Depend on Jekyll.logger.error, not $stderr
2013-12-25 19:36:49 -06:00
c759a7a75f
Allow custom Markdown processors.
2013-12-25 19:36:25 -06:00
626d54a812
New is implied by `raise`, 2nd is the message.
2013-12-25 19:36:25 -06:00
4d017b4fed
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 19:36:25 -06:00
036cbda2f6
Require at least 1.3.0 for Rouge
...
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.
An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
9d5785cead
Merge pull request #1847 from schneems/schneems/better-bat-time-error
2013-12-24 11:05:34 -08:00
88686e759e
Add `path` to required methods
...
The error messages in this module call `#path`, but the module does not require the `path` method to be implemented. This change documents that classes which include `Convertible` must define `path`.
See #1846 for discussion.
2013-12-23 12:56:02 -05:00
3ca2cb0119
Fix various typos and improve the doc
2013-12-23 13:03:29 +01:00
cab9047de1
Set the wrap option to false when using Rouge
...
Since Rouge yields the pre tag with a class attribute but we don't want
it, we should set the wrap parameter to false when instantiating a new
formatter object.
Also use Rouge::Formatter#format instead of #render which is deprecated
and will be removed in the near future.
2013-12-23 13:03:24 +01:00
fa8618879d
Merge remote-tracking branch 'upstream/master' into sort-attributes
2013-12-22 19:31:56 -05:00
bd442680ea
Rely on the Redcarpet plugin instead of hard-coding
...
To avoid code duplication and have to keep tracking of the API change of
Rouge, let's rely on the Redcarpet plugin and customize the output on
our needs.
2013-12-22 18:45:46 +01:00
4bf716c2ad
Set highlighter to pygments when upgrading
...
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
2013-12-22 18:45:46 +01:00
0831d2b0f8
Add support for the Rouge syntax highlighter
...
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
92064134d6
Rename the pygments option to highlighter
...
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.
It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
2bfafb3b33
make non-data properties/methods accessible to Liquid
...
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
2013-12-22 03:38:32 -05:00
c2b750448e
allow data attribute access by Liquid on Convertible items
2013-12-19 17:14:51 -05:00
10ee83d680
edited raise message when validating included file
2013-12-19 18:23:21 +01:00
3c1d45f45f
Sort pages by name by default
...
The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact.
2013-12-19 01:02:25 -05:00
22017d085b
Better error message when time is not parseable
...
Give the full path of the file that cannot be parsed so the user can locate it easier. Follow up the error message with helpful instructions: they can resolve the error by fixing the date or excluding the file or directory from being processed.
2013-12-18 16:14:21 -06:00
43ef9a2e4f
variables in include tag with filters
2013-12-17 23:51:52 +01:00
ecab2eb473
made error description more helpful
2013-12-17 10:57:12 +09:00
1ebce26881
Default Maruku fenced_code_blocks to ON.
...
Extends https://github.com/jekyll/jekyll/pull/1799
2013-12-15 16:08:21 -05:00
9d259fe315
added error description for invalid post name
2013-12-15 17:18:11 +09:00
a5545d5bad
post_url tag raises ArgumentError for invalid name
...
Using post_url tag with invalid name raises TypeError.
It should raise ArgumentError and should display detail of the error to
fix the error.
2013-12-14 22:30:22 +09:00
6195192bcf
mojombo/jekyll ~> jekyll/jekyll
2013-12-11 17:44:33 -05:00
39b6fe732f
Merge pull request #1780 from mojombo/kill-1-8
2013-12-11 06:08:10 -08:00
6efb726e2b
Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar
2013-12-10 20:58:45 -08:00
a7d4ee8bfb
Merge pull request #1799 from konklone/maruku_fenced_code_blocks
2013-12-10 20:30:44 -08:00
b18f6505dd
Remove margin-top of `.site` to prevent collapsing margins.
2013-12-10 18:39:16 -05:00
a70726e554
Merge pull request #1788 from mojombo/group-by-filter-2
2013-12-10 08:48:44 -08:00
afe9387578
condensing code slightly
2013-12-10 11:04:04 -05:00
ed82098162
Merge pull request #1796 from mojombo/fix-fetching-things
...
Reject nil entries in Site#read_things
2013-12-09 18:23:19 -08:00
695e5bbc40
move EntryFilter class from global namespace into Jekyll module
2013-12-09 23:06:27 +01:00
063111737c
Refactor data/[] fetching of item property.
2013-12-09 12:59:43 -05:00
bf9cf5340d
Reject nil entries in Site#read_things
2013-12-09 12:46:57 -05:00
14418f74ae
in-progress patch for maruku and fenced code blocks
2013-12-08 22:37:46 -05:00
381ab4e71b
Implement group_by Liquid filter & tests.
2013-12-08 01:16:48 -05:00
601f89d4d1
Remove File.read_with_options patch to allow 1.9 and 1.8 to behave the same
2013-12-08 00:50:12 -05:00
d130fd13dc
Remove Ruby <1.9 core extensions
2013-12-08 00:47:44 -05:00
b58cd5c132
Merge pull request #1657 from mojombo/safe-whitelist
...
A gem-based plugin whitelist for `safe` mode
2013-12-07 21:41:55 -08:00
350c9b3ab5
bump the version number in the code
2013-12-07 17:59:16 -06:00
362d28f11d
Merge pull request #1779 from mojombo/no-duplication
...
Refactor post and draft object creation
2013-12-06 20:58:24 -08:00
9f1593299a
Merge pull request #1775 from Ivoz/maruku
...
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
6a13f7dd57
Modifying enumerator for 1.8.7
2013-12-06 01:28:21 -05:00
e69d77b4df
Refactor post and draft object creation
...
De-duplicate object creation between posts and drafts. Inject the name
dependency through a parameter
2013-12-06 01:28:21 -05:00
e91db82d26
I mean the argument and the local variable should be the same thing
2013-12-06 01:07:34 -05:00
f0fbc8f356
Refactor conditions for allowing plugins into a new method: Site#plguin_allowed?
2013-12-06 00:26:44 -05:00
249b13a98a
Hm, shouldn't need that call to 'rescue' in Site#whitelist
2013-12-06 00:24:59 -05:00
5c9f9a4de8
The whitelist should be an array (not a file)
...
Default to `[]` if the key’s value is falsey
2013-12-06 00:23:22 -05:00
f1869cda98
Merge branch 'master' into frontmatter-defaults
2013-12-05 19:29:57 +01:00
960e01cba8
move self.type to convertible
2013-12-05 09:14:31 +01:00
4a2e5af52e
Merge pull request #1682 from envygeeks/patch-1
...
Sort plugins so people can have "load orders".
2013-12-04 18:40:04 -08:00
052a577938
Merge pull request #1765 from mojombo/tomlify
...
Add support for TOML config files
2013-12-04 18:28:20 -08:00
5ed9d21ec7
Remove extraneous newlines from XHTML output
2013-12-05 12:04:55 +11:00
b637420373
Merge pull request #1755 from gregkare/more_trailing_whitespace
...
Remove trailing whitespace
2013-12-02 12:35:06 -08:00
63122fdafc
add a space between "find" and "an"
2013-12-01 19:11:16 -05:00
b8bbc6e08b
require the TOML gem, idiot.
2013-11-29 23:33:38 -05:00
22b95aee38
Give that LoadError a good message.
2013-11-29 23:33:25 -05:00
1e32af47a6
Better config file parser error if it's not there.
2013-11-29 23:22:13 -05:00
51706e8da7
Parse TOML or YAML in Jekyll::Configuration.
2013-11-28 22:11:56 -05:00
91a4c5611e
Prep for the 1.3.1 release
2013-11-26 20:27:27 -06:00
eceebb23a6
Pagination generator should have :lowest priority
2013-11-26 12:45:00 -05:00
ce8e271b5d
Remove trailing whitespace
2013-11-25 13:31:53 +01:00
c5533e9016
restrict rescue-clause in IncludeTag#render
...
As it previously enclosed the whole method, it also
wrapped file validation errors, which is not meant to be.
Fixes #1745 .
2013-11-22 06:58:52 +01:00
3888a24068
output including file for include tag error
2013-11-21 22:03:39 +01:00
dfffc2e72a
Use Pathname#to_s instead of Pathname#to_path
...
Fixes #1723 .
2013-11-16 13:12:59 -05:00
5e0af84993
fix include tag: don't store variable value
...
This fixes the bug reported in #1495 (comments).
2013-11-14 20:53:59 +01:00
615d49ed66
Remove Site.whitelist attribute.
2013-11-04 23:24:21 -05:00
a4b9bab1dc
Add --whitelist flag and internal logic
2013-11-04 23:24:21 -05:00
480e35037b
A start at a gem-based plugin whitelist for Pages.
2013-11-04 23:24:21 -05:00
6791f9fc12
Use the new `EntryFilter` class in `Site`
2013-11-04 21:35:53 -06:00
63713799cd
Extract Site#filter_entries into its own class
2013-11-04 21:35:13 -06:00
65653fed84
Bump version to 1.3.0
2013-11-03 21:48:34 -06:00
50fabc7b37
Update implementation of listen for v1.3.x
2013-11-01 23:16:04 -04:00
7a1f63d994
Sort plugins so people can have "load orders".
...
This allows for people to do something like "_plugins/1-autoload-global.rb" and have it load first and so on making it much easier to organize code and have a "header file" that does all the requiring up front if it's needed for all plugins.
2013-10-31 07:12:54 -05:00
9f63ddb4db
Prepare for a 1.3.0.rc release
2013-10-28 20:26:36 -05:00
3ab9841272
Fix 1.8.7 syntax errors.
2013-10-28 14:03:34 -04:00
f697d12027
Merge pull request #1651 from liufengyun/jsonify
...
support jsonify filter
2013-10-23 20:50:14 -07:00
2287eed0c6
Merge pull request #1589 from dchest/better-watch
...
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
23ad7fa4bd
Merge pull request #1557 from mojombo/require-gems-plugins
...
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
f971aebfb1
support jsonify filter
2013-10-22 23:52:22 +08:00
12ba0a541c
Update listen to ~> 2.0.
2013-10-18 11:04:54 +02:00
0e784596a5
Merge pull request #1543 from maul-esel/fix-coderay
...
Add tests for special handling of kramdown's coderay options
2013-10-17 06:35:43 -07:00
c2aa26280c
extract pages.any?... in own method
2013-10-17 15:17:58 +02:00
f0aac30491
remove duplicated render code for posts and pages
2013-10-17 12:07:30 +02:00
7232948b62
simplify relative permalink deprecation
2013-10-17 12:06:21 +02:00
2b275ef192
oops, fix minor indentation quirk
2013-10-15 14:38:45 +02:00
dd851943c0
adjust frontmatter defaults precedence handling
...
Before, the bottom-most default set had highest precedence. Instead,
now the set with a longer i.e. more specific path has precedence and
sets with a type setting have precedence over those without one. In
case of equal precedence the bottom-most still wins.
2013-10-15 14:18:44 +02:00
20ea0c8d56
Merge branch 'master' into frontmatter-defaults
2013-10-14 19:44:06 +02:00
699eeba9f0
fix frontmatter defaults for custom paths
...
The Page#path or Post#path can be overriden by by a frontmatter
setting. This causes path-based frontmatter default detection to
fail. Add test to demonstrate this and fix it.
2013-10-14 19:16:53 +02:00
67a451ea84
fix slash handling for paths
2013-10-14 18:43:12 +02:00
0761769dda
Merge pull request #1615 from benbalter/downcase-lexers
...
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
87ef39aeb0
Add support for use of folders inside _layout path, closes #1622
2013-10-08 14:19:12 -03:00
844cc615e4
actually downcase lexer
2013-10-06 15:55:16 -04:00
9ff245dbdb
clean up comments to be more concise/uniform
2013-10-05 13:20:30 -04:00
d5f137bc86
downcase lexers before passing to Pygments
2013-10-05 11:26:26 -04:00
310688297b
I guess we'll wait until v2.0 to switch to absolute permalinks.
2013-10-04 15:03:05 -04:00
bf1d9a79c4
Add support for gem-based plugins.
2013-10-04 14:45:28 -04:00
b00849544b
fix error with variable as file name
2013-10-04 19:12:29 +02:00
fef96d95e1
Merge pull request #1495 from maul-esel/variable-include
...
Variable {% include %}
2013-10-04 05:42:27 -07:00
76ada8c672
output correct path in case of liquid error in layout
...
As with includes, an error in a layout was reported on the
page that used the layout. Fix this by passing on the path
of the layout that is rendered.
2013-10-04 00:07:50 +02:00
809ab5e355
Move catching of liquid errors in include tags
...
The previous code only caught render-time errors. This change
makes it catch parse-time errors as well, such as unknown tags.
2013-10-03 23:56:58 +02:00
92750c3cfd
Add parenthesis to the call for super
2013-10-02 21:51:32 -05:00
7a4ea086a1
Output path in case of render error in included file
...
Fixes #1591 .
2013-10-01 23:02:50 +02:00
623fa14b3c
Include tag: provide path in case of render error
2013-10-01 22:54:39 +02:00
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
a93795bcc0
implement variable retrieval in include tag
...
Fixes #1464 .
2013-10-01 22:28:45 +02:00
9d4f9169e9
Merge pull request #1514 from maul-esel/tag-errors
...
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
cb4d15561c
Merge pull request #1003 from liufengyun/data-sources
...
support data sources
2013-09-30 20:47:57 -07:00
760cbc7f91
Autoload yaml files under _data directory
...
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
58cab6b050
Handle destinations outside of source.
2013-09-30 05:55:38 +02:00
dfaf1f45cc
Remove require 'pathname': already included.
2013-09-30 05:11:15 +02:00
8fe25a6958
Replace directory_watcher with listen.
...
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.
Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
924285695c
Print server address when launching a server.
...
Related to: https://github.com/mojombo/jekyll/issues/1583
2013-09-28 19:18:36 -04:00
27347596ad
Merge pull request #1449 from shigeya/config-encoding-and-yaml-opts
...
Adding "encoding" configuration (4th version)
2013-09-23 19:30:44 -07:00
c78c4159c0
Merge pull request #1571 from mojombo/non-destructive-array-concat
...
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
943acc4395
Remove overly specific css from site template
2013-09-23 13:23:54 +01:00
a88a63da2d
Don't use destructive Array#concat for Liquid Attribute arrays
2013-09-22 18:26:34 -04:00
1829c2734a
'gist' tag: switch to ArgumentError exception class
...
SyntaxError is reserved for Ruby's internal use.
Adjust the tests, including the call to liquid to
make it rethrow ArgumentErrors.
2013-09-19 23:23:04 +02:00
9409a3d034
raise exceptions in include tag
2013-09-19 14:32:15 +02:00
72c3bba56a
Change error handling in 'post_url' tag: raise exception
2013-09-19 14:24:22 +02:00
06fb31544f
Change error handling for gist tag: raise exception
2013-09-19 14:24:22 +02:00
c625ddf6cd
Invoke File.read with or without options depends on Ruby version
...
- Extract option fetch method as a separate method
- Added File.read_with_options method to use
- With performance fix
2013-09-19 12:22:50 +09:00
97e052df63
Pass encoding parameter as string, not an object
2013-09-19 12:21:26 +09:00
8b892ed735
read_yaml to accept optional parameter to override defaults
2013-09-19 12:21:25 +09:00
4cb24f4b87
consider a case of "site" is unavailable in Convertible
2013-09-19 12:21:25 +09:00
f4c2383d3c
write document for config.encoding
2013-09-19 12:21:25 +09:00
8a28d80690
add encoding for configuration
2013-09-19 12:21:25 +09:00
793eb96a77
Merge pull request #1490 from penibelst/allow-include-read-override
...
Extract include tag read file in a method
2013-09-18 19:34:45 -07:00
ec85c49de3
Change exception type
2013-09-17 22:11:56 +02:00
7cec996f90
Validate the entire markup as soon as possible
2013-09-17 21:41:11 +02:00
25519b38f6
Validate file name as soon as possible
2013-09-17 20:57:01 +02:00
8017548bd0
Rename variable
2013-09-17 20:46:01 +02:00
7f62e69837
Remove obvious comment
2013-09-17 20:36:33 +02:00
e5f99e2798
Remove return
2013-09-17 20:35:18 +02:00
3e2ab58d56
Fix unruby paradigm
2013-09-17 20:34:04 +02:00
a42e57f274
Rename constants
2013-09-17 20:14:41 +02:00
de49342324
Merge pull request #1556 from maul-esel/dest-match
...
Fix up matching against source and destination when the two locations are similar.
2013-09-16 18:34:22 -07:00
454e038fad
Require 'pathname'
2013-09-16 20:29:57 -05:00
3dadc94ce4
Don’t repeat yourself
2013-09-16 23:16:41 +02:00
299cb93147
improve path checking, now using Pathname instead of regex
2013-09-16 15:42:59 +02:00
bec4a07c12
Fix handling of source-dest matching being too aggressive
...
Fixes #1130 .
2013-09-16 14:41:20 +02:00
891ea8f604
People can symlink it if they want in unsafe mode
2013-09-16 08:37:07 +02:00
081b974114
Resolve conflict
2013-09-16 08:19:56 +02:00
79f50b0568
Resolve conflict
2013-09-16 08:15:10 +02:00
6f053fbc8c
Update gemspec & version to v1.2.1
2013-09-14 20:59:06 -04:00
29d0841e97
#to_sym is called by #symbolize_keys
2013-09-13 14:06:16 +02:00
4b8bb68e56
Cleanup newlines in Commands::Serve
2013-09-12 14:05:16 -04:00
c926596be7
Print better messages for detached server. Mute output on detach.
2013-09-12 14:02:52 -04:00
5775603f49
add inline code docs
2013-09-11 17:49:34 +02:00
0874c14b2c
improve validation code
2013-09-11 17:37:15 +02:00
accea6648c
fix for Ruby 1.8
2013-09-11 17:27:34 +02:00
fb911af2cd
Retrieve frontmatter defaults when retrieved internally
...
This is for example possible for layout defaults to take effect.
2013-09-11 00:57:18 +02:00
9d44d3290b
make frontmatter defaults available to liquid
2013-09-11 00:55:57 +02:00
b3fdaa9792
add a class `FrontmatterDefaults` for handling of frontmatter defaults
2013-09-11 00:55:28 +02:00
3ccd8dad31
Add a method to retrieve type to post, page and draft
2013-09-11 00:48:05 +02:00
421e58ad59
a patch for the issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll]( https://github.com/mojombo/jekyll/issues/1519 )
2013-09-10 23:12:15 +09:00
d8e0f009d2
Merge pull request #1363 from koron/stop-reverse-lookup
...
disable reverse lookup
2013-09-06 20:37:31 -07:00
afe1291f0c
Update Jekyll::VERSION
2013-09-06 22:23:31 -04:00
3212aac4bc
Merge pull request #1481 from mojombo/pathawks-patch-1
...
Expose Jekyll version to templates: `jekyll.version`
2013-09-05 13:24:37 -07:00
09ed340835
Fix include tag to avoid NameError
2013-09-02 14:25:13 +02:00
b7e34175d0
Put version under 'jekyll' namespace.
2013-08-30 18:54:03 -04:00
20f44be87f
Merge branch 'patch-1' of git://github.com/pathawks/jekyll into pathawks-patch-1
...
* 'patch-1' of git://github.com/pathawks/jekyll:
Use proper Ruby syntax for constant
Expose Jekyll version to templates
2013-08-30 18:50:58 -04:00
a9e2a74ea6
Merge pull request #1341 from maul-esel/minor-refactors
...
Minor refactors
2013-08-29 20:21:08 -07:00
0d890e4b70
Merge pull request #944 from x3ro/permalink-special-characters
...
WIP - Improve permalink generation for URLs with special characters
2013-08-28 15:02:20 -07:00
8ea336945c
Merge pull request #1429 from maul-esel/refactor-cleanup
...
Refactor `Site#cleanup` into Jekyll::Site::Cleaner class
2013-08-26 14:01:53 -07:00
4fa4ad2232
Merge pull request #1443 from ddavison/detachment
...
Detachment
2013-08-24 20:16:42 -07:00
b163bf637e
final mods
2013-08-24 21:31:05 -04:00
4c015fc5ff
move Jekyll::Cleaner to Jekyll::Site::Cleaner
2013-08-23 20:42:27 +02:00
dbd368f6ee
remove no longer necessary condition
2013-08-23 20:41:13 +02:00
9681f3a776
adding default configuration to false
2013-08-21 21:00:18 +00:00
4e52869f0f
adding detachment functionality
2013-08-21 20:53:01 +00:00
bca28056ef
Fix a misleading typo
2013-08-21 14:53:10 +02:00
d28858a9e9
put the Cleaner instance in a `Site#site_cleaner` method
2013-08-19 20:15:54 +02:00
0b3005b3b4
make obsolete_files a method (@mattr-)
2013-08-19 20:01:36 +02:00
820f526569
Merge pull request #1389 from mojombo/doctor-conflicting-permalinks
...
Implement URL conflict checking in `jekyll-doctor`.
2013-08-18 08:57:49 -07:00
506cdc5179
include: more helpful error message for symlinks
2013-08-18 17:08:42 +02:00
5d7dba476c
change site_cleaner to use attr_accessor
2013-08-17 22:33:01 +02:00
8b8fa4da4e
Use Doctor#healthy? and ensure _all_ items are checked before process quits.
2013-08-17 15:16:14 -04:00
5da13d2b66
Refactor `Site#cleanup`
...
Move the cleanup logic out into a separate class,
`Jekyll::Cleaner`.
2013-08-17 17:14:08 +02:00
95719fa4ce
improve error handling in include tag
...
* Reduce condition to one-liner
* Remove `self`
* Implicit return value
* Explicit error message for symlinks
2013-08-17 16:24:06 +02:00
32e55e7717
Use proper Ruby syntax for constant
2013-08-16 21:01:09 -07:00
2744b66fac
Expose Jekyll version to templates
...
Make available `site.version` to liquid
2013-08-16 20:30:26 -07:00
5f4efd34bd
When a Liquid Exception is caught, show the full path (rel to site source)
2013-08-12 21:19:54 +02:00
d4300be758
Merge branch 'permalink-no-dir' of git://github.com/maul-esel/jekyll into maul-esel-permalink-no-dir
...
* 'permalink-no-dir' of git://github.com/maul-esel/jekyll:
test per-post permalinks
do not force the permalink to be a dir if it ends on .html
Conflicts:
features/step_definitions/jekyll_steps.rb
2013-08-11 12:08:56 +02:00
affffb4ed4
Update dummy email address to example.com domain
2013-08-10 15:29:33 +02:00
381a8148e3
Correct the social dummie URLs
...
Twitter and Github seem to always force HTTPS. They don’t use backslashes after the username.
2013-08-09 17:09:24 +02:00
7d26be5102
Call ruby's 'abort' if the site is unhealthy
2013-08-08 18:33:55 +02:00
318a379747
Nuke comment.
2013-08-08 18:32:13 +02:00
bc3dccf0e5
Merge pull request #1386 from mojombo/disable-excerpts
...
Disable automatically-generated excerpts with option
2013-08-08 02:39:06 -07:00
9ca7f70d70
Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0
...
When using Ruby 1.8.7 and Kramdown 0.14.0 and newer, the following build error
would occur if any page in your site contained a `<name@example.com>` email
address link:
Generating... Conversion error: There was an error converting 'contribute.markdown'.
/Users/nick/Documents/puppet-docs/vendor/bundle/ruby/1.8/gems/kramdown-1.0.2/lib/kramdown/converter/html.rb:404:in `obfuscate': undefined method `encoding' for "mailto":String (NoMethodError)
See also:
http://rubyforge.org/tracker/index.php?func=detail&aid=29750&group_id=7403&atid=28673
This problem traced back to the following line in the Kramdown source:
result.force_encoding(text.encoding) if result.respond_to?(:force_encoding)
Strings aren't supposed to respond to the :force_encoding method in Ruby < 1.9,
but lib/jekyll/core_ext.rb was modifying the string class like so:
def force_encoding(enc)
self
end
Strings still won't respond to :encoding, though, so we get an error when
Kramdown tries to read the incoming encoding and everything will blow up.
An ack of the codebase suggests that this was only added so we could force an
encoding for rdiscount on 1.9 without having to check whether we were running
under 1.8. Since testing for said method to learn whether one is running under a
1.9-like encoding regime seems to be a thing in libraries we rely on, we
shouldn't insert this dummy method without also dummying every other part of the
Ruby 1.9+ encoding system.
This commit removes the dummy :force_encoding method to stop poisoning core
classes for libraries we use, and moves the adjustment for 1.9-like encoding
regimes to the one place where it's needed.
2013-08-07 20:07:54 -07:00
95534733ed
should_generate_excerpt? ~> generate_excerpt?
2013-08-08 00:35:42 +02:00
cb52535c03
Merge pull request #1390 from mojombo/better-errors
...
Catch and fix (somehow) common configuration errors
2013-08-07 15:28:16 -07:00
826293ebe3
Merge pull request #1364 from koron/write-in-binary-mode
...
use binary mode when writing file.
2013-08-07 08:12:27 -07:00
ccedcd0eb9
Use .empty? instead of == ''
2013-08-07 17:12:13 +02:00
d19c6983f2
paginate option cannot be 0.
2013-08-06 21:04:15 +02:00
6eec3a7942
Print warning when `paginate` is set to `true`.
...
Related to #1105 .
Sample output:
~/code/jekyll/tsite$ ../bin/jekyll build --trace
Configuration file: /Users/parker/code/jekyll/tsite/_config.yml
Config Warning: The `paginate` key must be a positive integer or nil. It's currently set to 'true'.
Source: /Users/parker/code/jekyll/tsite
Destination: /Users/parker/code/jekyll/tsite/_site
Generating... done.
2013-08-06 20:56:29 +02:00
8f7e229e8c
Cleaned up the deprecator a little
2013-08-06 20:56:20 +02:00
1d14692e5d
Implement URL conflict checking in `jekyll-doctor`.
2013-08-06 20:41:00 +02:00
aee7a41bc3
Align {{ content }} call with its siblings in site template.
2013-08-06 20:12:26 +02:00
ece35e5e36
Remove div.container from the default html template
2013-08-06 20:12:26 +02:00
e3abda9897
Fix 'undefined method `gsub' for nil:NilClass' when undefined method is called.
...
Closes #1388 .
http://stackoverflow.com/questions/18037596/error-undefined-method-gsub-for-nilnilclass/18038912
2013-08-06 20:06:33 +02:00
cb8bc5accc
Just clarifying the Post#should_generate_excerpt?
2013-08-06 18:15:06 +02:00
9dc90333c1
Only generate excerpts if the excerpt_separator isn't blank
2013-08-06 18:05:15 +02:00
627916bc54
force markdown match to match the full extension
2013-08-06 10:56:24 +02:00
362fcf28f0
Use do ... end for multiline block
2013-07-31 23:17:56 +02:00
a23e94ad48
Improve comment for url_placeholders method
2013-07-31 23:17:06 +02:00
cce58159ce
Use symbols for all placeholders
...
See https://github.com/mojombo/jekyll/pull/944#discussion_r5443105
for a discussion.
2013-07-31 23:11:51 +02:00
8a155e0a50
use binary mode when writing file.
2013-07-30 21:35:02 +09:00
d8bf10d761
disable reverse lookup
2013-07-30 21:28:27 +09:00
b5d25427e5
Merge branch 'master' into minor-refactors
2013-07-28 21:21:50 +02:00
01922a10ac
Convertible#to_liquid: allow an alternate attribute set to be passed
2013-07-28 21:18:54 +02:00
e973e59306
Remove redundant argument in Jekyll::Commands::New#scaffold_post_content
2013-07-26 16:25:39 +02:00
f5d0be9660
Move URL generation to own class instead of a module
...
As suggested by @parkr in #944
2013-07-25 22:44:27 +02:00
41b2f0824e
Merge branch 'master' of https://github.com/mojombo/jekyll into permalink-special-characters
2013-07-25 21:33:55 +02:00
0db5dcf832
Release 1.1.2
2013-07-25 09:15:34 +02:00
fe10f21d8d
Release 1.1.1
2013-07-24 22:42:03 +02:00
6c6dd173c7
Post + Page: extract real path retrieval into separate method (@parkr)
2013-07-24 16:30:24 +02:00
d815e2b2a2
coding style preferences (@parkr)
2013-07-24 16:28:03 +02:00
d68d29c06f
Merge pull request #1339 from mojombo/no-layouts-for-excerpt
...
No layouts for excerpt
2013-07-23 18:43:08 -07:00
0bb2af8dee
Remove superfluous conditional, props @mattr-
2013-07-23 20:04:39 +02:00
ba5db5ad5b
refactor Include tag file validation
...
Split validation into a separate method, and give a more
descriptive error on symlinks.
2013-07-23 14:23:33 +02:00
86e007f970
remove no-longer needed LSI accessor
...
LSI has been moved to another class (Jekyll::RelatedPosts),
but this was left in Post.
2013-07-23 11:24:23 +02:00
75d6587d27
Move #to_liquid to Convertible
2013-07-22 16:34:01 +02:00
21de43090a
Posts: move slug to title in a separate method
2013-07-22 16:23:40 +02:00
5efadd6674
Support missing kramdown coderay option
2013-07-22 16:02:50 +02:00
955f913f04
simplify Site#initialize
2013-07-22 16:02:50 +02:00
fd907fa631
simplify coderay option handling
2013-07-22 16:02:50 +02:00
5d777eb9e9
With the move of path handling, Page#to_liquid can be simplified
2013-07-22 16:02:50 +02:00
08567b1091
move path handling in pages to the `path` method, as in posts
2013-07-22 16:02:50 +02:00
f0e2468249
simplify some code with Hash#fetch
2013-07-22 16:02:42 +02:00
f883acc664
Remove debug statements
2013-07-22 11:33:19 +02:00
26dc14881c
Moving data around to make sure excerpts have no layouts but that they are still converted with liquid and the proper converter
2013-07-22 11:31:15 +02:00
e359472870
May as well add Stevenson#debug
2013-07-22 11:30:19 +02:00
c6a37a424b
Debug statements - take them out later
2013-07-22 10:11:32 +02:00
f99c726085
Override Excerpt#render_all_layouts to just assign content to output
2013-07-22 10:11:32 +02:00
0e0e25b9ba
start with Excerpt#output, otherwise call #to_s
2013-07-22 10:11:32 +02:00
04e0b318c8
Remove duplicate comment
2013-07-22 10:11:32 +02:00
374e6fcdf4
Add Jekyll::Stevenson#abort_with
2013-07-22 10:07:15 +02:00
a880b7f99f
Remove superfluous 'table' selector from main.css in 'jekyll new' site template.
...
Closes #1323
2013-07-19 16:01:32 +02:00
2ac98a7358
Merge branch 'master' into permalink-special-characters
...
Conflicts:
lib/jekyll/page.rb
lib/jekyll/post.rb
2013-07-14 23:58:22 +02:00
d572e588e8
Release 1.1.0
2013-07-14 19:52:44 +02:00
5d91b8f346
merge bang to modify in place. Woops. #1201
2013-07-14 17:48:34 +02:00
e95086b211
Fix for kramdown coderay options. #1201 .
2013-07-14 17:47:13 +02:00
4ce89ac96d
Merge pull request #1201 from zachgersh/all_kramdown
...
Supporting more kramdown options.
2013-07-14 08:45:05 -07:00
90500f37ac
Deleted unused code.
2013-07-14 00:24:57 -05:00
774bf07380
Supporting more kramdown options.
2013-07-14 00:24:56 -05:00
d815c12571
Don't try to be smarter than the computer. Pass Excerpt#to_liquid to its parent post.
2013-07-14 04:22:34 +02:00
015ace6773
Shuffle around rendering of extracted excerpt so it can be liquified.
2013-07-13 16:18:20 +02:00
253fc8c506
Raise LoadError if the file doesn't exist but do not catch it. :)
2013-07-12 12:22:06 +02:00
a7efb86d5c
Throw ArgumentError when there's an invalid config file, and catch only that.
2013-07-12 11:56:22 +02:00
456ac01890
Crash if a config file isn't there.
...
If a configuration file is specified via the command line but does not exist,
fail loudly and crash to preserve the current state. Do not fail if the requested
file is the default configuration file, _config.yml. In that case, fall back on
the defaults.
2013-07-12 11:18:46 +02:00
e1ecae250c
Site#site_files_each ~> Site#each_site_file
2013-07-12 10:52:00 +02:00
979d5c13c4
Merge pull request #1144 from jpiasetz/cleanup
...
Refactor Jekyll::Site
2013-07-12 01:48:34 -07:00
13fd798ec0
Extracted each method
2013-07-09 20:50:22 -04:00
08f6f3c2ed
Merge pull request #1204 from maul-esel/include-params2
...
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
9d2849c562
set value outside if/else block
2013-07-08 20:43:03 +02:00
e8d82fd88c
Merge pull request #1271 from sanandnarayan/related_posts
...
Latest post first in related posts
2013-07-08 10:55:39 -07:00
f72365da4f
more code improvements
...
Remove unused variable, extract validation to method (@mattr-).
Do not require markup to be passed to parse_params as argument.
2013-07-08 18:48:47 +02:00
9d3d095bca
Simplify check for String include/exclude option.
2013-07-08 18:35:16 +02:00
bbd466497f
Remove duplication for include/exclude options in backwards_compatibilize.
2013-07-08 18:34:26 +02:00
dfca2c6edc
Latest post is chosen first in related posts
2013-07-06 15:11:52 +05:30
b5d4a96149
Refactored site.rb, I tried to clean a bunch of the methods code climate was complaining about
2013-07-05 16:12:10 -04:00
ef22ebd7f1
code improvements according to @parkr's suggestions
2013-07-05 14:13:40 +02:00
2484833bc8
Merge pull request #1118 from maul-esel/dir-bug-take2
...
[bugfix #417 ] delete old files that have been replaced by a directory
2013-07-01 07:52:29 -07:00
cb1a2d1818
Catch conversion errors. Constituent of #1105 .
2013-06-30 16:38:35 +02:00
36fc16b4a4
Default Markdown template parser for new sites to RedCarpet via _config.yml. Related: #1236 .
2013-06-27 18:57:17 +02:00
c1850a38f7
Merge pull request #1215 from sanandnarayan/folder_plus
...
removed cgi unescape in page destination
2013-06-25 06:19:41 -07:00
fdebe492cc
Merge pull request #1171 from zachgersh/new_empty
...
Added a --blank command which scaffolds empty files.
2013-06-24 22:25:25 -07:00
2b01b06ec8
Support passing Liquid variables to includes
...
Change the regex matching to allow Liquid variables and object fields
to be passed to the include. Use the render context to retrieve the
variable value. Also, relax syntax checks by allowing surrounding spaces
and dashes in parameter names.
2013-06-22 15:47:16 +02:00
f8f6784305
move parameter parsing to render time
2013-06-22 15:30:10 +02:00
00ed567f99
move regex to the top
2013-06-22 15:07:10 +02:00
042c960df0
Moved md post into else block. Added _drafts blank dir.
2013-06-18 07:57:59 -07:00
a3d53a74be
Refactored per @parkr suggestions. Much cleaner.
2013-06-18 07:57:59 -07:00
16314ee4a2
New leaving empty layouts / posts dirs and empty index.html.
2013-06-18 07:57:58 -07:00
a21031eae9
Added a --blank command which scaffolds empty files.
2013-06-18 07:57:58 -07:00
Parker Moore
Nate Berkopec
Fabio Niephaus
Robert Papp
Stephen Crosby
Shinnosuke Kondo
Florian Weingarten
Günter Kits
Jensen Kuras
Jordon Bedwell
Lukas
Mike Bland
Alfred Xing
Seb
Bernardo Dias
Jim Meyer
schneems
Nicolas Hoizey
Martijn den Hoedt
Justin Weiss
Nicholas Burlett
Martin Jorn Rogalla
Matt Rogers
ChaYoung You
Will Norris
Philipp Rudloff
Joop Aué
Tony Eichelberger
Ryan Tomayko
Mark Tareshawty
Tanguy Krotoff
eksperimental
Seth Warburton
Garen Torikian
kaatt
Brandon Mathis
Pascal Borreli
Mads Ohm Larsen
Ryan Burnette
Sylvester Keil
Malo Skrylevo
Kevin Ushey
nitoyon
Aidan Feldman
robschia
Laust Rud Jacobsen
Alexander Köplinger
Aidan Feldman
Brandon Bradley
David Williamson
Sean Collins
Veres Lajos
Renaud Martinet
Glauco Custódio
Matt Hickford
Mike Kruk
XhmikosR
feivel
Pat Hawks
Igor Kapkov
Peter deHaan
Garen Torikian
Parker Moore
Chris Frederick
Shu Uesugi
Michael Kühnel
Faruk AYDIN
Ruslan Korolev
Kamil Dziemianowicz
Gordon Gao
James Smith
Kevin
Bret Comnes
Martin Seeler
Ivan Tse
Luciano Sousa
Sylvain UTARD
Anatol Broder
Simon Sarris
Alex Medearis
Denilson Figueiredo de Sá
Tomer Cohen
Tomer Cohen
Ivan Tse
Bud Parr
Jens Nazarenus
Renaud Martinet
Marc Ransome
Peter Rhoades
Terry Schmidt
Jesse shawl
Alberto Grespan
Yihang Ho
Mathieu Bruyen
Jordon Bedwell
Mathieu Bruyen
Quinn Shanahan
Rodrigo Dumont
Ben Balter
Aaron Broder
Gabe Ortiz
Matt Rogers
TheTomThorogood
Valery Tolstov
XhmikosR
John Piasetzki
John Piasetzki
Robin Dupret
maul.esel
Marcus Stollsteimer
Lincoln Mullen
Fabian Rodriguez
Ben Hanzl
Zequez
Daniel Schauenberg
Stephen McDonald
Joel Glovier
Corey Ward
Markus Roth
Zlatan Vasović
Anthony Smith
Josh Brown
Aziz Shamim
John Firebaugh
Dan Tao
liufengyun
Andy Lindeman
Mort Yao
Ahmed Hazem
Colin Dean
akira yamada
Eric Mill
Christoph Schiessl
Persa Zula
Matthew Iversen
David Sawyer
Greg Karékinian
Dmitry Chestnykh
Juan Ignacio Donoso
Brice
Edward Ball
Shigeya Suzuki
MURAOKA Taro
Ishibashi Hideto
ddavison
ddavison
Frederic ROS
Nick Fagerlund
Wlodek Bzyl
Thomas Torsney-Weir
Lucas Jenss
zachgersh
Anand Narayan