Commit Graph

1121 Commits

Author SHA1 Message Date
Parker Moore 6195192bcf mojombo/jekyll ~> jekyll/jekyll 2013-12-11 17:44:33 -05:00
Matt Rogers 39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers 6efb726e2b Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar 2013-12-10 20:58:45 -08:00
Matt Rogers a7d4ee8bfb Merge pull request #1799 from konklone/maruku_fenced_code_blocks 2013-12-10 20:30:44 -08:00
Ivan Tse b18f6505dd Remove margin-top of `.site` to prevent collapsing margins. 2013-12-10 18:39:16 -05:00
Parker Moore a70726e554 Merge pull request #1788 from mojombo/group-by-filter-2 2013-12-10 08:48:44 -08:00
Eric Mill afe9387578 condensing code slightly 2013-12-10 11:04:04 -05:00
Matt Rogers 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
Christoph Schiessl 695e5bbc40 move EntryFilter class from global namespace into Jekyll module 2013-12-09 23:06:27 +01:00
Parker Moore 063111737c Refactor data/[] fetching of item property. 2013-12-09 12:59:43 -05:00
Parker Moore bf9cf5340d Reject nil entries in Site#read_things 2013-12-09 12:46:57 -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 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
Parker Moore d130fd13dc Remove Ruby <1.9 core extensions 2013-12-08 00:47:44 -05:00
Parker Moore 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
Matt Rogers 350c9b3ab5 bump the version number in the code 2013-12-07 17:59:16 -06:00
Matt Rogers 362d28f11d Merge pull request #1779 from mojombo/no-duplication
Refactor post and draft object creation
2013-12-06 20:58:24 -08:00
Matt Rogers 9f1593299a Merge pull request #1775 from Ivoz/maruku
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
Persa Zula 6a13f7dd57 Modifying enumerator for 1.8.7 2013-12-06 01:28:21 -05:00
Matt Rogers & Persa Zula 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
Parker Moore e91db82d26 I mean the argument and the local variable should be the same thing 2013-12-06 01:07:34 -05:00
Parker Moore f0fbc8f356 Refactor conditions for allowing plugins into a new method: Site#plguin_allowed? 2013-12-06 00:26:44 -05:00
Parker Moore 249b13a98a Hm, shouldn't need that call to 'rescue' in Site#whitelist 2013-12-06 00:24:59 -05:00
Parker Moore 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
Matt Rogers 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
Matt Rogers 052a577938 Merge pull request #1765 from mojombo/tomlify
Add support for TOML config files
2013-12-04 18:28:20 -08:00
Matthew Iversen 5ed9d21ec7 Remove extraneous newlines from XHTML output 2013-12-05 12:04:55 +11:00
Parker Moore b637420373 Merge pull request #1755 from gregkare/more_trailing_whitespace
Remove trailing whitespace
2013-12-02 12:35:06 -08:00
David Sawyer 63122fdafc add a space between "find" and "an" 2013-12-01 19:11:16 -05:00
Parker Moore b8bbc6e08b require the TOML gem, idiot. 2013-11-29 23:33:38 -05:00
Parker Moore 22b95aee38 Give that LoadError a good message. 2013-11-29 23:33:25 -05:00
Parker Moore 1e32af47a6 Better config file parser error if it's not there. 2013-11-29 23:22:13 -05:00
Parker Moore 51706e8da7 Parse TOML or YAML in Jekyll::Configuration. 2013-11-28 22:11:56 -05:00
Matt Rogers 91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Parker Moore eceebb23a6 Pagination generator should have :lowest priority 2013-11-26 12:45:00 -05:00
Greg Karékinian ce8e271b5d Remove trailing whitespace 2013-11-25 13:31:53 +01:00
maul.esel 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
maul.esel 3888a24068 output including file for include tag error 2013-11-21 22:03:39 +01:00
Parker Moore dfffc2e72a Use Pathname#to_s instead of Pathname#to_path
Fixes #1723.
2013-11-16 13:12:59 -05:00
maul.esel 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
Parker Moore 615d49ed66 Remove Site.whitelist attribute. 2013-11-04 23:24:21 -05:00
Parker Moore a4b9bab1dc Add --whitelist flag and internal logic 2013-11-04 23:24:21 -05:00
Parker Moore 480e35037b A start at a gem-based plugin whitelist for Pages. 2013-11-04 23:24:21 -05:00
Matt Rogers 6791f9fc12 Use the new `EntryFilter` class in `Site` 2013-11-04 21:35:53 -06:00
Matt Rogers 63713799cd Extract Site#filter_entries into its own class 2013-11-04 21:35:13 -06:00
Matt Rogers 65653fed84 Bump version to 1.3.0 2013-11-03 21:48:34 -06:00
Parker Moore 50fabc7b37 Update implementation of listen for v1.3.x 2013-11-01 23:16:04 -04:00
Jordon Bedwell 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
Matt Rogers 9f63ddb4db Prepare for a 1.3.0.rc release 2013-10-28 20:26:36 -05:00
Parker Moore 3ab9841272 Fix 1.8.7 syntax errors. 2013-10-28 14:03:34 -04:00
Matt Rogers f697d12027 Merge pull request #1651 from liufengyun/jsonify
support jsonify filter
2013-10-23 20:50:14 -07:00
Matt Rogers 2287eed0c6 Merge pull request #1589 from dchest/better-watch
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
Matt Rogers 23ad7fa4bd Merge pull request #1557 from mojombo/require-gems-plugins
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
liufengyun f971aebfb1 support jsonify filter 2013-10-22 23:52:22 +08:00
Dmitry Chestnykh 12ba0a541c Update listen to ~> 2.0. 2013-10-18 11:04:54 +02: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
maul.esel c2aa26280c extract pages.any?... in own method 2013-10-17 15:17:58 +02:00
maul.esel f0aac30491 remove duplicated render code for posts and pages 2013-10-17 12:07:30 +02:00
maul.esel 7232948b62 simplify relative permalink deprecation 2013-10-17 12:06:21 +02: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 87ef39aeb0 Add support for use of folders inside _layout path, closes #1622 2013-10-08 14:19:12 -03:00
Ben Balter 844cc615e4 actually downcase lexer 2013-10-06 15:55:16 -04:00
Brice 9ff245dbdb clean up comments to be more concise/uniform 2013-10-05 13:20:30 -04:00
Ben Balter d5f137bc86 downcase lexers before passing to Pygments 2013-10-05 11:26:26 -04:00
Parker Moore 310688297b I guess we'll wait until v2.0 to switch to absolute permalinks. 2013-10-04 15:03:05 -04:00
Parker Moore bf1d9a79c4 Add support for gem-based plugins. 2013-10-04 14:45:28 -04:00
maul.esel b00849544b fix error with variable as file name 2013-10-04 19:12:29 +02:00
Matt Rogers fef96d95e1 Merge pull request #1495 from maul-esel/variable-include
Variable {% include %}
2013-10-04 05:42:27 -07:00
maul.esel 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
maul.esel 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
Matt Rogers 92750c3cfd Add parenthesis to the call for super 2013-10-02 21:51:32 -05:00
maul.esel 7a4ea086a1 Output path in case of render error in included file
Fixes #1591.
2013-10-01 23:02:50 +02:00
maul.esel 623fa14b3c Include tag: provide path in case of render error 2013-10-01 22:54:39 +02:00
maul.esel 2138dfc0ac Fix code to allow dots in variables 2013-10-01 22:31:11 +02:00
maul.esel a93795bcc0 implement variable retrieval in include tag
Fixes #1464.
2013-10-01 22:28:45 +02: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
Matt Rogers cb4d15561c Merge pull request #1003 from liufengyun/data-sources
support data sources
2013-09-30 20:47:57 -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
Dmitry Chestnykh 58cab6b050 Handle destinations outside of source. 2013-09-30 05:55:38 +02:00
Dmitry Chestnykh dfaf1f45cc Remove require 'pathname': already included. 2013-09-30 05:11:15 +02:00
Dmitry Chestnykh 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
Parker Moore 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
Parker Moore 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
Parker Moore c78c4159c0 Merge pull request #1571 from mojombo/non-destructive-array-concat
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
Edward Ball 943acc4395 Remove overly specific css from site template 2013-09-23 13:23:54 +01:00
Parker Moore a88a63da2d Don't use destructive Array#concat for Liquid Attribute arrays 2013-09-22 18:26:34 -04: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 9409a3d034 raise exceptions in include tag 2013-09-19 14:32:15 +02:00
maul.esel 72c3bba56a Change error handling in 'post_url' tag: raise exception 2013-09-19 14:24:22 +02:00
maul.esel 06fb31544f Change error handling for gist tag: raise exception 2013-09-19 14:24:22 +02:00
Shigeya Suzuki 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
Shigeya Suzuki 97e052df63 Pass encoding parameter as string, not an object 2013-09-19 12:21:26 +09:00
Shigeya Suzuki 8b892ed735 read_yaml to accept optional parameter to override defaults 2013-09-19 12:21:25 +09:00
MURAOKA Taro 4cb24f4b87 consider a case of "site" is unavailable in Convertible 2013-09-19 12:21:25 +09:00
MURAOKA Taro f4c2383d3c write document for config.encoding 2013-09-19 12:21:25 +09:00
MURAOKA Taro 8a28d80690 add encoding for configuration 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 ec85c49de3 Change exception type 2013-09-17 22:11:56 +02:00
Anatol Broder 7cec996f90 Validate the entire markup as soon as possible 2013-09-17 21:41:11 +02:00