Commit Graph

2352 Commits

Author SHA1 Message Date
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