Commit Graph

302 Commits

Author SHA1 Message Date
Fabian Rodriguez 302bc46914 rename variable inside block 2014-03-27 19:53:28 -03:00
Fabian Rodriguez adcfde14ed align 'end' with 'def' 2014-03-27 19:52:52 -03:00
Daniel Schauenberg 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
Corey Ward f1c4e247a5 Remove unnecessary references to `self` 2014-02-21 16:27:21 -06:00
Parker Moore e0166682da Sort the static files by relative path before sending to liquid 2014-02-19 14:02:03 -05:00
Parker Moore 949aa3fc32 Test fetching of static files 2014-02-19 13:16:21 -05:00
Parker Moore 6e40338f9e Expose site.static_files to Liquid 2014-02-19 13:04:33 -05:00
Matt Rogers & Persa Zula fd92820b03 Remove Site#read_layouts 2014-02-06 22:46:09 -06:00
Matt Rogers f581940c71 Create a LayoutReader class to read layouts 2014-02-06 22:22:06 -06:00
Dan Tao 4f0b1bdf6d switched from YAML.safe_load* to SafeYAML.load* 2014-01-23 17:25:17 -08:00
liufengyun 22e1e5f28c make sure pages with published being false are not generated 2014-01-19 09:52:19 +08:00
Matt Rogers 6f394e82b5 Rename read_things to read_content. 2014-01-11 15:29:22 -06:00
Parker Moore 42fc5e9ee7 Excludes should be relative to the site source 2014-01-05 10:45:42 -08: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 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
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
Parker Moore bf9cf5340d Reject nil entries in Site#read_things 2013-12-09 12:46:57 -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
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
maul.esel f1869cda98 Merge branch 'master' into frontmatter-defaults 2013-12-05 19:29:57 +01: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
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
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 23ad7fa4bd Merge pull request #1557 from mojombo/require-gems-plugins
Add `gems` for better plugin management
2013-10-23 07:39: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
maul.esel 20ea0c8d56 Merge branch 'master' into frontmatter-defaults 2013-10-14 19:44:06 +02:00
Juan Ignacio Donoso 87ef39aeb0 Add support for use of folders inside _layout path, closes #1622 2013-10-08 14:19:12 -03: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
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
Shigeya Suzuki 97e052df63 Pass encoding parameter as string, not an object 2013-09-19 12:21:26 +09:00
MURAOKA Taro 8a28d80690 add encoding for configuration 2013-09-19 12:21:25 +09:00
maul.esel bec4a07c12 Fix handling of source-dest matching being too aggressive
Fixes #1130.
2013-09-16 14:41:20 +02:00
maul.esel b3fdaa9792 add a class `FrontmatterDefaults` for handling of frontmatter defaults 2013-09-11 00:55:28 +02:00
Parker Moore b7e34175d0 Put version under 'jekyll' namespace. 2013-08-30 18:54:03 -04:00
Parker Moore 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
Matt Rogers a9e2a74ea6 Merge pull request #1341 from maul-esel/minor-refactors
Minor refactors
2013-08-29 20:21:08 -07:00
maul.esel d28858a9e9 put the Cleaner instance in a `Site#site_cleaner` method 2013-08-19 20:15:54 +02:00
maul.esel 5d7dba476c change site_cleaner to use attr_accessor 2013-08-17 22:33:01 +02:00
maul.esel 5da13d2b66 Refactor `Site#cleanup`
Move the cleanup logic out into a separate class,
`Jekyll::Cleaner`.
2013-08-17 17:14:08 +02:00
Pat Hawks 32e55e7717 Use proper Ruby syntax for constant 2013-08-16 21:01:09 -07:00
Pat Hawks 2744b66fac Expose Jekyll version to templates
Make available `site.version` to liquid
2013-08-16 20:30:26 -07:00
maul.esel 955f913f04 simplify Site#initialize 2013-07-22 16:02:50 +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
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
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 1f59e9c757 Use Jekyll.logger instead of Jekyll::Stevenson to log things. 2013-05-29 11:58:35 +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
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 35f4f09c3e Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem
Problem described here: ca888cad76
2013-05-14 21:07:23 +02:00
Parker Moore 161244fd78 Add better language and link to Upgrading page in docs for relative permalinks deprecation msg 2013-05-11 18:06:33 +02:00
Parker Moore 6294c4a204 Better-formatted output with relation to 'Generating... done.' 2013-05-11 17:56:42 +02:00
Parker Moore b355ef6469 Add jekyll doctor command 2013-05-11 17:49:20 +02:00
Parker Moore e22b1bb74a Add deprecation support for pages in subfolders with relative permalinks. 2013-05-11 17:40:00 +02:00
Matt Rogers f67f7f3db4 Move the building of related posts into their own class 2013-05-07 22:27:38 -05:00
Parker Moore 67aaada839 Clean up some copy in the limit_posts error handling. 2013-05-04 14:57:27 +02: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
Brian Kim 028e580bb8 Remove short-circuits from Site 2013-04-13 12:39:49 -04:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02: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
Lucas Jenss 2c7325223f Fix symlinked assets not being included, even in unsafe mode 2013-03-31 20:49:43 +02:00
Parker Moore 6f6ad001d2 Ignore entries if they are directories. 2013-03-19 21:59:06 +01:00
Parker Moore 4400e89898 Expect a 'baseurl' to be passed in to Site 2013-03-17 21:18:45 +01:00
Parker Moore d5ed4fc5d0 Add baseurl to Site attr_accessor list. 2013-03-17 20:42:11 +01:00
Parker Moore eef13d7d43 Expose site.baseurl to Liquid templates. 2013-03-17 17:26:33 +01:00
Tommy Sullivan caa6a4ebfd Sort instantiated subclasses in Site. 2013-03-16 15:24:34 +01:00
Matt Rogers 10ee5c8999 Remove the duplication when creating Converters and Generators
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
2013-03-16 15:20:11 +01:00
Matt Rogers 6399ec9b2b Remove duplication when aggregating post information 2013-03-05 19:11:07 -06:00
Matt Rogers 2dd98816d4 Remove duplication when generating list of entries to process
Posts and Drafts share the same logic to get the list of files to
process into objects when generating the site. Factor this logic into
its own method and use it when reading posts and reading drafts.
2013-03-05 19:06:20 -06:00
Tom Preston-Werner 2b9b613687 Normalize CLI options to match configuration expectations. 2013-03-03 18:23:02 -08:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Parker Moore 63d0eef646 Merge pull request #824 from sinamt/symlinked_folders
Allow symlinked folders in unsafe mode (with tests). Closes #796, resolves #233.
2013-02-26 16:54:52 -08:00
Matt Rogers d58859570d Fix up the whitespace.
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
Matt Rogers 5a9c20983d Rename setup_plugins to plugins_path 2013-02-25 13:20:32 -06:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
scribu 538c2086a5 whitespace fixes 2013-02-10 04:49:27 +02:00
scribu 3e164d6daf don't check if draft is published or if its date is in the future 2013-02-09 23:48:38 +02:00
scribu 78831d94cd don't mess with dir parameter 2013-02-09 23:19:35 +02:00
scribu 642349f797 implement and use Draft.valid? 2013-02-09 22:41:47 +02:00
scribu 1ac46b17c4 Don't require date in draft filenames. 2013-02-09 21:35:41 +02:00
Alexander Ekdahl 4cd7c22ee7 Now uses the more semantically correct AND operator 2013-02-04 22:17:03 +01:00
Alexander Ekdahl 7512e6bb66 Allow symlinked folders in unsafe mode 2013-02-04 17:16:01 +01:00
scribu 0ad623fb85 first pass at --drafts flag 2013-01-20 05:23:56 +02:00
Tom Bell 517e6f81d3 Remove new lines between module and class 2013-01-20 00:00:49 +00:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Parker Moore e383bfe65d Merge pull request #743 from mccxj/master
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
mccxj 3cf29eeee2 add Enumerable#glob_include? 2013-01-11 15:33:11 +08:00
Matt Rogers 151275d09e Add TomDoc 2013-01-10 21:53:21 -06:00
Matt Rogers 92eb926bf8 Look for plugins under the source directory by default 2013-01-10 21:24:28 -06:00
xiaojian cai b3e27f2c5d fixed a syntax error 2013-01-10 19:41:11 +08:00
xiaojian cai c627cd3519 use any? instead 2013-01-10 09:16:09 +08:00
xiaojian cai 1e892678bc Update lib/jekyll/site.rb 2013-01-09 16:06:43 +08:00
edeustace 6eed91871f Changes based on @mojombo's feedback 2013-01-08 23:17:06 +01:00
xiaojian cai 44822a252e add regexp support for option 'include','exclude' 2013-01-06 21:23:31 +08:00
Tom Preston-Werner dd0e208daa Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1 2013-01-03 22:26:09 -08:00
Tom Preston-Werner c23302f4fa Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection 2012-12-26 14:02:41 -07:00
edeustace 4bae42a671 use Array.join instead of Array.inject, add .svn to defaults 2012-12-09 11:43:49 +01:00
edeustace 7c800d3b07 Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556 2012-08-23 12:07:30 +02:00
Tom Preston-Werner 202894c196 Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory
Conflicts:
	lib/jekyll/site.rb
2012-06-11 15:40:22 -07:00
Tom Preston-Werner 47090ffd2a Fix up a few TomDocs. 2012-06-06 11:59:49 -07:00
Tom Preston-Werner 0e9e7fbc85 Simplify Site#read_layouts. 2012-06-06 11:59:49 -07:00
Tom Bell df2ad2ac59 Allow a custom 'layouts' directory
* Add 'layouts' option to change the dir from '_layouts' to anything relative
  to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes #563
2012-05-30 21:39:43 -04:00
Luca Grulla 7d88f72409 avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%. 2012-04-29 00:27:11 -07:00
Jason Roelofs 604b60c9ba Add checks to prevent accidental deletion of the source directory 2012-04-03 22:05:18 -05:00
Jason Roelofs 8368485fa0 Remove deletion of dot files on cleanup.
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.

All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
Jérémy Lecour 41f2805b7f No need to have a variable assignment, especially if it has the same name as the method parameter. 2012-02-11 09:05:59 +01:00
Tom Preston-Werner 4499df8033 Shorten plugin loading code and update history. 2012-01-29 12:49:57 -08:00
Tom Preston-Werner 02366ae5ff Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray 2012-01-29 12:32:59 -08:00
Tom Preston-Werner 9d70088f01 Properly select dotfiles during directory scan.
Fixes #363.
Fixes #431.
Fixes #377.
2012-01-23 00:21:08 -08:00
Beau Simensen e6d89c6a0f More testing, whitespace and comment cleanup. 2012-01-22 22:17:25 -08:00
Beau Simensen dcf546275b Tweaked plugin directory handling, tests. 2012-01-22 22:10:12 -08:00
Tom Preston-Werner d00bc8e8fe Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master 2012-01-21 19:49:08 -08:00
Tom Preston-Werner 89180169a4 Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include
Conflicts:
	lib/jekyll.rb
	lib/jekyll/site.rb
2012-01-14 19:48:04 -08:00
Tomotaka Sakuma 76fa7f016b Fix an issue NoMethodError happens in case number of files under _posts is less than limit_posts. 2011-11-28 16:32:20 +09:00
Beau Simensen ab08acace9 Support plugins being a list of directories to scan. 2011-11-21 21:09:39 -06:00
Lee Jarvis 6a756881f9 clean up some warnings 2011-06-03 23:38:39 +01:00
Tom Preston-Werner 851172b5ef Replace rdiscount filter with config-aware markdownify. 2011-05-31 14:40:21 -07:00
Tom Preston-Werner 82bd83fe7f More TomDoc and formatting cleanup. 2011-05-08 23:40:35 -07:00
Aman Gupta 13cc44fb12 sanitize urls and ignore symlinks 2011-03-10 20:14:38 -08:00
Aman Gupta be8b7715d3 speed up cleanup 2011-03-10 20:11:45 -08:00
lukebayes 717a2540e1 Added support for 'include' configuration parameter. This parameter
should work just like 'exclude', except it gives us the ability
to enumerate any files that should not be ignored - even if they
begin with the dastardly dot or underscore.
2010-12-30 16:41:34 -08:00
Stefan Schüßler 5b680f8dd8 remove orphaned files in destination 2010-12-01 18:04:50 +01:00
cblunt f688c9df81 Added limit-posts option to site configuration.
* Added unit tests for limit-posts.
  * Added feature for limit-posts.
  * Added --limit_posts option to bin/jekyll options parser
2010-09-13 00:31:52 +01:00
Postmodern f4fb833d34 The site configuration may not always provide a 'time' setting. Closes #184.
* This fixes a bug on Ruby 1.9.1 and 1.9.2 where Time.parse was being
  passed an emptry String, if the 'time' setting was not defined.
2010-08-24 15:19:22 -07:00
Tom Preston-Werner 1c3fedbb31 Expand source, destination, and plugin paths. Fixes #180. 2010-06-25 14:40:27 -07:00
Tom Preston-Werner de3ee99d30 Use Dir.pwd for other default paths as well (reverts fix in #101) 2010-06-22 16:22:58 -07:00
Tom Preston-Werner cb77a5287b load plugins under safe mode 2010-06-18 17:55:17 -07:00
Tom Preston-Werner a8efc3a0a2 tomdoc and normalize new extension and converter classes 2010-04-21 14:40:29 -07:00
Kris Brown 18545ddf71 pagination is now a generator extension 2010-02-28 11:17:03 +00:00
Kris Brown fc86c9dd85 extended concept to extensions in general, providing both converters and generators 2010-02-28 10:10:10 +00:00
Kris Brown 315f4c9222 allow converters to be registered through subclassing much like railties in rails 2010-02-27 23:31:54 +00:00
Kris Brown cedda3afa3 move converters to classes 2010-02-27 22:14:27 +00:00
Kris Brown 1261840769 generate phase added to site#process and pagination is now a generator 2010-02-27 15:31:59 +00:00
Kris Brown ef2fabb189 also provide html_pages. this is better for sitemaps should you wish to auto-populate page entries 2010-02-27 14:09:07 +00:00