Commit Graph

1360 Commits

Author SHA1 Message Date
Parker Moore a971fec801 rescue block for the method and added redcarpet as option for parser 2013-04-13 02:13:50 +02:00
Parker Moore 3bc497c1c9 Moved out conversion logic 2013-04-13 01:55:03 +02:00
Parker Moore 63cdd21353 Move initialization of parsers to separate classes 2013-04-13 01:47:40 +02:00
Parker Moore 47653381b1 Merge pull request #954 from maul-esel/liquid-override-path
Allow overriding "path" in YAML frontmatter
2013-04-12 15:16:11 -07:00
maul.esel c20fc03604 add cucumber tests for overriding path 2013-04-13 00:06:09 +02:00
maul.esel 968f3b0911 allow overriding page.path in YAML frontmatter 2013-04-13 00:05:49 +02:00
Parker Moore 6881d3bfbf Refactored Configuration#config_files 2013-04-12 23:59:37 +02:00
Parker Moore b44cf939e6 Add note in docs about page.path. #951. 2013-04-12 23:43:25 +02:00
Parker Moore dc39f02132 Add new pagination variables to the Variables page in the docs site. #942 2013-04-12 23:39:20 +02:00
Parker Moore 65f0d66e39 Update history to reflect merge of #951 2013-04-12 23:34:34 +02:00
Parker Moore 92db4ed89f Merge pull request #951 from maul-esel/liquid-file-path
Expose file path to Liquid
2013-04-12 14:33:19 -07:00
Parker Moore bd8d271ce3 Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr- 2013-04-12 23:11:38 +02:00
Parker Moore 0f600a322c Added a unit test for Configuration#backwards_compatibilize 2013-04-12 22:42:54 +02:00
Parker Moore 7c7bacffe7 Refactor setup block for test of Configuration#config_files 2013-04-12 22:37:01 +02:00
Parker Moore 25a882fa75 Merge pull request #952 from mojombo/refactor-commands
Remove code duplication in Build command
2013-04-12 13:36:19 -07:00
Parker Moore 879b08a0b0 In Configuration#config_files, cascade to the Configuration's value of 'source' before the default 2013-04-12 22:29:52 +02:00
Parker Moore 0812c1b4c9 Add unit tests for Configuration#config_files 2013-04-12 22:29:27 +02:00
Parker Moore 0c0b13e69b Unit test for Configuration#stringify_keys 2013-04-12 21:56:45 +02:00
Parker Moore f2f20d18f0 TomDoc Jekyll::Configuration 2013-04-12 21:38:30 +02:00
Parker Moore 810a29c719 Rescue the entire method instead of just a `begin` block 2013-04-12 22:25:58 +03:00
Parker Moore e2967c96cd Jekyll.configuration should use the new Jekyll::Configuration class 2013-04-12 21:20:30 +02:00
Parker Moore 64f224933b Add Jekyll::Configuration 2013-04-12 21:20:14 +02:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Parker Moore 0884a52fea Add TomDoc for Jekyll::Command.process_site 2013-04-12 20:01:25 +02:00
Parker Moore 5f54507204 Remove code duplication 2013-04-12 19:35:46 +02:00
maul.esel 5a92a73010 add cucumber tests for page.path variable 2013-04-12 18:18:17 +02:00
maul.esel dc4d7c0bf4 fix path for posts: must include "_posts" 2013-04-12 18:17:57 +02:00
maul.esel d64fd1e8fe expose file path relative to source dir to liquid
Fixes #633.
2013-04-12 17:37:16 +02:00
Parker Moore 5c680db758 Update history to reflect merge of #946. 2013-04-12 15:42:09 +02:00
Parker Moore bee8cd9d77 Merge pull request #946 from maul-esel/preserve_excerpt
Preserve 'excerpt` in YAML Front-Matter
2013-04-12 06:24:51 -07:00
Parker Moore 64aa31b3d3 Update history to reflect merge of #945 2013-04-12 15:20:55 +02:00
Parker Moore 17c1e23203 Merge pull request #945 from voidfiles/master
Accept multiple config files from command line
2013-04-12 06:19:55 -07:00
maul.esel 2b238786a2 one more indentation fix 2013-04-12 12:05:07 +02:00
maul.esel bcda51f97b do not allow markdown etc. in excerpt
Adjust the tests accordingly. Also
add a message for one of the tests.
2013-04-11 21:02:08 +02:00
maul.esel b10e06ce47 new test: ensure the correct excerpt is exposed to liquid
Also shorten test code a little bit.
2013-04-11 19:33:32 +02:00
Alex Kessinger 14a669530e Fixing tests, and making it more ruby friendly 2013-04-11 10:17:59 -07:00
maul.esel 951ee09a75 remove useless attr_reader for excerpt (is a method now) 2013-04-11 19:05:28 +02:00
maul.esel 654d598fcf rework excerpt to be an accessor method
Instead of setting self.excerpt, make it a method
that returns either the custom excerpt or the pre-
viously extracted excerpt.
2013-04-11 17:13:15 +02:00
maul.esel 2792e1e427 fix indentation of test 2013-04-11 16:51:48 +02:00
maul.esel 0113fea7a1 Add tests for using custom excerpt 2013-04-11 14:26:20 +02:00
maul.esel 069e70d1b3 do not override custom excerpt set in YAML frontmatter
Fixes #933.
2013-04-11 14:25:47 +02:00
Alex Kessinger 1e209c9bf3 Upgrade --config to accept an array of files 2013-04-10 11:38:49 -07:00
Alex Kessinger df1efeff25 Accept multiple config files from command line
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line

Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
Parker Moore 8446d6e8ad Update history to reflect merge of #413. 2013-04-10 01:58:06 +02:00
Parker Moore abb8e5039e Merge pull request #413 from sethladd/master
add page variable to liquid custom tags and blocks
2013-04-09 16:54:20 -07:00
Parker Moore 1319b823f8 Release 1.0.0.beta4 2013-04-09 21:31:23 +02:00
Parker Moore a715a8970b Update history to reflect merge of #942 2013-04-09 21:25:16 +02:00
Parker Moore b7646cc9ca Merge pull request #942 from mojombo/pagination-paths
Add paginator.previous_page_path and paginator.next_page_path
2013-04-09 12:24:30 -07:00
Parker Moore 88f92729bc Use paginate_path and don't help too much 2013-04-09 21:00:27 +02:00
Parker Moore c9a8a1b29f A bunch of pagination attributes will be nil if the subsequent/previous pages don't exist 2013-04-09 20:29:48 +02:00