Commit Graph

2754 Commits

Author SHA1 Message Date
Parker Moore 79f8210fff 'jekyll clean': also remove .sass-cache 2016-03-11 10:04:36 -08:00
surrim 52eb60e171 use copy_entry only in safe mode 2016-03-11 18:45:40 +01:00
jekyllbot 9e0ed00a59 Merge pull request #4555 from timwis/patch-1
Merge pull request 4555
2016-03-08 16:25:15 -08:00
Matt Rogers 9520d9bbf9 Merge pull request #4636 from HugoGiraudel/patch-4 2016-03-08 16:04:02 -06:00
Ben Balter eb341514a7 use def_delegator 2016-03-08 11:55:16 -05:00
Ben Balter e8617cf7cd better theme-not-found handling 2016-03-08 11:53:29 -05:00
Zack Spencer 13912482ad Adding a debug log statment for skipped future posts.
For https://github.com/jekyll/jekyll/issues/4507
2016-03-07 22:10:10 +00:00
Ben Balter c86fba6fb3 use /assets for theme assets, not _assets 2016-03-06 15:42:08 -05:00
surrim 46bdaa49dc using FileUtils.copy_entry instead of FileUtils.cp to allow symlinks 2016-03-05 23:31:16 +01:00
Ben Balter 8b880cb993 add theme tests 2016-03-05 13:35:52 -05:00
Ben Balter ada7c4f441 revert layout reader 2016-03-05 13:05:57 -05:00
Ben Balter 47416169c3 add sass path 2016-03-05 13:05:11 -05:00
Ben Balter 8bfb9e51f3 Merge branch 'master' into themes 2016-03-05 13:04:15 -05:00
Jordon Bedwell 37cc45239d Merge pull request #4635 from HugoGiraudel/patch-3
Added role="banner" to <header>
2016-03-05 02:22:10 -06:00
Hugo Giraudel 664206608d Removed unnecessary nesting from _base.scss 2016-03-04 17:40:19 +01:00
Hugo Giraudel 90e83e0636 Changed main <div> to <main> and added aria-label="Content" 2016-03-04 17:33:44 +01:00
Hugo Giraudel 09b9db259c Added role="banner" to <header> 2016-03-04 17:32:21 +01:00
Hugo Giraudel ff91463c43 Added a default lang attribute 2016-03-04 17:03:26 +01:00
Jeff Kolesky b80a0cb5ce Adds collection_tag
This tag mirrors the post_tag functionality but for collections instead of just
posts.
2016-03-02 14:56:30 -08:00
Jeff Kolesky 67904e849d Ensures related_posts are only set for a post
Prior to this change, the related posts for the most recently rendered post
stayed set on the `site` object. This could result in pages that showed related
posts even when the page represented an entire collection of posts, such as on
an index page.  This change restores the functionality from Jekyll V2.
2016-03-01 12:05:49 -08:00
Parker Moore 14e9ec2bbb Doctor: correctly set key name so --config works
Fixes #4598
2016-02-29 16:17:49 -08:00
jekyllbot c16a2f4d6a Merge pull request #4590 from tonyg/pr4582
Merge pull request 4590
2016-02-29 16:12:06 -08:00
jekyllbot cddea273a9 Merge pull request #4557 from timwis/patch-2
Merge pull request 4557
2016-02-29 16:08:11 -08:00
jekyllbot 9b889217fa Merge pull request #4611 from jekyll/draft-time-source-mtime
Merge pull request 4611
2016-02-29 16:00:52 -08:00
jekyllbot ac704b9763 Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs
Merge pull request 4545
2016-02-29 15:50:29 -08:00
Parker Moore ae228705b2 Document#date: drafts which have no date should use source file mtime 2016-02-29 15:46:11 -08:00
Chayoung You dafb25cbfe Escape title and description
Follows after #4307.
2016-02-28 22:07:10 +09:00
Ben Balter 91b348966e add theme class 2016-02-26 14:25:29 -05:00
Tony Garnock-Jones fa1eb68941 Fix for issue #4582, plus simple test 2016-02-26 11:06:03 -05:00
timwis 6245ddb14d where filter uses array for everything 2016-02-25 10:18:03 -05:00
Tim Wisniewski 7542ab51b7 Add size property to group_by result 2016-02-20 20:30:38 -05:00
Tim Wisniewski 64ad293b89 add array support to where filter 2016-02-20 19:46:48 -05:00
Parker Moore 05d753f4e0 Release 💎 v3.1.2 2016-02-19 15:40:57 -08:00
Parker Moore d929242e2b Permalinks which end in a slash should always output HTML
Duplicates #4493 for 3.1.1.

/cc @jekyll/core
2016-02-19 15:02:13 -08:00
Parker Moore 3aa80b7d04 Allow collections to have documents that have no file extension 2016-02-19 13:40:17 -08:00
Parker Moore 551f8b751f `jekyll new` should create a Gemfile which is educational 2016-02-18 16:56:39 -08:00
Henry Goodman d387fd0baa Add show_dir_listing option for serve command 2016-02-17 20:54:57 -08:00
jekyllbot db9865ebb6 Merge pull request #4525 from atomicules/capitalize-in-titleize
Merge pull request 4525
2016-02-15 20:50:42 -08:00
atomicules e4aa45b03f Fix titleize_slug so already capitalized words are not dropped
Previously `titleize` used `capitalize!` which has the side effect of
returning `nil` for anything already starting with a capital letter. This
commit changes it to just `capitalize`.

Example, before:

A file "2016-01-01-This-is-a-title-with-Capitals.markdown" would return "Is A
Title With" for `post.title`

Example, after:

A file "2016-01-01-This-is-a-title-with-Capitals.markdown" will return "This Is A
Title With Capitals" for `post.title`

Tests added for `titleize_slug` in test_utils.rb

Fix problem introduced in 67f842546e

References #4525
2016-02-15 21:22:50 +00:00
lonnen e191109549 add consistency to the deprecation message 2016-02-09 23:46:45 -08:00
Parker Moore a040af37c0 Jekyll.sanitized_path: sanitizing a questionable path should handle tildes 2016-02-07 17:53:26 -08:00
Parker Moore 0e89a37eaf Revert "Jekyll.sanitized_path: sanitizing a questionable path should handle tildes"
This reverts commit 246e65914f.
2016-02-07 17:53:09 -08:00
Parker Moore 246e65914f Jekyll.sanitized_path: sanitizing a questionable path should handle tildes 2016-02-07 17:52:15 -08:00
Parker Moore 3373eb6525 EntryFilter#special?: ignore filenames which begin with '~' 2016-02-07 17:28:03 -08:00
Parker Moore 5058382d5a LiquidRenderer#parse: parse with line numbers. 2016-02-02 14:43:45 -08:00
Jordon Bedwell 65a1fc4120 Mispell Rouge intentionally. 2016-02-02 12:27:17 -06:00
Jordon Bedwell 4d805e29bc Fix #4427: Make our @config hash symbol accessible. 2016-01-30 09:48:37 -06:00
Parker Moore bfee5c5b59 Release 💎 v3.1.1 2016-01-28 20:36:51 -08:00
jekyllbot 00d753612c Merge pull request #4404 from jekyll/bom-it
Merge pull request 4404
2016-01-28 17:20:33 -08:00
Parker Moore 9daebe8dd2 Use improved Page#dir 2016-01-27 08:32:36 -08:00
Parker Moore aad54c9a87 Add Utils.merged_file_read_opts to unify reading & strip the BOM 2016-01-26 17:08:54 -08:00
Parker Moore 38b64faeb2 Page#dir: ensure it ends in a slash 2016-01-26 16:44:30 -08:00
Parker Moore d7ff4234f0 Renderer#output_ext: honor folders when looking for ext
Previously, even if the document permalink was a folder, it would look for
an extension on that.  For example, if I have:

    permalink: "/new-version-jekyll-v3.0.0/"

the output_ext would be ".0".  Now, the output_ext honors the trailing
slash and will report based on the converters instead.
2016-01-25 15:32:44 -08:00
Parker Moore 368f5b67a9 Release 💎 3.1.0 2016-01-24 13:13:15 -08:00
Parker Moore 4b827e1797 Release 💎 3.1.0.pre.rc3 2016-01-22 13:15:41 -08:00
jekyllbot ccb382679a Merge pull request #4195 from jekyll/pull/cleanup-document__post_read
Merge pull request 4195
2016-01-22 13:13:18 -08:00
jekyllbot 512c7fdb05 Merge pull request #4388 from jekyll/fix-page.class-access
Merge pull request 4388
2016-01-22 13:01:04 -08:00
Parker Moore 2b8de59717 remove merge conflict 2016-01-22 09:38:34 -08:00
Parker Moore afff4f0bec Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read
* origin/pull/cleanup-document__post_read:
  add Utils.strip_heredoc
  Fix #4191: Reduce Document#post_read complexity slightly.
  Fix #4188: Extract title from filename successfully when dateless.
2016-01-22 09:37:58 -08:00
Parker Moore 5878acaaf1 Document#post_read: only overwrite slug & ext if they aren't set by YAML 2016-01-22 09:36:55 -08:00
Parker Moore 8204e479c3 add Utils.strip_heredoc 2016-01-22 09:11:56 -08:00
Jordon Bedwell 67f842546e Fix #4191: Reduce Document#post_read complexity slightly. 2016-01-22 09:11:56 -08:00
rebornix 1298ba6908 Fix #4188: Extract title from filename successfully when dateless. 2016-01-22 09:09:30 -08:00
Parker Moore cf51e32d0e Drop#[]: use self.class.invokable? instead of content_methods.include? for speed 2016-01-22 08:59:48 -08:00
Zshawn Syed 4ecdf6ce10 Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb 2016-01-21 23:44:30 -06:00
Parker Moore 31ae61b419 Drop#[]: only use public_send for keys in the content_methods array 2016-01-21 18:20:35 -08:00
Parker Moore a72629908a Document: throw a useful error when an invalid date is given 2016-01-20 14:19:06 -08:00
Parker Moore 1ba23c32c6 add Utils.strip_heredoc 2016-01-20 11:46:18 -08:00
Pat Hawks 090cf5a50b
Disable auto-regeneration when running server detached 2016-01-19 23:12:59 -08:00
Jordon Bedwell f8e8672148 Fix #4191: Reduce Document#post_read complexity slightly. 2016-01-19 11:18:19 -08:00
rebornix d50656021f Fix #4188: Extract title from filename successfully when dateless. 2016-01-19 11:18:19 -08:00
Parker Moore 32fba4f01a Release 💎 v3.1.0.pre.rc2 2016-01-18 15:39:53 -08:00
Parker Moore e75d703806 Page#write? shouldn't freeze 'true' 2016-01-18 15:33:58 -08:00
Parker Moore 4de1873b56 Renderer: #output_ext should check to make sure the output extension of the permalink isn't empty 2016-01-18 14:09:14 -08:00
Parker Moore 2554281188 document#merge_data!: reformat 2016-01-18 13:41:49 -08:00
Parker Moore e5d8bdee8f Page: freeze true in write? 2016-01-18 12:47:48 -08:00
Parker Moore 66dc083ad0 Renderer: set paginator 2016-01-18 12:47:36 -08:00
Parker Moore 0a6f289ba5 page: write? should always be true 2016-01-18 11:53:16 -08:00
Parker Moore 7d81c00b29 Renderer: use Convertible's way of picking the last Converter's output extension 2016-01-18 11:41:47 -08:00
Parker Moore d343da61eb Page: pipe through Renderer instead of using Convertible 2016-01-18 11:41:05 -08:00
Parker Moore c678640553 Release 💎 v3.1.0.pre.rc1 2016-01-15 16:25:58 -08:00
jekyllbot 0daafd7bda Merge pull request #4361 from jekyll/pheuko-empty-permalink
Merge pull request 4361
2016-01-15 16:19:22 -08:00
Parker Moore 06fa14c11a Restructure data validation so that permalink check raises an error. 2016-01-15 16:11:08 -08:00
Parker Moore 89db3c6384 Convertible: separate data validation out of #read 2016-01-15 15:52:54 -08:00
Parker Moore 948dcf2714 Convertible: consolidate empty check into Convertible#read 2016-01-15 15:51:32 -08:00
Parker Moore 15a2dacd37 Merge pull request #4359 from jekyll/optimize-drop
Fix deep_merge_hashes! handling of drops and hashes
2016-01-15 15:19:18 -08:00
Parker Moore 0587a3bb57 Fix some debug logging.
- excluded? should now only print when it is excluded
- requiring is now properly aligned
2016-01-15 11:30:02 -08:00
Parker Moore 5d79c55b2c Fix deep_merge_hashes! handling of drops and hashes 2016-01-15 11:22:39 -08:00
Parker Moore 22931f42b8 Drop: require 'json' for #inspect call 2016-01-15 10:00:56 -08:00
Parker Moore 3e81331af1 Utils: don't require mime/types 2016-01-15 10:00:45 -08:00
Pedro Euko 5681742223 Check if permalink key was given 2016-01-15 14:40:59 -02:00
Pedro Euko f8a63157d7 Empty permalink now shows an error 2016-01-15 14:40:47 -02:00
Jordon Bedwell 70f741b86f Remove ObectSpace dumping and start using inherited, it's faster. 2016-01-10 14:08:53 -06:00
jekyllbot 735554007c Merge pull request #4314 from jekyll/allow-custom-php-extensions
Merge pull request 4314
2016-01-09 18:11:47 -08:00
Parker Moore bb4f5910c9 document: don't cache @output_ext
Fixes race issue.
Will introduce perf issues, though...
2016-01-09 18:04:13 -08:00
Pat Hawks ddf640e6bd
Test all the things 2016-01-08 17:10:36 -08:00
Pat Hawks acb2263f51
Add smartify filter 2016-01-07 02:36:24 -08:00
Parker Moore a1b39840bb Revert change to Collection#url_template which caused test breakage.
Reverts dab53a697b
2016-01-06 10:13:13 -08:00
Peter Suschlik b1a2115948 Fix spelling of GitHub in docs and history
* Github -> GitHub
* GitHub pages -> GitHub Pages
2016-01-06 17:21:09 +01:00
Parker Moore dc31264160 url: tiny optimization to #generate_url_from_drop 2016-01-04 18:18:28 -08:00
Parker Moore 9579924f8a drop: tiny optimization to .mutable to create fewer objects 2016-01-04 18:18:12 -08:00
Parker Moore dab53a697b collection: tiny optimization to #url_template 2016-01-04 18:17:51 -08:00
Parker Moore b6c283a4ae wip: allow custom extensions 2016-01-04 17:42:06 -08:00
Parker Moore f995d86673 Merge pull request #4254 from jekyll/shim-docs-import-with-nudge
Merge pull request 4254
2016-01-04 16:30:30 -08:00
Parker Moore f47612ee98 Merge pull request #4307 from fulldecent/patch-1
Merge pull request 4307
2016-01-04 16:25:41 -08:00
Parker Moore 4fe9eecf05 For blessed gems, shim their commands so users know how to use them. 2016-01-04 16:10:21 -08:00
Parker Moore cb5bc1093e utils: has_yaml_header? should accept files with extraneous spaces
Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
2016-01-04 14:09:30 -08:00
Parker Moore e097a15657 Merge pull request #4312 from jekyll/fix-layout-metadata
Merge pull request 4312
2016-01-04 13:05:00 -08:00
Parker Moore 95a3c54ddb drop: only check mutable if the key is a method 2016-01-04 12:41:40 -08:00
Parker Moore 06c45df8c3 Drop: hash syntax should use setter method for a property if it's defined 2016-01-04 12:38:41 -08:00
Parker Moore 735194ccaf Convertible/Page/Renderer: use payload hash accessor & setter syntax 2016-01-04 12:37:19 -08:00
Pat Hawks 060904d809
Rubocop: Style/TrailingWhitespace
- Trailing whitespace detected
Rubocop: Style/EmptyLines
 - Extra blank line detected
Rubocop: Style/EmptyLinesAroundBlockBody
 - Extra empty line detected at block body beginning
2016-01-04 12:16:36 -08:00
Pat Hawks ab3d906e04
Rubocop: Style/ParenthesesAroundCondition
- Don't use parentheses around the condition of an if
2016-01-04 12:14:00 -08:00
Pat Hawks cce848d3d8
Rubocop: Avoid single-line method definitions 2016-01-04 12:12:17 -08:00
Pat Hawks c1c8b6dbf7
Rubocop: Style/SpaceInsideHashLiteralBraces 2016-01-04 12:07:34 -08:00
Pat Hawks 04e635b10c
Rubocop: Style/SpaceInsideRangeLiteral
- Space inside range literal
2016-01-04 12:06:40 -08:00
Pat Hawks 6711234d5f
Rubocop: Style/BlockDelimiters
- Avoid using {...} for multi-line blocks
2016-01-04 12:05:54 -08:00
Pat Hawks 086e85ca9e
Rubocop: Style/PerlBackrefs
- Avoid the use of Perl-style backrefs
2016-01-04 12:01:23 -08:00
Pat Hawks be3666fcf0
Rubocop: Do not use unless with else
- Rewrite these with the positive case first
2016-01-04 11:51:14 -08:00
Pat Hawks ec83ef60b5
Rubocop: Lint/UselessAssignment 2016-01-04 11:49:54 -08:00
Pat Hawks 085a778b0a
Rubocop: Style/NestedTernaryOperator
- Ternary operators must not be nested. Prefer if/else constructs instead.
2016-01-04 11:46:25 -08:00
Pat Hawks 78e9f3389e
Rubocop: Style/IndentationWidth 2016-01-04 11:42:17 -08:00
Pat Hawks f9926edbc4
Rubocop: Style/TrivialAccessors
- Use `attr_writer` to define trivial writer methods
2016-01-04 11:39:14 -08:00
Pat Hawks af9ec6831d
Rubocop: Style/ElseAlignment
- Align else with if
Rubocop: Lint/EndAlignment
 - Align end with if
2016-01-04 11:23:06 -08:00
Pat Hawks f6fd9014ba
Rubocop: Style/CaseIndentation
- Indent when as deep as case
2016-01-04 11:15:37 -08:00
Pat Hawks 2c9a349f9a Rubocop: Style/Next
- Use next to skip iteration
2016-01-04 11:10:52 -08:00
Pat Hawks f221b925b4 Rubocop: Lint/StringConversionInInterpolation
- Redundant use of Object#to_s in interpolation
2016-01-04 11:08:31 -08:00
Pat Hawks 13c980c896 Rubocop: Style/TrailingComma 2016-01-04 11:08:31 -08:00
Pat Hawks 4c5d77a4b5 Rubocop: Style/EmptyLines 2016-01-04 11:08:18 -08:00
Pat Hawks fd8fdd87d3
Rubocop: Style/RegexpLiteral 2016-01-03 17:10:39 -08:00
Pat Hawks e3189e3828
Rubocop: Lint/UnusedMethodArgument 2016-01-03 17:07:39 -08:00
Pat Hawks 11f0aab4b1
Rubocop: Lint/UnusedBlockArgument
- Unused block argument
2016-01-03 16:24:13 -08:00
Pat Hawks 7ca4f7cd62
Rubocop: Style/Proc
- Use proc instead of Proc.new
...and use lambda instead of proc
2016-01-03 16:18:26 -08:00
Pat Hawks af5d51289f
Rubocop: Style/SymbolProc
- Pass &:to_sym as an argument to map instead of a block
 - Pass &:capitalize as an argument to select instead of a block
 - Pass &:to_s as an argument to map instead of a block
2016-01-03 16:02:32 -08:00
Pat Hawks 704ca6b8cc
Rubocop: Style/NegatedIf
- Favor unless over if for negative conditions
2016-01-03 15:59:12 -08:00
Pat Hawks 663a2d3279
Rubocop: Style/SpaceBeforeBlockBraces
Rubocop: Style/SpaceInsideBlockBraces
2016-01-03 15:58:02 -08:00
Pat Hawks a70d89a862
Rubocop: Style/SpaceAfterComma
- Space missing after comma
2016-01-03 15:56:44 -08:00
Pat Hawks cda226de45
Rubocop: Style/EmptyLinesAroundClassBody
- Extra empty line detected at class body end
2016-01-03 15:55:33 -08:00
Pat Hawks 2530a8cdfc
Rubocop: Style/HashSyntax
- Use hash rockets syntax
2016-01-03 15:49:22 -08:00
Pat Hawks d157a04c6d
Rubocop: Performance/StringReplacement
- Use delete! instead of gsub!
 - Use tr instead of gsub
2016-01-03 15:47:31 -08:00
Pat Hawks ff5f7b7120
Rubocop: Style/DeprecatedHashMethods
- Hash#has_key? is deprecated in favor of Hash#key?
Add method `key?` to Drop
2016-01-03 15:41:04 -08:00
Pat Hawks 98a19cdf2b
Rubocop: Style/PercentLiteralDelimiters
- %w-literals should be delimited by ( and )
Rubocop: Style/WordArray
 - Use %w or %W for array of words
2016-01-03 15:32:11 -08:00
Pat Hawks fb0457bf3d
Rubocop: Style/AndOr
- Use && instead of and
 - Use || instead of or
2016-01-03 15:30:26 -08:00
Pat Hawks 6550867051
Rubocop: Style/SpecialGlobalVars
- Prefer $LOAD_PATH over $:
2016-01-03 15:29:49 -08:00
Pat Hawks 8223ebd861
Use select and find instead of conditional loop 2016-01-03 15:24:18 -08:00
Pat Hawks 0eae36aec2
Rubocop: Style/LineEndConcatenation
- Use \ instead of + or << to concatenate those strings
2016-01-03 14:41:49 -08:00
Pat Hawks 44d2995277
Rubocop: Style/Semicolon
- Do not use semicolons to terminate expressions
2016-01-03 14:40:45 -08:00
Pat Hawks 31dd0ebed5
Rubocop: Style/EmptyLiteral
- Use array literal [] instead of Array.new
 - Use hash literal {} instead of Hash.new
2016-01-03 14:39:01 -08:00
William Entriken 22a0be3f7b Escape html from site.title and page.title 2016-01-03 16:10:38 -05:00
Jordon Bedwell f2f88dbd9f Move require "jekyll/drops/drop" to "jekyll.rb"
Linux does not read files in alphanumeric order, this can lead to
Jekyll drops not working on Linux because the assumption here is that
the collection drop will be required first.
2015-12-27 12:48:21 -06:00
Parker Moore 5034216637 Release 💎 3.1.0.pre.beta1 2015-12-27 08:32:08 -05:00
Parker Moore 7c4876d2eb Merge pull request #4289 from jekyll/fix-utils-deep-merge-drops
Merge pull request 4289
2015-12-27 08:27:25 -05:00
Parker Moore 1b73751abf Merge branch 'fixup-custom-markdown'
* fixup-custom-markdown:
  markdown: minor style fixes
  Add support for underscores.
  Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
2015-12-27 08:24:16 -05:00
Parker Moore 8e887dcd8b markdown: minor style fixes
ref: #3771
2015-12-27 08:24:00 -05:00
Parker Moore 5bf596b239 utils/drops: update Drop to support Utils.deep_merge_hashes
Fixes #4287
2015-12-27 08:06:37 -05:00
Parker Moore d138558c1d drops: provide #to_h to allow for hash introspection
Follow-up to #4277
2015-12-26 14:25:29 -05:00
Parker Moore 3fa8af2a18 drops: create one base Drop class which can be set as mutable or not 2015-12-26 13:43:42 -05:00
Parker Moore 57613b31dd Slightly restructure rake helper files
Ref #4282
2015-12-26 12:53:30 -05:00
Parker Moore e3da5a3f9f Merge pull request #4282 from leethomas/refactor-rake-tasks
Merge pull request 4282
2015-12-26 12:47:30 -05:00
Parker Moore 1f298e0d9d url: move setter outside of if statement
Addresses @envygeeks's comment:
d070a77716 (commitcomment-15164169)
2015-12-26 12:32:21 -05:00
Parker Moore b70ea3ca5c immutable_drop/errors: consolidate errors & fix syntax for raising
Addresses @envygeeks's comments:
bff1726a5a
2015-12-26 12:27:07 -05:00
Parker Moore 1afbe9967d document: return nil if bad arg in #<=>
Addresses @envygeek's comment:

233589e150 (commitcomment-15164178)
2015-12-26 12:23:21 -05:00
leethomas b05b174b87 moved namespaced rake tasks to separate .rake files under lib/tasks 2015-12-25 22:50:23 -08:00
Parker Moore c63b51b661 document: revert comparison of Documents to old style & add nil check
@envygeeks, this should address your comment: fcce0d5482 (commitcomment-15162261)
2015-12-25 22:54:12 -05:00
Parker Moore debdb15171 Move 'forwardable' require to earlier in the program start up. 2015-12-25 22:45:51 -05:00
Parker Moore b2b634e767 drops: use def_delegator more liberally where acceptable 2015-12-24 15:07:48 -05:00
Parker Moore fcce0d5482 document: fix issue with bad comparison 2015-12-24 15:07:31 -05:00
Parker Moore d070a77716 url: fix issue with bad URL escaping when using Drop 2015-12-24 15:07:20 -05:00
Parker Moore bff1726a5a immutable_drop: use custom error for bad set 2015-12-24 15:06:32 -05:00
Parker Moore 233589e150 document: throw ArgumentError if compared to non-doc 2015-12-22 21:34:24 -05:00
Parker Moore 532bb9e9cb Further consolidation in the Drops. 2015-12-22 21:33:42 -05:00
Parker Moore 4935e85f7c CollectionDrop: to_s should work like Array#to_s 2015-12-21 23:41:36 -05:00
Parker Moore 03488b1cde DocumentDrop: use def_delegators instead of duplicating methods 2015-12-21 23:36:31 -05:00
Parker Moore ebe3c10604 Drops: fix accessing of site collections via site.COL_NAME 2015-12-21 23:33:33 -05:00
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
Parker Moore a87cda4b12 Add configuration fallback for paginate, and fix tests. 2015-01-31 13:53:17 -08:00
Parker Moore 65d43ef398 Move previous runtime dependencies to development dependencies. 2015-01-31 13:53:17 -08:00
Parker Moore 057b8cae7f Use `rouge` as the default syntax highlighter. 2015-01-31 13:52:50 -08:00
Parker Moore 336bb44750 Use #require_with_graceful_fail in Highlight tag. 2015-01-31 13:52:26 -08:00
Parker Moore 18e0d2fe75 Make the {% include %} tag a teensy bit faster. 2015-01-31 12:59:25 -08:00
Parker Moore aceb5b5d53 Merge branch 'jekyll-gjtorikian-patch-1'
* jekyll-gjtorikian-patch-1:
  Use the source_dir() helper
  Add test for new extracted method
  Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
Parker Moore a2b19c1d2b Merge pull request #3383 from jekyll/respect-the-title 2015-01-31 00:07:10 -08:00
Parker Moore 0c624eb11b The :title URL placeholder for collections should be the filename slug.
This mimicks posts most closely. It can be overridden by the
YAML front matter.

Undoes some of #2864.
2015-01-30 01:53:11 -08:00
Parker Moore e2e6e7dc22 Merge pull request #3376 from tkrotoff/helvetica 2015-01-29 18:52:07 -08:00
Matt Rogers fe08405ae1 Merge pull request #3378 from kaatt/initial-build-time 2015-01-29 16:10:05 -06:00
Alfred Xing 63bca94bde Merge pull request #3375 from tkrotoff/fix-nav-items-gaps 2015-01-29 14:07:49 -08:00
Garen Torikian e1e60499b1 Factor out a `read_data_file` call to keep things clean 2015-01-29 12:41:19 -08:00
kaatt ff646738fc Shows time after initial generation 2015-01-30 01:32:00 +05:30
Tanguy Krotoff aa44c7f53d Switch default font to Helvetica Neue
Helvetica Neue (1983) features multiple improvements over the original Helvetica font (1957), 'neue' means 'new' in German
2015-01-29 16:38:12 +01:00
Tanguy Krotoff 368b862ebb Refactoring: replace !important with cleaner CSS 2015-01-29 16:18:22 +01:00
Parker Moore 3e609b1cd9 Merge pull request #3329 from tkrotoff/fix-nav-items-gaps 2015-01-24 11:56:52 -08:00
Alfred Xing 31b03e9b86 Merge pull request #3325 from imathis/generate-url 2015-01-24 11:21:51 -08:00
Parker Moore 317e2f460e Release 💎 v3.0.0.beta1 2015-01-24 09:55:46 -08:00
Tanguy Krotoff 53a59544e8 Fix site-nav alignment 2015-01-21 01:44:31 +01:00
Alfred Xing 58e231ce40 Rename Regenerator#write to Regenerator#write_metadata 2015-01-19 16:29:50 -08:00
Tanguy Krotoff 90eecc5da6 Fix nav items alignment when in "burger" mode 2015-01-19 20:55:32 +01:00
Alfred Xing fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Brandon Mathis 589919d58a Strip slashes on nil url tokens 2015-01-18 08:31:14 -06:00
Parker Moore c378f741a8 Merge pull request #3319 from jekyll/split-off-textile 2015-01-17 17:08:15 -08:00
Parker Moore cbe5f8e4dd Merge pull request #3321 from jekyll/performance-upgrades 2015-01-17 16:55:51 -08:00
Parker Moore c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Parker Moore 877cba9811 Remove direct baked-in support for Textile. 2015-01-17 16:51:28 -08:00
Pascal Borreli d28fb07bb9 Fixed typo [ci skip] 2015-01-18 00:45:28 +00:00
Parker Moore aaf0ba15cc Use frozen regular expressions for Utils#slugify 2015-01-17 16:25:33 -08:00
Parker Moore ef2d558874 Markdown#matches should avoid regexp 2015-01-17 16:25:10 -08:00
Parker Moore 10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
Parker Moore b2099ac763 Merge branch 'davidized-collection_yaml_dots'
* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.

Conflicts:
	test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore c7d92c4e6d Move YAML Front Matter regexp into a constant. 2015-01-17 15:23:33 -08:00
Parker Moore 6d9b4c2aba Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path 2015-01-17 15:16:50 -08:00
Parker Moore a312115a5a Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest 2015-01-17 15:13:17 -08:00
Parker Moore 84cfc1ceff Merge branch 'majioa-devel'
* majioa-devel:
  Ensure Post#excerpt_separator always returns a string.
  get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
  Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
Parker Moore 18f3d76603 Ensure Post#excerpt_separator always returns a string. 2015-01-17 14:59:44 -08:00
Parker Moore ba2e1390ad Merge pull request #2571 from yous/patch-mixed-case-category 2015-01-17 14:55:30 -08:00
Mads Ohm Larsen 60da4ef010 Fix weird spacing 2015-01-15 22:04:00 +01:00
Matt Rogers ce78ea7818 Merge pull request #3220 from inukshuk/patch-1 2015-01-13 19:02:41 -06:00
Ryan Burnette 80465efff7 Require date in filters.rb 2015-01-13 13:51:47 -05:00
Ryan Burnette 936c737a32 Address #3298 2015-01-13 02:21:28 -05:00
Sylvester Keil 60921132c6 Preserve original mtime when copying static files 2015-01-12 13:00:35 +01:00
Parker Moore 4cbd814546 Add support for Windows line feeds too. 2015-01-09 23:55:47 -08:00
Malo Skrylevo a0f2b5f944 get procedure for default excerpt separator for both cases site and page was
moved to the post's specific method :excerpt_separator.
2015-01-10 04:05:16 +03:00
Kevin Ushey b92274b101 only strip newlines when rendering highlight blocks (#3265) 2015-01-09 00:07:11 -08:00
Malo Skrylevo 54d0bf47e8 Added per post excerpt_separator functionality, so you are able to
specify :excerpt_separator (as well as just :excerpt) key direct inside
the post YAML, to make an excerpt based on the value in the post. Tests
were also added.
2015-01-08 15:18:06 +03:00
Tanguy Krotoff c4d617e6aa Fix nav items alignment when on multiple lines 2015-01-07 12:30:48 +01:00
Parker Moore 502fd94f2c Merge pull request #3172 from alfredxing/docs-output-overrides 2015-01-05 23:19:12 -08:00
Alfred Xing c58ac78a5e Expose Publisher in Site 2015-01-05 16:13:04 -08:00
Alfred Xing 7655b533c9 Allow documents to set `published` in front matter 2015-01-05 16:11:02 -08:00
Seth Warburton 21bd3e6c5a [imp] Semantic structure improvements 2015-01-02 12:14:58 +00:00
Parker Moore a098dc80cd Merge pull request #3234 from jekyll/ruby-2-2 2014-12-29 20:49:04 -05:00
Parker Moore 7cd5847826 Merge pull request #3244 from jekyll/store-messages 2014-12-29 20:48:23 -05:00
Parker Moore 7bcf8d689e Always call Time#localtime to translate to TZ'd time. 2014-12-29 20:12:35 -05:00
nitoyon 5e10958faa Unescape Document output path
Document#destination wasn't unescaped properly.

For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.

We now unecape URL at Document#destination like Post#destination and
Page#destination.
2014-12-29 22:38:50 +09:00
Parker Moore 7fc47bfc43 Initialize @messages at instantiation time. 2014-12-29 01:14:16 -05:00
Parker Moore b2146e8659 Store log messages in an array of messages. 2014-12-29 01:14:16 -05:00
Parker Moore 35a5af783a Merge pull request #3189 from robschia/patch-1 2014-12-29 00:49:40 -05:00
Parker Moore 612eb737a5 Merge pull request #3047 from karouf/slugify-non-latin 2014-12-29 00:31:34 -05:00
Parker Moore 004f923644 Revert "Revert "Make permalink parsing consistent with pages"" 2014-12-29 00:30:42 -05:00
Parker Moore e39dfa3f0b Merge pull request #2908 from alfredxing/document-path 2014-12-29 00:26:35 -05:00
Parker Moore be23e18555 Say 'since 2.0' 2014-12-28 23:54:03 -05:00
Parker Moore aa4beda868 Merge pull request #3240 from jekyll/snake_case 2014-12-28 23:36:08 -05:00
Parker Moore c576d23908 Use External instead of Deprecator for requiring gracefully 2014-12-28 14:37:49 -05:00
Parker Moore ac41312c5d Separate jekyll-docs out into a separate gem & bless it 2014-12-28 14:37:02 -05:00
Parker Moore 0c0aea3ad7 Improve Site#getConverterImpl and call it Site#find_converter_instance 2014-12-28 14:12:09 -05:00
Parker Moore b6641be8ef Call it site_payload instead of payload. 2014-12-26 22:40:18 -05:00
Parker Moore 2f8248a6f1 Only call #site_payload once for all collection work. 2014-12-26 22:24:18 -05:00
Parker Moore 0eb2796a66 Sort static files just once.
Ref: #2075.
2014-12-26 22:23:45 -05:00
Parker Moore d35af9c1f3 Read 'enable_coderay' in the Kramdown parser 2014-12-26 22:16:57 -05:00
Parker Moore f6bff6fb61 Have a deprecation fallback for 'use_coderay' 2014-12-26 22:16:47 -05:00
Parker Moore a103898980 Set 'use_coderay' to 'enable_coderay' 2014-12-26 22:16:33 -05:00
Parker Moore b68dd3a5cb Add liquid c if it's available. 2014-12-26 21:53:56 -05:00
Parker Moore 70a331d854 Set the error mode to :strict 2014-12-26 21:53:56 -05:00
Tanguy Krotoff 0aa61f66a8 Remove unneeded end tag 2014-12-26 12:10:03 +01:00
Parker Moore cb2eea0e41 Release 💎 2.5.3 2014-12-22 09:16:40 -05:00
Parker Moore 8284714d8a Release 💎 2.5.3 2014-12-22 09:15:57 -05:00
Parker Moore 7227ad4ebb Merge pull request #3116 from alfredxing/incremental 2014-12-22 08:57:50 -05:00
Parker Moore 49115dbdab Merge pull request #3158 from afeld/as-liquid-refactor 2014-12-09 10:50:42 -08:00
Aidan Feldman 383a0d0aa7 modify as_liquid to use case statement 2014-12-09 07:42:14 -05:00
robschia 59acdaab9a Fixed itemprop="author name"
You are right, I tried to oversimplify it. Also, {{ page.date | %Y-%m-%d }} doesn't output what I expected. I think it's fixed now, I tried the code with a couple of validators and everything seems fine.
2014-12-08 19:46:49 +01: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
robschia ed9cc80ff9 Update post.html 2014-12-06 00:49:04 +01:00
robschia 9b6eeba81e Added basic microdata 2014-12-06 00:32:05 +01:00
Alfred Xing 52f0b36558 Add incremental rebuild info to build command output 2014-12-04 20:09:49 -08:00
Laust Rud Jacobsen c8fc567c8d Site /feed.xml is RSS 2.0, fix auto-discovery header
Refs #2996
2014-12-02 22:40:22 +01:00
Alexander Köplinger 6055f112fb Incorporate code review feedback 2014-11-30 14:52:16 +01:00
Alexander Köplinger a0da18e4f8 Incorporate code review feedback 2014-11-30 14:30:22 +01:00
Alexander Köplinger 98405edf61 Add a Jekyll doctor warning for URLs that only differ by case
Those URLs are problematic on case-insensitive file systems because one of the URLs is overwritten by the other.
Fixes #3035
2014-11-29 15:14:44 +01:00
Tanguy Krotoff 64b0102686 Fix viewport meta tag 2014-11-29 12:30:43 +01:00
Alfred Xing d0e12d69bc Last few revisions 2014-11-28 14:05:40 -08:00
Alfred Xing b6d81c58df Perform less expensive operation first 2014-11-27 10:00:29 -08:00
Aidan Feldman 4776b27ff3 reduce nesting of #as_liquid 2014-11-27 04:20:05 -06:00
Aidan Feldman 87d08ec827 refactor #as_liquid 2014-11-27 04:16:29 -06:00
Alfred Xing 02f281eef3 Add unit and cucumber tests 2014-11-26 21:15:53 -08:00
Alfred Xing 8a257aca6b Implement more suggestions 2014-11-26 20:15:42 -08:00
Aidan Feldman 0662d31bf6 fix jsonify filter when used with boolean values 2014-11-26 02:40:41 -06:00
Brandon Bradley e546eb3e9f force markdown regexp to match the full extension 2014-11-24 20:08:31 -06:00
Alfred Xing dc30114605 Use site.in_source_dir 2014-11-23 16:16:19 -08:00
Alfred Xing 2a5cf11ee2 Add --no-metadata option 2014-11-23 15:38:00 -08:00
Parker Moore 5b77d02e3b Merge pull request #3141 from jekyll/bundle-require-is-borking-pygments
Fix Bundler-integration Plugin Manager
2014-11-23 14:18:06 -08:00
Parker Moore c2b24e82e5 Refactor the case statement in highlighter for better readability. [ci skip] 2014-11-23 14:17:21 -08:00
Parker Moore 10030ae8cd Put that Bundle.require statement back. 2014-11-23 14:13:47 -08:00
Alfred Xing 75c5c16297 Handle path overrides 2014-11-23 14:06:29 -08:00
Parker Moore ef53e677a4 Better tests for plugin manager. 2014-11-23 13:14:51 -08:00
Alfred Xing 4acf343fea Add clean command 2014-11-23 12:51:19 -08:00
Parker Moore b1bba1945a Prepare for a v2.5.2 release. 2014-11-22 15:37:07 -08:00
Parker Moore d17b80bf2a Keep track of the required gems. 2014-11-22 12:38:36 -08:00
Alfred Xing ac03af3229 Implement @mattr-'s suggestions 2014-11-21 22:12:21 -08:00
Alfred Xing fe6bfc6f1b Fix failing tests 2014-11-21 22:12:21 -08:00
Alfred Xing d438362971 Add regenerate front-matter variable 2014-11-21 22:12:21 -08:00
Alfred Xing 842470b0c4 Refinements 2014-11-21 22:12:21 -08:00
Alfred Xing 11917645f2 Incremental regeneration 2014-11-21 22:12:20 -08:00
David Williamson d7e3d4df8f Add support for collections documents to have YAML front matter ending in dots. 2014-11-20 14:38:17 -06:00
Parker Moore 60202782ea Only try bundler if the Gemfile is there. 2014-11-16 21:21:50 -08:00
Parker Moore 32b14d6402 First, setup Bundler. Then, require it.
Per a conversation in
https://github.com/bundler/bundler/issues/3252#issuecomment-63208769
2014-11-16 21:18:23 -08:00
Parker Moore 687b9cdf19 Merge pull request #3058 from alfredxing/fix-post-url-equality 2014-11-16 20:19:37 -08:00
Parker Moore 314fb875b5 Merge pull request #3089 from jekyll/remove-duplication-in-regexp 2014-11-12 18:46:44 -08:00
Alfred Xing d4c15efff9 Cache name matching regex 2014-11-11 17:35:09 -08:00
Alfred Xing 06750b8502 Print error message in renderer 2014-11-10 11:45:56 -08:00
Parker Moore bd907c5be6 Remove duplicate regexp phrase: ^\A.
Addresses @mastahyeti's comment in #3077: https://github.com/jekyll/jekyll/pull/3077#discussion_r20077150
2014-11-10 11:36:05 -08:00
Alfred Xing 84cef2202d Remove duplicate 'Conversion error:' message 2014-11-10 09:12:51 -08:00
Alfred Xing eaa132c65b Fall back to old method with deprecation warning 2014-11-09 11:55:47 -08:00
Parker Moore 22d11bef2d Prepare a 💎 v2.5.1 release. 2014-11-08 22:29:47 -08:00