Commit Graph

133 Commits

Author SHA1 Message Date
Parker Moore ac9fa413a5 Convertible should make layout data accessible via 'layout'
Not via 'page'. Erroneous!

Fixes #4117.
2015-11-30 14:35:55 -08:00
Jordon Bedwell 0f4aed9ccf Fix #4066: Move Convertible#render_liquid to using render! 2015-10-29 16:06:17 -05:00
Parker Moore b89f943bf2 collections: posts as collection 2015-10-26 00:29:14 -07:00
Parker Moore 8927898e1f Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change
Merge pull request 3871
2015-08-23 12:55:00 -07:00
Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
Conflicts:
	bin/jekyll
2015-08-09 16:22:33 +01:00
Fabio Niephaus ac56e9dd16 Make _includes directory configurable; closes #2684
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
Stephen Crosby 7c4f319442 #3870 trigger hooks by owner symbol 2015-07-27 16:23:07 -07:00
Florian Weingarten 1e9163fdf4 Liquid profiler 2015-06-07 16:38:05 +00:00
Stephen Crosby 6ca9633354 prototype of jekyll hooks, encapsulated 2015-05-01 14:35:15 -07:00
Parker Moore c76c4e478b Convertible#read_yaml should return self.data.
Broken in 4b108df3ab.
2015-04-11 15:42:58 -04:00
Parker Moore 4b108df3ab convertible: abort with an error if Page/Post#data isn't a hash.
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.

Fixes #3643.
2015-04-10 17:07:14 -04:00
Alfred Xing fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Alfred Xing 43a28aed96 Fix indentation 2014-12-05 19:38:43 -08:00
Alfred Xing 5d9662f80f Always regenerate asset files 2014-12-05 19:07:18 -08:00
Alfred Xing b6d81c58df Perform less expensive operation first 2014-11-27 10:00:29 -08:00
Alfred Xing dc30114605 Use site.in_source_dir 2014-11-23 16:16:19 -08:00
Alfred Xing 11917645f2 Incremental regeneration 2014-11-21 22:12:20 -08:00
Alfred Xing 84cef2202d Remove duplicate 'Conversion error:' message 2014-11-10 09:12:51 -08:00
Parker Moore 0bc88975c8 More removal of File.join 2014-11-03 22:15:40 -08:00
feivel 0701fa7b16 Update outdated comment
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
Parker Moore eea5921856 Fix test for Liquid rendering in Sass. 2014-08-30 21:54:50 -07:00
Chris Frederick 79992fc3c8 Fix inaccurate comments 2014-08-26 17:17:13 +09:00
Chris Frederick 71b10e2d4a Make render_with_liquid? true for CoffeeScript 2014-08-26 17:14:33 +09:00
Parker Moore 707278f099 Use the proper extname getter. 2014-08-12 14:11:27 -04:00
Parker Moore 8ff9074ce5 Allow Sass files to be rendered, but never place them in layouts.
Fixes #2573.
2014-08-12 13:38:53 -04:00
Parker Moore 9c090c862f Ask about 'Draft' before asking about 'Post'
`Draft`s are a subclass of `Post` so `draft.is_a?(Post)` will return
`true`, thus making all `Draft`s `Post`s, which is not desired. If
asking about `Draft` first, then we avoid this problem.

Fixes #2726
2014-08-12 11:52:16 -04:00
Parker Moore 60c29561f2 Use plural 'type' in front matter defaults for pages/posts/drafts
Fixes #2657
2014-08-12 11:50:02 -04:00
Parker Moore fd2d7df9b7 Don't concat extnames in output for multiple converters 2014-08-10 20:32:29 -04:00
Parker Moore d004bc4ea5 Allow Convertibles to be converted by >= 1 converters. 2014-08-06 16:20:24 -04:00
Alfred Xing 6d62dbbafc Replace deprecated Ruby methods
Replace `Hash#has_key?` and `File.exists?` with `Hash#key?`
and `File.exist?`
2014-07-31 12:50:20 -07:00
Alfred Xing 7586538432 Use `is_a?` instead of `class` 2014-07-21 09:23:21 -07:00
Alfred Xing 4bd5614f4c Exclude excerpts from layout checks 2014-07-20 12:57:40 -07:00
Alfred Xing c8e0fcfcdf Fix up errors in CI build 2014-07-20 12:56:54 -07:00
Alfred Xing 7fa30c0dec Add path of file requesting nonexistent layout 2014-07-20 12:17:04 -07:00
Alfred Xing a0d679439f Move layout validity logic to separate method 2014-07-20 10:01:09 -07:00
Alfred Xing ac744a6313 Give a build warning if a layout does not exist
Throw a warning if a non-"none" layout is specified but the corresponding
layout file does not exist.
2014-07-20 09:17:19 -07:00
Parker Moore a66d96ce0a Use Jekyll.sanitized_path more. 2014-07-01 18:29:15 -04:00
Parker Moore e37b3ca8e1 Any assets read in as Pages shall not be rendered or layout'd 2014-05-21 00:52:21 -04:00
Parker Moore 63e959e4e1 Use Jekyll.logger, never puts 2014-05-06 13:02:35 -04:00
Parker Moore 955dc38400 Deep merge data overrides into defaults. 2014-04-05 15:42:53 -04:00
Parker Moore 6bd07501e8 Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft

Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
Lincoln Mullen 52ac2b3850 Permit YAML blocks to end with three dots
The YAML spec permits blocks to end with three dots (...) in addition to
three dashes (---): http://www.yaml.org/spec/1.2/spec.html#id2760395. Some
programs that work with Jekyll (e.g., Pandoc) prefer the dots to dashes. This
commit permits the YAML metadata block to end with either dots or dashes. It
includes tests.

Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-04-02 14:06:22 -04:00
Parker Moore 7787d64bce Rename those Utils functions. 2014-03-04 15:52:05 -05:00
Parker Moore e2af1b547b Extract core extensions into a Utils module
Fixes #2111
2014-03-03 22:13:03 -05:00
Corey Ward f1c4e247a5 Remove unnecessary references to `self` 2014-02-21 16:27:21 -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
Pascal Borreli bdda3a8ef6 Fixed typos 2014-01-04 14:17:38 +00:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers a2fd8ba7c3 Merge pull request #1849 from afeld/sort-attributes 2013-12-30 20:31:45 -08:00