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

2316 Commits

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