dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,057 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2280 Commits

Author SHA1 Message Date
Parker Moore 82c3ee365f Initial work on using Liquid::Drops instead of Hashes. 
The properties of Liquid::Drops are only evaluated when they're asked for
and therefore save computation time. This prevents a lot of GC time cleaning
up objects that are not needed, because they're not created unless requested.
Additionally, this saves time for actual computation of those values because
they can be computed only if needed.

It's funny how much it helps when you only do what is needed. Far less overhead.
 2015-12-21 22:47:30 -05:00
Parker Moore fdcd761313 Merge branch 'akoeplinger-doctor-permalink-same-case-warning' 
* akoeplinger-doctor-permalink-same-case-warning:
  Added tests for new jekyll doctor warning
  Incorporate code review feedback
  Incorporate code review feedback
  Add a Jekyll doctor warning for URLs that only differ by case
 2015-12-13 12:26:07 -08:00
Parker Moore 92adfd0e46 Merge pull request #4052 from Crunch09/process-empty-config-files 
Merge pull request 4052
 2015-12-11 14:11:11 -08:00
Parker Moore b94800361b Collection: change missing_method message to be a bit clearer. 
Fixes #4234. Fixes #4199.
 2015-12-11 14:07:34 -08:00
Parker Moore 4f21458b34 Merge pull request #4184 from ducktyper/allow-quoted-dates 
Merge pull request 4184
 2015-12-11 14:02:55 -08:00
Parker Moore 11959ab2bc Merge pull request #4233 from RochesterinNYC/patch-1 
Merge pull request 4233
 2015-12-07 22:10:09 -08:00
James Wen 0e89e80426 Switch PluginManager to use require_with_graceful_fail 
* Add debug statement specifying current plugin to External#require_with_graceful_fail
 2015-12-07 20:46:07 -05:00
Jordon Bedwell 643ae68912 Add a default charset to content-type on webrick. 
Add a default charset to content-type on webrick, using Jekyll's
default encoding (or user set encoding) and cleanup servlet removing
unecessary logic that really served no purpose at the end of the
day, we don't need to strictly match Nginx, only be "like it."

This also cleans up the way we set headers and merges that logic
into a cleaner to understand interface that is slightly speedier.
 2015-12-06 20:33:53 -06:00
Jordon Bedwell b63712e403 Fix an edge where file is sometimes not returned properly. 2015-12-05 04:48:51 -06:00
Ducksan Cho 99042fa870 Improve error message 2015-12-05 16:21:50 +13:00
Parker Moore c6255d5f28 Merge pull request #4223 from jekyll/pull/sample-filter 
Merge pull request 4223
 2015-12-04 14:12:18 -08:00
Parker Moore 47d2a2459d filters: refactor #sample to leave off the arg 2015-12-04 13:48:09 -08:00
Jordon Bedwell 8efbdc01ff Fix #3791/#3478 
* Add support for SSL through command line switches.
* Add suppport for file/index.html > file.html > directory.
* Add support for custom-headers through configuration.
* Modernize and split up the serve.
* Add a few basic tests.
 2015-12-04 14:07:07 -06:00
Parker Moore 2e91d094e5 filters#sample: n == 1, return item; n > 1, return array 2015-12-04 10:25:13 -08:00
Jordon Bedwell 28c568386d Merge pull request #4220 from jekyll/pull/enable-codeclimate-platform 
Fix: #4219: Add CodeClimate Platform.
 2015-12-04 12:08:00 -06:00
Jordon Bedwell b6de905ee4 Fix: #4219: Add CodeClimate Platform. 2015-12-04 11:42:52 -06:00
Parker Moore 86195655d7 filters: allow sample(n) instead of just sample(1) 2015-12-04 09:40:57 -08:00
Parker Moore 96bc62c666 Add 'sample' Liquid filter 
Equivalent to Array#sample functionality
 2015-12-04 09:33:33 -08:00
Parker Moore 6cbd06ea85 Merge pull request #4109 from jekyll/cleanup-kramdown-converter 
Merge pull request 4109
 2015-12-04 09:21:22 -08:00
Parker Moore fe13c3b366 KramdownConverter: clean up some source with some unified methods 2015-12-04 09:21:11 -08:00
Jordon Bedwell e331a37260 Fix #4202: Have Kramdown behave like Github. 2015-12-04 11:11:30 -06:00
Jordon Bedwell 3432fd2c2d Modernize Kramdown for Markdown converter. 2015-12-04 08:09:08 -06:00
Parker Moore b90f8e048a Merge pull request #4150 from ducktyper/master 
Merge pull request 4150
 2015-11-30 19:57:01 -08:00
Parker Moore 4890cecaf3 Merge pull request #4205 from jekyll/pull/fix-layout-vs-page-data 
Merge pull request 4205
 2015-11-30 19:55:36 -08:00
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 c8edb15820 Prevent shell injection when opening a URL. 2015-11-29 21:22:27 -06:00
Parker Moore 64e87bfac9 Merge pull request #4144 from friedenberg/master 
Merge pull request 4144
 2015-11-28 23:21:30 -08:00
Sasha Friedenberg face3985dc add "-o" option to serve command which opens server URL 2015-11-28 15:13:44 -05:00
Ducksan Cho c159f19c7d Rename destructive method with bang 2015-11-26 00:06:09 +13:00
Ducksan Cho e60e5f3532 Allow quoted date in front matter defaults 2015-11-25 23:18:33 +13:00
rebornix 657a8d7239 Allow users to input multiple variables in include tag 2015-11-25 16:37:08 +08:00
Parker Moore ac1b2b88d4 Merge pull request #4160 from jekyll/fix-html-htm-xhtml-pages 
Merge pull request 4160
 2015-11-24 16:19:46 -08:00
Sam Volin 35070d6806 added debug message to collection 2015-11-24 16:02:10 -07:00
Jordon Bedwell f7a2b52cd9 Merge pull request #4174 from gfxmonk/master 
Fix #4173: Rename @options so that it does not impact Liquid.
 2015-11-24 04:19:57 -06:00
Tim Cuthbertson a7730914df rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173 2015-11-24 20:24:44 +11:00
rebornix 16aea22c8d pass build options into clean command 2015-11-23 22:38:45 +08:00
Jordon Bedwell 275aea11d1 Merge pull request #4168 from jekyll/pr/cleanup-url-sanitize 
Slightly speed up url sanitization and handle multiples of ///.
 2015-11-19 19:26:31 -06:00
Jordon Bedwell 487d9ffc21 Slightly speed up url sanitization and handle multiples of ///. 2015-11-19 18:46:03 -06:00
ducksan cho e9f8b4df74 Add Windows support to Utils.safe_glob 2015-11-19 17:15:51 +13:00
Jordon Bedwell 90865d5fc1 Fix #4082: Allow users to use .htm and .xhtml (XHTML5.) 2015-11-18 16:02:03 -06:00
Parker Moore c1761bc478 Merge pull request #4120 from rebornix/CacheIncludeTemplate 
Merge pull request 4120
 2015-11-18 11:53:10 -08:00
Ducksan Cho 20735e12f9 Use safe_glob to unsafe glob 2015-11-19 01:02:48 +13:00
Ducksan Cho a168edae45 Add Utils.safe_glob method 
which works the same way as Dir.glob but seperating the input
into two parts ('dir' + '/' + 'pattern') to make sure
the first part('dir') does not act as a pattern.
 2015-11-19 00:46:46 +13:00
Parker Moore 2b4a3c008d Release 💎 3.0.1 2015-11-17 22:19:45 -08:00
rebornix 6a98ab2a15 Make `:title` cased for backwards compability and add `:slug` for uncased usage. 2015-11-18 10:43:13 +08:00
Ducksan Cho bd2c337e5b Avoid using Dir.glob with absolute path 
the absolute path including '[', '{', '?', or '*'
could change the outcome
 2015-11-18 02:18:25 +13:00
Larry Fox 246ff3f9b6 Remove Post autoload 
Seems like this got missed. Referencing `Jekyll::Post` results in a `LoadError`
 2015-11-11 11:55:54 -05:00
rebornix 87a8695196 Cache include file to save liquid parsing time. 2015-11-10 21:08:37 +08:00
chrisfinazzo d1cbea8a37 Fix the deprecation warning in the doctor command 2015-11-06 09:48:42 -05:00
Parker Moore db6103bdee Document: only superdirectories of the collection are categories 2015-11-04 15:18:02 +07:00
Parker Moore bbc2b66a84 Merge pull request #4104 from willnorris/fix-hooks 
Merge pull request 4104
 2015-11-04 07:13:16 +07:00
Will Norris 1bfe5a6f95 align hooks documentation and implementation 
- add site post_render hook, which was documented but wasn't being
  called
- define documents post_init hook, which was documented but caused an
  error when called (fixes #4102)
- add docs for site post_read hook, which was being called but wasn't
  documented
- fix container name in example: s/post/posts/
 2015-11-03 07:47:32 -08:00
Paul Robert Lloyd e5279d4773 Santize @config['highlighter'] to only allow highlighters supported by kramdown 2015-11-01 23:04:59 +00:00
Paul Robert Lloyd 9d1641f163 Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter 2015-10-31 23:58:49 +00:00
Parker Moore 48b23858ad Merge pull request #4079 from jekyll/fix-jekyll-metdata-being-generated-on-non-incremental 
Merge pull request 4079
 2015-10-31 03:40:32 +08:00
Jordon Bedwell 0f4aed9ccf Fix #4066: Move Convertible#render_liquid to using render! 2015-10-29 16:06:17 -05:00
Jordon Bedwell 71f4383d18 Fix #4075: Make sure that .jekyll-metadata is not generated when not needed. 2015-10-29 15:44:38 -05:00
Jordon Bedwell e5f26b5a36 Fix test warnings when doing rake {test,spec} or script/test 2015-10-29 15:18:19 -05:00
Florian Thomas cf71c563ab Handle empty config files 
SafeYAML.load_file returns `false` when processing empty files so we
convert this into an empty hash for further processing.

fixes #4030
 2015-10-28 22:31:42 +01:00
Parker Moore 5082e144d8 Release 💎 3.0.0.pre.rc1 2015-10-26 20:22:53 -07:00
Parker Moore 7b81f00137 Defaults: compare paths in applies_path? as Strings to avoid confusion 
/cc #4064
 2015-10-26 17:28:20 -07:00
Parker Moore 45f69bb8cd Utils: deep_merge_hashes should also merge default_proc 
If the target hash's default_proc isn't set, overwrite with the new hash's default_proc.

/cc #4064
 2015-10-26 17:27:36 -07:00
Parker Moore e45b6f91e7 Document: Only auto-generate the excerpt if it's not overridden 
Fixes #4061
 2015-10-26 16:08:19 -07:00
Parker Moore 79c33af3fc post_url: fix access deprecation warning & fix deprecation msg 2015-10-26 14:46:42 -07:00
Parker Moore 05ba1afc29 Release 💎 v3.0.0.pre.rc1 2015-10-26 14:42:03 -07:00
Parker Moore d6176d6010 Merge pull request #4059 from alfredxing/disable-incremental-default 
Merge pull request 4059
 2015-10-26 14:41:03 -07:00
Alfred Xing 2a040fd527 Rename incremental regeneration flag 
Rename from `full_rebuild` to disable, to `incremental` to enable
 2015-10-26 14:20:44 -07:00
Alfred Xing d9b12bc090 Disable incremental regeneration by default in Jekyll 3.0 
Disable the feature as it's still not 100% working 100% of the time. Feature
can be re-enabled by specifying `full_rebuild: false` in the configuration
 2015-10-26 13:37:47 -07:00
Parker Moore 2e7c471c70 Add Document#method_missing and Collection#method_missing 
Proxies calls to either #data or #docs, respectively. Deprecation warning is printed.
 2015-10-26 13:37:04 -07:00
Parker Moore e9e4a5d21e Merge pull request #4053 from sparanoid/patch-1 
Merge pull request 4053
 2015-10-26 09:56:03 -07:00
Parker Moore e58d0ae0ef Merge pull request #4055 from jekyll/beefer-collections 
Merge pull request 4055
 2015-10-26 09:53:13 -07:00
Parker Moore b89f943bf2 collections: posts as collection 2015-10-26 00:29:14 -07:00
Tunghsiao Liu 2f5303dd67 Apply rouge highlighter background to child node 2015-10-26 15:17:04 +08:00
Tunghsiao Liu 58365ae898 Add missing highlighting CSS class for Rouge 2015-10-25 19:40:40 +08:00
Alfred Xing c84627b2e1 Change default font weight to 400 to fix bold/strong text issues 2015-10-22 00:30:14 -07:00
BigBlueHat d8f38eef0e Made icon-twitter.html inline-able 2015-10-20 09:03:27 -04:00
BigBlueHat 2cde74c44b Use GitHub icon inline in about.md 
Had to remove whitespace from icon includes
because Markdown...
 2015-10-20 08:56:36 -04:00
BigBlueHat 5d92a90bde Make HTML includes for GitHub & Twitter icons 
Made one for each to avoid over paramaterizing
the includes. Also allows for various icon formats.
 2015-10-20 08:52:20 -04:00
BigBlueHat c2c671641d Move GitHub & Twitter icons into includes 2015-10-20 08:46:51 -04:00
Jordon Bedwell 271dc42724 Merge pull request #4032 from jekyll/refactor-cleaner-for-expressiveness 
Make a constant for the regex to find hidden files
 2015-10-17 06:56:55 -05:00
Parker Moore ff55da727e Release 💎 3.0.0.pre.beta10 2015-10-16 12:53:18 -07:00
Matt Rogers 20303de60d Merge pull request #4004 from kevinoid/excerpt-match-post-content 2015-10-15 21:13:32 -05:00
Matt Rogers b72556fd03 Make a constant for the regex to find hidden files 
A raw regular expression isn't very expressive, IMHO. Rather than having
people who read this code parse the regular expression to figure out
what it's for, let's give a name. This way, it becomes more obvious what
exactly it is we're doing here.
 2015-10-15 20:34:44 -05:00
Marcus Stollsteimer 45902b2047 Avoid "mismatched indentations" warning for ruby -w 2015-10-11 19:49:40 +02:00
Kevin Locke bb9462f12f Whole-post excerpts should match the post content 
When a post does not contain an excerpt_separator, meaning the excerpt
includes the entire post, the excerpt should contain exactly the post
content.

This is desirable both from a correctness standpoint, that the excerpt
should not introduce any new content, and more practically to allow fast
and easy detection of whole-post excerpts in Liquid templates using
`post.excerpt == post.content`.  A common use-case is deciding whether
to render "Read More" links on a page containing post excerpts.

This commit does exactly that.  It avoids adding additional newlines to
the excerpt content when the excerpt includes the whole post and adds
tests to ensure that this behavior is correct and preserved going
forward.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
 2015-10-01 13:58:00 -07:00
hartmel 951c604017 Add timezone as hour & minute offset in the initial post in the new site template. Fixes #3998 2015-09-28 22:18:02 +02:00
David Herman 1703b59ce8 Add header message to _config.yml 
The first thing new users to Jekyll do is open _config.yml, so this
change adds a simple welcome message to the top of it. Additionally,
it informs the user that the file is not automatically reloaded when
changed, which is a point of confusion for new users.

Related issue: https://github.com/jekyll/jekyll/issues/2302
 2015-09-25 18:57:46 -07:00
Parker Moore e193f5a738 Merge pull request #3992 from jekyll/abort-before-confusing-msg 
Merge pull request 3992
 2015-09-24 16:06:26 -07:00
Pedro Euko 22b59ae793 Added permalink time variables 2015-09-23 21:51:02 -03:00
Parker Moore c7bc76269c Abort if no subcommand. 
Fixes #3412
 2015-09-23 17:32:33 -07:00
Parker Moore f3b99ebda7 Release 💎 3.0.0.pre.beta9 2015-09-21 12:31:00 -07:00
Jordon Bedwell 908bb2e7af Fix #3970: Use Gem::Version to compare versions, not >. 2015-09-11 14:44:20 -05:00
Alfred Xing 93d282a5c1 Merge pull request #3828 from superlukas/fix-clean-command 
Merge pull request 3828
 2015-09-02 20:22:14 -07:00
Parker Moore 4169075dd1 filters: `where` should compare stringified versions of input & comparator 
Non-string input was being missed as a result of poor comparison.
Converting inputs to strings ensure numerical and boolean values are
properly compared.

Fixes #3911.
 2015-08-25 23:00:58 -07:00
Ben Balter 1eb1f4ea4d add script to vendor mime types 2015-08-24 16:21:50 -04: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
Parker Moore 44a43b757d Merge branch 'fniephaus-_includes' into 'master' 
* fniephaus-_includes:
  Unify renaming of configuration options to a single method. /cc #3782.
  Make _includes directory configurable; closes #2684
 2015-08-16 13:30:45 -04:00
Parker Moore 399606c544 Unify renaming of configuration options to a single method. /cc #3782. 2015-08-16 13:30:39 -04:00
Nate Berkopec 559cd6c7e7 Future should be set to false in the default config 2015-08-16 13:11:08 -04: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
Robert Papp 371ca58e69 Fixes #3776 by changing to the correct name for whitelisting. 2015-08-05 00:20:14 +02:00
Parker Moore 14e6809bcd Merge pull request #3838 from gynter/issue-3836 
Merge pull request 3838
 2015-07-28 11:29:01 -07:00
Stephen Crosby 7c4f319442 #3870 trigger hooks by owner symbol 2015-07-27 16:23:07 -07:00
Shinnosuke Kondo 1eb626b1df Fix keep_files not to match a file with repeated path. 2015-07-13 19:08:11 -05:00
Shinnosuke Kondo 3b60237cb1 Fix keep_files to be used as paths relative to the destination. 
They were used as keywords to match files containing them in the paths.
 2015-07-13 18:34:40 -05:00
Florian Weingarten 8bdfdae0ab Fix reading of binary metadata file 2015-07-09 13:40:36 -04:00
Günter Kits b9f8fc1715 Fixes #3836. Fix site template header menu iteration variables 2015-07-06 21:02:56 +03:00
Jensen Kuras f4bbbd6952 Fixed an unclear code comment 2015-07-06 10:43:28 -07:00
Jordon Bedwell 5bf5c36ce0 Close #3833 by removing execute bit. 2015-07-04 04:59:06 -05:00
Jordon Bedwell 3a49770ce2 Merge pull request #3823 from 18F/adapt-static-file 
Adapt StaticFile for collections, config defaults
 2015-07-01 12:06:08 -05:00
Lukas 6d196275fc Add build options (fixes #3744) 2015-06-30 20:53:31 +02:00
Mike Bland 250b6ebb7e Adapt StaticFile for collections, config defaults 
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.

It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
 2015-06-29 19:58:27 -04:00
Parker Moore 8c9e9497a2 Release 💎 3.0.0.pre.beta8 2015-06-29 14:33:38 -07:00
Florian Weingarten 3c656ae2ed Remove unnecessary 'ensure' in LiquidRenderer 2015-06-23 21:27:24 +00:00
Parker Moore 5647b91689 Release 💎 3.0.0.pre.beta7 2015-06-18 20:52:40 -07:00
Parker Moore 8b44a7bb42 Merge pull request #3762 from fw42/liquid_profiler 
Merge pull request 3762
 2015-06-16 10:21:33 -07:00
Jordon Bedwell 137efdc9f4 Fix: #3738; Move code wrapper from div to figure. 2015-06-10 15:20:44 -05:00
Jordon Bedwell a58f23aeaf Add support for underscores. 2015-06-10 15:05:17 -05:00
Jordon Bedwell 34438ed325 Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks. 
Reason: #3770
 2015-06-10 15:04:25 -05:00
Florian Weingarten 7bc9e1aae6 Add byte counter 2015-06-07 16:49:22 +00:00
Florian Weingarten 1e9163fdf4 Liquid profiler 2015-06-07 16:38:05 +00:00
Jordon Bedwell e9215ec047 Merge pull request #3732 from jekyll/fix-frontmatter-defaults 
Fix it so that 'blog.html' matches 'blog.html'
 2015-06-06 06:30:43 -05:00
Parker Moore a134e05fda Release 💎 3.0.0.pre.beta6 2015-06-04 16:57:13 -07:00
Alfred Xing bba7870f8b Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files 
Merge pull request 3717
 2015-05-31 11:10:42 -07:00
Seb e68d18c3cc Update link in welcome post to talk.jekyllrb.com 
Previously the link pointed to the jekyll-help repository on github
which no longer accepts issues.
 2015-05-28 21:19:24 +02:00
Jordon Bedwell 14ed5cc954 Fix it so that 'blog.html' matches 'blog.html' 2015-05-25 02:07:21 -05:00
Alfred Xing a2ee820609 Regenerator: handle deleted/renamed/moved dependencies 
Should fix #3716
 2015-05-19 22:47:58 -07:00
Florian Weingarten 376c87b62e Don't crash when reading/writing Marshal 2015-05-19 15:51:55 +00:00
Parker Moore 73db98c244 Release 💎 3.0.0.pre.beta5 2015-05-19 10:54:37 +07:00
Jordon Bedwell 498ea4fd24 Merge pull request #3706 from fw42/marshal_metadata 
Performance: Marshal metadata
 2015-05-18 09:17:42 -05:00
Florian Weingarten 3474481043 Marshal metadata 2015-05-18 14:02:43 +00:00
Florian Weingarten 5928618de1 Performance: Sort files only once 2015-05-18 13:56:56 +00:00
Jordon Bedwell ae11cae659 Fix #3653: Add a doctor helper to test pwd's. 2015-05-17 02:46:40 -05:00
Florian Weingarten 15c4d9bee2 Jekyll::Cleaner#existing_files: Call keep_file_regex and keep_dirs only once, not per iteration 2015-05-11 22:01:10 +00:00
Parker Moore ba12d28fbe Release 💎 v3.0.0.pre.beta4 2015-05-10 01:10:57 -07:00
Parker Moore ce9fcfaebb Merge pull request #3553 from stevecrozz/jekyll-hooks 
Merge pull request 3553
 2015-05-09 23:58:46 -07:00
Florian Weingarten f99abc5314 Cache Document#to_liquid 2015-05-10 03:51:50 +00:00
Parker Moore 4b038259c7 Release 💎 v3.0.0.pre.beta3 2015-05-06 23:19:23 -07:00
Stephen Crosby 79a178f7f1 move document.post_render hook to after render call 2015-05-03 13:53:28 -07:00
Stephen Crosby 736e6a78f1 address code review feedback from #3553 
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
 2015-05-02 15:56:19 -07:00
Stephen Crosby 245d9677d7 Refine hook implementation 
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
  register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
  :high)
- implement hooks for collections as they are in octopress-hooks, aside
  from post_init
 2015-05-01 19:00:37 -07:00
Stephen Crosby 6ca9633354 prototype of jekyll hooks, encapsulated 2015-05-01 14:35:15 -07:00
Bernardo Dias 8546298047 fix collections output, see #2346 2015-04-29 10:49:06 -07:00
Alfred Xing 9ab3c201c8 Remove relative permalinks 2015-04-28 14:03:20 -07:00
Jim Meyer 269662d0f0 DRY config value fetching 
Adds #get_config_value_with_override, refactoring the three fetch
methods to use it.
 2015-04-18 16:59:36 -07:00
Jim Meyer 9c03fc3f27 Set logging to debug when verbose flag is set 
Adds Jekyll::LogAdapter#adjust_verbosity which ensures that --quiet
always wins.
 2015-04-18 16:57:57 -07:00
Parker Moore f908051aa4 mime.types: remove extraneous hyphen before comment 2015-04-14 17:15:08 -07:00
Parker Moore ab83f0bf2e Merge pull request #3649 from schneems/schneems/utf8-myhomework 
Merge pull request 3649
 2015-04-14 16:51:21 -07:00
schneems 701617cb0e Fix header for RSS feeds with UTF8 characters. 
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```

Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
 2015-04-14 18:21:25 -04:00
Parker Moore 0072865512 Merge pull request #3629 from justinweiss/lsi_search_on_posts 
Merge pull request 3629
 2015-04-14 13:13:24 -07:00
Parker Moore ff3edbc16b static files mtime liquid should return a Time obj 2015-04-14 11:52:25 -07:00
Alfred Xing 5a60adb6bd Maruku deprecation error message 2015-04-14 10:58:47 -07:00
Alfred Xing ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -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
Parker Moore bf98004843 Merge pull request #3608 from nickburlett/patch/incremental-build 
Merge pull request 3608
 2015-04-10 16:51:56 -04:00
Parker Moore eeb13872e3 Merge branch 'delftswa2014-remove-unused-method' 
* delftswa2014-remove-unused-method:
  static_file: extract extname in initializer and save as variable. #3632
  removed unused method StaticFile::extname
 2015-04-10 16:31:26 -04:00
Parker Moore f14af82da5 static_file: extract extname in initializer and save as variable. #3632 2015-04-10 16:31:19 -04:00
Nicolas Hoizey 76416e50e8 Add WOFF2 font format 2015-04-10 00:13:02 +02:00
Martijn den Hoedt f0cac685de removed unused method StaticFile::extname 2015-04-01 12:57:49 +02:00
Justin Weiss fa435fae94 Use `Jekyll::Post`s for both LSI indexing and lookup. 
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:

1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.

2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.

This is a more accurate fix for #3484.
 2015-03-29 23:43:55 -07:00
Jordon Bedwell f75346c799 Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing 
Incremental build if destination file missing
 2015-03-28 19:26:01 -05:00
Nicholas Burlett 1f8157022a Clean up destination modified check 
Clean up the destination modified check in `source_modified_or_dest_missing?` to be easier to read. Note that it can now return `nil` instead of `false` for an unmodified `source_path` and a `nil` `dest_path`, but in a discussion on 706007ead9 we decided that was okay.
 2015-03-25 08:51:58 -07:00
Martijn den Hoedt d98047ef74 Removed the word 'Jekyll' a few times from the comments 2015-03-25 08:49:05 +01:00
Nicholas Burlett 8f4194eea5 Clean up regeneration missing-destination checks 
Use easier-to-follow checks for missing-destinations in the regenerator.
 2015-03-24 21:21:37 -07:00
Parker Moore e7d0b6c5a5 Merge pull request #3545 from delftswa2014/site_extract_readers 
Merge pull request 3545
 2015-03-23 19:53:07 -07:00
Nicholas Burlett d4b8f0d9dd Process metadata for all dependencies 
When adding a dependency, also add the dependency to the metadata hash.

Addresses part 1 of #3591. Prior to this fix, the regnerator only paid attention the mtime of the first dependency it checked, so for posts/pages with N multiple dependencies (i.e., every layout file used to render them), it continues to regenerate the post/page approximately N times, at which point it's seen all of the dependencies.
 2015-03-22 13:33:12 -07:00
Parker Moore e91527058a Merge pull request #3592 from nickburlett/patch/incremental-build 
Merge pull request 3592
 2015-03-21 19:29:45 -07:00
Nicholas Burlett 706007ead9 Incrementally regenerate missing destination file 
Addresses the third point of #3591, in which the incremental regenerator doesn't notice that destination files have gone missing.
 2015-03-21 19:25:02 -07:00
Martin Jorn Rogalla 63a1ec8949 Made corrections as suggested by @mattr-. 
- Corrected TomDoc, added variables and fixed typos.
 - deprecated_rel_permalink -> relative_permalinks_are_deprecated.
 - Grouped calls together in @reader.read.
 - Removed dynamic and static reader subdirectories.
 - Removed unnecessary move of limit_posts.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-20 12:41:19 +01:00
Martin Rogalla 324748a5a6 Added corrections as suggested by @parkr. 
- Replaced occurrences of #array += with concat
   operations.(performance)
 - Corrected alignment.
 - Removed rebase artifact.

Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
 2015-03-19 14:56:46 +01:00
Nicholas Burlett 15ebf929e1 Use the new clear_cache method 
Instead of assigning `@cache = {}`, clear the cache using `clear_cache`
 2015-03-18 22:30:31 -07:00
Nicholas Burlett adce349d7a Clear the regenerator cache every time we process 
To address part of #3591, clear the regenerator's cache every time the
site is processed. This ensures that the regenerator doesn't incorrectly
believe a file hasn't changed based on stale information.
 2015-03-18 10:27:40 -07:00
Jordon Bedwell e268ee0f33 Whoops, forgot the pre in the beta tag. 2015-03-18 05:25:36 -05:00
Parker Moore eb2fc89776 Correct the semantics of checking for jekyll-paginate 2015-03-16 15:48:50 -07:00
Parker Moore bb57c80478 Perform jekyll-paginate deprecation warning correctly. 
Fixes #3393
 2015-03-16 14:54:31 -07:00
Martin Jorn Rogalla b178358cf9 Merge branch 'master' into site_extract_readers 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 17:28:45 +01:00
Martin Jorn Rogalla 00cdcbc184 Separated some more readers from the main reader.rb file. 
- Draft Reader
 - Collection Reader
 - Page Reader
 - Post Reader
 - Static File Reader

Fixed references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 17:20:25 +01:00
Martin Jorn Rogalla bebd80342e Extracted draft, post reader into external classes. 
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-06 12:39:50 +01:00
Parker Moore 6d9258bcdc Release 💎 v3.0.0.beta2 2015-03-05 13:40:10 -08:00
Matt Rogers 02e98f238e Merge pull request #3520 from delftswa2014/sort-null 2015-03-05 14:35:40 -06:00
Martin Jorn Rogalla 4b8e3cfdbd Moved the in_(source/dest)_dir back to site.rb. 
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-05 13:34:46 +01:00
ChaYoung You 7806f9ed52 Replace `File.exists?` with `File.exist?` 
`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method.
 2015-03-05 18:21:52 +09:00
ChaYoung You 489da6784a Remove duplicated range from regex 
`/\w/` is equivalent to `[a-zA-Z0-9_]`. See
http://ruby-doc.org/core-2.2.0/doc/regexp_rdoc.html#label-Character+Classes.
 2015-03-05 18:19:32 +09:00
Parker Moore e229e3285f Merge pull request #3537 from kleinfreund/patch-2 
Removing unused code from post layout
 2015-03-04 18:32:57 -08:00
Will Norris f6f2626828 Merge pull request #3538 from willnorris/permalink 
Improved permalinks for pages and collections
 2015-03-04 15:18:43 -08:00
Parker Moore ced9146c11 Merge pull request #3544 from delftswa2014/micro_refactor_url 
Refactored url.rb to be compliant with Ruby Style Guide.
 2015-03-04 15:13:35 -08:00
Martin Jorn Rogalla ca7375a51b Corrected quote-usage. Replaced [-1].eql with end_with. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 22:31:19 +01:00
Martin Jorn Rogalla 9e1cb96a7e Added site reference for encoding configuration. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 22:23:47 +01:00
Martin Jorn Rogalla 7114380da7 Added and improved documentation, fixed long method name. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 21:37:25 +01:00
Martin Jorn Rogalla 1b796354fb Added documentation, made method private and fixed quotes. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 21:10:26 +01:00
Martin Jorn Rogalla f252a82afc Made the Reader responsible for the actual Reading. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 21:00:45 +01:00
Martin Jorn Rogalla 2f88a0c0a1 Extracted `read_collections` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:55:53 +01:00
Martin Jorn Rogalla 2857350df1 Extracted `read_directories` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
 2015-03-04 20:51:26 +01:00
Martin Jorn Rogalla 9bcad08e3a Extracted `limit_posts` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
 2015-03-04 20:35:02 +01:00
Martin Jorn Rogalla a4adeb446b Extracted `read_posts` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:22:37 +01:00
Martin Jorn Rogalla 504c9a34ad Extracted `read_drafts` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:19:39 +01:00
Martin Jorn Rogalla 29169aa858 Extracted `aggregate_post_info` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:16:31 +01:00
Martin Jorn Rogalla 67a2369854 Extracted `read_content` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:11:27 +01:00
Martin Jorn Rogalla 537235c38b Extracted `read_data` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:07:53 +01:00
Martin Jorn Rogalla 5b0e2a294d Extracted `read_data_to` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:05:10 +01:00
Martin Jorn Rogalla e586105b46 Extracted `sanitize_filename` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:01:27 +01:00
Martin Jorn Rogalla ddfecb0f53 Extracted `read_data_file` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:55:54 +01:00
Martin Jorn Rogalla 6e06fd8734 Extracted `get_entries` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:51:44 +01:00
Martin Jorn Rogalla 05bbcddb29 Extracted `filter_entries` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:46:10 +01:00
Martin Jorn Rogalla c836ec613d Extracted `in_dest_dir` from site.rb into reader.rb 
- Extracted in_dest_dir from site.rb.
 - Updated References.
 - Ran Tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:21:24 +01:00
Martin Jorn Rogalla bb9d43dff5 Extracted `in_source_dir` from site.rb and into reader.rb. 
Extracted `in_source_dir` from site.rb into reader.rb.
Updated all the references and tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:16:03 +01:00
Will Norris 0d1586a5c4 Improved permalinks for pages and collections 
This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting.  If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well.  Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections.  If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.

This impacts only the default permalink structure for pages and
collections.  Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.

Fixes #2691
 2015-03-04 09:38:23 -08:00
Martin Jorn Rogalla 2ef9bae75a Refactored url.rb to compliant with Ruby Style Guide. 
- Single Quotes
 - Fixed Typo's in variable names.
 - Removed Redundant Escaping in Regular Expressions.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 14:16:55 +01:00
Jordon Bedwell d40b6d6ee0 Merge pull request #3418 from tarebyte/destination-and-source 
Added build --destination and --source flags
 2015-03-04 05:21:36 -06:00
Philipp Rudloff d56df7592c Removing unused code from post layout 
The post from the site template does not have `meta` in its front matter. 

Related to #3536.
 2015-03-03 09:52:23 +01:00
Will Norris 669c803912 always include file extension on destination files 
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure.  This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.

Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension.  In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
 2015-03-02 21:20:54 -08:00
Joop Aué 7a31029c79 Removed deprecation inconsistency 
Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.

Signed-off-by: Joop Aué <joopaue@gmail.com>
 2015-03-02 21:54:05 +01:00
Martin Jorn Rogalla 92a9582733 Corrected error message as suggested by @parkr. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-01 11:16:08 +01:00
Martin Jorn Rogalla 78af3c5018 Improved clarity of sort nil input error message. 
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-01 09:51:59 +01:00
Martin Jorn Rogalla 0565308ce6 Added test to check on nil input for sort filter. 
- Added a test to check if the sort filter will raise the correct
   exception on given nil input.
 - Improved error message and used "nil" consistently.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-01 09:40:32 +01:00
Martin Jorn Rogalla 531d0fb261 Sort will now raise error on nil object array input. 
Sort will now throw an error when a nil object array is given as input.
See issue #3491 for more information.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-02-26 22:12:06 +01:00
Parker Moore 3f3b203992 Use end_with? instead of regexp for adding index.html 2015-02-25 11:59:27 -08:00
Parker Moore b75db477e0 Merge pull request #3485 from watkyn/extra_slash_in_example_base_url 
Removed the trailing slash from the example "/blog/" basurl comment.
 2015-02-24 23:01:03 -08:00
Parker Moore 5c388309b2 Spacing. [ci skip] 2015-02-23 01:25:58 -08:00
Parker Moore 0903515c39 Merge pull request #3502 from delftswa2014/update-doc-link 
Changed doc link in template
 2015-02-23 01:25:05 -08:00
Parker Moore 7a93ca6f6c Merge pull request #3496 from yous/site-template-gitignore 
Ignore .jekyll-metadata in site template
 2015-02-22 21:21:08 -08:00
Joop Aué 6bc3dee98d Changed doc link in template 
Changed the doc link in the template to link to /docs/home instead of /

Signed-off-by: Joop Aué <joopaue@gmail.com>
 2015-02-22 18:42:12 +01:00
ChaYoung You 7db9397a9d
Remove trailing whitespace 2015-02-22 20:27:15 +09:00
ChaYoung You ae244c4425
Ignore .jekyll-metadata 2015-02-22 18:31:46 +09:00
Parker Moore 52c4ce2a5a Finish of moving the unit tests over to Minitest 2015-02-21 00:31:07 -08:00
Tony Eichelberger 47ee5db5fc Removed the trailing slash from the example "/blog/" basurl comment. Following the example would add two slashes into the url, i.e. http://yourdomain.com/blog// 2015-02-20 07:06:12 -06:00
Will Norris 6e89c1c02b write .jekyll-metadata even on full_rebuild 
For a full rebuild, we certainly don't want to *read* from
.jeykll-metadata, but we should still write it.  Otherwise, a subsequent
incremental build would have to do a full rebuild again since there is
no metadata file to start from.
 2015-02-14 22:43:43 -08:00
Will Norris 58dc1f77e9 add draft? method to identify if Post is a draft 2015-02-14 00:01:27 -08:00
Parker Moore c6d5a913f1 Site#read_data_file: read CSV's with proper file encoding 
Fixes #3451.
 2015-02-13 19:39:15 -08:00
Ryan Tomayko 491cce7a99 Avoid requiring webrick at boot time 
This is a bit uglier but allows deferring loading webrick until the
serve command is invoked as opposed to when it's required.
 2015-02-12 22:16:12 -05:00
Ryan Tomayko e99a9e5821 Custom WEBrick FileHandler for stripping .html extension 
This first performs the normal static file check at the exact
location. If no file is found, attempt the check again with an
".html" suffix.

See the following for base class search_file implementation:

https://github.com/ruby/ruby/blob/4607f95/lib/webrick/httpservlet/filehandler.rb#L363-L383
 2015-02-12 21:58:35 -05:00
Alfred Xing a907addbe2 Optimize text rendering for legibility 2015-02-11 15:45:47 -08:00
Alfred Xing a64b7e7a62 Merge pull request #3440 from tkrotoff/class-text 2015-02-11 13:58:44 -08:00
Mark Tareshawty f933164a2a use SCREAMING_SNAKE_CASE and remove --destination from --source options 2015-02-10 15:02:49 -05:00
Tanguy Krotoff 0914948099 Remove class="text" 
There is no class text defined in the CSS
 2015-02-10 17:09:06 +01:00
Mark Tareshawty c96abf7e82 added -s and -d 2015-02-10 11:08:22 -05:00
Parker Moore bf149a0b97 highlight: fix problem with linenos and rouge. 
Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435

The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.

To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
 2015-02-09 21:42:52 -08:00
Parker Moore c625b94bc0 Merge pull request #3401 from jekyll/fix-code-cleanup 2015-02-09 16:26:19 -08:00
Parker Moore 571800c8ad Use 3 places to the right of the decimal place instead of 2. 2015-02-07 23:57:07 -08:00
eksperimental d795113e94 Update build.rb 
parenthesis added to round
 2015-02-07 23:57:07 -08:00
eksperimental dbc8530068 Show only two decimals in time to generate pages 
no need to display 10 decimals.
it feels up my screen with useless numbers! ;-p
 2015-02-07 23:57:07 -08:00
ChaYoung You 6521b84aac
Change `overflow-x` value to `auto` 
`overflow-x: scroll;` makes scrollbar visible always whether the content
does overflow or not.
 2015-02-07 06:21:21 +09:00
Mark Tareshawty 120d3e07ca added flags from docs 2015-02-06 13:27:23 -05:00
eksperimental 5e541b5eb0 fix quote 2015-02-05 16:48:59 +07:00
Seth Warburton 2745be736e A lighter font declaration 
Removes unnecessary Sass

Thanks @kleinfreund :)
 2015-02-02 11:43:53 +00:00
Parker Moore d24ea66933 The highlight tip should only clip the newlines before and after the *entire* block, not in between. 
Ref: https://github.com/jneen/rouge/issues/230
 2015-02-01 22:37:10 -08:00
Jordon Bedwell 9ba9c47cd6 Fixes #3339 Add `pkill -f jekyll` to ways to kill. 
This shows people how to kill Jekyll without knowing the PID using `pkill` (you could also do `kill -9 $(pgrep -f jekyll)` but that is just the long way around doing `pkill -f` so it shouldn't be shown in the Jekyll logger but can be documented here for people.
 2015-02-01 06:45:52 -06:00
Parker Moore 3318c38eec Merge pull request #3391 from jekyll/enspeeden-include 2015-01-31 15:41:34 -08:00