Commit Graph

499 Commits

Author SHA1 Message Date
Parker Moore 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
Jordon c759a7a75f Allow custom Markdown processors. 2013-12-25 19:36:25 -06:00
Aidan Feldman 9d7c524530 fix file sorting test 2013-12-22 19:33:00 -05:00
Aidan Feldman fa8618879d Merge remote-tracking branch 'upstream/master' into sort-attributes 2013-12-22 19:31:56 -05:00
Robin Dupret 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
Robin Dupret 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
Robin Dupret 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
Aidan Feldman 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
Aidan Feldman 45ee9f814a clarify page sorting test 2013-12-19 13:46:43 -05:00
Jens Nazarenus f9ffbe0d6a removed duplicate test scenario 2013-12-19 18:23:07 +01:00
Aidan Feldman a6e1c40051 link to Stack Overflow answer re: Dir sorting 2013-12-19 01:05:00 -05:00
Aidan Feldman 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
Jens Nazarenus 43ef9a2e4f variables in include tag with filters 2013-12-17 23:51:52 +01:00
akira yamada 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
Matt Rogers 39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers a7d4ee8bfb Merge pull request #1799 from konklone/maruku_fenced_code_blocks 2013-12-10 20:30:44 -08:00
Eric Mill 28ca5d71ee Remove comments 2013-12-09 16:47:42 -05:00
Eric Mill 470abf46e2 better, simpler test case... 2013-12-09 16:42:51 -05:00
Eric Mill 71e625e02c current state 2013-12-08 22:56:29 -05:00
Eric Mill 14418f74ae in-progress patch for maruku and fenced code blocks 2013-12-08 22:37:46 -05:00
Parker Moore 381ab4e71b Implement group_by Liquid filter & tests. 2013-12-08 01:16:48 -05:00
Parker Moore f14c9db282 Add tests in all the time that was omitted for Ruby 1.8.x 2013-12-08 00:48:25 -05:00
Parker Moore b4b6df5b6c Remove checks for Ruby 1.8.x 2013-12-08 00:48:10 -05:00
Matt Rogers 9f1593299a Merge pull request #1775 from Ivoz/maruku
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
Matthew Iversen fb9de8cbf6 Fix tests to expect maruku 0.7 output 2013-12-05 12:20:11 +11:00
Parker Moore 3b0c8ad654 Add some unit tests for TOML integration. 2013-11-29 23:33:52 -05:00
Greg Karékinian 9182b1b7ae Fix duplicate test case name 2013-11-25 12:59:27 +01:00
Greg Karékinian 49d5c3457c Remove extra trailing whitespace 2013-11-20 00:50:56 +01:00
Matt Rogers 63713799cd Extract Site#filter_entries into its own class 2013-11-04 21:35:13 -06:00
liufengyun f971aebfb1 support jsonify filter 2013-10-22 23:52:22 +08:00
Matt Rogers 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
Matt Rogers 0761769dda Merge pull request #1615 from benbalter/downcase-lexers
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
Juan Ignacio Donoso 01f41a7cfc Add test to reflect #1622 behaviour 2013-10-08 14:17:56 -03:00
Ben Balter 9b0a7b3438 test for lexer case insensitivity 2013-10-06 16:06:20 -04:00
Matt Rogers 9d4f9169e9 Merge pull request #1514 from maul-esel/tag-errors
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
liufengyun 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
maul.esel 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
maul.esel 39c0d125bb fix tests for new behaviour 2013-09-19 14:24:22 +02:00
Shigeya Suzuki fbea3471dd Make TestConvertible to pass with utf-8 encoding 2013-09-19 12:21:25 +09:00
Matt Rogers 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
Anatol Broder f97eed544c Change exception type in tests 2013-09-17 22:20:41 +02:00
maul.esel b26327f20a simplify conditions for coverage reports 2013-09-14 15:28:41 +02:00
maul.esel ed58ba1508 add tests for moving of coderay settings for kramdown 2013-09-13 14:06:16 +02:00
maul.esel 76d56c2352 shorten test code by moving converter instantiation to #setup 2013-09-13 14:06:16 +02:00
maul.esel a12227c07a setup coveralls for unit tests 2013-09-12 21:19:36 +02:00
Parker Moore 097779a19f Merge pull request #1531 from maul-esel/mute-tests
mute LSI output in tests
2013-09-12 09:42:40 -07:00
maul.esel 87de8ddeb4 fix test muting to work for Ruby > 1.9 2013-09-12 13:26:32 +02:00
maul.esel 0afe79d1cb mute LSI output in tests 2013-09-11 18:00:28 +02:00
Ishibashi Hideto 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
Parker Moore 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
Parker Moore bc3dccf0e5 Merge pull request #1386 from mojombo/disable-excerpts
Disable automatically-generated excerpts with option
2013-08-08 02:39:06 -07:00
Matt Rogers 3c12495b00 Add test for disabled excerpts 2013-08-07 20:22:32 -05:00
Parker Moore 46b0d5037b Add test for Configuration#fix_common_issues 2013-08-06 21:22:08 +02:00
Thomas Torsney-Weir c983f38cc9 add test to demonstrate issue with markdown extension parsing. adding mkd as an extension should not cause mkdn files to also be markdownified 2013-08-06 10:52:24 +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
Parker Moore 1e7dbcaaff 1.8.7 doesn't support Time.new(*args), so use Time.parse instead 2013-07-22 14:37:51 +02:00
Parker Moore 95491eb7e7 update categories on the new post to not fuck up old numbers 2013-07-22 13:04:07 +02:00
Parker Moore 930aac3b79 Unit tests are simple 2013-07-22 13:03:48 +02:00
Parker Moore 3418a9197a Add categories and tags and test #to_liquid 2013-07-22 12:57:03 +02:00
Parker Moore 1bbacbd396 Dumb tests are helpful anyway 2013-07-22 12:40:49 +02:00
Parker Moore 81a7b22672 Add a new post, bump @site.posts.size 2013-07-22 12:22:47 +02:00
Parker Moore e78d5dd5cb Will now have to render the post, not just transform it. 2013-07-13 16:18:38 +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 08f6f3c2ed Merge pull request #1204 from maul-esel/include-params2
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
Anand Narayan dfca2c6edc Latest post is chosen first in related posts 2013-07-06 15:11:52 +05:30
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
Anand Narayan 7e79b9df92 added a plus to permalink 2013-06-15 23:18:31 +05:30
Anand Narayan 5c47014c90 removed cgi unescape in page destination 2013-06-15 18:38:14 +05:30
maul.esel 5a990f7854 add unit tests for include tag parameters 2013-06-11 16:11:56 +02:00
Parker Moore 7f10b32431 Fix tests to match new behaviour of Pager.paginate_path 2013-06-09 21:09:06 +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 066912556e Support new private gist syntax. 2013-06-07 00:34:23 +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 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 63dc563621 Add tests for exclude/include backwards-compatibility 2013-05-17 21:05:09 +02:00
Sebastian Morr 151ffab6fe Removed space characters in empty lines 2013-05-16 20:27:27 +02:00
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 179a746091 Merge pull request #1066 from Rowno/data-language
Add a `data-lang` attribute to code blocks
2013-05-12 03:11:11 -07:00
maul.esel eda11aa534 ensure number category is NOT included as fixnum 2013-05-11 18:03:51 +02:00
maul.esel 17cdd59206 adjust tests to new test post 2013-05-10 14:07:43 +02:00
Roland Warmerdam 2a6c722e78 Add a `data-lang` attribute to code blocks 2013-05-10 19:18:13 +12:00
Rafael Revi 528c94e481 new test case: numbers in categories 2013-05-10 02:20:43 -04:00
Matt Rogers 770402d912 Also stub the building of the index
Since we don't actually use the index in getting the related posts from
the tests there's no need to build an index, which can take a long time
if the ruby bindings for the GSL library are not installed.
2013-05-08 22:33:20 -05:00
Matt Rogers 1aa49fa734 Wrap tests around Jekyll::RelatedPosts
This gives me more confidence that we're doing the right things when it
comes to both the LSI and non-LSI cases and prevents regressions.
2013-05-08 21:57:10 -05:00
Christopher Giroir b0c04c89f4 Further clarify what paginate_path should do in the case of directories in the path 2013-05-08 14:08:03 -07:00
Christopher Giroir 09fafd6418 Fixing paginate_path on windows 2013-05-07 23:24:10 -07:00
Parker Moore f69c39c3ac fix up tests for pygments-aware redcarpet 2013-05-08 00:45:42 +02:00
Parker Moore 62b4fd77ac Using modules instead of classes for Redcarpet with/without Pygments. 2013-05-08 00:28:51 +02:00
Parker Moore 5dd3b0b71d Update tests to be compliant with #1037. 2013-05-07 16:45:15 +02:00
Pascal Borreli 29b3dc97f0 Fixed typos 2013-05-06 20:27:00 +01:00
Parker Moore 0b1d22dd61 Merge pull request #1016 from mojombo/fix-pagination
Paginate in subdirectories properly
2013-05-05 14:01:29 -07:00
Parker Moore ce999f12fc Merge pull request #992 from maul-esel/consistent-page.url
add leading slash to page.url and post.url
2013-05-05 13:56:15 -07:00
Parker Moore dcd7b36269 Fixing Pager test for 1.8.7. 2013-05-05 18:08:03 +02:00
Parker Moore 1c146ec649 Instead of just a string name, Pager.pagination_enabled? now accepts a page 2013-05-05 17:26:48 +02:00
Parker Moore 20334aabbe Test all cases for post_url modifications. #998 2013-05-05 15:13:17 +02:00
Parker Moore 9179f56ed7 Quick clean-up from #998. 2013-05-05 14:59:50 +02:00
Parker Moore 290ba131e2 Merge pull request #998 from dhcole/master
Use post's directory path when matching for the post_url tag
2013-05-05 05:16:39 -07:00
Parker Moore c9bd1437a3 Testing parsing of String objects which represent times to Date filters 2013-05-04 14:41:21 +02:00
Dave Cole b1cf3d5dd5 Adjust expected post count for tests. 2013-04-30 12:46:31 -04:00
Dave Cole 805f378586 Add test for nested post_url 2013-04-29 17:48:10 -04:00
uu59 0f52f15cc2 Clean up code #1104 2013-04-29 21:07:46 +09:00
uu59 94756340cd Remove to_i. Let commander gem do it #1004 2013-04-29 15:56:02 +09:00
uu59 20a837d15c Change default value of limit_posts from nil to 0 (see #1004)
Before this commit meaning of limit_posts:
  nil: no limit. generate all posts
  0: raise error
  n ( > 0): generate n posts only
  n ( < 0): raise error
  else: raise error

After this commit:
  nil: same as 0
  0: no limit. generate all posts
  n ( > 0): generate n posts only
  n ( < 0): raise error
  else: almost same as 0 (depend on `to_i` result)
2013-04-29 01:41:22 +09:00
uu59 ad2c706a34 Fix `jekyll serve --limit_posts n` failed 2013-04-28 02:03:08 +09:00
Parker Moore 46ce757b71 Compliant with Ruby 2.0.0 2013-04-26 21:20:48 +02:00
maul.esel 6f28b6d432 fix tests for always-present slash 2013-04-20 13:21:31 +02:00
maul.esel cc5ce06d78 remove tests for default layouts 2013-04-15 17:24:18 +02:00
Parker Moore 5bcce7a1f1 Fix unit tests for Configuration#backwards_compatibilize 2013-04-15 00:41:46 +02:00
Parker Moore ef9d8ddb7d Matching tests to new colorized output 2013-04-13 20:24:45 +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 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 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +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
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 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
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 8bf55ef8fa Merge pull request #928 from danieldriver/ordinal_date
add ordinal date permalink style (/YYYY/DDD/slug.html)
2013-04-07 13:52:30 -07:00
Parker Moore 0f2c9d29ee Merge pull request #875 from mojombo/posts-cant-be-dirs
Directories with valid post names should be filtered out
2013-04-07 12:54:42 -07:00
Parker Moore 7b36d26240 Merge pull request #892 from rafaelrosafu/master
Added date_to_rfc822 used on RSS feeds
2013-04-07 12:43:50 -07:00
Daniel Driver ea753130e6 add ordinal date permalink style (/YYYY/DDD/slug.html) 2013-04-06 08:17:02 -04:00
Parker Moore 483a0b68b6 Merge pull request #890 from zachgersh/abbreviated_month
Added abbreviated month + test.
2013-04-05 09:44:50 -07:00
Lucas Jenss 571bdd686c Move tests for symlinked files to separate test cases 2013-04-01 12:02:15 +02:00
Lucas Jenss 0bebe0f31c Add test for processing of symlinked static files and pages 2013-03-31 20:20:15 +02:00
Rafael Rosa Fu 7879d2e02c Fixed expected output from xmlschema and rfc822 2013-03-29 01:07:47 -04:00
zachgersh e931414b77 Changed to short_month and re-ran tests. 2013-03-27 08:40:58 -07:00
Rafael Rosa Fu 186b68adb0 Added filter date_to_rfc822
According to the W3C RSS Feed Validator, feeds must format dates as described
on RFC-822 to be valid. Refer to their site to get more info:
http://feedvalidator.org/docs/error/InvalidRFC2822Date.html

I also added a couple of missing unit tests to the other date filters
2013-03-27 02:21:48 -04:00
zachgersh 6657f2add9 Added abbreviated month + test. 2013-03-26 23:06:34 -07:00
Parker Moore 8f890cb064 Fix tests that fail due to having a directory that looks like a post 2013-03-19 21:59:43 +01:00
Parker Moore a054ce2788 Merge pull request #861 from danielgrieve/gist-tag
display single files from gist
2013-03-17 13:33:10 -07:00
Parker Moore 0765d07730 Added sanity tests for #869. 2013-03-17 21:15:17 +01:00
Parker Moore 6c1a08ce87 Merge pull request #862 from mojombo/fix-autogen-dest-prob
Stop DirectoryWatcher from watching the destination directory
2013-03-17 12:48:30 -07:00
Parker Moore 936ed1f849 Merge pull request #837 from ixti/feature-excerpt
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
Parker Moore aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
Parker Moore 5d34a4c533 Merge pull request #864 from mojombo/prioritize_plugins
Prioritize plugins & DRY subclass instantiation
2013-03-16 12:09:43 -07:00
Parker Moore d091cfe3fc Merge pull request #863 from mojombo/accept-custom-config
Accept custom configuration
2013-03-16 12:07:31 -07:00
Parker Moore 39f144ed01 Newline. 2013-03-16 20:06:50 +01:00
Parker Moore 1d05e0be81 Added tests for generators. 2013-03-16 20:06:40 +01:00
Tommy Sullivan 7425b2c32e Add test to ensure plugins are executed in order of priority. 2013-03-16 15:12:57 +01:00
Parker Moore 9100967ebd Add unit tests for custom configuration. 2013-03-16 14:46:26 +01:00
Parker Moore 52efb71aa2 Added directory_with_contents() to DRY up test code and ensure folders exist in TestCommand. 2013-03-16 14:09:53 +01:00
Parker Moore d93faac3b8 Rudimentary tests for Jekyll::Command 2013-03-16 13:59:59 +01:00
Parker Moore a0c0d983bf Using a test_dir helper method for tests. 2013-03-16 13:59:40 +01:00
Daniel Grieve 92d9c4301b display single files from gist 2013-03-15 22:37:14 +00:00