Commit Graph

953 Commits

Author SHA1 Message Date
Lucas Jenss 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
MURAOKA Taro 8a155e0a50 use binary mode when writing file. 2013-07-30 21:35:02 +09:00
MURAOKA Taro d8bf10d761 disable reverse lookup 2013-07-30 21:28:27 +09:00
maul.esel b5d25427e5 Merge branch 'master' into minor-refactors 2013-07-28 21:21:50 +02:00
maul.esel 01922a10ac Convertible#to_liquid: allow an alternate attribute set to be passed 2013-07-28 21:18:54 +02:00
Parker Moore e973e59306 Remove redundant argument in Jekyll::Commands::New#scaffold_post_content 2013-07-26 16:25:39 +02:00
Lucas Jenss 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
Lucas Jenss 41b2f0824e Merge branch 'master' of https://github.com/mojombo/jekyll into permalink-special-characters 2013-07-25 21:33:55 +02:00
Parker Moore 0db5dcf832 Release 1.1.2 2013-07-25 09:15:34 +02:00
Parker Moore fe10f21d8d Release 1.1.1 2013-07-24 22:42:03 +02:00
maul.esel 6c6dd173c7 Post + Page: extract real path retrieval into separate method (@parkr) 2013-07-24 16:30:24 +02:00
maul.esel d815e2b2a2 coding style preferences (@parkr) 2013-07-24 16:28:03 +02:00
Matt Rogers d68d29c06f Merge pull request #1339 from mojombo/no-layouts-for-excerpt
No layouts for excerpt
2013-07-23 18:43:08 -07:00
Parker Moore 0bb2af8dee Remove superfluous conditional, props @mattr- 2013-07-23 20:04:39 +02:00
maul.esel 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
maul.esel 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
maul.esel 75d6587d27 Move #to_liquid to Convertible 2013-07-22 16:34:01 +02:00
maul.esel 21de43090a Posts: move slug to title in a separate method 2013-07-22 16:23:40 +02:00
maul.esel 5efadd6674 Support missing kramdown coderay option 2013-07-22 16:02:50 +02:00
maul.esel 955f913f04 simplify Site#initialize 2013-07-22 16:02:50 +02:00
maul.esel fd907fa631 simplify coderay option handling 2013-07-22 16:02:50 +02:00
maul.esel 5d777eb9e9 With the move of path handling, Page#to_liquid can be simplified 2013-07-22 16:02:50 +02:00
maul.esel 08567b1091 move path handling in pages to the `path` method, as in posts 2013-07-22 16:02:50 +02:00
maul.esel f0e2468249 simplify some code with Hash#fetch 2013-07-22 16:02:42 +02:00
Parker Moore f883acc664 Remove debug statements 2013-07-22 11:33:19 +02:00
Parker Moore 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
Parker Moore e359472870 May as well add Stevenson#debug 2013-07-22 11:30:19 +02:00
Parker Moore c6a37a424b Debug statements - take them out later 2013-07-22 10:11:32 +02:00
Parker Moore f99c726085 Override Excerpt#render_all_layouts to just assign content to output 2013-07-22 10:11:32 +02:00
Parker Moore 0e0e25b9ba start with Excerpt#output, otherwise call #to_s 2013-07-22 10:11:32 +02:00
Parker Moore 04e0b318c8 Remove duplicate comment 2013-07-22 10:11:32 +02:00
Parker Moore 374e6fcdf4 Add Jekyll::Stevenson#abort_with 2013-07-22 10:07:15 +02:00
Wlodek Bzyl a880b7f99f Remove superfluous 'table' selector from main.css in 'jekyll new' site template.
Closes #1323
2013-07-19 16:01:32 +02:00
Lucas Jenss 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
Parker Moore d572e588e8 Release 1.1.0 2013-07-14 19:52:44 +02:00
Parker Moore 5d91b8f346 merge bang to modify in place. Woops. #1201 2013-07-14 17:48:34 +02:00
Parker Moore e95086b211 Fix for kramdown coderay options. #1201. 2013-07-14 17:47:13 +02:00
Parker Moore 4ce89ac96d Merge pull request #1201 from zachgersh/all_kramdown
Supporting more kramdown options.
2013-07-14 08:45:05 -07:00
zachgersh 90500f37ac Deleted unused code. 2013-07-14 00:24:57 -05:00
zachgersh 774bf07380 Supporting more kramdown options. 2013-07-14 00:24:56 -05:00
Parker Moore 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
Parker Moore 015ace6773 Shuffle around rendering of extracted excerpt so it can be liquified. 2013-07-13 16:18:20 +02:00
Parker Moore 253fc8c506 Raise LoadError if the file doesn't exist but do not catch it. :) 2013-07-12 12:22:06 +02:00
Parker Moore a7efb86d5c Throw ArgumentError when there's an invalid config file, and catch only that. 2013-07-12 11:56:22 +02:00
Parker Moore 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
Parker Moore e1ecae250c Site#site_files_each ~> Site#each_site_file 2013-07-12 10:52:00 +02:00
Parker Moore 979d5c13c4 Merge pull request #1144 from jpiasetz/cleanup
Refactor Jekyll::Site
2013-07-12 01:48:34 -07:00
John Piasetzki 13fd798ec0 Extracted each method 2013-07-09 20:50:22 -04:00
Parker Moore 08f6f3c2ed Merge pull request #1204 from maul-esel/include-params2
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
maul.esel 9d2849c562 set value outside if/else block 2013-07-08 20:43:03 +02:00
Parker Moore e8d82fd88c Merge pull request #1271 from sanandnarayan/related_posts
Latest post  first in related posts
2013-07-08 10:55:39 -07:00
maul.esel 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
Parker Moore 9d3d095bca Simplify check for String include/exclude option. 2013-07-08 18:35:16 +02:00
Parker Moore bbd466497f Remove duplication for include/exclude options in backwards_compatibilize. 2013-07-08 18:34:26 +02:00
Anand Narayan dfca2c6edc Latest post is chosen first in related posts 2013-07-06 15:11:52 +05:30
John Piasetzki 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
maul.esel ef22ebd7f1 code improvements according to @parkr's suggestions 2013-07-05 14:13:40 +02:00
Matt Rogers 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
Parker Moore cb1a2d1818 Catch conversion errors. Constituent of #1105. 2013-06-30 16:38:35 +02:00
Parker Moore 36fc16b4a4 Default Markdown template parser for new sites to RedCarpet via _config.yml. Related: #1236. 2013-06-27 18:57:17 +02:00
Matt Rogers c1850a38f7 Merge pull request #1215 from sanandnarayan/folder_plus
removed cgi unescape in page destination
2013-06-25 06:19:41 -07:00
Matt Rogers 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
imathis 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
maul.esel f8f6784305 move parameter parsing to render time 2013-06-22 15:30:10 +02:00
maul.esel 00ed567f99 move regex to the top 2013-06-22 15:07:10 +02:00
zachgersh 042c960df0 Moved md post into else block. Added _drafts blank dir. 2013-06-18 07:57:59 -07:00
zachgersh a3d53a74be Refactored per @parkr suggestions. Much cleaner. 2013-06-18 07:57:59 -07:00
zachgersh 16314ee4a2 New leaving empty layouts / posts dirs and empty index.html. 2013-06-18 07:57:58 -07:00
zachgersh a21031eae9 Added a --blank command which scaffolds empty files. 2013-06-18 07:57:58 -07:00
maul.esel bdd84f275e Ruby 1.8.7 only supports 1 param to Regexp.match() 2013-06-15 18:28:26 +02:00
maul.esel 99721ee8aa To satisfy Ruby 1.8.7, use look-ahead instead of look-behind 2013-06-15 18:19:52 +02:00
Anand Narayan 5c47014c90 removed cgi unescape in page destination 2013-06-15 18:38:14 +05:30
maul.esel 0fa03d2651 stupid Ruby 1.8.7 doesn't support named groups 2013-06-13 18:48:40 +02:00
maul.esel 639acea0a7 do parameter parsing with @imathis' incredible regex
This also introduces single-quote support.
2013-06-13 18:38:14 +02:00
maul.esel f612330565 add support for parameters to {% include %} tags 2013-06-11 16:04:42 +02:00
Parker Moore 7dc6767bc9 Fix Pager.in_hierarchy to actually do the right thing 2013-06-09 21:08:45 +02:00
Parker Moore 05218711b2 Add warning when pagination is enabled but no template page has been found 2013-06-09 21:08:29 +02:00
Parker Moore 6e80ba868e Fix tests for Pager. 2013-06-09 18:52:24 +02:00
Parker Moore 81a2d03e58 WIP – fixing tests. 2013-06-09 18:31:09 +02:00
Parker Moore bd0e45c1b9 Fixed bugs with pagination in a subdirectory. 2013-06-09 18:31:09 +02:00
Parker Moore 700d840a06 Release 1.0.3 2013-06-07 21:02:13 +02:00
Parker Moore 86e5a1f7a9 Merge pull request #1189 from mojombo/private-gist-support
Support new private gist syntax.
2013-06-07 11:55:09 -07:00
Parker Moore 1c18394afc Catch and print errors when MaRuKu freaks out, and exit with an error code other than 0. 2013-06-07 01:41:30 +02:00
Parker Moore 066912556e Support new private gist syntax. 2013-06-07 00:34:23 +02:00
Matt Rogers cd3732e612 Merge pull request #1170 from mojombo/remove-ids-from-site-template
For template site, convert #post to .post. Fixes #1161.
2013-06-03 08:07:09 -07:00
Parker Moore 2d27deaec7 For template site, convert #post to .post. 2013-06-02 18:48:45 +02:00
Brian Kim 1083bfd533 Fix typo in Stevenson 2013-05-31 17:23:57 -04:00
Parker Moore 14a4e32bbe Use singleton instance variable instead of class variable 2013-05-29 12:04:50 +02:00
Parker Moore 1f59e9c757 Use Jekyll.logger instead of Jekyll::Stevenson to log things. 2013-05-29 11:58:35 +02:00
Mikael Konutgan 9adfd6ddeb Document uri_escape 2013-05-23 20:18:08 +02:00
Matt Rogers 1eab13c068 Merge pull request #1063 from Kelsin/fixing-paginate_path-for-windows
Fixing pagination on windows
2013-05-22 12:26:54 -07:00
Matt Rogers 7c012a9e0c Merge pull request #1115 from clang1234/master
Add --force flag to new command
2013-05-17 21:15:17 -07:00
Matt Rogers 2b84173eca Merge pull request #1121 from mojombo/non-zero-exit-on-liquid-exception
Non zero exit on Liquid exception
2013-05-17 20:41:04 -07:00
Matt Rogers ddba4cde8b Merge pull request #1114 from mojombo/backwards-compatibilize-exclude-include
Backwards-compatibilize 'exclude' and 'include' config tags
2013-05-17 19:56:48 -07:00
Parker Moore ff8cf7c868 provide access to the layout name so when shit goes down we get the name of the layout which couldn't be processed 2013-05-17 22:45:39 +02:00
Parker Moore a95fa70d72 raise things when there's a yaml exception (non-zero exit code 2013-05-17 22:44:46 +02:00
maul.esel 96efa9ed06 delete old files that have been replaced by a directory
Fixes #417.
Replaces #1086, more logical code.
2013-05-17 17:45:51 +02:00
Casey Lang fafacc43ca Add ? to preserve_source_location 2013-05-16 16:15:21 -05:00
Casey Lang 00dd37d2e4 Extract check for force to improve readability 2013-05-16 16:13:13 -05:00
Sebastian Morr 151ffab6fe Removed space characters in empty lines 2013-05-16 20:27:27 +02:00